diff --git a/.clang-format b/.clang-format
index 31db2f468..0d1102725 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,8 @@
 BasedOnStyle: LLVM
 IndentWidth: 4
 ColumnLimit: 120
-UseTab: Never
+UseTab: Always
+TabWidth: 4
 
 # Disallow single-line statements
 AllowShortIfStatementsOnASingleLine: false
@@ -31,4 +32,5 @@ PointerAlignment: Left
 AccessModifierOffset: -4
 PackConstructorInitializers: Never
 FixNamespaceComments: true
-SortIncludes: true
+SortIncludes: false
+NamespaceIndentation: All
\ No newline at end of file
diff --git a/.clangd b/.clangd
index eedaea903..b65daaf0c 100644
--- a/.clangd
+++ b/.clangd
@@ -1,8 +1,8 @@
 CompileFlags:
-  CompilationDatabase: build/ninja-debug
+  CompilationDatabase: build/windows-clang
   Add:
     - -Wall
-    - -Wextra
+    - -Wextras
   Remove:
     - -fmodules-ts
     - -fmodule-mapper=*
@@ -10,8 +10,9 @@ CompileFlags:
     - -Winvalid-pch
     - -Winvalid-offsetof
 
-Index:
-    Background: Skip
 Diagnostics:
   UnusedIncludes: None
 
+Index:
+  Background: Skip
+
diff --git a/.gitattributes b/.gitattributes
index 8cc1b614d..632178c3d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,28 +1,25 @@
 *.glb filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.bin -text
-*.gltf -text
-*.obj -text
-*.fbx -text
-*.png -text
-*.jpg -text
-*.hdr -text
-*.hdr filter=lfs diff=lfs merge=lfs -text
-*.fbx filter=lfs diff=lfs merge=lfs -text
 *.gltf filter=lfs diff=lfs merge=lfs -text
+*.fbx filter=lfs diff=lfs merge=lfs -text
 *.obj filter=lfs diff=lfs merge=lfs -text
+*.hdr filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
-*.wav filter=lfs diff=lfs merge=lfs -text
-*.mp3 filter=lfs diff=lfs merge=lfs -text
-*.ogg filter=lfs diff=lfs merge=lfs -text
-*.pack filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
 *.tga filter=lfs diff=lfs merge=lfs -text
 *.bmp filter=lfs diff=lfs merge=lfs -text
 *.psd filter=lfs diff=lfs merge=lfs -text
+*.tif filter=lfs diff=lfs merge=lfs -text
+*.tiff filter=lfs diff=lfs merge=lfs -text
 *.exr filter=lfs diff=lfs merge=lfs -text
 *.dds filter=lfs diff=lfs merge=lfs -text
+*.ktx filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
 *.7z filter=lfs diff=lfs merge=lfs -text
 *.rar filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.ogg filter=lfs diff=lfs merge=lfs -text
 *.flac filter=lfs diff=lfs merge=lfs -text
+*.pack filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
new file mode 100644
index 000000000..b794e9b89
--- /dev/null
+++ b/.githooks/pre-commit
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Git pre-commit hook: Auto-format staged C++ files using clang-format (excluding thirdparty/)
+
+set -e
+
+# Find staged C++ files excluding thirdparty/
+FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep -E '\.(cpp|h|hpp|cc|cxx)$' | grep -v '^thirdparty/' || true)
+
+if [ -n "$FILES" ]; then
+    echo "[pre-commit] Formatting staged C++ files with clang-format..."
+    echo "$FILES" | xargs clang-format -i --style=file
+    echo "$FILES" | xargs git add
+fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f10a8750..7c211697a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,31 +2,46 @@ name: CI
 
 on:
   push:
-    branches: [main, develop]
+    branches: [main, develop, opengl]
     paths:
       - "**/*.cpp"
       - "**/*.h"
+      - "**/*.hpp"
+      - "**/*.c"
+      - "**/*.inl"
       - "**/*.cs"
       - "**/*.csproj"
+      - "**/*.props"
+      - "**/*.py"
+      - "tools/**"
+      - "resources/shaders/**"
       - "**/CMakeLists.txt"
       - "**/CMakePresets.json"
-      - "cmake/*.cmake"
-      - ".github/workflows/*.yml"
+      - "cmake/**"
+      - ".github/**"
   pull_request:
-    branches: [main, develop, chained-gui, refactor-branch]
+    branches: [main, develop, opengl]
+    types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - "**/*.cpp"
       - "**/*.h"
+      - "**/*.hpp"
+      - "**/*.c"
+      - "**/*.inl"
       - "**/*.cs"
       - "**/*.csproj"
+      - "**/*.props"
+      - "**/*.py"
+      - "tools/**"
+      - "resources/shaders/**"
       - "**/CMakeLists.txt"
       - "**/CMakePresets.json"
-      - "cmake/*.cmake"
-      - ".github/workflows/*.yml"
+      - "cmake/**"
+      - ".github/**"
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 env:
@@ -36,6 +51,10 @@ env:
   DOTNET_NOLOGO: true
 
 jobs:
+  format:
+    name: Format Check
+    uses: ./.github/workflows/format.yml
+
   linux:
     name: Linux Builds
     uses: ./.github/workflows/linux.yml
@@ -46,14 +65,25 @@ jobs:
     uses: ./.github/workflows/windows.yml
     secrets: inherit
 
-  managed:
-    name: Managed Tests
-    uses: ./.github/workflows/managed.yml
-    secrets: inherit
-
-  quality-gate:
-    name: PR Gate
+  ci-success:
+    name: CI Passed
     runs-on: ubuntu-latest
-    needs: [linux, windows, managed]
+    needs: [format, linux, windows]
+    if: always()
     steps:
-      - run: echo "Native builds and managed tests passed."
\ No newline at end of file
+      - name: Evaluate CI status
+        run: |
+          echo "Format Check: ${{ needs.format.result }}"
+          echo "Linux Builds: ${{ needs.linux.result }}"
+          echo "Windows Builds: ${{ needs.windows.result }}"
+
+          if [[ "${{ needs.format.result }}" != "success" ]] || \
+             [[ "${{ needs.linux.result }}" != "success" ]] || \
+             [[ "${{ needs.windows.result }}" != "success" ]]; then
+            echo "CI failed: One or more required workflow jobs did not succeed."
+            exit 1
+          fi
+
+          echo "All CI workflow jobs passed successfully!"
+
+
diff --git a/.github/workflows/deploy-sdk.yml b/.github/workflows/deploy-sdk.yml
index 8c724fc89..ed2735293 100644
--- a/.github/workflows/deploy-sdk.yml
+++ b/.github/workflows/deploy-sdk.yml
@@ -4,31 +4,62 @@ on:
   push:
     tags:
       - 'v*'
+      - 'release/*'
+      - 'release-*'
+    branches:
+      - main
+      - opengl
+      - develop
   workflow_dispatch:
+    inputs:
+      tag_name:
+        description: "Release tag / version name (e.g. release/1.0.0 or v1.0.0)"
+        required: false
+        default: ""
+        type: string
+      create_release:
+        description: "Publish as official GitHub Release?"
+        required: true
+        default: true
+        type: boolean
+      is_draft:
+        description: "Publish as Draft Release?"
+        required: false
+        default: false
+        type: boolean
+      is_prerelease:
+        description: "Mark as Pre-release?"
+        required: false
+        default: false
+        type: boolean
+
+concurrency:
+  group: deploy-sdk-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   CI: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
+  NODE_OPTIONS: "--no-deprecation"
 
 jobs:
-  deploy:
-    name: Deploy SDK (${{ matrix.os }})
+  build:
+    name: Build SDK (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
         include:
           - os: ubuntu-latest
-            name: linux
-            preset: linux-gcc
-            config_preset: linux-gcc
+            platform: linux
+            preset: linux-clang
+            config: Release
           - os: windows-latest
-            name: windows
-            preset: windows-gcc
-            config_preset: windows-gcc
+            platform: windows
+            preset: windows-clang
+            config: Release
 
     defaults:
       run:
@@ -38,46 +69,70 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: false
+          fetch-depth: 1
 
-      - name: Get CMake and Ninja
-        uses: lukka/get-cmake@latest
+      - name: Write submodule SHA manifest
+        run: git submodule status | tee submodule-shas.txt
 
-      - name: Setup Compiler Cache
-        uses: hendrikmuhs/ccache-action@v1.2
+      - name: Cache submodules
+        uses: actions/cache@v4
         with:
-          variant: ${{ matrix.os == 'windows-latest' && 'sccache' || 'ccache' }}
-          key: ${{ runner.os }}-${{ matrix.config_preset }}
-          max-size: 5G
+          path: |
+            .git/modules
+            thirdparty
+          key: submodules-${{ runner.os }}-${{ hashFiles('submodule-shas.txt') }}
+          restore-keys: |
+            submodules-${{ runner.os }}-
 
-      - name: Get current version/date
-        id: info
-        shell: bash
-        run: |
-          echo "date=$(date +'%d.%m.%y')" >> $GITHUB_OUTPUT
-          TAG_VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=${TAG_VERSION:-manual}" >> $GITHUB_OUTPUT
+      - name: Init submodules
+        run: git submodule update --init --recursive --depth 1
 
-      - name: Setup environment
-        id: build-env
-        shell: bash
+      - name: Setup MSYS2 (Windows)
+        if: matrix.os == 'windows-latest'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: false
+          path-type: inherit
+          install: mingw-w64-x86_64-clang lld mingw-w64-x86_64-lld mingw-w64-x86_64-gcc mingw-w64-x86_64-make
+
+      - name: Prefer MSYS2 toolchain over preinstalled MinGW
+        if: matrix.os == 'windows-latest'
+        shell: msys2 {0}
         run: |
-          mkdir -p build/${{ matrix.preset }}
-          mkdir -p package/bin
-          echo "package-dir=$(pwd)/package" >> $GITHUB_OUTPUT
+          cygpath -w /mingw64/bin >> "$GITHUB_PATH"
 
-      - name: Install dependencies (Ubuntu)
+      - name: Setup Mold Linker (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        uses: rui314/setup-mold@v1
+
+      - name: Install Linux Dependencies
         if: matrix.os == 'ubuntu-latest'
         run: |
+          set -euo pipefail
           sudo apt-get update
-          sudo apt-get install -y build-essential cmake ninja-build ccache \
-            libgl1-mesa-dev libx11-dev libxrandr-dev libxinerama-dev \
-            libxcursor-dev libxi-dev libasound2-dev libglu1-mesa-dev \
-            libwayland-dev libxkbcommon-dev libegl1-mesa-dev \
+          sudo apt-get install -y --no-install-recommends \
+            build-essential \
+            xorg-dev \
+            libgl1-mesa-dev libglu1-mesa-dev \
+            libasound2-dev \
             pkg-config libgtk-3-dev libdrm-dev libgbm-dev \
-            xvfb libxkbcommon-x11-0 gcc-14 g++-14
-          echo "CC=gcc-14" >> $GITHUB_ENV
-          echo "CXX=g++-14" >> $GITHUB_ENV
+            xvfb libxkbcommon-x11-0 libgl1-mesa-dri mesa-utils \
+            clang-18 clang++-18 libc++-18-dev libc++abi-18-dev lld-18 llvm-18
+          echo "CC=clang-18" >> $GITHUB_ENV
+          echo "CXX=clang++-18" >> $GITHUB_ENV
+          echo "LDFLAGS=-fuse-ld=mold" >> $GITHUB_ENV
+
+      - name: Get CMake and Ninja
+        uses: lukka/get-cmake@latest
+
+      - name: Setup Compiler Cache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          variant: ${{ matrix.os == 'windows-latest' && 'sccache' || 'ccache' }}
+          key: SDK-${{ matrix.preset }}-${{ matrix.config }}
+          max-size: 5G
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -90,106 +145,233 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install jinja2
 
-      - name: Setup MSYS2
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: >-
-            mingw-w64-x86_64-gcc
-
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: |
+            9.0.x
+            10.0.x
 
-      - name: Run managed progression tests
+      - name: Get current version/date
+        id: info
         shell: bash
         run: |
-          dotnet test ./game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj \
-            -c Release \
-            --logger "trx;LogFileName=deploy-managed-tests-${{ matrix.name }}.trx"
-
-      - name: Upload managed test report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: deploy-managed-tests-${{ matrix.name }}
-          path: "**/deploy-managed-tests-${{ matrix.name }}.trx"
-          retention-days: 7
+          echo "date=$(date +'%d.%m.%y')" >> $GITHUB_OUTPUT
+          if [[ -n "${{ inputs.tag_name }}" ]]; then
+            RAW_TAG="${{ inputs.tag_name }}"
+            TAG_VERSION="${RAW_TAG#release/}"
+            TAG_VERSION="${TAG_VERSION#release-}"
+            TAG_VERSION="${TAG_VERSION#v}"
+          elif [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            RAW_TAG="${GITHUB_REF#refs/tags/}"
+            TAG_VERSION="${RAW_TAG#release/}"
+            TAG_VERSION="${TAG_VERSION#release-}"
+            TAG_VERSION="${TAG_VERSION#v}"
+          else
+            BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+            CLEAN_BRANCH="${BRANCH_NAME//\//-}"
+            SHORT_SHA="${GITHUB_SHA:0:7}"
+            TAG_VERSION="${CLEAN_BRANCH}-${SHORT_SHA}"
+            RAW_TAG="v${TAG_VERSION}"
+          fi
+          echo "raw_tag=${RAW_TAG}" >> $GITHUB_OUTPUT
+          echo "version=${TAG_VERSION}" >> $GITHUB_OUTPUT
 
       - name: Configure CMake
         run: |
           set -euo pipefail
-          PYTHON_EXE=$(python -c "import sys; print(sys.executable)")
-          extra_flags=""
+          PYTHON_EXE=$(python3 -c "import sys; print(sys.executable)" 2>/dev/null || python -c "import sys; print(sys.executable)")
           launcher="sccache"
           if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
-            extra_flags="-DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX"
             launcher="ccache"
           fi
 
+          mkdir -p "build/${{ matrix.preset }}"
           cmake --preset ${{ matrix.preset }} \
-            -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER_LAUNCHER=$launcher \
             -DCMAKE_CXX_COMPILER_LAUNCHER=$launcher \
-            -DCMAKE_INSTALL_PREFIX="${{ steps.build-env.outputs.package-dir }}" \
             -DPython_EXECUTABLE="${PYTHON_EXE}" \
             -DPython3_EXECUTABLE="${PYTHON_EXE}" \
             -DCH_CI=ON \
-            -DENABLE_UNITY_BUILD=ON \
+            -DENABLE_UNITY_BUILD=OFF \
             -DENABLE_PCH=OFF \
             -DBUILD_TESTS=OFF \
-            $extra_flags
+            2>&1 | tee "build/${{ matrix.preset }}/configure.log"
 
       - name: Build binaries
         run: |
           set -euo pipefail
-          cmake --build --preset ${{ matrix.preset }} \
-            --target ChainedEditor ChainedRuntime \
-            --parallel $(nproc 2>/dev/null || echo 8) \
-            2>&1 | tee "build/${{ matrix.preset }}/build.log"
+          cmake --build "build/${{ matrix.preset }}" --config ${{ matrix.config }} --parallel \
+            2>&1 | tee "build/${{ matrix.preset }}/build_${{ matrix.config }}.log"
 
-      - name: Install to package directory
-        shell: bash
+      - name: Sync resources
+        run: |
+          set -euo pipefail
+          python tools/sync_resources.py --root . --bin "build/${{ matrix.preset }}/bin" --config ${{ matrix.config }}
+
+      - name: Package with CPack
         run: |
-          cmake --install build/${{ matrix.preset }} \
-            --component Runtime
+          set -euo pipefail
+          cd "build/${{ matrix.preset }}"
+          cpack -C ${{ matrix.config }} || true
 
-      - name: Package SDK
+      - name: Package all archives
+        id: package
         shell: bash
         run: |
-          cd "${{ steps.build-env.outputs.package-dir }}"
-          # Exact naming from screenshot: Chained Engine(Chained Decos) SDK DD.MM.YY
-          PACKAGE_NAME="Chained Engine(Chained Decos) SDK ${{ steps.info.outputs.date }}"
-          echo "Creating SDK package: $PACKAGE_NAME"
-          
-          if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
-            powershell -Command "
-              Compress-Archive -Path '*' -DestinationPath '${{ steps.build-env.outputs.package-dir }}/$PACKAGE_NAME.zip' -Force
-            "
-            echo "p-file=$PACKAGE_NAME.zip" >> $GITHUB_ENV
+          set -euo pipefail
+          VERSION="${{ steps.info.outputs.version }}"
+          DATE="${{ steps.info.outputs.date }}"
+          PLATFORM="${{ matrix.platform }}"
+          IS_WINDOWS="${{ matrix.os == 'windows-latest' }}"
+
+          BIN_DIR="${{ github.workspace }}/build/${{ matrix.preset }}/bin/${{ matrix.config }}"
+          if [[ ! -d "$BIN_DIR" ]]; then
+            BIN_DIR="${{ github.workspace }}/build/${{ matrix.preset }}/bin"
+          fi
+
+          make_archive() {
+            local NAME="$1"
+            local SRC_DIR="$2"
+            local ARCHIVE_NAME="${NAME}-${VERSION}-${DATE}-${PLATFORM}"
+            local DEST="${{ github.workspace }}/${ARCHIVE_NAME}"
+            cd "$SRC_DIR"
+            if [[ "$IS_WINDOWS" == "true" ]]; then
+              powershell -Command "Compress-Archive -Path * -DestinationPath '${DEST}.zip' -Force"
+              echo "${ARCHIVE_NAME}.zip"
+            else
+              tar -czf "${DEST}.tar.gz" .
+              echo "${ARCHIVE_NAME}.tar.gz"
+            fi
+          }
+
+          # --- SDK (editor + game + assets + resources) ---
+          SDK_DIR="${{ github.workspace }}/package-sdk"
+          mkdir -p "$SDK_DIR"
+          cp -r "$BIN_DIR"/* "$SDK_DIR/"
+          if [[ -d "${{ github.workspace }}/assets" ]]; then
+            cp -r "${{ github.workspace }}/assets" "$SDK_DIR/"
+          fi
+          SDK_ARCHIVE=$(make_archive "ChainedEngine-SDK" "$SDK_DIR")
+          echo "sdk_archive=$SDK_ARCHIVE" >> $GITHUB_OUTPUT
+
+          # --- Game (ChainedDecos + assets + resources) ---
+          GAME_DIR="${{ github.workspace }}/package-game"
+          mkdir -p "$GAME_DIR"
+          cp "$BIN_DIR/ChainedDecos" "$GAME_DIR/" 2>/dev/null || true
+          cp "$BIN_DIR/ChainedDecos.exe" "$GAME_DIR/" 2>/dev/null || true
+          if [[ -d "${{ github.workspace }}/assets" ]]; then
+            cp -r "${{ github.workspace }}/assets" "$GAME_DIR/"
+          fi
+          GAME_ARCHIVE=$(make_archive "ChainedDecos-Game" "$GAME_DIR")
+          echo "game_archive=$GAME_ARCHIVE" >> $GITHUB_OUTPUT
+
+          # --- Editor (ChainedEditor only) ---
+          EDITOR_DIR="${{ github.workspace }}/package-editor"
+          mkdir -p "$EDITOR_DIR"
+          cp "$BIN_DIR/ChainedEditor" "$EDITOR_DIR/" 2>/dev/null || true
+          cp "$BIN_DIR/ChainedEditor.exe" "$EDITOR_DIR/" 2>/dev/null || true
+          EDITOR_ARCHIVE=$(make_archive "ChainedEditor" "$EDITOR_DIR")
+          echo "editor_archive=$EDITOR_ARCHIVE" >> $GITHUB_OUTPUT
+
+      - name: Upload CPack Packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: CPack-Packages-${{ matrix.platform }}
+          path: |
+            build/${{ matrix.preset }}/*.zip
+            build/${{ matrix.preset }}/*.tar.gz
+            build/${{ matrix.preset }}/*.deb
+            build/${{ matrix.preset }}/*.exe
+          if-no-files-found: ignore
+          retention-days: 30
+
+      - name: Upload SDK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SDK-${{ matrix.platform }}
+          path: ${{ github.workspace }}/${{ steps.package.outputs.sdk_archive }}
+          retention-days: 30
+
+      - name: Upload Game artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Game-${{ matrix.platform }}
+          path: ${{ github.workspace }}/${{ steps.package.outputs.game_archive }}
+          retention-days: 30
+
+      - name: Upload Editor artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Editor-${{ matrix.platform }}
+          path: ${{ github.workspace }}/${{ steps.package.outputs.editor_archive }}
+          retention-days: 30
+
+  release:
+    name: Create GitHub Release
+    runs-on: ubuntu-latest
+    needs: build
+    if: >-
+      (github.event_name == 'workflow_dispatch' && (inputs.create_release == true || inputs.create_release == 'true')) ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get release info
+        id: info
+        run: |
+          echo "date=$(date +'%d.%m.%y')" >> $GITHUB_OUTPUT
+          if [[ -n "${{ inputs.tag_name }}" ]]; then
+            RAW_TAG="${{ inputs.tag_name }}"
+            TAG_VERSION="${RAW_TAG#release/}"
+            TAG_VERSION="${TAG_VERSION#release-}"
+            TAG_VERSION="${TAG_VERSION#v}"
+          elif [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            RAW_TAG="${GITHUB_REF#refs/tags/}"
+            TAG_VERSION="${RAW_TAG#release/}"
+            TAG_VERSION="${TAG_VERSION#release-}"
+            TAG_VERSION="${TAG_VERSION#v}"
           else
-            tar -czf "$PACKAGE_NAME.tar.gz" .
-            echo "p-file=$PACKAGE_NAME.tar.gz" >> $GITHUB_ENV
+            BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+            CLEAN_BRANCH="${BRANCH_NAME//\//-}"
+            SHORT_SHA="${GITHUB_SHA:0:7}"
+            TAG_VERSION="${CLEAN_BRANCH}-${SHORT_SHA}"
+            RAW_TAG="v${TAG_VERSION}"
           fi
+          echo "raw_tag=${RAW_TAG}" >> $GITHUB_OUTPUT
+          echo "version=${TAG_VERSION}" >> $GITHUB_OUTPUT
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: release-assets
+          pattern: "{SDK,Game,Editor,CPack}-*"
+          merge-multiple: true
 
       - name: Create Release
-        if: matrix.os == 'ubuntu-latest'
         uses: softprops/action-gh-release@v2
         with:
-          name: "Chained Engine(Chained Decos) SDK ${{ steps.info.outputs.date }}"
-          tag_name: "release-sdk-${{ steps.info.outputs.date }}"
-          files: |
-            package/*.zip
-            package/*.tar.gz
+          name: "Chained Engine v${{ steps.info.outputs.version }}"
+          tag_name: "${{ steps.info.outputs.raw_tag }}"
+          files: release-assets/*
           body: |
-            ### Chained Engine SDK Update
-            - **Version**: ${{ steps.info.outputs.version }}
+            ### Chained Engine v${{ steps.info.outputs.version }}
             - **Build Date**: ${{ steps.info.outputs.date }}
-            - **Architecture**: ${{steps.build-env}}
-          draft: false
-          prerelease: false
+            - **Platforms**: Linux (clang), Windows (clang)
+
+            #### Assets
+            - **ChainedEngine-SDK** — full SDK (editor + game + engine)
+            - **ChainedDecos-Game** — game only
+            - **ChainedEditor** — editor only
+            - **CPack Packages** — standalone ZIP, NSIS Windows installer, DEB, tar.gz packages
+          draft: ${{ inputs.is_draft || false }}
+          prerelease: ${{ inputs.is_prerelease || false }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 000000000..e4f43c407
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,53 @@
+name: Format
+
+on:
+  workflow_call:
+
+jobs:
+  clang-format:
+    name: clang-format check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          fetch-depth: 0
+
+      - name: Install clang-format-18
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang-format-18
+
+      - name: Determine changed C++ files
+        id: changed
+        run: |
+          set -euo pipefail
+          BASE_REF=""
+          if [[ -n "${{ github.base_ref }}" ]] && git rev-parse --verify "origin/${{ github.base_ref }}" >/dev/null 2>&1; then
+            BASE_REF="origin/${{ github.base_ref }}"
+          elif [[ -n "${{ github.event.pull_request.base.sha }}" ]] && git rev-parse --verify "${{ github.event.pull_request.base.sha }}" >/dev/null 2>&1; then
+            BASE_REF="${{ github.event.pull_request.base.sha }}"
+          else
+            BASE_REF="HEAD~1"
+          fi
+
+          if git rev-parse --verify "$BASE_REF" >/dev/null 2>&1; then
+            FILES=$(git diff --name-only --diff-filter=ACMR "$BASE_REF"...HEAD -- '*.cpp' '*.h' '*.hpp' '*.cc' '*.cxx' '*.inl' '*.c' | grep -v -E '^(thirdparty/|engine/scripting/generated/|build/)' || true)
+          else
+            FILES=$(git diff --name-only --diff-filter=ACMR HEAD~1 -- '*.cpp' '*.h' '*.hpp' '*.cc' '*.cxx' '*.inl' '*.c' | grep -v -E '^(thirdparty/|engine/scripting/generated/|build/)' || true)
+          fi
+          echo "files<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$FILES" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+      - name: Run clang-format --dry-run
+        if: steps.changed.outputs.files != ''
+        run: |
+          set -euo pipefail
+          echo "${{ steps.changed.outputs.files }}" | xargs -r clang-format-18 --dry-run --Werror -style=file
+
+      - name: No changed C++ files
+        if: steps.changed.outputs.files == ''
+        run: echo "No C++ files changed — skipping format check."
+
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index bba3f95ae..a22f05dbc 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -8,10 +8,11 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
+  NODE_OPTIONS: "--no-deprecation" 
 
 jobs:
   build-linux:
-    name: ubuntu-latest / ${{ matrix.preset }} (${{ matrix.build_type }})
+    name: build (ubuntu-latest, ${{ matrix.build_type }}, ${{ matrix.toolchain.compiler }})
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -19,16 +20,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        preset: [linux-gcc, linux-clang]
         build_type: [Debug, Release]
+        toolchain:
+          - { preset: linux-clang, compiler: clang }
+          - { preset: linux-gcc, compiler: gcc }
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: false
           fetch-depth: 1
 
+      - name: Write submodule SHA manifest
+        run: git submodule status | tee submodule-shas.txt
+
+      - name: Cache submodules
+        uses: actions/cache@v4
+        with:
+          path: |
+            .git/modules
+            thirdparty
+          key: submodules-${{ runner.os }}-${{ hashFiles('submodule-shas.txt') }}
+          restore-keys: |
+            submodules-${{ runner.os }}-
+
+      - name: Init submodules
+        run: git submodule update --init --recursive --depth 1
+
       - name: Get CMake and Ninja
         uses: lukka/get-cmake@latest
 
@@ -36,7 +55,7 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           variant: ccache
-          key: Linux-${{ matrix.preset }}-${{ matrix.build_type }}
+          key: Linux-${{ matrix.toolchain.preset }}-${{ matrix.build_type }}
           max-size: 5G
 
       - name: Setup Mold Linker
@@ -48,49 +67,51 @@ jobs:
           python3 -m pip install jinja2
 
       - name: Install Linux Dependencies
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: >-
-            build-essential
-            libgl1-mesa-dev libx11-dev libxrandr-dev libxinerama-dev
-            libxcursor-dev libxi-dev libasound2-dev libglu1-mesa-dev
-            pkg-config libgtk-3-dev libdrm-dev libgbm-dev
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          # xorg-dev is the GLFW-recommended meta-package: it pulls the full set of
+          # X11 development headers/libs (libx11, xrandr, xinerama, xcursor, xi, xext,
+          # and the X protocol headers) that find_package(X11) needs. Installing it
+          # directly (rather than via a cache-apt action) avoids cache-restore gaps
+          # where a package is "installed" per the manifest but its files are absent.
+          sudo apt-get install -y --no-install-recommends \
+            build-essential \
+            xorg-dev \
+            libgl1-mesa-dev libglu1-mesa-dev \
+            libasound2-dev \
+            pkg-config libgtk-3-dev libdrm-dev libgbm-dev \
             xvfb libxkbcommon-x11-0 libgl1-mesa-dri mesa-utils
-          version: 1.0
 
       - name: Setup Linux Compilers
         run: |
-          if [[ "${{ matrix.preset }}" == *"gcc"* ]]; then
-            sudo apt-get install -y gcc-14 g++-14
-            echo "CC=gcc-14" >> $GITHUB_ENV
-            echo "CXX=g++-14" >> $GITHUB_ENV
-          elif [[ "${{ matrix.preset }}" == *"clang"* ]]; then
+          set -euo pipefail
+          if [[ "${{ matrix.toolchain.compiler }}" == "clang" ]]; then
             sudo apt-get install -y clang-18 clang++-18 libc++-18-dev libc++abi-18-dev lld-18 llvm-18
             echo "CC=clang-18" >> $GITHUB_ENV
             echo "CXX=clang++-18" >> $GITHUB_ENV
-            echo "LDFLAGS=-fuse-ld=mold" >> $GITHUB_ENV
+          else
+            sudo apt-get install -y gcc-13 g++-13
+            echo "CC=gcc-13" >> $GITHUB_ENV
+            echo "CXX=g++-13" >> $GITHUB_ENV
           fi
+          echo "LDFLAGS=-fuse-ld=mold" >> $GITHUB_ENV
 
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: |
+            9.0.x
+            10.0.x
 
       - name: Preflight
         run: |
           set -euo pipefail
-          echo "Repository root: $PWD"
-          git submodule status --recursive
           cmake --version
           dotnet --info
-          echo "CC=${CC:-unset}"
-          echo "CXX=${CXX:-unset}"
           if [[ -n "${CC:-}" ]] && command -v "$CC" >/dev/null 2>&1; then
             "$CC" --version | head -n 1
           fi
-          if [[ -n "${CXX:-}" ]] && command -v "$CXX" >/dev/null 2>&1; then
-            "$CXX" --version | head -n 1
-          fi
 
       - name: Configure
         run: |
@@ -100,46 +121,59 @@ jobs:
             SANITIZERS_FLAG="ON"
           fi
 
-          mkdir -p "build/${{ matrix.preset }}"
+          mkdir -p "build/${{ matrix.toolchain.preset }}"
           PYTHON_EXE=$(python3 -c "import sys; print(sys.executable)")
-          cmake --preset ${{ matrix.preset }} \
-            -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          
+          cmake --preset ${{ matrix.toolchain.preset }} \
             -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DPython_EXECUTABLE="${PYTHON_EXE}" \
             -DPython3_EXECUTABLE="${PYTHON_EXE}" \
             -DCH_CI=ON \
-            -DENABLE_UNITY_BUILD=ON \
+            -DENABLE_UNITY_BUILD=OFF \
             -DENABLE_SANITIZERS=$SANITIZERS_FLAG \
             -DENABLE_LTO=OFF \
             -DENABLE_PCH=OFF \
-            2>&1 | tee "build/${{ matrix.preset }}/configure.log"
+            2>&1 | tee "build/${{ matrix.toolchain.preset }}/configure.log"
 
       - name: Build
         run: |
           set -euo pipefail
-          cmake --build --preset ${{ matrix.preset }} \
-            2>&1 | tee "build/${{ matrix.preset }}/build.log"
+          cmake --build "build/${{ matrix.toolchain.preset }}" --config ${{ matrix.build_type }} \
+            2>&1 | tee "build/${{ matrix.toolchain.preset }}/build_${{ matrix.build_type }}.log"
 
       - name: Test
         run: |
           set -euo pipefail
-          BUILD_DIR="${{ github.workspace }}/build/${{ matrix.preset }}"
+          BUILD_DIR="${{ github.workspace }}/build/${{ matrix.toolchain.preset }}"
           export LIBGL_ALWAYS_SOFTWARE=1
           export GALLIUM_DRIVER=llvmpipe
           export MESA_GL_VERSION_OVERRIDE=4.5
           export LSAN_OPTIONS="suppressions=${{ github.workspace }}/.github/lsan.supp"
-          xvfb-run -a ctest --test-dir "$BUILD_DIR" -C "${{ matrix.build_type }}" --output-on-failure --timeout 300 --output-junit "$BUILD_DIR/junit.xml" \
-            2>&1 | tee "$BUILD_DIR/ctest.log"
+          
+          xvfb-run -a ctest --test-dir "$BUILD_DIR" -C "${{ matrix.build_type }}" --output-on-failure --timeout 300 --output-junit "$BUILD_DIR/junit_${{ matrix.build_type }}.xml" \
+            2>&1 | tee "$BUILD_DIR/ctest_${{ matrix.build_type }}.log"
 
       - name: Upload Artifacts
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Linux-${{ matrix.preset }}-${{ matrix.build_type }}-binaries
+          name: Linux-${{ matrix.toolchain.preset }}-${{ matrix.build_type }}-binaries
+          if-no-files-found: ignore
+          path: |
+            build/${{ matrix.toolchain.preset }}/**/*.log
+            build/${{ matrix.toolchain.preset }}/**/junit_*.xml
+          retention-days: 7
+
+      - name: Upload Release Binaries
+        if: matrix.build_type == 'Release'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux-${{ matrix.toolchain.preset }}-Release-executables
           if-no-files-found: ignore
           path: |
-            build/${{ matrix.preset }}/**/*.log
-            build/${{ matrix.preset }}/junit.xml
+            build/${{ matrix.toolchain.preset }}/bin/Release/ChainedEditor
+            build/${{ matrix.toolchain.preset }}/bin/Release/ChainedDecos
+            build/${{ matrix.toolchain.preset }}/bin/Release/*.so
           retention-days: 7
\ No newline at end of file
diff --git a/.github/workflows/managed.yml b/.github/workflows/managed.yml
deleted file mode 100644
index c475eded3..000000000
--- a/.github/workflows/managed.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: Managed
-
-on:
-  workflow_call:
-
-env:
-  CI: true
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
-  DOTNET_NOLOGO: true
-
-jobs:
-  managed-tests:
-    name: Managed Scripts Tests
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 1
-
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '9.0.x'
-
-      - name: Preflight
-        run: |
-          set -euo pipefail
-          echo "Repository root: $PWD"
-          git submodule status --recursive
-          dotnet --info
-
-      - name: Restore managed tests
-        run: |
-          set -euo pipefail
-          dotnet restore ./game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj \
-            2>&1 | tee managed-tests-restore.log
-
-      - name: Run managed tests
-        run: |
-          set -euo pipefail
-          dotnet test ./game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj -c Release --no-restore --logger "trx;LogFileName=managed-tests.trx" \
-            2>&1 | tee managed-tests.log
-
-      - name: Upload managed test report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: managed-tests-report
-          if-no-files-found: ignore
-          path: |
-            managed-tests-restore.log
-            managed-tests.log
-            **/managed-tests.trx
-          retention-days: 7
\ No newline at end of file
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index b10e2f8ec..e17b28336 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -8,10 +8,11 @@ env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_NOLOGO: true
+  NODE_OPTIONS: "--no-deprecation"
 
 jobs:
   build-windows:
-    name: windows-latest / ${{ matrix.preset }} (${{ matrix.build_type }})
+    name: build (windows-latest, ${{ matrix.build_type }}, ${{ matrix.compiler }})
     runs-on: windows-latest
     defaults:
       run:
@@ -19,28 +20,94 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        preset: [windows-gcc, windows-clang, windows-msvc]
-        build_type: [Debug, Release]
+        include:
+          - preset: windows-clang
+            compiler: clang
+            build_type: Release
+          - preset: windows-clang
+            compiler: clang
+            build_type: Debug
+          - preset: windows-vs2026
+            compiler: vs2026
+            build_type: Release
+          - preset: windows-vs2026
+            compiler: vs2026
+            build_type: Debug
+          - preset: windows-gcc
+            compiler: gcc
+            build_type: Release
+          - preset: windows-gcc
+            compiler: gcc
+            build_type: Debug
+          
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: false
           fetch-depth: 1
 
+      - name: Write submodule SHA manifest
+        run: git submodule status | tee submodule-shas.txt
+
+      - name: Cache submodules
+        uses: actions/cache@v4
+        with:
+          path: |
+            .git/modules
+            thirdparty
+          key: submodules-${{ runner.os }}-${{ hashFiles('submodule-shas.txt') }}
+          restore-keys: |
+            submodules-${{ runner.os }}-
+
+      - name: Init submodules
+        run: git submodule update --init --recursive --depth 1
+
       - name: Setup MSYS2
-        if: contains(matrix.preset, 'gcc') || contains(matrix.preset, 'clang')
+        if: "contains(matrix.preset, 'clang') || contains(matrix.preset, 'gcc')"
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: false
-          install: ${{ contains(matrix.preset, 'clang') && 'mingw-w64-x86_64-clang lld' || 'mingw-w64-x86_64-gcc' }}
+          path-type: inherit
+          install: mingw-w64-x86_64-clang lld mingw-w64-x86_64-lld mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-gdb
 
       - name: Setup MSVC
-        if: contains(matrix.preset, 'msvc')
+        if: "contains(matrix.preset, 'msvc') || contains(matrix.preset, 'vs')"
         uses: ilammy/msvc-dev-cmd@v1
 
+      - name: Setup lld-link (MSVC only)
+        if: matrix.use_lld == true
+        shell: pwsh
+        run: |
+          # LLVM is pre-installed on windows-latest; find lld-link and put it on PATH.
+          # Prefer the LLVM install that ships with VS, fall back to standalone LLVM.
+          $candidates = @(
+            "C:\Program Files\LLVM\bin",
+            "C:\Program Files (x86)\LLVM\bin"
+          )
+          $llvmBin = $candidates | Where-Object { Test-Path "$_\lld-link.exe" } | Select-Object -First 1
+          if (-not $llvmBin) {
+            # Standalone LLVM not found — install via winget (fast, no choco overhead)
+            choco install llvm --no-progress -y | Out-Null
+            $llvmBin = "C:\Program Files\LLVM\bin"
+          }
+          Write-Host "Using lld-link from: $llvmBin"
+          "$llvmBin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          lld-link --version
+
+      - name: Prefer MSYS2 toolchain over preinstalled MinGW
+        if: "contains(matrix.preset, 'clang') || contains(matrix.preset, 'gcc')"
+        shell: msys2 {0}
+        run: |
+          # The windows-latest image preinstalls a MinGW-Builds GCC at C:\mingw64
+          # which shadows the MSYS2 toolchain installed above (jobs run in Git
+          # Bash, not the msys2 shell). That build's libstdc++ segfaults in
+          # std::format Debug code, and it is NOT the toolchain anyone tests
+          # against locally. Put MSYS2's mingw64/bin first on PATH.
+          cygpath -w /mingw64/bin >> "$GITHUB_PATH"
+
       - name: Get CMake and Ninja
         uses: lukka/get-cmake@latest
 
@@ -48,7 +115,7 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           variant: sccache
-          key: Windows-${{ matrix.preset }}-${{ matrix.build_type }}
+          key: Windows-${{ matrix.preset }}-${{ matrix.build_type }}${{ matrix.use_lld == true && '-lld' || '' }}
           max-size: 5G
 
       - name: Setup Python
@@ -65,54 +132,83 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: |
+            9.0.x
+            10.0.x
 
       - name: Preflight
         run: |
           set -euo pipefail
-          echo "Repository root: $PWD"
-          git submodule status --recursive
           cmake --version
           dotnet --info
           if [[ "${{ matrix.preset }}" == *"clang"* ]]; then
             clang --version | head -n 1
-          elif [[ "${{ matrix.preset }}" == *"msvc"* ]]; then
+          elif [[ "${{ matrix.preset }}" == *"msvc"* || "${{ matrix.preset }}" == *"vs"* ]]; then
             cl || true
-          else
+          elif [[ "${{ matrix.preset }}" == *"gcc"* ]]; then
             gcc --version | head -n 1
           fi
 
       - name: Configure
         run: |
           set -euo pipefail
+          SANITIZERS_FLAG="OFF"
+          # Disable ASan on Windows Clang due to static CRT conflicts (libucrtd.lib vs clang_rt.asan)
           mkdir -p "build/${{ matrix.preset }}"
           PYTHON_EXE=$(python -c "import sys; print(sys.executable)")
+
+          LLD_FLAG=""
+          if [[ "${{ matrix.use_lld }}" == "true" ]]; then
+            LLD_FLAG="-DCMAKE_LINKER_TYPE=LLD"
+          fi
+
           cmake --preset ${{ matrix.preset }} \
-            -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
             -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" \
             -DCMAKE_C_COMPILER_LAUNCHER=sccache \
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
             -DPython_EXECUTABLE="${PYTHON_EXE}" \
             -DPython3_EXECUTABLE="${PYTHON_EXE}" \
             -DCH_CI=ON \
-            -DENABLE_UNITY_BUILD=ON \
-            -DENABLE_SANITIZERS=OFF \
+            -DENABLE_UNITY_BUILD=OFF \
+            -DENABLE_SANITIZERS=$SANITIZERS_FLAG \
             -DENABLE_LTO=OFF \
             -DENABLE_PCH=OFF \
+            ${LLD_FLAG} \
             2>&1 | tee "build/${{ matrix.preset }}/configure.log"
 
       - name: Build
         run: |
           set -euo pipefail
-          cmake --build --preset ${{ matrix.preset }} \
-            2>&1 | tee "build/${{ matrix.preset }}/build.log"
+          cmake --build "build/${{ matrix.preset }}" --config ${{ matrix.build_type }} --parallel \
+            2>&1 | tee "build/${{ matrix.preset }}/build_${{ matrix.build_type }}.log"
 
       - name: Test
+        env:
+          COREHOST_TRACE: 1
         run: |
           set -euo pipefail
           BUILD_DIR="${{ github.workspace }}/build/${{ matrix.preset }}"
-          ctest --test-dir "$BUILD_DIR" -C "${{ matrix.build_type }}" --output-on-failure --timeout 300 --output-junit "$BUILD_DIR/junit.xml" \
-            2>&1 | tee "$BUILD_DIR/ctest.log"
+          ctest --test-dir "$BUILD_DIR" -C "${{ matrix.build_type }}" --output-on-failure --timeout 300 --output-junit "$BUILD_DIR/junit_${{ matrix.build_type }}.xml" \
+            2>&1 | tee "$BUILD_DIR/ctest_${{ matrix.build_type }}.log"
+
+      - name: Crash backtrace (gcc Debug only)
+        if: failure() && matrix.compiler == 'gcc' && matrix.build_type == 'Debug'
+        env:
+          COREHOST_TRACE: 1
+          ENGINE_ROOT: ${{ github.workspace }}
+        run: |
+          # The integration tests crash with an access violation on this runner
+          # but pass locally with the identical build config. Run one failing
+          # test directly under gdb to capture the faulting module and stack.
+          BIN_DIR="build/${{ matrix.preset }}/bin/${{ matrix.build_type }}"
+          cd "$BIN_DIR"
+          gdb -batch -return-child-result \
+            -ex "set pagination off" \
+            -ex run \
+            -ex "bt" \
+            -ex "info registers" \
+            -ex "info sharedlibrary" \
+            --args ./engine_tests_integration.exe --gtest_filter=RegressionTest.CopyEntityResetsUUID || true
 
       - name: Upload Artifacts
         if: always()
@@ -122,5 +218,7 @@ jobs:
           if-no-files-found: ignore
           path: |
             build/${{ matrix.preset }}/**/*.log
-            build/${{ matrix.preset }}/junit.xml
+            build/${{ matrix.preset }}/**/junit_*.xml
+            build/${{ matrix.preset }}/${{ matrix.build_type }}/*.exe
+            build/${{ matrix.preset }}/${{ matrix.build_type }}/*.dll
           retention-days: 7
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 63e70b529..8bf290e56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@ include/*-build/
 build/
 cmake-build-*/
 
-.cmake
 .cache
 .zencoder
 .idea/
@@ -86,3 +85,32 @@ engine/script/managed/ManagedDependencies.props
 *.log
 
 build_error.txt
+
+# Engine Cache
+*.chcache
+*.chasset
+*.pdf
+
+.opencode
+.claude
+.zcode
+AGENTS.md
+CLAUDE.md
+# CMake install directory
+install/
+
+# Deploy packaging
+package/
+
+# Test results
+*.trx
+
+# Zip archives (SDK builds)
+*.zip
+*.tar.gz
+
+exported
+
+nul
+
+.serena
diff --git a/.gitmodules b/.gitmodules
index d86dea438..6de4e97e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,65 +1,102 @@
+[submodule "thirdparty/imgui"]
+    path = thirdparty/imgui
+    url = https://github.com/ocornut/imgui.git
+    branch = master
 
-[submodule "include/imgui"]
-	path = include/imgui
-	url = https://github.com/ocornut/imgui.git
-	branch = master
+[submodule "thirdparty/nfd"]
+    path = thirdparty/nfd
+    url = https://github.com/btzy/nativefiledialog-extended.git
+    branch = master
 
-[submodule "include/nfd"]
-	path = include/nfd
-	url = https://github.com/btzy/nativefiledialog-extended.git
-	branch = master
+[submodule "thirdparty/googletest"]
+    path = thirdparty/googletest
+    url = https://github.com/google/googletest.git
+    branch = main
 
-[submodule "include/googletest"]
-	path = include/googletest
-	url = https://github.com/google/googletest.git
-	branch = main
+[submodule "thirdparty/JoltPhysics"]
+    path = thirdparty/JoltPhysics
+    url = https://github.com/jrouwe/JoltPhysics.git
+    branch = master
 
-[submodule "include/entt"]
-	path = include/entt
-	url = https://github.com/skypjack/entt.git
-	branch = master
+[submodule "thirdparty/entt"]
+    path = thirdparty/entt
+    url = https://github.com/skypjack/entt.git
+    branch = master
 
-[submodule "include/yaml-cpp"]
-	path = include/yaml-cpp
-	url = https://github.com/jbeder/yaml-cpp.git
+[submodule "thirdparty/yaml-cpp"]
+    path = thirdparty/yaml-cpp
+    url = https://github.com/jbeder/yaml-cpp.git
 
-[submodule "include/imguizmo"]
-	path = include/imguizmo
-	url = https://github.com/CedricGuillemet/ImGuizmo.git
+[submodule "thirdparty/imguizmo"]
+    path = thirdparty/imguizmo
+    url = https://github.com/CedricGuillemet/ImGuizmo.git
 
-[submodule "include/glm"]
-	path = include/glm
-	url = https://github.com/g-truc/glm.git
+[submodule "thirdparty/glm"]
+    path = thirdparty/glm
+    url = https://github.com/g-truc/glm.git
 
-[submodule "include/assimp"]
-	path = include/assimp
-	url = https://github.com/assimp/assimp.git
+[submodule "thirdparty/assimp"]
+    path = thirdparty/assimp
+    url = https://github.com/assimp/assimp.git
 
-[submodule "include/coral"]
-	path = include/coral
-	url = https://github.com/StudioCherno/Coral.git
+[submodule "thirdparty/coral"]
+    path = thirdparty/coral
+    url = https://github.com/StudioCherno/Coral.git
 
-[submodule "include/enet"]
-	path = include/enet
+[submodule "thirdparty/miniaudio"]
+    path = thirdparty/miniaudio
+    url = https://github.com/mackron/miniaudio.git
+
+[submodule "thirdparty/stb"]
+    path = thirdparty/stb
+    url = https://github.com/nothings/stb.git
+
+[submodule "thirdparty/glad"]
+    path = thirdparty/glad
+    url = https://github.com/Dav1dde/glad.git
+    branch = glad2
+
+[submodule "thirdparty/glfw"]
+    path = thirdparty/glfw
+    url = https://github.com/glfw/glfw.git
+
+[submodule "thirdparty/cereal"]
+    path = thirdparty/cereal
+    url = https://github.com/USCiLab/cereal.git
+
+[submodule "thirdparty/zstd"]
+    path = thirdparty/zstd
+    url = https://github.com/facebook/zstd.git
+
+[submodule "thirdparty/spdlog"]
+    path = thirdparty/spdlog
+    url = https://github.com/gabime/spdlog.git
+
+[submodule "thirdparty/reflect-cpp"]
+    path = thirdparty/reflect-cpp
+    url = https://github.com/getml/reflect-cpp.git
+
+[submodule "thirdparty/portable-file-dialogs"]
+    path = thirdparty/portable-file-dialogs
+    url = https://github.com/samhocevar/portable-file-dialogs.git
+[submodule "cmake/external/thirdparty/portable-file-dialogs"]
+	path = cmake/external/thirdparty/portable-file-dialogs
+	url = https://github.com/samhocevar/portable-file-dialogs.git
+    
+[submodule "thirdparty/pack"]
+	path = thirdparty/pack
+	url = https://github.com/cfnptr/pack.git
+
+[submodule "thirdparty/miniupnp"]
+	path = thirdparty/miniupnp
+	url = https://github.com/miniupnp/miniupnp.git
+
+[submodule "thirdparty/enet"]
+	path = thirdparty/enet
 	url = https://github.com/zpl-c/enet.git
-	branch = master
-
-[submodule "include/GameNetworkingSockets"]
-	path = include/GameNetworkingSockets
-	url = https://github.com/ValveSoftware/GameNetworkingSockets.git
-	branch = master
-
-[submodule "include/miniaudio"]
-	path = include/miniaudio
-	url = https://github.com/mackron/miniaudio.git
-
-[submodule "include/stb"]
-	path = include/stb
-	url = https://github.com/nothings/stb.git
-[submodule "include/glad"]
-	path = include/glad
-	url = https://github.com/Dav1dde/glad.git
-	branch = glad2
-[submodule "include/glfw"]
-	path = include/glfw
-	url = https://github.com/glfw/glfw.git
+[submodule "thirdparty/freetype"]
+	path = thirdparty/freetype
+	url = https://github.com/freetype/freetype.git
+[submodule "thirdparty/freetype-gl"]
+	path = thirdparty/freetype-gl
+	url = https://github.com/rougier/freetype-gl.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 116d0803c..5db2f8f65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.31)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
 
+# Enforce static CRT (/MT) globally — must be set before project() or early
+# so that third-party add_subdirectory calls don't override it.
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
 # Windows SDK Version (must be set before project())
 if(WIN32)
     set(WINDOWS_SDK_VERSION "10.0" CACHE STRING "Windows SDK Version")
@@ -9,35 +13,37 @@ endif()
 
 project(ChainedDecos LANGUAGES CXX C)
 
-set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_C_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Generate compile_commands.json")
-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
 
 # Options
 option(BUILD_TESTS "Build unit tests" ON)
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 option(CH_CI "Set to ON for CI environments" OFF)
+option(CH_NETWORKING "Enable networking features in the editor" ON)
 
 if(CH_CI)
     add_compile_definitions(CH_CI)
 endif()
 
 # Global library definitions
-add_compile_definitions(GLM_ENABLE_EXPERIMENTAL GLM_FORCE_DEPTH_ZERO_TO_ONE)
+# GLM behavior macros live here (not in engine_pch.h) so every TU — including
+# NO_PCH modules — sees the same GLM configuration.
+add_compile_definitions(GLM_FORCE_DEPTH_ZERO_TO_ONE GLM_ENABLE_EXPERIMENTAL)
+
+# Enable logging only in Debug and RelWithDebInfo configurations
+add_compile_definitions($<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:CH_ENABLE_LOGGING>)
+
+# Embed build preset name and configuration so the exporter knows exactly which build was used
+# e.g. CH_BUILD_PRESET="windows-clang-debug", CH_BUILD_CONFIG="Debug"
+add_compile_definitions($<$<CONFIG:Debug>:CH_BUILD_CONFIG="Debug">)
+add_compile_definitions($<$<CONFIG:Release>:CH_BUILD_CONFIG="Release">)
+add_compile_definitions($<$<CONFIG:RelWithDebInfo>:CH_BUILD_CONFIG="RelWithDebInfo">)
+if(CMAKE_BUILD_PRESET)
+	add_compile_definitions(CH_BUILD_PRESET="${CMAKE_BUILD_PRESET}")
+endif()
 
-# Warning Settings
-option(DISABLE_ALL_WARNINGS "Disable all compiler warnings" OFF)
-option(ENABLE_WARNINGS "Enable compiler warnings" OFF)
-option(WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
 
 # Optional: ccache support for faster rebuilds
-# Install ccache: choco install ccache (Windows) or apt install ccache (Linux)
 option(USE_CCACHE "Use ccache if available" ON)
 if(USE_CCACHE)
     find_program(CCACHE_PROGRAM ccache)
@@ -50,70 +56,73 @@ if(USE_CCACHE)
     endif()
 endif()
 
-# === BUILD OPTIMIZATION: Prevent unnecessary recompilation ===
-# 1. Don't regenerate build files if nothing changed
-set(CMAKE_SUPPRESS_REGENERATION OFF)
-
-# 2. Incremental linking (faster linking)
-if(MSVC)
-    add_link_options(/INCREMENTAL)
-endif()
-
-# 3. Parallel build must be controlled by the build tool (cmake --build --parallel)
-# Never pass -j as a compiler flag, because compilers like gcc treat it as invalid.
-
-# 4. Unity builds in Release (combine multiple source files)
-# Trades disk space for faster compilation times
-if(CMAKE_BUILD_TYPE STREQUAL Release OR CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_UNITY_BUILD ON CACHE BOOL "Enable Unity builds" FORCE)
-    set(CMAKE_UNITY_BUILD_BATCH_SIZE 8 CACHE STRING "Unity build batch size")
-endif()
+# Note: do NOT add /INCREMENTAL here. MSVC enables it by default in Debug;
+# forcing it globally conflicts with /OPT:ICF in Release (LNK4075).
 
 # Dependencies
 include(cmake/CompilerSettings.cmake)
 include(cmake/Dependencies.cmake)
 include(cmake/ProjectHelpers.cmake)
 
-chained_generate_build_preset_header()
+# Find Python interpreter
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+set(CH_PYTHON_EXECUTABLE "${Python3_EXECUTABLE}" CACHE FILEPATH "Python interpreter used for build helper scripts" FORCE)
 
 set(CH_ACTIVE_GAME "chaineddecos" CACHE STRING "Active game project to build")
 set_property(CACHE CH_ACTIVE_GAME PROPERTY STRINGS chaineddecos testproject)
 
-# Useful definitions
 if(UNIX AND NOT APPLE)
     add_compile_definitions(_GNU_SOURCE)
 endif()
 
 if(MINGW)
-    add_compile_options(-Wa,-mbig-obj)
+    # Serialize link steps under MinGW. Ninja otherwise links several heavy
+    # Debug targets concurrently, and each linker process holds large archives
+    # in memory at once — the combined footprint is what exhausts RAM. A
+    # single-slot link pool keeps compilation fully parallel but links one
+    # target at a time.
+    set_property(GLOBAL PROPERTY JOB_POOLS link_pool=1)
+    set(CMAKE_JOB_POOL_LINK link_pool)
 endif()
 
-file(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}" PROJECT_ROOT_DIR_ESCAPED)
-add_compile_definitions(PROJECT_ROOT_DIR="${PROJECT_ROOT_DIR_ESCAPED}")
-
-# Standardize output directories for all targets
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
-
 add_subdirectory(engine)
-add_subdirectory(scripting)
-
-# Build Game Projects
-# Build the selected game project
-if(CH_ACTIVE_GAME STREQUAL "chaineddecos")
-    add_subdirectory(game/chaineddecos)
-elseif(CH_ACTIVE_GAME STREQUAL "testproject")
-    add_subdirectory(game/testproject)
-else()
-    message(FATAL_ERROR "Unknown CH_ACTIVE_GAME='${CH_ACTIVE_GAME}'. Supported values are: chaineddecos, testproject.")
-endif()
-
-add_subdirectory(editor)
-add_subdirectory(runtime)
 
-if(BUILD_TESTS)
-    enable_testing()
-    add_subdirectory(tests)
-endif()
+# ── Build Game Projects ──────────────────────────────────────────────────────
+file(GLOB GAME_PROJECT_LIST RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/game" "game/*")
+foreach(GAME_PROJECT_DIR ${GAME_PROJECT_LIST})
+    set(GAME_PATH "${CMAKE_CURRENT_SOURCE_DIR}/game/${GAME_PROJECT_DIR}")
+    if(IS_DIRECTORY "${GAME_PATH}" AND EXISTS "${GAME_PATH}/CMakeLists.txt")
+        if(NOT CH_ACTIVE_GAME OR CH_ACTIVE_GAME STREQUAL GAME_PROJECT_DIR)
+            add_subdirectory("game/${GAME_PROJECT_DIR}")
+        endif()
+    endif()
+endforeach()
 
+add_subdirectory(editor)
+# Google Tests for engine
+enable_testing()
+add_subdirectory(tests)
+
+# ── Resource Sync Targets ────────────────────────────────────────────────────
+add_custom_target(sync-resources
+    COMMAND ${CH_PYTHON_EXECUTABLE}
+            "${CMAKE_SOURCE_DIR}/tools/sync_resources.py"
+            sync-resources
+            --root "${CMAKE_SOURCE_DIR}"
+            --bin  "${CMAKE_BINARY_DIR}/bin"
+            --all-configs
+    COMMENT "Syncing resources to all configs"
+    VERBATIM
+)
+
+add_custom_target(sync-scripts
+    COMMAND ${CH_PYTHON_EXECUTABLE}
+            "${CMAKE_SOURCE_DIR}/tools/sync_scripts.py"
+            --build-dir "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
+            --game-dir  "${CMAKE_SOURCE_DIR}/game/chaineddecos"
+    COMMENT "Syncing C# scripts to game assets"
+    VERBATIM
+)
+
+# ── Packaging (CPack) ────────────────────────────────────────────────────────
+include(cmake/Packaging.cmake)
\ No newline at end of file
diff --git a/CMakePresets.json b/CMakePresets.json
index 75d4e25be..f80e44ba7 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -15,50 +15,45 @@
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_CXX_EXTENSIONS": "OFF",
         "BUILD_TESTS": "ON",
-        "BUILD_MAP_EDITOR": "ON",
+        "CMAKE_SUPPRESS_DEVELOPER_WARNINGS": "OFF",
         "DISABLE_ALL_WARNINGS": "ON",
         "CH_ENGINE_SHARED": "OFF",
         "CH_ACTIVE_GAME": "chaineddecos",
-        "WINDOWS_SDK_VERSION": "10.0"
+        "WINDOWS_SDK_VERSION": "10.0",
+        "CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo"
       }
     },
     {
       "name": "ninja-base",
       "hidden": true,
       "inherits": "base",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "linux-gcc",
-      "displayName": "Linux GCC",
-      "inherits": "ninja-base",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
+        "ENABLE_UNITY_BUILD": "OFF",
+        "CMAKE_SUPPRESS_REGENERATION": "ON"
       }
     },
     {
-      "name": "linux-clang",
-      "displayName": "Linux Clang",
+      "name": "windows-clang",
+      "displayName": "Windows Ninja Clang",
       "inherits": "ninja-base",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++"
+      },
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
-        "rhs": "Linux"
+        "rhs": "Windows"
       }
     },
     {
-      "name": "windows-ninja",
-      "displayName": "Windows Ninja",
+      "name": "windows-gcc",
+      "displayName": "Windows Ninja GCC (MinGW)",
       "inherits": "ninja-base",
       "cacheVariables": {
-        "ENABLE_UNITY_BUILD": "OFF",
-        "CMAKE_CXX_SCAN_FOR_MODULES": "OFF",
-        "CMAKE_SUPPRESS_REGENERATION": "ON"
+        "CMAKE_C_COMPILER": "gcc",
+        "CMAKE_CXX_COMPILER": "g++"
       },
       "condition": {
         "type": "equals",
@@ -67,72 +62,72 @@
       }
     },
     {
-      "name": "windows-mingw-base",
-      "hidden": true,
+      "name": "linux-clang",
+      "displayName": "Linux Ninja Clang",
       "inherits": "ninja-base",
       "cacheVariables": {
-        "ENABLE_UNITY_BUILD": "OFF",
-        "CMAKE_CXX_SCAN_FOR_MODULES": "OFF",
-        "CMAKE_SUPPRESS_REGENERATION": "ON"
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++"
       },
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
-        "rhs": "Windows"
+        "rhs": "Linux"
       }
     },
     {
-      "name": "windows-gcc",
-      "displayName": "Windows GCC (MSYS2)",
-      "inherits": "windows-mingw-base",
+      "name": "linux-gcc",
+      "displayName": "Linux Ninja GCC",
+      "inherits": "ninja-base",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "gcc",
         "CMAKE_CXX_COMPILER": "g++"
-      }
-    },
-    {
-      "name": "windows-clang",
-      "displayName": "Windows Clang (MSYS2)",
-      "inherits": "windows-mingw-base",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {
       "name": "windows-msvc",
-      "displayName": "Windows MSVC",
-      "inherits": "windows-ninja",
+      "displayName": "Windows Ninja MSVC",
+      "inherits": "ninja-base",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "cl",
         "CMAKE_CXX_COMPILER": "cl"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "linux-gcc",
-      "configurePreset": "linux-gcc"
     },
     {
-      "name": "linux-clang",
-      "configurePreset": "linux-clang"
-    },
-    {
-      "name": "windows-ninja",
-      "configurePreset": "windows-ninja"
-    },
-    {
-      "name": "windows-gcc",
-      "configurePreset": "windows-gcc"
-    },
-    {
-      "name": "windows-clang",
-      "configurePreset": "windows-clang"
-    },
-    {
-      "name": "windows-msvc",
-      "configurePreset": "windows-msvc"
+      "name": "windows-vs2026",
+      "displayName": "Windows Visual Studio 2026",
+      "inherits": "base",
+      "generator": "Visual Studio 18 2026",
+      "architecture": { "value": "x64", "strategy": "set" },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
     }
+  ],
+  "buildPresets": [
+    { "name": "windows-clang-debug", "configurePreset": "windows-clang", "configuration": "Debug" },
+    { "name": "windows-clang-release", "configurePreset": "windows-clang", "configuration": "Release" },
+    { "name": "windows-msvc-debug", "configurePreset": "windows-msvc", "configuration": "Debug" },
+    { "name": "windows-msvc-release", "configurePreset": "windows-msvc", "configuration": "Release" },
+    { "name": "windows-vs2026-debug", "configurePreset": "windows-vs2026", "configuration": "Debug" },
+    { "name": "windows-vs2026-release", "configurePreset": "windows-vs2026", "configuration": "Release" },
+    { "name": "windows-gcc-debug", "configurePreset": "windows-gcc", "configuration": "Debug" },
+    { "name": "windows-gcc-release", "configurePreset": "windows-gcc", "configuration": "Release" },
+    { "name": "linux-clang-debug", "configurePreset": "linux-clang", "configuration": "Debug" },
+    { "name": "linux-clang-release", "configurePreset": "linux-clang", "configuration": "Release" },
+    { "name": "linux-gcc-debug", "configurePreset": "linux-gcc", "configuration": "Debug" },
+    { "name": "linux-gcc-release", "configurePreset": "linux-gcc", "configuration": "Release" }
   ]
 }
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 000000000..e3fb9a7fd
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <RollForward>LatestMajor</RollForward>
+  </PropertyGroup>
+</Project>
diff --git a/cmake/CompilerSettings.cmake b/cmake/CompilerSettings.cmake
index 664586528..6e2863fc9 100644
--- a/cmake/CompilerSettings.cmake
+++ b/cmake/CompilerSettings.cmake
@@ -1,132 +1,36 @@
 # Chained Engine - Compiler Settings
 # Extracted from root CMakeLists.txt for modularity
-set(CMAKE_DEBUG_POSTFIX "")
-# Compiler-specific settings
-if(MSVC)
-    # MSVC-specific settings
-    add_compile_options(
-        $<$<CONFIG:Debug>:/Od> $<$<CONFIG:Debug>:/MTd>
-        $<$<CONFIG:Release>:/O2> $<$<CONFIG:Release>:/MT> $<$<CONFIG:Release>:/DNDEBUG>
-        /Zi /EHsc
-        /MP                  # Multi-processor compilation
-        /Zc:preprocessor     # Modern preprocessor
-        /Gm-                 # Disable minimal rebuild (it's slower)
-        /utf-8               # Use UTF-8 character set
-        /bigobj              # Allow large object files (required for many modules)
-        
-        # Dead Code Elimination: Function-Level Linking
-        $<$<CONFIG:Release>:/Gy>
-    )
 
-    
-    
-    # Strip unused functions in Release
-    add_link_options($<$<CONFIG:Release>:/OPT:REF> $<$<CONFIG:Release>:/OPT:ICF>)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_DEBUG_POSTFIX "")
 
-    if(DISABLE_ALL_WARNINGS)
-        add_compile_options(/W0)
-    elseif(ENABLE_WARNINGS)
-        add_compile_options(/W4 /permissive-)
-        if(WARNINGS_AS_ERRORS)
-            add_compile_options(/WX)
-        endif()
-    else()
-        add_compile_options(/W1)
-    endif()
+# Standardize output directories for all targets (Set BEFORE including dependencies)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 
-    if(ENABLE_SANITIZERS)
-        add_compile_options(/fsanitize=address)
-    endif()
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Generate compile_commands.json")
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+if(UNIX AND NOT APPLE)
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
+endif()
 
-    # Level 2 Security Hardening
-    add_compile_options(/guard:cf /GS)
-    add_link_options(/DYNAMICBASE /NXCOMPAT /guard:cf)
+set(CMAKE_DEBUG_POSTFIX "")
 
+# Compiler-specific settings
+if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # MSVC (Standardcl.exe)
+    include(${CMAKE_CURRENT_LIST_DIR}/compilers/CompilerMSVC.cmake)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # Clang settings (includes AppleClang and clang-cl)
-    if(MSVC)
-        # clang-cl behaves like MSVC
-        add_compile_options(/Zc:preprocessor /utf-8 /bigobj)
-    else()
-        add_compile_options(
-            $<$<CONFIG:Debug>:-O0> $<$<CONFIG:Debug>:-g>
-            $<$<CONFIG:Release>:-O3> $<$<CONFIG:Release>:-DNDEBUG>
-            $<$<CONFIG:Release>:-ffunction-sections>
-            $<$<CONFIG:Release>:-fdata-sections>
-        )
-
-        if(MINGW)
-            add_compile_options(-Wa,-mbig-obj)
-        endif()
-
-        # Dead Code Elimination linkage and binary stripping for Release build
-        add_link_options(
-            $<$<CONFIG:Release>:-Wl,--gc-sections>
-            $<$<CONFIG:Release>:-s>
-        )
-
-        if(DISABLE_ALL_WARNINGS)
-            add_compile_options(-w)
-        elseif(ENABLE_WARNINGS)
-            add_compile_options(-Wall -Wextra -Wpedantic -Wshadow -Wmost -Wno-missing-braces -Wno-missing-field-initializers -Wno-attributes)
-            if(WARNINGS_AS_ERRORS)
-                add_compile_options(-Werror)
-            endif()
-        else()
-            add_compile_options(-Wno-all)
-        endif()
-    endif()
-
-    if(ENABLE_SANITIZERS)
-        add_compile_options(-fsanitize=address -fsanitize=undefined)
-        add_link_options(-fsanitize=address -fsanitize=undefined)
-    endif()
-
-    if(NOT WIN32)
-        add_link_options(-Wl,-z,relro -Wl,-z,now)
-    endif()
-
+    include(${CMAKE_CURRENT_LIST_DIR}/compilers/CompilerClang.cmake)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # GCC settings
-    add_compile_options(
-        $<$<CONFIG:Debug>:-O0> $<$<CONFIG:Debug>:-g>
-        $<$<CONFIG:Release>:-O3> $<$<CONFIG:Release>:-DNDEBUG>
-        $<$<CONFIG:Release>:-ffunction-sections>
-        $<$<CONFIG:Release>:-fdata-sections>
-    )
-
-    if(MINGW)
-        add_compile_options(-Wa,-mbig-obj)
-    endif()
-
-    # Suppress overly strict C++23 template body checks for third-party headers (GLM)
-    add_compile_options(-Wno-template-body)
-
-    # Dead Code Elimination linkage and binary stripping for Release build
-    add_link_options(
-        $<$<CONFIG:Release>:-Wl,--gc-sections>
-        $<$<CONFIG:Release>:-s>
-    )
-
-    if(DISABLE_ALL_WARNINGS)
-        add_compile_options(-w)
-    elseif(ENABLE_WARNINGS)
-        add_compile_options(-Wall -Wextra -Wpedantic -Wshadow -Wno-missing-field-initializers -Wno-attributes)
-        if(WARNINGS_AS_ERRORS)
-            add_compile_options(-Werror)
-        endif()
-    else()
-        add_compile_options(-Wno-all)
-    endif()
-
-    if(ENABLE_SANITIZERS)
-        add_compile_options(-fsanitize=address -fsanitize=undefined)
-        add_link_options(-fsanitize=address -fsanitize=undefined)
-    endif()
-
-    if(NOT WIN32)
-        add_link_options(-Wl,-z,relro -Wl,-z,now)
-    endif()
+    include(${CMAKE_CURRENT_LIST_DIR}/compilers/CompilerGCC.cmake)
 endif()
 
 # Platform-specific settings
@@ -138,10 +42,15 @@ if(WIN32)
 endif()
 
 # Optimized Build Settings
-option(ENABLE_UNITY_BUILD "Enable Unity Builds for faster compilation" ON)
+option(ENABLE_UNITY_BUILD "Enable Unity Builds for faster compilation" OFF)
 option(ENABLE_PCH "Enable Precompiled Headers for faster compilation" ON)
 option(ENABLE_LTO "Enable Link-Time Optimization (IPO) for Release configurations" ON)
 option(ENABLE_COVERAGE "Enable Code Coverage (GCC/Clang only)" OFF)
+# Warning Settings
+option(DISABLE_ALL_WARNINGS "Disable all compiler warnings" OFF)
+option(ENABLE_WARNINGS "Enable compiler warnings" OFF)
+option(WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
+
 
 if(ENABLE_COVERAGE)
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
@@ -155,41 +64,28 @@ if(ENABLE_UNITY_BUILD)
     set(CMAKE_UNITY_BUILD_BATCH_SIZE 16)
 endif()
 
-# Function to apply common engine optimizations to a target
-function(apply_engine_optimizations target_name)
-    if(ENABLE_PCH)
-        # Real PCH: faster local dev, but breaks sccache cache hit rates
-        target_precompile_headers(${target_name} PUBLIC "${PROJECT_SOURCE_DIR}/engine/engine_pch.h")
+# ── Engine-wide PCH ──────────────────────────────────────────────────────────
+# INTERFACE library that propagates the engine precompiled header to any target
+# that links it privately.  Each consumer creates its own .pch binary matching
+# its own compiler flags, so there is no cross-TU contamination.
+if(ENABLE_PCH)
+    add_library(engine_pch INTERFACE)
+    target_precompile_headers(engine_pch INTERFACE "${PROJECT_SOURCE_DIR}/engine/engine_pch.h")
+else()
+    # Force-include: injects engine_pch.h into every TU via compiler flags.
+    # Gives the same include coverage as PCH but without a .pch binary,
+    # so ccache/sccache still achieves 100% hit rates in CI.
+    add_library(engine_pch INTERFACE)
+    set(_pch_path "${PROJECT_SOURCE_DIR}/engine/engine_pch.h")
+    if(MSVC)
+        target_compile_options(engine_pch INTERFACE "/FI${_pch_path}")
     else()
-        # Force-include: injects engine_pch.h into every TU via compiler flags.
-        # This gives the same include coverage as PCH but without a .pch binary,
-        # so ccache/sccache still achieves 100% hit rates in CI.
-        set(_pch_path "${PROJECT_SOURCE_DIR}/engine/engine_pch.h")
-        if(MSVC)
-            target_compile_options(${target_name} PRIVATE "/FI${_pch_path}")
-        else()
-            target_compile_options(${target_name} PRIVATE "-include" "${_pch_path}")
-        endif()
-    endif()
-
-    if(ENABLE_LTO)
-        # Disable LTO for MinGW/GCC in Debug as it's extremely slow
-        if(MINGW OR (CMAKE_BUILD_TYPE STREQUAL "Debug"))
-            set(ipo_supported OFF)
-        else()
-            include(CheckIPOSupported)
-            check_ipo_supported(RESULT ipo_supported OUTPUT ipo_output)
-        endif()
-
-        if(ipo_supported)
-            set_property(TARGET ${target_name} PROPERTY INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
-        elseif(ipo_output AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-            message(STATUS "IPO/LTO is not supported or disabled for this configuration: ${ipo_output}")
-        endif()
+        target_compile_options(engine_pch INTERFACE "-include" "${_pch_path}")
     endif()
+endif()
 
-    # Enable Unity Build for the target if global option is ON
-    if(ENABLE_UNITY_BUILD)
-        set_target_properties(${target_name} PROPERTIES UNITY_BUILD ON)
-    endif()
-endfunction()
+# ── LTO (global) ────────────────────────────────────────────────────────────
+# Applied once here so individual targets don't need to set it.
+if(ENABLE_LTO AND NOT MINGW)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
+endif()
diff --git a/cmake/CopyIfDifferent.cmake b/cmake/CopyIfDifferent.cmake
new file mode 100644
index 000000000..1258b30dd
--- /dev/null
+++ b/cmake/CopyIfDifferent.cmake
@@ -0,0 +1,23 @@
+# CopyIfDifferent.cmake
+# Usage: cmake -DSOURCE=src_dir -DDEST=dst_dir -P CopyIfDifferent.cmake
+
+if(NOT SOURCE OR NOT DEST)
+    message(FATAL_ERROR "SOURCE and DEST must be defined")
+endif()
+
+# Gather all files from SOURCE recursively and copy each one individually.
+# This way a single locked/permission-denied file does not abort the whole sync.
+file(GLOB_RECURSE _all_files RELATIVE "${SOURCE}" "${SOURCE}/*")
+foreach(_rel IN LISTS _all_files)
+    set(_src "${SOURCE}/${_rel}")
+    set(_dst "${DEST}/${_rel}")
+    # Only copy when the destination is missing or older than the source
+    if(NOT EXISTS "${_dst}" OR "${_src}" IS_NEWER_THAN "${_dst}")
+        get_filename_component(_dst_dir "${_dst}" DIRECTORY)
+        file(MAKE_DIRECTORY "${_dst_dir}")
+        file(COPY_FILE "${_src}" "${_dst}" ONLY_IF_DIFFERENT RESULT _copy_result)
+        if(NOT _copy_result EQUAL 0)
+            message(WARNING "CopyIfDifferent: Could not copy '${_rel}' (${_copy_result}) — file may be in use, skipping.")
+        endif()
+    endif()
+endforeach()
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 4beb54d48..8b5c21578 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -1,218 +1,62 @@
-
-# Chained Engine - Dependencies
-# Extracted from root CMakeLists.txt for modularity
-
-# yaml-cpp
-set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
-set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "" FORCE)
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/yaml-cpp/CMakeLists.txt")
-    add_subdirectory(include/yaml-cpp)
-    set(yaml-cpp_SOURCE_DIR "${CMAKE_SOURCE_DIR}/include/yaml-cpp" CACHE INTERNAL "")
-else()
-    message(FATAL_ERROR "yaml-cpp submodule not found! Run: git submodule update --init --recursive")
-endif()
-
-# ImGuizmo (Manipulators)
-set(imguizmo_SOURCE_DIR "${CMAKE_SOURCE_DIR}/include/imguizmo")
-
-# GLM
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/glm/CMakeLists.txt")
-    # GLM is header-only but provides CMake integration
-    add_subdirectory(include/glm)
-    set(glm_SOURCE_DIR "${CMAKE_SOURCE_DIR}/include/glm" CACHE INTERNAL "")
-else()
-    message(FATAL_ERROR "glm submodule not found! Run: git submodule update --init --recursive")
-endif()
-
-# Coral (for C# scripting integration)
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/coral/cmake/CMakeLists.txt")
-    add_subdirectory(include/coral/cmake)
-    set(coral_SOURCE_DIR "${CMAKE_SOURCE_DIR}/include/coral" CACHE INTERNAL "")
-    
-    # --- CI Fixes for Coral (Injection) ---
-    if(WIN32)
-        set(CORAL_FIX_DIR "${CMAKE_BINARY_DIR}/coral_fixes")
-        file(MAKE_DIRECTORY "${CORAL_FIX_DIR}")
-        
-        # 1. ShlObj_core.h shim (MinGW fix)
-        if(MINGW)
-            file(WRITE "${CORAL_FIX_DIR}/ShlObj_core.h" "#pragma once\n#include <shlobj.h>\n")
-        endif()
-        
-        # 2. MSVC wchar_t stream fix (C2280 fix)
-        file(WRITE "${CORAL_FIX_DIR}/StreamFix.hpp" 
-            "#pragma once\n"
-            "#include <iostream>\n"
-            "#include <string>\n"
-            "// Standalone fix for deleted operator<< in Coral logging\n"
-            "inline std::ostream& operator<<(std::ostream& os, const wchar_t* str) { return os << \"[wide string]\"; }\n"
-            "inline std::ostream& operator<<(std::ostream& os, const std::wstring& str) { return os << \"[wide string]\"; }\n"
-        )
-        
-        if(TARGET Coral.Native)
-            if(MINGW)
-                target_include_directories(Coral.Native PRIVATE "${CORAL_FIX_DIR}")
-            endif()
-            
-            if(MSVC)
-                target_compile_options(Coral.Native PRIVATE "/FI${CORAL_FIX_DIR}/StreamFix.hpp")
-            else()
-                target_compile_options(Coral.Native PRIVATE "-include${CORAL_FIX_DIR}/StreamFix.hpp")
-            endif()
-        endif()
-    endif()
-else()
-    message(FATAL_ERROR "coral submodule not found! Run: git submodule update --init --recursive")
-endif()
-
-# assimp (Asset Importer Library)
-set(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "" FORCE)
-set(ASSIMP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(ASSIMP_INSTALL OFF CACHE BOOL "" FORCE)
-set(ASSIMP_BUILD_ZLIB ON CACHE BOOL "" FORCE)
-set(ASSIMP_BUILD_DRACO OFF CACHE BOOL "" FORCE)
-set(ASSIMP_NO_EXPORT ON CACHE BOOL "" FORCE)
-
-# Enable ALL model format importers to ensure maximum compatibility
-set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT ON CACHE BOOL "" FORCE)
-# Specific overrides if needed (currently all on by default)
-
-# Ensure no unity build for assimp or its subprojects
-set(CMAKE_UNITY_BUILD OFF) 
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/assimp/CMakeLists.txt")
-    add_subdirectory(include/assimp)
-    set(assimp_SOURCE_DIR "${CMAKE_SOURCE_DIR}/include/assimp" CACHE INTERNAL "")
-    set(assimp_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/include/assimp" CACHE INTERNAL "")
-    # Disable unity build for assimp to avoid header/namespace conflicts
-    if(TARGET assimp)
-        set_target_properties(assimp PROPERTIES UNITY_BUILD OFF)
-        if(NOT MSVC)
-            target_compile_options(assimp PRIVATE -Wno-error)
-        endif()
-    endif()
-else()
-    message(FATAL_ERROR "assimp submodule not found! Run: git submodule update --init --recursive")
-endif()
-
-# ============================================================================
-# GLFW (Standalone)
-# ============================================================================
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/glfw/CMakeLists.txt")
-    message(STATUS "Loading standalone GLFW...")
-    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
-    set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
-    add_subdirectory(include/glfw)
-
-    if(UNIX AND NOT APPLE)
-        find_package(X11 REQUIRED)
-        target_link_libraries(glfw PUBLIC ${X11_LIBRARIES})
-    endif()
-
-    set(GLFW_SOURCE_DIR "${CMAKE_SOURCE_DIR}/include/glfw" CACHE INTERNAL "")
-else()
-    message(FATAL_ERROR "Standalone GLFW not found in include/glfw")
-endif()
-
 # ============================================================================
-# GLAD (Standalone Generator)
-# ============================================================================
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/glad/cmake/CMakeLists.txt")
-    message(STATUS "Loading standalone GLAD generator...")
-    # Add the glad subdirectory which provides glad_add_library
-    add_subdirectory(include/glad/cmake EXCLUDE_FROM_ALL)
-    
-    # Generate GLAD for OpenGL 4.3 Core
-    glad_add_library(glad STATIC API gl:core=4.3)
-else()
-    message(FATAL_ERROR "Standalone GLAD generator not found in include/glad")
-endif()
-
-# ============================================================================
-# GoogleTest (for unit tests)
-# ============================================================================
-if(BUILD_TESTS)
-    if(EXISTS "${CMAKE_SOURCE_DIR}/include/googletest/CMakeLists.txt")
-        message(STATUS "Loading GoogleTest from submodule...")
-        set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
-        
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            add_compile_definitions(_DEBUG)
-        else()
-            add_compile_definitions(NDEBUG)
-        endif()
-        
-        add_subdirectory(include/googletest)
-        message(STATUS "GoogleTest loaded from submodule")
-    else()
-        message(WARNING "GoogleTest submodule not found. Tests will be disabled.")
-    endif()
-endif()
-
-# ============================================================================
-# EnTT (header-only library)
-# ============================================================================
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/entt/src")
-    message(STATUS "Loading EnTT from submodule...")
-    add_library(EnTT INTERFACE)
-    target_include_directories(EnTT INTERFACE ${CMAKE_SOURCE_DIR}/include/entt/src)
-    if(NOT TARGET EnTT::EnTT)
-        add_library(EnTT::EnTT ALIAS EnTT)
-    endif()
-    message(STATUS "EnTT loaded from submodule (header-only)")
-else()
-    message(FATAL_ERROR "EnTT submodule not found. Run: git submodule update --init --recursive")
-endif()
-
-# ============================================================================
-# ImGui Standalone (GLFW + OpenGL3)
-# ============================================================================
-set(IMGUI_SOURCES
-    include/imgui/imgui.cpp
-    include/imgui/imgui_draw.cpp
-    include/imgui/imgui_widgets.cpp
-    include/imgui/imgui_tables.cpp
-    include/imgui/imgui_demo.cpp
-    include/imgui/misc/cpp/imgui_stdlib.cpp
-    include/imgui/backends/imgui_impl_glfw.cpp
-    include/imgui/backends/imgui_impl_glfw.h
-    include/imgui/backends/imgui_impl_opengl3.cpp
-    include/imgui/backends/imgui_impl_opengl3.h
-    ${imguizmo_SOURCE_DIR}/ImGuizmo.cpp
-    ${imguizmo_SOURCE_DIR}/ImGuizmo.h
+# Chained Engine - Dependencies Configuration
+# ============================================================================
+
+
+# Add external modules directory to search path
+list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/external")
+
+# Core dependencies (independent)
+include(yaml-cpp)
+include(glm)
+include(entt)
+include(miniaudio)
+include(cereal)
+include(stb)
+# zstd is provided by pack — no separate include needed.
+include(spdlog)
+include(jolt)
+include(freetype)
+include(freetype_gl)
+
+# Platform & Graphics (independent)
+include(glfw)
+include(glad)
+
+# UI (depends on GLFW and GLAD)
+include(imgui)
+
+# Complex modules
+include(assimp)
+
+include(coral)
+include(external_gtest)
+include(pack)
+include(portable-file-dialogs)
+# enet + sodium are the networking transport (added via engine/CMakeLists.txt)
+include(reflect-cpp)
+include(miniupnpc)
+
+# Disable unity builds for third-party libraries to avoid symbol redefinitions
+# (e.g., zstd cover.h has no include guard, causing redefinition under unity build)
+# Coral.Native is specifically excluded because MSVC's unity PCH in C++20 mode
+# deletes operator<<(wchar_t*) which is used internally by Coral's cerr logging.
+foreach(_ext_target
+    libzstd_static yaml-cpp
+    glm entt cereal stb spdlog miniaudio
+    imgui imguizmo
+    glfw glad
+    Jolt
+    GTest gmock
+    Coral.Native
+    assimp
+    freetype engine_freetype_gl
 )
+    if(TARGET ${_ext_target})
+        set_target_properties(${_ext_target} PROPERTIES UNITY_BUILD OFF)
+    endif()
+endforeach()
 
-if(NOT TARGET imguilib)
-    add_library(imguilib STATIC ${IMGUI_SOURCES})
-
-    target_include_directories(imguilib PUBLIC
-        ${CMAKE_SOURCE_DIR}/include/imgui
-        ${CMAKE_SOURCE_DIR}/include/glfw/include
-        ${imguizmo_SOURCE_DIR}
-    )
-    target_link_libraries(imguilib PUBLIC glfw glad)
-
-    # Define IMGUI math operators and GLFW settings
-    target_compile_definitions(imguilib PUBLIC 
-        IMGUI_DEFINE_MATH_OPERATORS
-        GLFW_INCLUDE_NONE
-        IMGUI_IMPL_OPENGL_LOADER_GLAD
-    )
-
-    # Disable unity build for imguilib to avoid GLAD header conflicts
-    set_target_properties(imguilib PROPERTIES UNITY_BUILD OFF)
-endif()
-
-# ============================================================================
-# Native File Dialog (nfd)
-# ============================================================================
-if(EXISTS "${CMAKE_SOURCE_DIR}/include/nfd/CMakeLists.txt")
-    message(STATUS "Loading nfd from submodule...")
-    set(NFD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    add_subdirectory(include/nfd)
-    message(STATUS "nfd loaded from submodule")
+if(NOT TARGET libzstd_static AND NOT TARGET libzstd)
+    add_subdirectory(thirdparty/zstd/build/cmake/lib)
 endif()
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
new file mode 100644
index 000000000..56083b76f
--- /dev/null
+++ b/cmake/Packaging.cmake
@@ -0,0 +1,67 @@
+# ── Packaging Configuration (CPack) ──────────────────────────────────────────
+
+set(CPACK_PACKAGE_NAME "ChainedEngine")
+set(CPACK_PACKAGE_VENDOR "IOleg")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Chained Engine - 3D Game Engine, Editor & SDK")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/IOleg-crypto/Chained-Engine")
+set(CPACK_PACKAGE_CONTACT "IOleg")
+
+if(NOT DEFINED CPACK_PACKAGE_VERSION)
+    set(CPACK_PACKAGE_VERSION_MAJOR 0)
+    set(CPACK_PACKAGE_VERSION_MINOR 1)
+    set(CPACK_PACKAGE_VERSION_PATCH 0)
+    set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+endif()
+
+# License & Readme files
+if(EXISTS "${CMAKE_SOURCE_DIR}/license")
+    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/license")
+endif()
+if(EXISTS "${CMAKE_SOURCE_DIR}/readme.md")
+    set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/readme.md")
+endif()
+
+# Component packaging support
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+
+# Component definitions & descriptions
+set(CPACK_COMPONENT_EDITOR_DISPLAY_NAME "Chained Editor")
+set(CPACK_COMPONENT_EDITOR_DESCRIPTION "Stand-alone editor for building 3D games and editing scenes.")
+set(CPACK_COMPONENT_EDITOR_GROUP "Applications")
+
+set(CPACK_COMPONENT_GAME_DISPLAY_NAME "Chained Decos Game")
+set(CPACK_COMPONENT_GAME_DESCRIPTION "Standalone game binary and assets.")
+set(CPACK_COMPONENT_GAME_GROUP "Applications")
+
+set(CPACK_COMPONENT_RUNTIME_DISPLAY_NAME "Engine Runtime")
+set(CPACK_COMPONENT_RUNTIME_DESCRIPTION "Core runtime libraries, assets, and engine resources.")
+set(CPACK_COMPONENT_RUNTIME_GROUP "Runtime")
+
+set(CPACK_COMPONENT_SDK_DISPLAY_NAME "Chained Engine SDK")
+set(CPACK_COMPONENT_SDK_DESCRIPTION "C++ headers, libraries, and scripting tools to develop with Chained Engine.")
+set(CPACK_COMPONENT_SDK_GROUP "Development")
+
+# Platform-specific packaging generators
+if(WIN32)
+    set(CPACK_GENERATOR "ZIP;NSIS")
+    set(CPACK_SOURCE_GENERATOR "ZIP")
+    
+    # NSIS Installer configuration
+    set(CPACK_NSIS_DISPLAY_NAME "Chained Engine")
+    set(CPACK_NSIS_PACKAGE_NAME "ChainedEngine")
+    set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+    set(CPACK_NSIS_MODIFY_PATH OFF)
+else()
+    set(CPACK_GENERATOR "TGZ;DEB")
+    set(CPACK_SOURCE_GENERATOR "TGZ")
+    
+    # Debian packaging metadata
+    set(CPACK_DEBIAN_PACKAGE_MAINTAINER "IOleg <contact@chainedengine.dev>")
+    set(CPACK_DEBIAN_PACKAGE_SECTION "games")
+    set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+endif()
+
+# Package file naming pattern
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}")
+
+include(CPack)
diff --git a/cmake/ProjectHelpers.cmake b/cmake/ProjectHelpers.cmake
index 700aef512..0de6db425 100644
--- a/cmake/ProjectHelpers.cmake
+++ b/cmake/ProjectHelpers.cmake
@@ -12,29 +12,29 @@ function(chained_add_csharp_scripts TARGET_NAME CSHARP_PROJECT_PATH)
         return()
     endif()
 
-    set(CORAL_MANAGED_DIR "${CMAKE_BINARY_DIR}/include/coral/cmake")
-    set(SCRIPT_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin/scripts/${TARGET_NAME}")
-    
-    # Track only gameplay .cs files for incremental builds
-    file(GLOB_RECURSE CS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cs")
+    set(CORAL_MANAGED_DIR "${CMAKE_BINARY_DIR}/vendor/coral")
+    set(SCRIPT_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/scripts/${TARGET_NAME}")
     set(SCRIPT_DLL_PATH "${SCRIPT_OUTPUT_DIR}/${TARGET_NAME}.dll")
 
-    add_custom_command(
-        OUTPUT "${SCRIPT_DLL_PATH}"
-        COMMAND dotnet build "${FULL_CSPROJ_PATH}"
-                -c $<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:>>,Debug,Release> 
-                --output "${SCRIPT_OUTPUT_DIR}" 
-                -p:CoralManagedDir="${CORAL_MANAGED_DIR}"
+    add_custom_target(${SCRIPT_TARGET}
+        COMMAND "${CH_PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/tools/build_managed.py"
+            --project "${FULL_CSPROJ_PATH}"
+            --configuration $<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:>>,Debug,Release>
+            --output "${SCRIPT_OUTPUT_DIR}"
+            --coral-dir "${CORAL_MANAGED_DIR}"
+            --parallel
+        COMMAND "${CH_PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/tools/sync_scripts.py"
+            --build-dir "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
+            --game-dir "${CMAKE_CURRENT_SOURCE_DIR}"
         WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        DEPENDS ${FULL_CSPROJ_PATH} ${CS_SOURCES}
         COMMENT "Building C# Scripts for ${TARGET_NAME} (incremental)"
+        BYPRODUCTS "${SCRIPT_DLL_PATH}"
+        VERBATIM
     )
-
-    add_custom_target(${SCRIPT_TARGET} ALL DEPENDS "${SCRIPT_DLL_PATH}")
     
-    # Ensure scripts build AFTER CHEngine_Managed to avoid dotnet race condition
-    if(TARGET CHEngine_Managed)
-        add_dependencies(${SCRIPT_TARGET} CHEngine_Managed)
+    # Ensure scripts build AFTER Chained_Managed to avoid dotnet race condition
+    if(TARGET Chained_Managed)
+        add_dependencies(${SCRIPT_TARGET} Chained_Managed)
     endif()
 endfunction()
 
@@ -44,7 +44,9 @@ macro(_chained_configure_game_target TGT)
         ${CMAKE_CURRENT_SOURCE_DIR}/src
         ${CMAKE_SOURCE_DIR}
     )
-    apply_engine_optimizations(${TGT})
+    if(TARGET engine_pch)
+        target_link_libraries(${TGT} PRIVATE engine_pch)
+    endif()
 endmacro()
 
 # Main helper function to create a standalone game project
@@ -60,136 +62,77 @@ function(chained_add_game TARGET_NAME)
     set(multiValueArgs SOURCES)
     cmake_parse_arguments(GAME "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    # 1. Locate the entry point (main.cpp)
+    # 1. Locate the entry point (main.cpp) (OPTIONAL)
     set(ENTRY_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp")
-    if(NOT EXISTS "${ENTRY_SOURCE}")
-        message(FATAL_ERROR "chained_add_game: Could not find src/main.cpp for ${TARGET_NAME}")
+    set(HAS_ENTRY_POINT OFF)
+    if(EXISTS "${ENTRY_SOURCE}")
+        set(HAS_ENTRY_POINT ON)
     endif()
 
-    # 2. Create C++ libraries if native sources are provided
+    # 2. Compile game sources as a static library (saves RAM and compile time)
     if(GAME_SOURCES)
-        # Static library for logic/tests
         add_library(${TARGET_NAME} STATIC ${GAME_SOURCES})
-        target_link_libraries(${TARGET_NAME} PUBLIC engine)
+        # Rename static lib so its .lib doesn't clash with the IMPLIB generated
+        # by the exe on MSVC (both would be ChainedDecos.lib otherwise → LNK1181).
+        set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${TARGET_NAME}Game")
+        target_link_libraries(${TARGET_NAME} PUBLIC ChainedEngine::Framework)
         _chained_configure_game_target(${TARGET_NAME})
-        
-        # Shared library for Hot Reload
-        add_library(${TARGET_NAME}Module SHARED ${GAME_SOURCES})
-        target_link_libraries(${TARGET_NAME}Module PUBLIC engine)
-        target_compile_definitions(${TARGET_NAME}Module PRIVATE GAME_BUILD_DLL)
-        set_target_properties(${TARGET_NAME}Module PROPERTIES OUTPUT_NAME "${TARGET_NAME}")
-        _chained_configure_game_target(${TARGET_NAME}Module)
     endif()
 
     # 3. Create the EXECUTABLE target
-    add_executable(${TARGET_NAME}Exe ${ENTRY_SOURCE})
-    target_link_libraries(${TARGET_NAME}Exe PRIVATE RuntimeCore)
-    
-    if(GAME_SOURCES)
-         target_link_libraries(${TARGET_NAME}Exe PRIVATE ${TARGET_NAME})
+    if(HAS_ENTRY_POINT)
+        add_executable(${TARGET_NAME}Exe ${ENTRY_SOURCE})
+        target_link_libraries(${TARGET_NAME}Exe PRIVATE engine_runtime_core)
+
+        if(GAME_SOURCES)
+             target_link_libraries(${TARGET_NAME}Exe PRIVATE ${TARGET_NAME})
+        endif()
+
+        set_target_properties(${TARGET_NAME}Exe PROPERTIES
+            OUTPUT_NAME "${TARGET_NAME}"
+            VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        )
+
+        target_compile_definitions(${TARGET_NAME}Exe PRIVATE
+            GAME_BUILD_EXE
+        )
+        _chained_configure_game_target(${TARGET_NAME}Exe)
     endif()
-    
-    set_target_properties(${TARGET_NAME}Exe PROPERTIES 
-        OUTPUT_NAME "${TARGET_NAME}"
-        VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    )
-    
-    target_compile_definitions(${TARGET_NAME}Exe PRIVATE 
-        GAME_BUILD_EXE
-    )
-    _chained_configure_game_target(${TARGET_NAME}Exe)
 
     # 4. Handle C# Script Building
     if(GAME_CSHARP_PROJECT)
         chained_add_csharp_scripts(${TARGET_NAME} "${GAME_CSHARP_PROJECT}")
-        add_dependencies(${TARGET_NAME}Exe "BuildScripts_${TARGET_NAME}")
+        if(HAS_ENTRY_POINT)
+            add_dependencies(${TARGET_NAME}Exe "BuildScripts_${TARGET_NAME}")
+        endif()
     endif()
 
     # 5. Installation
-    set(INSTALL_TARGETS ${TARGET_NAME}Exe)
-    if(TARGET ${TARGET_NAME})
-        list(APPEND INSTALL_TARGETS ${TARGET_NAME})
-    endif()
-    if(TARGET ${TARGET_NAME}Module)
-        list(APPEND INSTALL_TARGETS ${TARGET_NAME}Module)
+    if(HAS_ENTRY_POINT)
+        set(INSTALL_TARGETS ${TARGET_NAME}Exe)
+        if(TARGET ${TARGET_NAME})
+            list(APPEND INSTALL_TARGETS ${TARGET_NAME})
+        endif()
+
+        install(TARGETS ${INSTALL_TARGETS}
+            RUNTIME DESTINATION bin COMPONENT Game
+            ARCHIVE DESTINATION lib COMPONENT SDK
+        )
     endif()
 
-    install(TARGETS ${INSTALL_TARGETS}
-        RUNTIME DESTINATION bin COMPONENT Runtime
-        ARCHIVE DESTINATION lib COMPONENT Runtime
-        LIBRARY DESTINATION lib COMPONENT Runtime
-    )
-
-    message(STATUS "Configured Project: ${GAME_PROJECT_GAME} (Exe=${TARGET_NAME}Exe, Output=${TARGET_NAME})")
+    message(STATUS "Configured Project: ${GAME_PROJECT_GAME} (Output=${TARGET_NAME})")
 endfunction()
 
-# Generate a header with the build preset names from CMakePresets.json so C++
-# code does not need to duplicate or hardcode preset lists.
-function(chained_generate_build_preset_header)
-    set(PRESETS_FILE "${CMAKE_SOURCE_DIR}/CMakePresets.json")
-    if(NOT EXISTS "${PRESETS_FILE}")
-        message(FATAL_ERROR "chained_generate_build_preset_header: Could not find ${PRESETS_FILE}")
-    endif()
-
-    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${PRESETS_FILE}")
-
-    file(READ "${PRESETS_FILE}" PRESETS_JSON)
+# Copy engine resources (shaders, fonts, icons, config) to a target's output directory
+function(ch_add_resource_sync TARGET)
+    set(RESOURCES_SRC "${CMAKE_SOURCE_DIR}/resources")
+    set(RESOURCES_DST "$<TARGET_FILE_DIR:${TARGET}>/resources")
 
-    set(BUILD_PRESET_NAMES "")
-    string(JSON BUILD_PRESET_COUNT LENGTH "${PRESETS_JSON}" buildPresets)
-    if(BUILD_PRESET_COUNT GREATER 0)
-        math(EXPR LAST_INDEX "${BUILD_PRESET_COUNT} - 1")
-        foreach(INDEX RANGE 0 ${LAST_INDEX})
-            string(JSON CONFIGURE_PRESET_NAME GET "${PRESETS_JSON}" buildPresets ${INDEX} configurePreset)
-            if(CONFIGURE_PRESET_NAME STREQUAL "")
-                string(JSON CONFIGURE_PRESET_NAME GET "${PRESETS_JSON}" buildPresets ${INDEX} name)
-            endif()
-
-            if(NOT CONFIGURE_PRESET_NAME STREQUAL "")
-                list(APPEND BUILD_PRESET_NAMES "${CONFIGURE_PRESET_NAME}")
-            endif()
-        endforeach()
-    endif()
-
-    list(REMOVE_DUPLICATES BUILD_PRESET_NAMES)
-    list(LENGTH BUILD_PRESET_NAMES BUILD_PRESET_COUNT)
-
-    set(BUILD_PRESET_ENTRIES "")
-    foreach(PRESET_NAME IN LISTS BUILD_PRESET_NAMES)
-        string(APPEND BUILD_PRESET_ENTRIES "    \"${PRESET_NAME}\",\n")
-    endforeach()
-
-    set(GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/generated/chaineddecos")
-    file(MAKE_DIRECTORY "${GENERATED_INCLUDE_DIR}")
-
-    set(GENERATED_HEADER "${GENERATED_INCLUDE_DIR}/build_preset_names.h")
-
-    set(CH_BUILD_PRESET_NAMES_INCLUDE_DIR "${GENERATED_INCLUDE_DIR}" PARENT_SCOPE)
-    set(CH_BUILD_PRESET_NAMES_HEADER "${GENERATED_HEADER}" PARENT_SCOPE)
-    set(CH_BUILD_PRESET_NAMES_COUNT "${BUILD_PRESET_COUNT}" PARENT_SCOPE)
-
-    set(GENERATED_HEADER_CONTENT "#pragma once\n\n#include <array>\n\nnamespace CHEngine::detail\n{\ninline constexpr std::array<const char*, ${BUILD_PRESET_COUNT}> kBuildPresetNames = {\n${BUILD_PRESET_ENTRIES}};\n} // namespace CHEngine::detail\n")
-    file(GENERATE OUTPUT "${GENERATED_HEADER}" CONTENT "${GENERATED_HEADER_CONTENT}")
+    add_custom_command(TARGET ${TARGET} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${RESOURCES_DST}"
+        COMMAND ${CMAKE_COMMAND} -DSOURCE="${RESOURCES_SRC}" -DDEST="${RESOURCES_DST}" -P "${CMAKE_SOURCE_DIR}/cmake/CopyIfDifferent.cmake"
+        COMMENT "Syncing engine resources to ${RESOURCES_DST}..."
+    )
 endfunction()
 
-# Centralized target to copy engine resources to the binary directory.
-# Making this a target prevents race conditions during parallel builds.
-function(chained_add_engine_resources_copy)
-    if(TARGET EngineResources)
-        return()
-    endif()
-
-    set(CH_RESOURCE_SRC_DIR "${CMAKE_SOURCE_DIR}/resources")
-    set(CH_RESOURCE_DST_DIR "${CMAKE_BINARY_DIR}/bin/resources")
 
-    add_custom_command(
-        OUTPUT "${CH_RESOURCE_DST_DIR}/.copied"
-        COMMAND ${CMAKE_COMMAND} -E make_directory "${CH_RESOURCE_DST_DIR}"
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CH_RESOURCE_SRC_DIR}" "${CH_RESOURCE_DST_DIR}"
-        COMMAND ${CMAKE_COMMAND} -E touch "${CH_RESOURCE_DST_DIR}/.copied"
-        DEPENDS "${CH_RESOURCE_SRC_DIR}"
-        COMMENT "Copying global engine resources to ${CH_RESOURCE_DST_DIR}..."
-    )
-
-    add_custom_target(EngineResources ALL DEPENDS "${CH_RESOURCE_DST_DIR}/.copied")
-endfunction()
diff --git a/cmake/compilers/CompilerClang.cmake b/cmake/compilers/CompilerClang.cmake
new file mode 100644
index 000000000..d64d694f8
--- /dev/null
+++ b/cmake/compilers/CompilerClang.cmake
@@ -0,0 +1,64 @@
+# Clang Compiler Settings (includes AppleClang and clang-cl)
+
+if(MSVC)
+    # clang-cl behaves like MSVC
+    add_compile_options(/Zc:preprocessor /utf-8 /bigobj)
+else()
+    add_compile_options(
+        $<$<CONFIG:Debug>:-O0> $<$<CONFIG:Debug>:-g>
+        $<$<CONFIG:Release>:-O3> $<$<CONFIG:Release>:-DNDEBUG>
+        $<$<CONFIG:Release>:-ffunction-sections>
+        $<$<CONFIG:Release>:-fdata-sections>
+    )
+
+    # -mstackrealign: MinGW/ELF Clang at -O0 may misalign the stack,
+    # causing SSE/AVX faults inside CoreCLR/hostfxr (same as GCC).
+    if(MINGW OR (NOT WIN32))
+        add_compile_options(
+            $<$<CONFIG:Debug>:-mstackrealign>
+        )
+    endif()
+
+    if(MINGW)
+        add_compile_options(-Wa,-mbig-obj)
+    endif()
+
+    # Dead Code Elimination linkage
+    if(NOT WIN32)
+        # Linux/macOS ELF — standard gc-sections
+        add_link_options(
+            $<$<CONFIG:Release>:-Wl,--gc-sections>
+        )
+    endif()
+
+    # Windows targeting lld-link — /OPT:REF /OPT:ICF replaces --gc-sections.
+    # Use -Wl, prefix to pass comma-separated options to the linker via the driver.
+    if(WIN32 AND NOT MINGW)
+        add_link_options(
+            $<$<CONFIG:Release>:-Wl,/OPT:REF,/OPT:ICF>
+        )
+    endif()
+
+    if(DISABLE_ALL_WARNINGS)
+        add_compile_options(-w)
+    elseif(ENABLE_WARNINGS)
+        add_compile_options(-Wall -Wextra -Wpedantic -Wshadow -Wmost -Wno-missing-braces -Wno-missing-field-initializers -Wno-attributes)
+        if(WARNINGS_AS_ERRORS)
+            add_compile_options(-Werror)
+        endif()
+    else()
+        add_compile_options(-Wno-all)
+    endif()
+endif()
+
+# LLD linker preference: only on non-Windows (Linux/macOS) where it's not the
+# default. On Windows, the MSYS2/LLVM toolchain already sets -fuse-ld=lld-link.
+
+if(ENABLE_SANITIZERS)
+    add_compile_options(-fsanitize=address -fsanitize=undefined)
+    add_link_options(-fsanitize=address -fsanitize=undefined)
+endif()
+
+if(NOT WIN32)
+    add_link_options(-Wl,-z,relro -Wl,-z,now)
+endif()
diff --git a/cmake/compilers/CompilerGCC.cmake b/cmake/compilers/CompilerGCC.cmake
new file mode 100644
index 000000000..de6c68ddb
--- /dev/null
+++ b/cmake/compilers/CompilerGCC.cmake
@@ -0,0 +1,68 @@
+add_compile_options(
+    # Debug: Plain -g. We use -mstackrealign because MinGW GCC at -O0 sometimes 
+    # fails to maintain the 16-byte stack alignment required by the Windows x64 ABI.
+    # This causes Access Violations (AV) inside CoreCLR/hostfxr which uses SSE/AVX
+    # instructions heavily during initialization and callbacks. LLD handles the
+    # debug info memory pressure.
+    $<$<CONFIG:Debug>:-O0> $<$<CONFIG:Debug>:-g> $<$<CONFIG:Debug>:-mstackrealign>
+    $<$<CONFIG:Release>:-O3> $<$<CONFIG:Release>:-DNDEBUG>
+    # Section-per-symbol in all configs so --gc-sections can drop unused code and
+    # shrink what the linker has to hold in memory.
+    -ffunction-sections
+    -fdata-sections
+)
+
+if(MINGW)
+    add_compile_options(-Wa,-mbig-obj)
+endif()
+
+if(CH_CI)
+    # CI only runs Debug binaries to execute tests, never steps through them.
+    # Full -g on GCC (especially MinGW) dominates compile and link time and
+    # object size; -g1 keeps line tables for readable backtraces. Listed after
+    # the -g above, so it wins (GCC takes the last debug-level flag).
+    add_compile_options($<$<CONFIG:Debug>:-g1>)
+endif()
+
+# Prefer LLD over the default BFD ld: it is dramatically more memory-efficient
+# and faster, which is what actually fixes the MinGW Debug link failures.
+# Guard on availability so the configure step never fails on toolchains that
+# ship without lld (e.g. a minimal Linux CI runner) — there we silently fall
+# back to the default linker.
+find_program(CH_LLD_LINKER NAMES lld ld.lld lld-link)
+if(CH_LLD_LINKER)
+    add_link_options(-fuse-ld=lld)
+    message(STATUS "GCC: using LLD linker (${CH_LLD_LINKER})")
+else()
+    message(STATUS "GCC: lld not found, falling back to default linker (heavy Debug links may exhaust memory)")
+endif()
+
+# Suppress overly strict C++23 template body checks for third-party headers (GLM)
+add_compile_options(-Wno-template-body)
+
+# Dead Code Elimination linkage and binary stripping.
+# Enabled in all configs now that -ffunction-sections/-fdata-sections are global:
+# dropping unused sections also reduces linker memory pressure in Debug.
+add_link_options(
+    -Wl,--gc-sections
+)
+
+if(DISABLE_ALL_WARNINGS)
+    add_compile_options(-w)
+elseif(ENABLE_WARNINGS)
+    add_compile_options(-Wall -Wextra -Wpedantic -Wshadow -Wno-missing-field-initializers -Wno-attributes)
+    if(WARNINGS_AS_ERRORS)
+        add_compile_options(-Werror)
+    endif()
+else()
+    add_compile_options(-Wno-all)
+endif()
+
+if(ENABLE_SANITIZERS)
+    add_compile_options(-fsanitize=address -fsanitize=undefined)
+    add_link_options(-fsanitize=address -fsanitize=undefined)
+endif()
+
+if(NOT WIN32)
+    add_link_options(-Wl,-z,relro -Wl,-z,now)
+endif()
diff --git a/cmake/compilers/CompilerMSVC.cmake b/cmake/compilers/CompilerMSVC.cmake
new file mode 100644
index 000000000..14ccaa8dd
--- /dev/null
+++ b/cmake/compilers/CompilerMSVC.cmake
@@ -0,0 +1,47 @@
+# MSVC Compiler Settings
+
+# MSVC-specific settings
+    add_compile_options(
+        $<$<CONFIG:Debug>:/Od>
+        $<$<CONFIG:Release>:/O2> $<$<CONFIG:Release>:/DNDEBUG>
+        /Zi /EHsc
+        /MP                  # Multi-processor compilation
+        /Zc:preprocessor     # Modern preprocessor
+        /Gm-                 # Disable minimal rebuild (it's slower)
+        /utf-8               # Use UTF-8 character set
+        /bigobj              # Allow large object files (required for many modules)
+        
+        # Dead Code Elimination: Function-Level Linking
+        $<$<CONFIG:Release>:/Gy>
+    )
+
+# Strip unused functions in Release
+add_link_options($<$<CONFIG:Release>:/OPT:REF> $<$<CONFIG:Release>:/OPT:ICF>)
+
+# /DEBUG:FULL — FASTLINK is deprecated in VS 2022 toolchain
+add_link_options($<$<CONFIG:Debug>:/DEBUG:FULL>)
+
+if(DISABLE_ALL_WARNINGS)
+    add_compile_options(/W0)
+elseif(ENABLE_WARNINGS)
+    add_compile_options(/W4 /permissive-)
+    if(WARNINGS_AS_ERRORS)
+        add_compile_options(/WX)
+    endif()
+else()
+    add_compile_options(/W1)
+endif()
+
+if(ENABLE_SANITIZERS)
+    add_compile_options(/fsanitize=address)
+endif()
+
+# Level 2 Security Hardening
+# Note: /guard:cf on the LINKER pulls in uwapi.lib (Windows App Cert Kit),
+# which is absent on the GitHub Actions windows-latest runner. The compile
+# flag is sufficient for CFG code-gen; the linker flag is not needed here.
+add_compile_options(/guard:cf /GS)
+add_link_options(/DYNAMICBASE /NXCOMPAT)
+
+
+    
\ No newline at end of file
diff --git a/cmake/external/assimp.cmake b/cmake/external/assimp.cmake
new file mode 100644
index 000000000..8eb5714be
--- /dev/null
+++ b/cmake/external/assimp.cmake
@@ -0,0 +1,29 @@
+# Assimp dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/assimp/CMakeLists.txt")
+    set(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "" FORCE)
+    set(ASSIMP_NO_EXPORT ON CACHE BOOL "" FORCE)
+    set(ASSIMP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(ASSIMP_INSTALL OFF CACHE BOOL "" FORCE)
+    set(ASSIMP_BUILD_ZLIB ON CACHE BOOL "" FORCE)
+    set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE) # Build as shared to reduce dev link times (overrides project default for assimp only)
+
+    # Set model importer formats
+    set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT OFF CACHE INTERNAL "")
+
+    set(ASSIMP_BUILD_GLTF_IMPORTER ON CACHE INTERNAL "")
+    set(ASSIMP_BUILD_OBJ_IMPORTER ON CACHE INTERNAL "")
+    set(ASSIMP_BUILD_FBX_IMPORTER ON CACHE INTERNAL "")
+    
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/assimp" EXCLUDE_FROM_ALL)
+
+    # CRITICAL: Assimp's bundled zlib (contrib/zlib/*.c) has headers without include
+    # guards (gzguts.h), causing 'typedef redefinition' errors when Unity Build merges
+    # translation units. Disable Unity Build for both assimp and its internal zlibstatic.
+    foreach(_assimp_target assimp zlibstatic)
+        if(TARGET ${_assimp_target})
+            set_target_properties(${_assimp_target} PROPERTIES UNITY_BUILD OFF)
+        endif()
+    endforeach()
+else()
+    message(FATAL_ERROR "assimp submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/assimp")
+endif()
diff --git a/cmake/external/cereal.cmake b/cmake/external/cereal.cmake
new file mode 100644
index 000000000..ab3c096fe
--- /dev/null
+++ b/cmake/external/cereal.cmake
@@ -0,0 +1,13 @@
+# Cereal dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/cereal/CMakeLists.txt")
+    # Cereal is header-only, so we just need its include target
+    set(JUST_INSTALL_CEREAL ON CACHE BOOL "" FORCE)
+    set(BUILD_SANDBOX OFF CACHE BOOL "" FORCE)
+    set(SKIP_PERFORMANCE_COMPARISON ON CACHE BOOL "" FORCE)
+    set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(SKIP_PORTABILITY_TEST ON CACHE BOOL "" FORCE)
+
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/cereal" "${CMAKE_BINARY_DIR}/vendor/cereal" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "cereal submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/cereal")
+endif()
diff --git a/cmake/external/coral.cmake b/cmake/external/coral.cmake
new file mode 100644
index 000000000..d96126f20
--- /dev/null
+++ b/cmake/external/coral.cmake
@@ -0,0 +1,59 @@
+# Coral dependency (Scripting host)
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/coral/cmake/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/coral/cmake" "${CMAKE_BINARY_DIR}/vendor/coral" EXCLUDE_FROM_ALL)
+
+    # Coral.Native must be compiled in strict isolation from the engine's unity/PCH build.
+    # MSVC in C++20 mode deletes operator<<(const wchar_t*) on narrow ostreams (strict
+    # conformance change). Coral internally uses wchar_t conversion helpers that trip this
+    # when compiled inside a merged unity TU that includes the engine's C++20 PCH.
+    # Solution: force C++17, disable unity build for this target.
+    set_target_properties(Coral.Native PROPERTIES
+        CXX_STANDARD 17
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS OFF
+        UNITY_BUILD OFF
+    )
+
+    # MSVC-specific: suppress size-conversion warnings that are expected in Coral
+    if(MSVC)
+        target_compile_options(Coral.Native PRIVATE /wd4267 /wd4244 /wd4018)
+    endif()
+
+    if(WIN32)
+        set(CORAL_FIX_DIR "${CMAKE_BINARY_DIR}/vendor/coral_fixes")
+        if(NOT EXISTS "${CORAL_FIX_DIR}")
+            file(MAKE_DIRECTORY "${CORAL_FIX_DIR}")
+        endif()
+        
+        # MinGW fixes for Coral
+        if(MINGW)
+            file(WRITE "${CORAL_FIX_DIR}/ShlObj_core.h" "#pragma once\n#include <shlobj.h>\n")
+            target_include_directories(Coral.Native PRIVATE "${CORAL_FIX_DIR}")
+
+            # MinGW GCC at -O0 emits prologues that can leave the stack
+            # misaligned at the call boundary into hostfxr/coreclr.dll, whose
+            # SSE/AVX init code then faults with an access violation (CI-only,
+            # timing/layout dependent; -mstackrealign alone does not cover the
+            # cross-DLL call path). -Og keeps debuggability but restores the
+            # aligned prologue codegen, matching the Release behavior.
+            target_compile_options(Coral.Native PRIVATE $<$<CONFIG:Debug>:-Og>)
+        endif()
+
+        # CI environment LLVM Clang / Windows SDK fix for missing CoTaskMemAlloc
+        file(WRITE "${CORAL_FIX_DIR}/CombaseFix.hpp"
+            "#pragma once\n"
+            "#ifdef _WIN32\n"
+            "#include <windows.h>\n"
+            "#include <objbase.h>\n"
+            "#include <combaseapi.h>\n"
+            "#endif\n"
+        )
+        if(MSVC)
+            target_compile_options(Coral.Native PRIVATE "/FI${CORAL_FIX_DIR}/CombaseFix.hpp")
+        else()
+            target_compile_options(Coral.Native PRIVATE "-include" "${CORAL_FIX_DIR}/CombaseFix.hpp")
+        endif()
+    endif()
+else()
+    message(FATAL_ERROR "Coral submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/coral/cmake")
+endif()
diff --git a/cmake/external/enet.cmake b/cmake/external/enet.cmake
new file mode 100644
index 000000000..3bde8168c
--- /dev/null
+++ b/cmake/external/enet.cmake
@@ -0,0 +1,17 @@
+# ENet — Reliable UDP networking library
+# Provides: client/server, reliable/unreliable channels, fragmentation.
+# Single-header variant (enet.h with ENET_IMPLEMENTATION).
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/enet")
+    set(ENET_STATIC ON CACHE BOOL "" FORCE)
+    set(ENET_SHARED OFF CACHE BOOL "" FORCE)
+    set(ENET_TEST OFF CACHE BOOL "" FORCE)
+    # Force IPv4-only sockets: ENet's default AF_INET6 dual-stack fails to
+    # bind on some Windows systems. IPv4 is reliable everywhere we ship.
+    set(ENET_IPV4_ONLY ON CACHE BOOL "" FORCE)
+
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/enet" "${CMAKE_BINARY_DIR}/enet")
+
+    message(STATUS "enet: configured (static lib, IPv4-only)")
+else()
+    message(FATAL_ERROR "enet missing at ${CMAKE_SOURCE_DIR}/thirdparty/enet")
+endif()
diff --git a/cmake/external/entt.cmake b/cmake/external/entt.cmake
new file mode 100644
index 000000000..0c3033e34
--- /dev/null
+++ b/cmake/external/entt.cmake
@@ -0,0 +1,7 @@
+# EnTT dependency (Header-only)
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/entt/src")
+    add_library(engine_external_entt INTERFACE)
+    target_include_directories(engine_external_entt INTERFACE "${CMAKE_SOURCE_DIR}/thirdparty/entt/src")
+else()
+    message(FATAL_ERROR "EnTT submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/entt/src")
+endif()
diff --git a/cmake/external/external_gtest.cmake b/cmake/external/external_gtest.cmake
new file mode 100644
index 000000000..a3fcd1920
--- /dev/null
+++ b/cmake/external/external_gtest.cmake
@@ -0,0 +1,6 @@
+# GoogleTest dependency
+if( EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/googletest/CMakeLists.txt")
+    set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
+    set(BUILD_SHARED_LIBS OFF)
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/googletest" "${CMAKE_BINARY_DIR}/vendor/googletest" EXCLUDE_FROM_ALL)
+endif()
diff --git a/cmake/external/freetype.cmake b/cmake/external/freetype.cmake
new file mode 100644
index 000000000..9d5e110ed
--- /dev/null
+++ b/cmake/external/freetype.cmake
@@ -0,0 +1,16 @@
+# FreeType2 — configured as a static library with minimal options
+if(TARGET freetype)
+    return()
+endif()
+
+set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_BROTLI ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_BZIP2 ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_PNG ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_LIBPNG ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_BROTLI ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_UNSYSCALL_HACK ON CACHE BOOL "" FORCE)
+# Build as static lib with /MT on MSVC
+set(FT_WITH_ZLIB OFF CACHE BOOL "" FORCE)
+
+add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/freetype" "${CMAKE_BINARY_DIR}/freetype" EXCLUDE_FROM_ALL)
diff --git a/cmake/external/freetype_gl.cmake b/cmake/external/freetype_gl.cmake
new file mode 100644
index 000000000..62f0a5145
--- /dev/null
+++ b/cmake/external/freetype_gl.cmake
@@ -0,0 +1,34 @@
+# freetype-gl — minimal build: only atlas + font (no vertex-buffer / text-buffer / OpenGL)
+if(TARGET engine_freetype_gl)
+    return()
+endif()
+
+set(FREETYPE_GL_DIR "${CMAKE_SOURCE_DIR}/thirdparty/freetype-gl")
+
+add_library(engine_freetype_gl STATIC
+    "${FREETYPE_GL_DIR}/texture-atlas.c"
+    "${FREETYPE_GL_DIR}/texture-font.c"
+    "${FREETYPE_GL_DIR}/vector.c"
+    "${FREETYPE_GL_DIR}/utf8-utils.c"
+    "${FREETYPE_GL_DIR}/ftgl-utils.c"
+    "${FREETYPE_GL_DIR}/distance-field.c"
+    "${FREETYPE_GL_DIR}/edtaa3func.c"
+)
+
+target_include_directories(engine_freetype_gl PUBLIC "${FREETYPE_GL_DIR}")
+target_link_libraries(engine_freetype_gl PUBLIC freetype)
+
+# freetype-gl headers declare ftgl namespace when compiled as C++
+# — suppress any warnings from its C code on MSVC
+if(MSVC)
+    target_compile_options(engine_freetype_gl PRIVATE /W0)
+else()
+    target_compile_options(engine_freetype_gl PRIVATE -w)
+endif()
+
+# freetype-gl's texture-font.c has a broken fallback for MSVC that
+# undefines inline and tries to define __builtin_bswap32 — define
+# __GNUC__ for clang so it skips that code path.
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    target_compile_definitions(engine_freetype_gl PRIVATE __GNUC__)
+endif()
diff --git a/cmake/external/glad.cmake b/cmake/external/glad.cmake
new file mode 100644
index 000000000..d0d3f9b33
--- /dev/null
+++ b/cmake/external/glad.cmake
@@ -0,0 +1,7 @@
+# GLAD dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/glad/cmake/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/glad/cmake" "${CMAKE_BINARY_DIR}/vendor/glad" EXCLUDE_FROM_ALL)
+    glad_add_library(engine_external_glad STATIC API gl:core=4.3)
+else()
+    message(FATAL_ERROR "GLAD submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/glad/cmake")
+endif()
diff --git a/cmake/external/glfw.cmake b/cmake/external/glfw.cmake
new file mode 100644
index 000000000..8550b54b9
--- /dev/null
+++ b/cmake/external/glfw.cmake
@@ -0,0 +1,20 @@
+# GLFW dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/glfw/CMakeLists.txt")
+    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+    set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+
+    # On Linux, GLFW builds both X11 and Wayland backends by default. The Wayland
+    # backend requires wayland-scanner + libwayland-dev at configure time, which we
+    # don't ship on CI (or most dev machines). X11 alone is sufficient for our
+    # OpenGL renderer, so disable Wayland to avoid a hard configure failure.
+    if(UNIX AND NOT APPLE)
+        set(GLFW_BUILD_X11 ON CACHE BOOL "" FORCE)
+        set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
+    endif()
+
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/glfw" "${CMAKE_BINARY_DIR}/vendor/glfw" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "GLFW submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/glfw")
+endif()
diff --git a/cmake/external/glm.cmake b/cmake/external/glm.cmake
new file mode 100644
index 000000000..072c4cbfb
--- /dev/null
+++ b/cmake/external/glm.cmake
@@ -0,0 +1,6 @@
+# GLM dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/glm/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/glm" "${CMAKE_BINARY_DIR}/vendor/glm" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "glm submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/glm")
+endif()
diff --git a/cmake/external/imgui.cmake b/cmake/external/imgui.cmake
new file mode 100644
index 000000000..f5c0085d5
--- /dev/null
+++ b/cmake/external/imgui.cmake
@@ -0,0 +1,47 @@
+# ImGui + ImGuizmo dependency
+set(IMGUI_DIR "${CMAKE_SOURCE_DIR}/thirdparty/imgui")
+set(IMGUIZMO_DIR "${CMAKE_SOURCE_DIR}/thirdparty/imguizmo")
+
+set(IMGUI_PLATFORM_SOURCES "${IMGUI_DIR}/backends/imgui_impl_glfw.cpp")
+set(IMGUI_PLATFORM_DEPS glfw)
+
+add_library(engine_external_imgui STATIC
+    "${IMGUI_DIR}/imgui.cpp"
+    "${IMGUI_DIR}/imgui_draw.cpp"
+    "${IMGUI_DIR}/imgui_widgets.cpp"
+    "${IMGUI_DIR}/imgui_tables.cpp"
+    "${IMGUI_DIR}/imgui_demo.cpp"
+    "${IMGUI_DIR}/misc/cpp/imgui_stdlib.cpp"
+    ${IMGUI_PLATFORM_SOURCES}
+    "${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp"
+    "${IMGUIZMO_DIR}/ImGuizmo.cpp"
+    "${IMGUIZMO_DIR}/GraphEditor.cpp"
+    "${IMGUIZMO_DIR}/ImCurveEdit.cpp"
+    "${IMGUIZMO_DIR}/ImGradient.cpp"
+    "${IMGUIZMO_DIR}/ImSequencer.cpp"
+)
+
+target_include_directories(engine_external_imgui PUBLIC 
+    "${IMGUI_DIR}" 
+    "${IMGUIZMO_DIR}" 
+    "${IMGUI_DIR}/backends"
+)
+
+target_link_libraries(engine_external_imgui 
+    PUBLIC 
+        ${IMGUI_PLATFORM_DEPS}
+        engine_external_glad
+)
+
+if(UNIX AND NOT APPLE)
+    target_link_libraries(engine_external_imgui PUBLIC X11)
+endif()
+
+target_compile_definitions(engine_external_imgui PUBLIC 
+    IMGUI_DEFINE_MATH_OPERATORS
+    IMGUI_IMPL_OPENGL_LOADER_GLAD
+)
+
+target_compile_definitions(engine_external_imgui PUBLIC GLFW_INCLUDE_NONE CH_PLATFORM_BACKEND_GLFW)
+
+set_target_properties(engine_external_imgui PROPERTIES UNITY_BUILD OFF)
diff --git a/cmake/external/jolt.cmake b/cmake/external/jolt.cmake
new file mode 100644
index 000000000..476b59ab1
--- /dev/null
+++ b/cmake/external/jolt.cmake
@@ -0,0 +1,20 @@
+# Chained Engine - Jolt Physics Dependency
+
+set(INTERPROCEDURAL_OPTIMIZATION OFF CACHE BOOL "" FORCE)
+set(FLOATING_POINT_EXCEPTIONS_ENABLED OFF CACHE BOOL "" FORCE)
+set(USE_SSE4_2 ON CACHE BOOL "" FORCE)
+set(USE_AVX2 ON CACHE BOOL "" FORCE)
+set(USE_WERROR OFF CACHE BOOL "" FORCE)
+set(CPP_RTTI_ENABLED ON CACHE BOOL "" FORCE) # Required for Linux CI - engine uses RTTI
+set(TARGET_UNIT_TESTS OFF CACHE BOOL "" FORCE)
+set(TARGET_HELLO_WORLD OFF CACHE BOOL "" FORCE)
+set(TARGET_PERFORMANCE_TEST OFF CACHE BOOL "" FORCE)
+set(TARGET_VIEWER OFF CACHE BOOL "" FORCE)
+
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/JoltPhysics/Build/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/JoltPhysics/Build" "${CMAKE_BINARY_DIR}/vendor/jolt" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "JoltPhysics submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/JoltPhysics")
+endif()
+
+
diff --git a/cmake/external/miniaudio.cmake b/cmake/external/miniaudio.cmake
new file mode 100644
index 000000000..31d0c4383
--- /dev/null
+++ b/cmake/external/miniaudio.cmake
@@ -0,0 +1,7 @@
+# Miniaudio dependency (Header-only)
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/miniaudio")
+    add_library(engine_external_miniaudio INTERFACE)
+    target_include_directories(engine_external_miniaudio INTERFACE "${CMAKE_SOURCE_DIR}/thirdparty/miniaudio")
+else()
+    message(FATAL_ERROR "Miniaudio submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/miniaudio")
+endif()
diff --git a/cmake/external/miniupnpc.cmake b/cmake/external/miniupnpc.cmake
new file mode 100644
index 000000000..791676224
--- /dev/null
+++ b/cmake/external/miniupnpc.cmake
@@ -0,0 +1,55 @@
+# miniupnpc — lightweight UPnP IGD client
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/miniupnp/miniupnpc")
+    set(MINIUPNPC_DIR "${CMAKE_SOURCE_DIR}/thirdparty/miniupnp/miniupnpc")
+
+    # Generate miniupnpcstrings.h (config header)
+    file(WRITE "${CMAKE_BINARY_DIR}/generated/miniupnpcstrings.h"
+        "#ifndef MINIUPNPCSTRINGS_H_INCLUDED\n"
+        "#define MINIUPNPCSTRINGS_H_INCLUDED\n"
+        "\n"
+        "#define OS_STRING \"${CMAKE_SYSTEM_NAME}\"\n"
+        "#define MINIUPNPC_VERSION_STRING \"2.3.0\"\n"
+        "\n"
+        "#define UPNP_VERSION_MAJOR 1\n"
+        "#define UPNP_VERSION_MINOR 1\n"
+        "#define UPNP_VERSION_STRING \"UPnP/1.1\"\n"
+        "\n"
+        "#endif\n"
+    )
+
+    add_library(engine_external_miniupnpc STATIC
+        ${MINIUPNPC_DIR}/src/miniupnpc.c
+        ${MINIUPNPC_DIR}/src/miniwget.c
+        ${MINIUPNPC_DIR}/src/minisoap.c
+        ${MINIUPNPC_DIR}/src/minixml.c
+        ${MINIUPNPC_DIR}/src/igd_desc_parse.c
+        ${MINIUPNPC_DIR}/src/upnpcommands.c
+        ${MINIUPNPC_DIR}/src/upnperrors.c
+        ${MINIUPNPC_DIR}/src/upnpreplyparse.c
+        ${MINIUPNPC_DIR}/src/portlistingparse.c
+        ${MINIUPNPC_DIR}/src/receivedata.c
+        ${MINIUPNPC_DIR}/src/connecthostport.c
+        ${MINIUPNPC_DIR}/src/addr_is_reserved.c
+        ${MINIUPNPC_DIR}/src/minissdpc.c
+        ${MINIUPNPC_DIR}/src/upnpdev.c
+    )
+
+    target_include_directories(engine_external_miniupnpc PUBLIC
+        ${MINIUPNPC_DIR}/include
+    )
+
+    target_include_directories(engine_external_miniupnpc PRIVATE
+        ${CMAKE_BINARY_DIR}/generated
+    )
+
+    # MINIUPNP_STATICLIB (2 N's) — this is what the header checks
+    target_compile_definitions(engine_external_miniupnpc PUBLIC
+        MINIUPNP_STATICLIB
+    )
+
+    if(WIN32)
+        target_link_libraries(engine_external_miniupnpc PUBLIC ws2_32 iphlpapi)
+    endif()
+else()
+    message(FATAL_ERROR "miniupnpc submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/miniupnp")
+endif()
diff --git a/cmake/external/nfd.cmake b/cmake/external/nfd.cmake
new file mode 100644
index 000000000..a03132963
--- /dev/null
+++ b/cmake/external/nfd.cmake
@@ -0,0 +1,5 @@
+# NFD dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/nfd/CMakeLists.txt")
+    set(NFD_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/nfd" "${CMAKE_BINARY_DIR}/vendor/nfd" EXCLUDE_FROM_ALL)
+endif()
diff --git a/cmake/external/pack.cmake b/cmake/external/pack.cmake
new file mode 100644
index 000000000..8b08a0465
--- /dev/null
+++ b/cmake/external/pack.cmake
@@ -0,0 +1,15 @@
+# pack dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/pack/CMakeLists.txt")
+    set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE)
+    set(BUILD_SHARED_LIBS OFF)
+    set(PACK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/pack"
+        "${CMAKE_BINARY_DIR}/vendor/pack" EXCLUDE_FROM_ALL)
+
+    # GCC 14+ treats -Wincompatible-pointer-types as error.
+    # mpio/source/os.c passes char** to _spawvp() which expects const char* const*.
+    if(TARGET mpio-static AND CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+        target_compile_options(mpio-static PRIVATE -Wno-error=incompatible-pointer-types)
+    endif()
+endif()
\ No newline at end of file
diff --git a/cmake/external/portable-file-dialogs.cmake b/cmake/external/portable-file-dialogs.cmake
new file mode 100644
index 000000000..9e777a680
--- /dev/null
+++ b/cmake/external/portable-file-dialogs.cmake
@@ -0,0 +1,5 @@
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/portable-file-dialogs/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/portable-file-dialogs" "${CMAKE_BINARY_DIR}/vendor/portable-file-dialogs" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "portable-file-dialogs submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/portable-file-dialogs")
+endif()
diff --git a/cmake/external/reflect-cpp.cmake b/cmake/external/reflect-cpp.cmake
new file mode 100644
index 000000000..f0771d9ba
--- /dev/null
+++ b/cmake/external/reflect-cpp.cmake
@@ -0,0 +1,10 @@
+set(REFLECTCPP_YAML ON CACHE BOOL "" FORCE)
+set(REFLECTCPP_JSON ON CACHE BOOL "" FORCE)
+set(REFLECTCPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(REFLECTCPP_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/reflect-cpp/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/reflect-cpp" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "reflect-cpp submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/reflect-cpp")
+endif()
diff --git a/cmake/external/sodium.cmake b/cmake/external/sodium.cmake
new file mode 100644
index 000000000..ec7c82b36
--- /dev/null
+++ b/cmake/external/sodium.cmake
@@ -0,0 +1,17 @@
+# sodium — minimal bundled subset (XChaCha20-Poly1305 AEAD only)
+# Extracted from yojimbo's vendored sodium. Provides encryption primitives
+# for the networking layer.
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/sodium")
+    add_library(sodium STATIC "${CMAKE_SOURCE_DIR}/thirdparty/sodium/sodium.c")
+    target_include_directories(sodium PUBLIC "${CMAKE_SOURCE_DIR}/thirdparty/sodium")
+    set_target_properties(sodium PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    if(MSVC)
+        target_compile_options(sodium PRIVATE /w)
+    else()
+        target_compile_options(sodium PRIVATE -w)
+    endif()
+
+    message(STATUS "sodium: configured (minimal bundled subset)")
+else()
+    message(FATAL_ERROR "sodium missing at ${CMAKE_SOURCE_DIR}/thirdparty/sodium")
+endif()
diff --git a/cmake/external/spdlog.cmake b/cmake/external/spdlog.cmake
new file mode 100644
index 000000000..58c2e67db
--- /dev/null
+++ b/cmake/external/spdlog.cmake
@@ -0,0 +1,17 @@
+# Configuration for spdlog 1.14.x
+set(SPDLOG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(SPDLOG_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(SPDLOG_BUILD_BENCH OFF CACHE BOOL "" FORCE)
+set(SPDLOG_FMT_EXTERNAL OFF CACHE BOOL "" FORCE)
+set(SPDLOG_POSITION_INDEPENDENT_CODE ON CACHE BOOL "" FORCE)
+
+# Use C++20 std::format for spdlog to avoid bundled fmt library issues with C++23/Clang
+# Since the project already uses std::format successfully, this is the most robust fix.
+set(SPDLOG_USE_STD_FORMAT ON CACHE BOOL "" FORCE)
+
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/spdlog/CMakeLists.txt")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/spdlog" "${CMAKE_BINARY_DIR}/vendor/spdlog" EXCLUDE_FROM_ALL)
+else()
+    message(FATAL_ERROR "Spdlog submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/spdlog")
+endif()
+
diff --git a/cmake/external/stb.cmake b/cmake/external/stb.cmake
new file mode 100644
index 000000000..2991c7616
--- /dev/null
+++ b/cmake/external/stb.cmake
@@ -0,0 +1,7 @@
+# STB dependency (Header-only)
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/stb")
+    add_library(engine_external_stb INTERFACE)
+    target_include_directories(engine_external_stb INTERFACE "${CMAKE_SOURCE_DIR}/thirdparty/stb")
+else()
+    message(FATAL_ERROR "STB submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/stb")
+endif()
diff --git a/cmake/external/yaml-cpp.cmake b/cmake/external/yaml-cpp.cmake
new file mode 100644
index 000000000..438cf900a
--- /dev/null
+++ b/cmake/external/yaml-cpp.cmake
@@ -0,0 +1,23 @@
+# yaml-cpp dependency
+if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/yaml-cpp/CMakeLists.txt")
+    set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
+    set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "" FORCE)
+    set(YAML_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+    set(YAML_MSVC_SHARED_RT OFF CACHE BOOL "" FORCE)
+    
+    add_subdirectory("${CMAKE_SOURCE_DIR}/thirdparty/yaml-cpp" "${CMAKE_BINARY_DIR}/vendor/yaml-cpp" EXCLUDE_FROM_ALL)
+
+    # yaml-cpp 0.8.0's emitterutils.cpp uses uint16_t without including <cstdint>.
+    # It compiled only because older standard libraries leaked <cstdint> transitively.
+    # MinGW's libstdc++ (shared by BOTH Windows Clang and Windows GCC) no longer does,
+    # so those two toolchains fail with "'uint16_t' was not declared in this scope"
+    # while Linux and MSVC still build. Force-include the header for GCC/Clang instead
+    # of patching the submodule source (which would revert on submodule update). MSVC
+    # neither needs this nor understands -include, so it is excluded.
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+        target_compile_options(yaml-cpp PRIVATE -include cstdint)
+    endif()
+else()
+    message(FATAL_ERROR "yaml-cpp submodule missing at ${CMAKE_SOURCE_DIR}/thirdparty/yaml-cpp")
+endif()
diff --git a/cmake/external/zstd.cmake b/cmake/external/zstd.cmake
new file mode 100644
index 000000000..63e5e6f5e
--- /dev/null
+++ b/cmake/external/zstd.cmake
@@ -0,0 +1,27 @@
+# Zstandard compression library
+set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "Build zstd programs" FORCE)
+set(ZSTD_BUILD_TESTS OFF CACHE BOOL "Build zstd tests" FORCE)
+set(ZSTD_BUILD_CONTRIB OFF CACHE BOOL "Build zstd contrib" FORCE)
+set(ZSTD_BUILD_STATIC ON CACHE BOOL "Build zstd static library" FORCE)
+set(ZSTD_BUILD_SHARED OFF CACHE BOOL "Build zstd shared library" FORCE)
+set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "Zstd legacy support" FORCE)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zstd/build/cmake EXCLUDE_FROM_ALL)
+
+# Unity build causes redefinition errors in cover.h (no include guard)
+if(TARGET libzstd_static)
+    set_target_properties(libzstd_static PROPERTIES UNITY_BUILD OFF)
+endif()
+
+# --- Create zstd:: namespace aliases for downstream consumers (pak_archive) ---
+# This runs immediately after zstd targets are created, so aliases are ready
+# before pak_archive.cmake is included.
+if(TARGET libzstd_static AND NOT TARGET zstd::libzstd_static)
+    add_library(zstd::libzstd_static ALIAS libzstd_static)
+endif()
+if(TARGET libzstd_shared AND NOT TARGET zstd::libzstd_shared)
+    add_library(zstd::libzstd_shared ALIAS libzstd_shared)
+endif()
+
+set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zstd/lib CACHE PATH "Zstd include directory" FORCE)
+set(ZSTD_LIBRARY libzstd_static CACHE STRING "Zstd library target" FORCE)
diff --git a/docs/ANIMATION_GRAPHS.md b/docs/ANIMATION_GRAPHS.md
new file mode 100644
index 000000000..ac481f12f
--- /dev/null
+++ b/docs/ANIMATION_GRAPHS.md
@@ -0,0 +1,137 @@
+# Animation Graph Tutorial
+
+Chained Engine features a visual, data-driven Animation Graph system (`.chag`) for driving state machine animations with smooth blending.
+
+## Table of Contents
+
+- [Overview & Graph File Format](#1-overview--graph-file-format-chag)
+- [Editor Workflow](#2-editor-workflow-animgraphpanel)
+- [Driving from C# Scripts](#3-driving-animation-graph-from-c-scripts)
+- [Transition Condition Operators](#4-transition-condition-comparison-operators)
+- [Runtime vs. Edit Mode](#5-runtime-vs-edit-mode-execution)
+
+---
+
+## 1. Overview & Graph File Format (`.chag`)
+
+Animation Graphs are node-based state machines serialized as YAML. A graph contains:
+- **Default Variables**: Declares the schema of parameters (e.g., `speed`, `isMoving`, `isGrounded`).
+- **Nodes (`AnimNode`)**: Define animation states, frame ranges, looping, and playback speed.
+- **Transitions (`AnimTransition`)**: Define connections between states with blend durations and variable-based conditions.
+
+[![Znimok-ekrana-2026-08-01-173424.png](https://i.postimg.cc/sgHrQcjq/Znimok-ekrana-2026-08-01-173424.png)](https://postimg.cc/FYSqw0JV)
+
+[![Znimok-ekrana-2026-08-01-175555.png](https://i.postimg.cc/bNJ8zW8D/Znimok-ekrana-2026-08-01-175555.png)](https://postimg.cc/kDkLsj2q)
+
+Example `new_graph.chag` structure:
+
+```yaml
+AnimationGraph:
+  EntryNodeID: 4
+  NextNodeID: 5
+  Variables:
+    speed: 0
+    isMoving: 0
+    isGrounded: 1
+  Nodes:
+    - ID: 1
+      Name: Walk
+      AnimationIndex: 0
+      IsLooping: true
+      StartFrame: 690
+      EndFrame: 780
+      Speed: 1.0
+    - ID: 2
+      Name: Run
+      AnimationIndex: 0
+      IsLooping: true
+      StartFrame: 1450
+      EndFrame: 1500
+      Speed: 1.0
+    - ID: 4
+      Name: Stop
+      AnimationIndex: 0
+      IsLooping: true
+      StartFrame: 0
+      EndFrame: 0
+      Speed: 1.0
+  Transitions:
+    - ID: 1
+      SourceNodeID: 1
+      TargetNodeID: 2
+      BlendDuration: 0.2
+      HasExitTime: false
+      Conditions:
+        - VariableName: speed
+          Op: 4 # GreaterThan (>)
+          Value: 0.9
+```
+
+## 2. Editor Workflow (`AnimGraphPanel`)
+
+1. **Open the Animation Graph Panel:** In the editor top menu, open **Panels -> Animation Graph Editor**.
+2. **Create/Load Graph:** Click **New Graph** or select an existing `.chag` file.
+3. **Configure Nodes:**
+   - Add nodes for states like `Idle`/`Stop`, `Walk`, `Run`, `Jump`.
+   - Set `StartFrame` and `EndFrame` according to your model asset's animation tracks.
+4. **Manage Variables:**
+   - Add variables (e.g., `speed`, `isMoving`, `isGrounded`).
+   - Use the type toggle in the editor to switch between `Float` and `Bool` parameter types.
+5. **Create Transitions & Conditions:**
+   - Drag connections between nodes.
+   - Select a transition to edit `BlendDuration` (e.g., `0.2s` crossfade) and add conditions (e.g., `isMoving == 1`, `speed >= 0.9`).
+6. **Assign to Entity:**
+   - Select an entity with an `AnimationComponent`.
+   - Set `GraphPath` to `assets/animations/new_graph.chag`.
+
+## 3. Driving Animation Graph from C# Scripts
+
+C# gameplay scripts pass parameters directly to `AnimationComponent`. The engine automatically seeds graph variables on entity initialization and updates state transitions at runtime during simulation.
+
+```csharp
+using Chained;
+
+public class PlayerController : Script
+{
+    private AnimationComponent? m_Anim;
+
+    public override void OnCreate()
+    {
+        m_Anim = GetComponent<AnimationComponent>();
+    }
+
+    public override void OnUpdate(float ts)
+    {
+        Vector3 movement = GetInputVector();
+        bool isMoving = movement.LengthSquared() > 0.01f;
+        bool isSprinting = Input.IsKeyDown(Key.LeftShift);
+
+        float speed = 0.0f;
+        if (isMoving)
+        {
+            speed = isSprinting ? 1.0f : 0.5f;
+        }
+
+        // Drive graph variables dynamically from script
+        m_Anim?.SetBool("isMoving", isMoving);
+        m_Anim?.SetFloat("speed", speed);
+        m_Anim?.SetBool("isGrounded", IsGrounded());
+    }
+}
+```
+
+## 4. Transition Condition Comparison Operators
+
+| Op Code | Operator | Description |
+| :--- | :--- | :--- |
+| `0` | `==` | Equal |
+| `1` | `!=` | Not Equal |
+| `2` | `<` | Less Than |
+| `3` | `<=` | Less Than or Equal |
+| `4` | `>` | Greater Than |
+| `5` | `>=` | Greater Than or Equal |
+
+## 5. Runtime vs. Edit Mode Execution
+
+- **Simulation Mode (`Play`):** C# scripts update `AnimationComponent.Variables`, and `AnimationSystem` evaluates transitions frame-by-frame with smooth interpolation.
+- **Edit Mode:** Animation transitions are paused to keep the editor viewport stable and prevent state jitter while authoring.
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 9867a78c6..de4e497f0 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -1,39 +1,81 @@
 # Chained Engine Architecture
 
-This document provides a deep dive into the internal structure of Chained Engine, from the entry point to the main loop.
+This document describes the current runtime structure of Chained Engine, from executable entry points to the main loop.
 
 ## 1. Bootstrapping Flow
 
-The engine uses a modular bootstrapping system centered around the `ProjectLauncher` class. This allows the engine to be initialized in different modes (Editor, Runtime, or Headless) without duplicating initialization logic.
+The engine uses a small `main` wrapper in `entry_point.h` and delegates application construction to a per-executable `CreateApplication` function.
 
-### Entry Point (`main`)
-The `main` function (found in `entry_point.h`) is minimalist. It delegages application creation to a project-specific `CreateApplication` function.
+### Bootstrapping Diagram
+```mermaid
+graph TD
+    A[main entry_point.h] --> B[CreateApplication]
+    B --> C[ApplicationSpec]
+    C --> D[Initialize Core Services]
+    D --> E[LayerStack Update Loop]
+    E --> F[Shutdown]
+```
 
-### ProjectLauncher
-The `ProjectLauncher` utility is responsible for:
-1.  **Parsing Command Line Arguments**: Determining the project path and window overrides.
-2.  **Loading Project Metadata**: Reading the `.chproject` YAML file.
-3.  **Preparing Application Specifications**: Setting VSync, window dimensions, and titles based on project data.
+### Entry Point Code Example
+```cpp
+// game/src/main.cpp
+#include "engine/core/application.h"
+#include "engine/core/entry_point.h"
 
-## 2. System Initialization (SRP)
+namespace Chained {
+    Application* CreateApplication(ApplicationCommandLineArgs args) {
+        ApplicationSpecification spec;
+        spec.Name = "Chained Game";
+        spec.WindowWidth = 1600;
+        spec.WindowHeight = 900;
+        
+        return new Application(spec);
+    }
+}
+```
 
-We adhere to the **Single Responsibility Principle**. Instead of a monolithic initialization block, each engine system is responsible for its own setup.
+### Project Selection and Discovery
+Startup usually follows this path:
+1. `CreateApplication` fills `ApplicationSpecification` from CLI args and default window settings.
+2. `Application` is constructed and initializes core services.
+3. Runtime-specific startup may discover or load a project through `Project::Discover` and `Project::Load`.
+4. The executable attaches either `EditorLayer` or `RuntimeLayer`.
 
-### Decentralized Asset Loaders
-Asset loaders are registered during the `Init()` phase of the relevant subsystem:
-*   **Renderer**: Registers `TextureLoader`, `ModelLoader`, `ShaderLoader`, and `EnvironmentLoader`.
-*   **UIRenderer**: Registers `FontLoader`.
+## 2. System Initialization
+
+Initialization is centralized in `Application`. That keeps startup predictable, but it also makes `Application` a coupling point for unrelated systems.
+
+### What `Application` Owns
+`Application` currently creates and coordinates the window, `ThreadPool`, `ComponentSerializer`, `AssetManager`, `Renderer`, `TextureSystem`, `Audio`, `PhysicsSystem`, `UIRenderer`, and `ScriptEngine`.
+
+### Current Tradeoff
+This is not a pure SRP split. The benefit is that bootstrap order is explicit. The cost is that changes to service lifecycle, headless mode, or renderer setup tend to ripple through `Application`.
 
 ## 3. Layer Stack Model
 
-The engine handles functionality through a `LayerStack`. Layers are processed in the following order:
-1.  **Engine Layers** (e.g., `RuntimeLayer` or `EditorLayer`): Handle the main logic and viewport rendering.
-2.  **Overlays** (e.g., `ImGuiLayer`): Render UI and debugging information on top of the layers.
+The engine uses a `LayerStack` for gameplay and editor/runtime behavior.
+
+1. `EditorLayer` or `RuntimeLayer` owns the primary experience.
+2. `ImGuiLayer` is pushed as an overlay in non-headless runs.
+3. Layers rely on shared process-wide services through `ServiceLocator` and `Application::Get()`.
 
 ## 4. Main Loop
 
-The `Application::Run()` method is the heart of the engine:
-1.  **Timing**: Calculates `Timestep` (delta time).
-2.  **Updates**: Iterates through the `LayerStack`, calling `OnUpdate` for each layer.
-3.  **UI Rendering**: Calls `Begin()` on `ImGuiLayer`, then `OnImGuiRender` for all layers, and finally `End()`.
-4.  **Events**: Dispatches platform events (input, window resize) through the stack.
+`Application::Run()` drives the frame loop:
+1. Update timing and frame delta.
+2. Poll input and platform events.
+3. Tick engine services.
+4. Run fixed-step updates on the layer stack.
+5. Run per-frame layer updates.
+6. Render scene layers, then render ImGui, then present the frame.
+
+## 5. Architectural Pressure Points
+
+The current shape works, but it has a few clear friction points:
+1. Service lifecycle order is encoded in registration order, which is easy to break.
+2. Runtime and editor logic both reach back into global state instead of depending on explicit interfaces.
+3. Entry-point setup and runtime project loading both interpret CLI and project configuration, which duplicates startup policy.
+4. `Application` owns too many unrelated concerns, so it is the main place where startup regressions accumulate.
+
+> [!NOTE]
+> Recent architectural improvements include the move of core gameplay logic (like Scene Transitions) into native C++ systems to reduce managed overhead and improve predictability.
diff --git a/docs/COMPONENTS.md b/docs/COMPONENTS.md
index 7507cfeea..9bb6ed354 100644
--- a/docs/COMPONENTS.md
+++ b/docs/COMPONENTS.md
@@ -1,55 +1,287 @@
 # Component Reference
 
-Chained Engine uses a pure ECS (Entity Component System) architecture powered by **EnTT**. Below is a list of the most commonly used components.
+Chained Engine uses a pure ECS (Entity Component System) architecture powered by **EnTT**. Below is a list of the most commonly used components with examples.
 
 ## Core Components
 
 ### `IDComponent`
-*   **Description**: Stores the globally unique identifier (UUID) for an entity.
-*   **Properties**: `ID` (UUID).
+- **Description**: Stores the globally unique identifier (UUID) for an entity.
+- **Properties**: `ID` (UUID)
+- **YAML Example**:
+
+  ```yaml
+  IDComponent:
+    ID: 13765047633248252361
+  ```
+
+- **C++ Example**:
+
+  ```cpp
+  auto uuid = entity.GetComponent<IDComponent>().ID;
+  ```
 
 ### `TagComponent`
-*   **Description**: A human-readable name for searching and identification in the editor.
-*   **Properties**: `Tag` (string).
+- **Description**: A human-readable name for searching and identification.
+- **Properties**: `Tag` (string)
+- **YAML Example**:
+
+  ```yaml
+  TagComponent:
+    Tag: Main Player
+  ```
+
+- **C++ Example**:
+
+  ```cpp
+  entity.GetComponent<TagComponent>().Tag = "New Name";
+  ```
 
 ### `TransformComponent`
-*   **Description**: Defines the position, rotation, and scale of the entity in 3D space.
-*   **Properties**: `Translation`, `Rotation` (Euler angles), `Scale`.
+- **Description**: Defines the position, rotation, and scale.
+- **Properties**: `Translation`, `Rotation` (Euler), `Scale`
+- **YAML Example**:
+
+  ```yaml
+  TransformComponent:
+    Translation: [0, 5, -10]
+    Rotation: [0, 90, 0]
+    Scale: [1, 1, 1]
+  ```
 
-### `HierarchyComponent`
-*   **Description**: Manages parent-child relationships between entities.
-*   **Properties**: `Parent` (UUID), `Children` (list of UUIDs).
+- **C++ Example**:
+
+  ```cpp
+  auto& transform = entity.GetComponent<TransformComponent>();
+  transform.Translation.y += 1.0f;
+  ```
 
 ## Rendering Components
 
 ### `MeshComponent`
-*   **Description**: Attaches a 3D model (static or dynamic) to the entity.
-*   **Properties**: `AssetHandle` (UUID), `MaterialOverrides`.
+- **Description**: Attaches a 3D model to the entity.
+- **Properties**: `AssetHandle` (UUID), `MaterialOverrides`
+- **YAML Example**:
+
+  ```yaml
+  MeshComponent:
+    AssetHandle: models/player.glb
+  ```
+
+- **C++ Example**:
+
+  ```cpp
+  entity.AddComponent<MeshComponent>("path/to/model.glb");
+  ```
 
 ### `CameraComponent`
-*   **Description**: Defines a viewpoint for rendering.
-*   **Properties**: `ProjectionType` (Perspective/Orthographic), `FOV`, `Near/Far Clips`.
+- **Description**: Defines a viewpoint for rendering.
+- **Properties**: `ProjectionType`, `FOV`, `Near/Far Clips`
+- **YAML Example**:
 
-### `LightComponent`
-*   **Description**: Emits light into the scene.
-*   **Properties**: `Type` (Point, Spot, Directional), `Color`, `Intensity`, `Radius`.
+  ```yaml
+  CameraComponent:
+    ProjectionType: 0
+    PerspectiveFOV: 45
+    PerspectiveNear: 0.1
+    PerspectiveFar: 1000
+  ```
 
-## Physics Components
+## UI Components
 
-### `RigidBodyComponent`
-*   **Description**: Subjects the entity to physics simulation.
-*   **Properties**: `BodyType` (Static, Dynamic, Kinematic), `Mass`, `Linear/Angular Damping`.
+### `WidgetComponent`
+- **Description**: The base for all in-game UI (buttons, text, images).
+- **Properties**: `WidgetType`, `Label`, `BoxStyle`, `TextStyle`
+- **YAML Example**:
 
-### `BoxColliderComponent` / `SphereColliderComponent`
-*   **Description**: Defines the physical shape for collisions.
-*   **Properties**: `Size`, `Offset`, `IsTrigger`, `Friction`.
+  ```yaml
+  WidgetComponent:
+    Widget Type: 1 # Button
+    Label: Start Game
+    Box Style:
+      BG Color: [40, 40, 40, 255]
+      Rounding: 4
+  ```
 
 ## Gameplay & Logic
 
+### `SceneTransitionComponent`
+- **Description**: Triggers a scene change. Automatically detects clicks if a `WidgetComponent` is present on the same entity.
+- **Properties**: `TargetScenePath` (string), `Triggered` (bool)
+- **YAML Example**:
+
+  ```yaml
+  Scene TransitionComponent:
+    Target Scene Path: scenes/level1.chscene
+    Triggered: false
+  ```
+
+- **C++ Example**:
+
+  ```cpp
+  // Manual trigger
+  entity.GetComponent<SceneTransitionComponent>().Triggered = true;
+  ```
+
 ### `ManagedScriptComponent`
-*   **Description**: Links the entity to one or more C# scripts.
-*   **Properties**: `ClassName` (Fully qualified, e.g., `MyGame.Player`).
+- **Description**: Links the entity to C# scripts.
+- **Properties**: `ClassName`
+- **YAML Example**:
+
+  ```yaml
+  ManagedScriptComponent:
+    Scripts:
+      - ClassName: ChainedDecos.PlayerController
+  ```
 
 ### `AudioComponent`
-*   **Description**: Handles 3D spatialized sound.
-*   **Properties**: `AssetHandle` (UUID), `Volume`, `Pitch`, `PlayOnAwake`, `Looping`.
+- **Description**: Handles 3D spatialized sound.
+- **Properties**: `AssetHandle`, `Volume`, `Looping`
+- **YAML Example**:
+
+  ```yaml
+  AudioComponent:
+    AssetHandle: audio/ambient.wav
+    Volume: 0.5
+    Looping: true
+  ```
+
+---
+
+## Adding a Native Component (C++)
+
+Need performance that scripting can't provide, or want to create a brand new foundational component? Here is the full workflow:
+
+### 1. Define the Component
+
+Add a fast `struct` in `engine/scene/components/`. We use `EnTT`, so components are plain structs — no methods on the component itself.
+
+```cpp
+// engine/scene/components/parkour_component.h
+#pragma once
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+struct ParkourComponent
+{
+    float Stamina = 100.0f;
+    bool  IsWallRunning = false;
+
+    static const char* GetStaticName() { return "ParkourComponent"; }
+
+    struct UI
+    {
+        UIMeta Stamina = {.Min = 0.0f, .Max = 100.0f, .Speed = 1.0f};
+        UIMeta IsWallRunning = {.ReadOnly = true, .Transient = true};
+    };
+};
+CH_MARK_RFL(ParkourComponent);
+} // namespace Chained
+```
+
+### 2. Register the Component
+
+Add one line in `engine/scene/component_registry.cpp` inside `RegisterEngineComponents()`:
+
+```cpp
+RegisterReflective<ParkourComponent>("Parkour", nullptr, "Gameplay");
+```
+
+Serialization and the editor inspector work automatically through the reflection system.
+
+### 3. Create a System
+
+Implement the logic as a free function in a namespace. **Always use `TransformSystem::` functions** to read/write transforms — never access `TransformComponent` fields directly.
+
+```cpp
+// engine/scene/systems/parkour_system.h
+#pragma once
+#include "engine/scene/scene_fwd.h"
+
+namespace Chained::Parkour
+{
+    void Update(entt::registry& reg, Timestep ts);
+}
+
+// engine/scene/systems/parkour_system.cpp
+#include "parkour_system.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+#include "engine/scene/systems/transform_system.h"
+
+namespace Chained::Parkour
+{
+    void Update(entt::registry& reg, Timestep ts)
+    {
+        auto view = reg.view<ParkourComponent, TransformComponent>();
+        for (auto entity : view)
+        {
+            auto& parkour = view.get<ParkourComponent>(entity);
+            auto& tc = view.get<TransformComponent>(entity);
+
+            if (parkour.IsWallRunning)
+            {
+                // Use TransformSystem — never write tc.Translation directly
+                auto pos = TransformSystem::GetTranslation(tc);
+                pos.y += 2.0f * ts;
+                TransformSystem::SetTranslation(tc, pos);
+            }
+        }
+    }
+}
+```
+
+> **Note**: `component_utils.h` was removed. All transform utilities live in `TransformSystem::` — see `engine/scene/systems/transform_system.h` for the full list (ComputeLocalMatrix, GetTranslation, GetRotation, GetScale, SetTranslation, SetRotation, SetScale, etc.).
+
+### 4. Hook into the Scene
+
+Add one call in `engine/scene/scene.cpp` in the appropriate update method:
+
+```cpp
+#include "engine/scene/systems/parkour_system.h"
+
+void Scene::OnUpdateRuntime(Timestep ts)
+{
+    // ...existing systems...
+    Parkour::Update(*m_Registry, ts);
+}
+```
+
+### 5. Expose to Scripting (C# Glue)
+
+To make the component's fields accessible from C# scripts, add a `[NativeProperty]` attribute on the C# wrapper class. The C++ glue code is generated automatically.
+
+**Step A — Create the C# wrapper** (if it doesn't exist):
+
+```csharp
+// engine/scripting/managed/src/Components/ParkourComponent.cs
+using System;
+
+namespace Chained
+{
+    [NativeProperty("Stamina", "float", "ParkourComponent_GetStamina", "ParkourComponent_SetStamina")]
+    [NativeProperty("IsWallRunning", "bool", "ParkourComponent_IsWallRunning", "ParkourComponent_SetIsWallRunning")]
+    public partial class ParkourComponent : Component
+    {
+    }
+}
+```
+
+**Step B — Register the class for glue generation** in `engine/scripting/CMakeLists.txt`:
+
+```cmake
+--classes PlayerComponent SpawnComponent NetworkIdentityComponent ParkourComponent
+```
+
+**Step C — Build**:
+
+```bash
+cmake --build --preset windows-clang-debug --parallel
+```
+
+The `tools/generate_glue.py` script runs automatically during the build and generates:
+- `engine/scripting/generated/script_glue_generated.h` — function declarations
+- `engine/scripting/generated/script_glue_generated.cpp` — getter/setter implementations
+- `engine/scripting/generated/script_glue_generated_reg.cpp` — `AddInternalCall` registrations
+
+No manual C++ glue code is needed for simple property get/set. For complex logic (physics sync, string conversion, etc.), use `[NativeCall]` instead and write hand-written glue in `script_glue_*.cpp` — see [Scripting Interop](SCRIPTING_INTEROP.md).
diff --git a/docs/EXPORT.md b/docs/EXPORT.md
new file mode 100644
index 000000000..f029388e2
--- /dev/null
+++ b/docs/EXPORT.md
@@ -0,0 +1,128 @@
+# Project Export / Packaging
+
+The engine includes a project exporter that packages game assets into a single compressed archive for distribution.
+
+## Table of Contents
+
+- [Scene Serialization Format](#scene-serialization-format)
+- [Debug Settings in Scene](#debug-settings-in-scene)
+- [How to Export](#how-to-export)
+- [Export Settings](#export-settings)
+- [Runtime Loading](#runtime-loading)
+
+---
+
+## Scene Serialization Format
+
+Scenes are stored as YAML (`.chscene` files). Each entity is serialized with its UUID, and components are nested under their serialization keys.
+
+```yaml
+Scene:
+  Entities:
+    - Entity: 1234567890          # UUID as uint64
+      TagComponent:
+        Tag: "Player"
+      NameComponent:
+        Name: "Player Entity"
+      TransformComponent:
+        Translation: [0.0, 5.0, 0.0]
+        Rotation: [0.0, 0.0, 0.0]
+        Scale: [1.0, 1.0, 1.0]
+      RigidBodyComponent:
+        Type: 1                    # 0=Static, 1=Dynamic, 2=Kinematic
+        Mass: 1.0
+        UseGravity: true
+      ColliderComponent:
+        Type: 0                    # 0=Box, 1=Sphere, 2=Capsule, 3=Mesh
+        Size: [0.5, 0.5, 0.5]
+        Friction: 0.5
+      ModelComponent:
+        ModelPath: "assets/models/player.glb"
+      AudioComponent:
+        SoundPath: "assets/sounds/footstep.wav"
+        Spatialized: true
+        Volume: 0.8
+    - Entity: 9876543210
+      TagComponent:
+        Tag: "SpawnPoint"
+      SpawnComponent:
+        IsActive: true
+        SpawnPoint: [0.0, 1.0, 0.0]
+        ZoneSize: [5.0, 2.0, 5.0]
+      Hierarchy:
+        Parent: 0                  # 0 = root entity
+        Children: []
+```
+
+## Debug Settings in Scene
+
+Scene-level debug rendering is serialized under `DebugSettings`:
+
+```yaml
+DebugSettings:
+  DiagnosticMode: 0               # 0=Full, 1=Normals, 2=Lighting, 3=Albedo
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0       # 0=Wireframe, 1=Solid, 2=Solid+Wireframe
+Grid:
+  Spacing: 1.0
+```
+
+## How to Export
+
+1. In the editor, go to **File > Export Project**.
+2. Choose a **Pack Mode**:
+   - **Fast (LZ4)** — Quick export, larger file.
+   - **Balanced (ZSTD)** — Slower export, smaller file.
+   - **Raw** — No packing. Game files are copied directly into `assets/` and `resources/` subfolders.
+3. Adjust **Compression Threshold** if needed.
+4. Click **Browse Output Folder** and select a destination.
+5. The export starts automatically. Progress is shown in the overlay.
+
+The exporter packages `.chproject`, `assets/`, and `resources/` into `resources.pack` using compression (via [cfnptr/pack](https://github.com/cfnptr/pack)). The executable, DLLs, and subdirectories are copied alongside the pack.
+
+## Export Settings
+
+| Setting | Default | Description |
+| :--- | :--- | :--- |
+| `Pack Mode` | Balanced | Compression algorithm: **Fast** (LZ4 HC), **Balanced** (ZSTD), or **Raw** (no pack — files copied directly) |
+| `ZipThreshold` | 0.05 | Files above this ratio of compressed/original size are stored uncompressed |
+| `DataVersion` | 0 | Increment to invalidate cached packs at runtime |
+
+## Runtime Loading
+
+At startup, `AssetManager::OpenPack()` automatically looks for `resources.pack` next to the executable. When found, all asset loading (textures, shaders, fonts) reads from the pack first, falling back to the filesystem if not found.
+
+In **Raw** mode no pack file is created. The runtime detects the absence of `resources.pack` and reads files directly from the `assets/` and `resources/` folders. This makes Raw mode ideal for rapid iteration and debugging.
+
+```
+# Fast / Balanced output structure:
+MyGame/
+  MyGame.exe
+  resources.pack
+  engine.dll
+  ...
+
+# Raw output structure:
+MyGame/
+  MyGame.exe
+  assets/
+    scenes/
+    textures/
+    ...
+  resources/
+    shaders/
+    fonts/
+    ...
+  engine.dll
+  ...
+```
+
+---
+
+For build instructions, see [Build](../readme.md#build).
+For the User Guide, see [User Guide](USER_GUIDE.md).
diff --git a/docs/FAQ.md b/docs/FAQ.md
new file mode 100644
index 000000000..f8b0c2365
--- /dev/null
+++ b/docs/FAQ.md
@@ -0,0 +1,195 @@
+# FAQ / Common Patterns
+
+Frequently asked questions and common patterns for ChainedEngine.
+
+## Table of Contents
+
+- [Scripting](#scripting)
+- [Editor](#editor)
+- [Build & Setup](#build--setup)
+- [Components](#components)
+
+---
+
+## Scripting
+
+### How do I teleport a player to a spawn point?
+
+Use `ForceSetVelocity` (not `Velocity =`) to avoid Jolt's Dynamic body Y-velocity override:
+
+```csharp
+public void TeleportToSpawn(Vector3 spawnPos) {
+    TransformComponent? transform = GetComponent<TransformComponent>();
+    RigidBodyComponent? rb = GetComponent<RigidBodyComponent>();
+    if (transform != null) transform.Translation = spawnPos;
+    if (rb != null) rb.ForceSetVelocity(Vector3.Zero);  // Not rb.Velocity = ...
+}
+```
+
+### How do I add a component from a C# script?
+
+```csharp
+public override void OnCreate() {
+    RigidBodyComponent rb = entity.AddComponent<RigidBodyComponent>();
+    rb.Type = RigidBodyComponent.BodyType.Dynamic;
+    rb.Mass = 1.5f;
+}
+```
+
+### How do I respond to collisions?
+
+Override `OnCollisionEnter` in your script. The engine passes a raw entity ID, not an `Entity` wrapper:
+
+```csharp
+public override void OnCollisionEnter(ulong otherEntityId) {
+    Entity other = new Entity(otherEntityId);
+    TagComponent? tag = other.GetComponent<TagComponent>();
+    if (tag != null && tag.Tag == "Pickup") {
+        Log.Info("Collected a pickup!");
+    }
+}
+```
+
+### How do I trigger a scene transition?
+
+Add a `SceneTransitionComponent` to your entity and set `TargetScenePath`. When `Triggered` is set to `true` (by a script or collision), the engine loads the target scene automatically.
+
+### How do I play spatial audio?
+
+Add an `AudioComponent` with `Spatialized = true` and `PlayOnStart = true`. The audio system syncs the listener with the primary camera automatically.
+
+### How do I switch between scenes from a script?
+
+```csharp
+Scene.LoadScene("assets/scenes/level2.chscene");
+```
+
+### How do I find an entity by name/tag?
+
+```csharp
+Entity? player = Scene.FindEntityByTag("Player");
+if (player != null)
+{
+    TransformComponent? t = player.GetComponent<TransformComponent>();
+}
+```
+
+### How do I copy/duplicate an entity?
+
+```csharp
+Entity? clone = Scene.CopyEntity(original);
+```
+
+### How do I exit the game from a script?
+
+```csharp
+Application.Close();
+```
+
+### How do I get the FPS or delta time?
+
+```csharp
+int fps = Time.FPS;
+float dt = Time.DeltaTime;
+```
+
+### How do I change the window size at runtime?
+
+```csharp
+AppWindow.SetSize(1920, 1080);
+AppWindow.SetFullscreen(true);
+```
+
+Or configure it in the `.chproject` file:
+
+```yaml
+Project:
+  Window:
+    Width: 1920
+    Height: 1080
+    VSync: true
+```
+
+### How do I add sound/music?
+
+1. Place your `.wav` or `.mp3` files in the assets folder.
+2. Create an entity, add **AudioComponent**.
+3. Set the audio file path in the Inspector.
+4. Enable **PlayOnStart** for automatic playback, or call `Audio.Play("path/to/sound.wav")` from a script.
+
+For background music, enable **Loop** on the component.
+
+---
+
+## Editor
+
+### My script doesn't compile. What's wrong?
+
+Most C# script errors come from:
+
+1. **Wrong namespace.** Your script must be in a namespace inside the game assembly (e.g., `namespace ChainedDecos`).
+2. **Missing `using Chained;`** — Required for `Script`, `Entity`, `Input`, `Log`, etc.
+3. **.NET SDK not found.** Install .NET SDK 10.0.x and verify it's on PATH: `dotnet --version`.
+4. **Script not in the right folder.** Place `.cs` files in `game/<yourgame>/assets/scripts/src/`.
+
+### The editor doesn't see my script. What do I do?
+
+After adding a new script file, the script assembly needs to rebuild. The engine auto-rebuilds when you press **Play**, but if it doesn't:
+
+1. Save the script file.
+2. In the editor, go to **File > Reload Scripts** (or press Ctrl+R).
+3. Check the **Console** panel for compilation errors.
+
+---
+
+## Build & Setup
+
+### How do I switch between game projects?
+
+Set `CH_ACTIVE_GAME` at CMake configure time:
+
+```bash
+cmake -S . -B build/windows-clang -DCH_ACTIVE_GAME=testproject
+```
+
+The executable name changes automatically. The `.chproject` file determines what scene the runtime opens.
+
+### What build presets are available?
+
+| Preset | Compiler | Platform |
+|---|---|---|
+| `windows-clang-debug` | Clang | Windows |
+| `windows-clang-release` | Clang | Windows |
+| `windows-msvc-debug` | MSVC | Windows |
+| `windows-msvc-release` | MSVC | Windows |
+| `windows-gcc-debug` | GCC | Windows (MinGW) |
+| `windows-gcc-release` | GCC | Windows (MinGW) |
+| `linux-clang-debug` | Clang | Linux |
+| `linux-clang-release` | Clang | Linux |
+| `linux-gcc-debug` | GCC | Linux |
+| `linux-gcc-release` | GCC | Linux |
+
+### How do I run tests?
+
+```bash
+cmake --build --preset windows-clang-debug --target EngineTests --parallel
+ctest --test-dir build/windows-clang-debug --output-on-failure
+```
+
+### The build fails with submodule errors
+
+Run this before building:
+
+```bash
+git submodule update --init --recursive
+```
+
+### How do I add a new component in C++?
+
+See the [Component Reference](COMPONENTS.md) for the full guide. In short:
+
+1. Define a struct in `engine/scene/components/`.
+2. Register it in `component_registry.cpp`.
+3. Add a system in `engine/scene/systems/`.
+4. Hook the system into the scene update loop.
+5. Add `[NativeProperty]` attributes on the C# wrapper and register in `CMakeLists.txt --classes` to expose fields to scripts (auto-generated glue).
diff --git a/docs/SCRIPTING_API.md b/docs/SCRIPTING_API.md
index bad164d2f..8cd73a840 100644
--- a/docs/SCRIPTING_API.md
+++ b/docs/SCRIPTING_API.md
@@ -1,54 +1,412 @@
 # Scripting API Reference (C#)
 
-This document covers the managed API surface available to C# scripts in Chained Engine.
+This document is the reference for the managed C# API available to gameplay scripts
+in Chained Engine. Every signature and example here is taken directly from the
+sources under `scripting/managed/src/` and is kept in sync with them. When in doubt,
+those files are the source of truth.
 
-## 1. Script Lifecycle
+The managed layer is a thin wrapper over the native engine. C# holds no game state of
+its own: each component wrapper forwards to a C++ function pointer bound at startup
+through Coral (the .NET/CoreCLR host). A wrapper is therefore only valid while its
+entity is valid.
 
-All gameplay scripts must inherit from `CHEngine.Script`.
+## Contents
+
+0. [Quick reference](#0-quick-reference)
+1. [Script lifecycle](#1-script-lifecycle)
+2. [Entities and components](#2-entities-and-components)
+3. [Components](#3-components)
+4. [Input](#4-input)
+5. [Scene, application, and services](#5-scene-application-and-services)
+6. [Logging](#6-logging)
+7. [In-game UI](#7-in-game-ui)
+8. [Worked example](#8-worked-example)
+
+---
+
+## 0. Quick reference
+
+| Namespace | Class | Purpose |
+|---|---|---|
+| `Chained` | `Script` | Base class for all gameplay scripts |
+| `Chained` | `Entity` | Wraps a native entity, provides component access |
+| `Chained` | `Input` | Keyboard and mouse input queries |
+| `Chained` | `Scene` | Find entities, load scenes, copy entities |
+| `Chained` | `Audio` | Play/stop sounds |
+| `Chained` | `Application` | Application lifecycle (close) |
+| `Chained` | `Time` | FPS and delta time |
+| `Chained` | `AppWindow` | Window size, fullscreen, vsync, AA |
+| `Chained` | `Physics` | Gravity query |
+| `Chained` | `UI` | Minimal in-game text rendering |
+| `Chained` | `Log` | Console logging (Info, Warn, Error) |
+
+**Key enums** (`Chained` namespace, defined in `Math.cs`):
+
+| Enum | Values |
+|---|---|
+| `Key` | `A`–`Z`, `D0`–`D9`, `Space`, `Escape`, `Enter`, `Tab`, `LeftShift`, `LeftControl`, `LeftAlt`, arrows, `F1`–`F12`, etc. |
+| `MouseButton` | `Left`, `Right`, `Middle` |
+
+---
+
+## 1. Script lifecycle
+
+Every gameplay script derives from `Chained.Script` (`scripting/managed/src/Script.cs`).
+The lifecycle methods are `public virtual` — override the ones you need. They are not
+`protected`; the engine invokes them across the interop boundary.
+
+```csharp
+using Chained;
+
+namespace MyGame
+{
+    public class Example : Script
+    {
+        // Called once, one frame after the script is instantiated.
+        // Entity is already assigned here.
+        public override void OnCreate() { }
+
+        // Called once, on the first Update frame after OnCreate.
+        public override void OnStart() { }
+
+        // Called every frame while the simulation runs.
+        public override void OnUpdate(float deltaTime) { }
+
+        // Called during the UI pass. Use the UI helper here (see section 7).
+        public override void OnGUI() { }
+
+        // Called when the physics system reports a contact. The argument is the
+        // other entity's raw id, not an Entity wrapper — construct one if needed.
+        public override void OnCollisionEnter(ulong otherEntityId) { }
+
+        // Called when a native engine event is forwarded. eventType is the
+        // integer value of the native EventType enum.
+        public override void OnEvent(int eventType) { }
+
+        // Called once when the script is torn down.
+        public override void OnDestroy() { }
+    }
+}
+```
+
+Ordering guarantees: `OnCreate` runs one frame after instantiation, `OnStart` runs the
+frame after `OnCreate`, and `OnUpdate` only begins once `OnStart` has completed. This
+staging is deliberate — it prevents `OnUpdate` from running on the same frame the
+script was created.
+
+### Accessing the owning entity
+
+The base class exposes the entity the script is attached to, plus shortcuts:
+
+```csharp
+public Entity Entity { get; }              // the owning entity
+public T? GetComponent<T>() where T : Component, new();   // shortcut to Entity.GetComponent
+public bool HasComponent<T>() where T : Component, new(); // shortcut to Entity.HasComponent
+```
+
+---
+
+## 2. Entities and components
+
+`Entity` (`scripting/managed/src/Entity.cs`) wraps a native entity id and provides
+component access. Component lookups are cached per entity, so repeated
+`GetComponent<T>()` calls do not re-allocate.
+
+```csharp
+public ulong ID { get; }
+public bool IsValid { get; }                       // ID != 0
+public TransformComponent? Transform { get; }      // shortcut, null if absent
+
+public bool HasComponent<T>() where T : Component, new();
+public T? GetComponent<T>() where T : Component, new();   // null if the entity lacks T
+public T AddComponent<T>() where T : Component, new();
+public static ulong[] FindAllWithComponent<T>() where T : Component, new();
+public void InvalidateComponentCache();  // clears cached component wrappers
+```
+
+`GetComponent<T>()` returns `null` when the component is absent, so always null-check
+before use:
 
 ```csharp
-public class MyScript : Script
+public override void OnUpdate(float deltaTime)
 {
-    protected override void OnCreate() { /* Called once when the entity is instantiated */ }
-    protected override void OnUpdate(float deltaTime) { /* Called every frame */ }
-    protected override void OnDestroy() { /* Called when the entity is removed */ }
-    protected override void OnCollisionEnter(Entity other) { /* Physics callback */ }
-    protected override void OnGUI() { /* Immediate-mode UI layout */ }
+    RigidBodyComponent? rb = GetComponent<RigidBodyComponent>();
+    if (rb == null)
+        return;
+
+    rb.Velocity = new Vector3(0.0f, 0.0f, -5.0f);
 }
 ```
 
-## 2. Entity & Component Access
+> Note: the C# type name is what the native side matches against. `GetComponent<T>()`
+> sends `typeof(T).Name` (for example `"RigidBodyComponent"`) to the engine, which
+> resolves it against the component registry. If a lookup unexpectedly returns null,
+> confirm the component is actually present on the entity.
+
+---
+
+## 3. Components
+
+Component wrappers live in `scripting/managed/src/Components/`. All derive from
+`Component`, which itself exposes `Entity` and a `Transform` shortcut.
+
+> 💡 **Native Binding Architecture**: Components use Roslyn Source Generation (`[NativeProperty]` and `[NativeCall]` attributes). Function pointers (`_Ptr` fields) and C# getters/setters are auto-generated at compile time. See [SCRIPTING_INTEROP.md](SCRIPTING_INTEROP.md) for details on extending components and adding native calls.
+
+The wrappers available to scripts are listed below with their public members.
+
+### TransformComponent
+
+```csharp
+public Vector3 Translation { get; set; }
+public Vector3 Rotation    { get; set; }   // Euler angles (radians)
+public Vector3 Scale       { get; set; }
+```
+
+### RigidBodyComponent
+
+```csharp
+public Vector3 Velocity    { get; set; }
+public bool    IsGrounded  { get; }        // read-only, driven by the physics world
+public bool    IsKinematic { get; set; }
+public float   Mass        { get; set; }
+public void    ForceSetVelocity(Vector3 velocity);  // bypasses Jolt's internal override
+```
+
+### CameraComponent
+
+```csharp
+public Vector3 Forward { get; }            // derived from the entity transform
+public Vector3 Right   { get; }
+public bool    Primary { get; set; }
+public bool    IsOrbitCamera { get; set; }
+public string  TargetEntityTag { get; set; }
+
+public void GetOrbit(out float yaw, out float pitch, out float distance);
+public void SetOrbit(float yaw, float pitch, float distance);
+```
+
+### Other wrappers
+
+| Wrapper | Key members |
+| :--- | :--- |
+| `ModelComponent` | `string ModelPath { get; set; }` |
+| `TagComponent` | `string Tag { get; }` |
+| `AudioComponent` | `float Volume { set; }`, `bool Loop { set; }`, `bool IsPlaying { get; }`, `string SoundPath { get; }`, `Play()`, `Stop()` |
+| `SpriteComponent` | `string TexturePath { get; set; }`, `Vector4 Tint { get; set; }`, `bool FlipX { get; set; }`, `bool FlipY { get; set; }`, `int ZOrder { get; set; }` |
+| `ShaderComponent` | `bool Enabled { get; set; }`, `SetFloat(name, value)`, `SetVector3(name, value)` |
+| `PlayerComponent` | `float MovementSpeed { get; set; }`, `float JumpForce { get; set; }`, `float LookSensitivity { get; set; }` |
+| `SpawnComponent` | `bool IsActive { get; set; }`, `bool IsCheckpoint { get; set; }`, `Vector3 SpawnPoint { get; set; }`, `bool RenderSpawnZoneInScene { get; }`, `Vector3 ZoneSize { get; }` |
+| `AnimationComponent` | `int CurrentAnimationIndex { get; set; }`, `bool IsPlaying { get; set; }`, `bool IsLooping { get; set; }`, `bool IsFinished { get; }`, `float Duration { get; }`, `float NormalizedTime { get; }`, `float BlendDuration { get; set; }`, `Play()`, `Pause()`, `CrossFade(int index, float duration)`, `SetFloat(name, value)`, `SetBool(name, value)`, `GetFloat(name)` |
 
-### Local Access
-*   `Entity self`: Access the entity this script is attached to.
-*   `T GetComponent<T>()`: Retrieves a component from the current entity.
-*   `bool HasComponent<T>()`: Checks if the entity has a specific component.
+---
 
-### Global Search
-*   `Entity Scene.FindEntityByTag(string tag)`: Find an entity by its name/tag.
-*   `Entity Scene.CreateEntity(string name)`: Spawn a new entity.
-*   `void Scene.DestroyEntity(Entity entity)`: Remove an entity.
+## 4. Input
 
-## 3. Input Handling
+`Input` (`scripting/managed/src/Input.cs`) is a static class. Keyboard queries take the
+`Key` enum; mouse-button queries take the `MouseButton` enum (both in
+`scripting/managed/src/Math.cs`). Note the enum is `Key`, not `KeyCode`.
 
-Use the static `Input` class to query hardware state:
-*   `bool Input.IsKeyDown(KeyCode code)`: Check keyboard.
-*   `bool Input.IsMouseButtonPressed(MouseButton button)`: Check mouse.
-*   `Vector2 Input.GetMousePosition()`: Screen-space coordinates.
+```csharp
+public static bool  IsKeyDown(Key key);          // held this frame
+public static bool  IsKeyPressed(Key key);       // went down this frame
+public static bool  IsKeyReleased(Key key);      // went up this frame
+public static bool  IsMouseButtonDown(MouseButton button);
+public static bool  IsMouseButtonPressed(MouseButton button);
+public static float GetMouseWheelMove();         // scroll delta this frame
+public static Vector3 MouseDelta { get; }        // (dx, dy, 0) since last frame
+```
+
+`Key` covers `A`–`Z`, `Space`, `Escape`, `Enter`, `Tab`, arrows, function keys,
+modifiers such as `LeftShift`/`LeftControl`, and the digit keys `D0`–`D9`.
+`MouseButton` is `Left`, `Right`, or `Middle`.
+
+```csharp
+public override void OnUpdate(float deltaTime)
+{
+    if (Input.IsKeyDown(Key.W))
+    {
+        // move forward
+    }
 
-## 4. Mathematics
+    if (Input.IsMouseButtonDown(MouseButton.Right))
+    {
+        Vector3 delta = Input.MouseDelta;   // look around
+    }
+}
+```
 
-The engine uses custom wrappers for GLM types:
-*   `Vector2`, `Vector3`, `Vector4`: Standard coordinate and color containers.
-*   `Quaternion`: For stable rotation math.
-*   `Math.Lerp`, `Math.Clamp`: Common scalar utilities.
+---
 
-## 5. UI & Logging
+## 5. Scene, application, and services
 
-### UI (In-Game HUD)
-Draw simple debug or gameplay UI inside `OnGUI`:
-*   `void UI.DrawText(string text, Vector2 pos, Color color)`
-*   `bool UI.DrawButton(string label, Vector2 pos)`
+These static classes live in `scripting/managed/src/SceneAndApplication.cs`.
 
-### Logging
-*   `Log.Trace`, `Log.Info`, `Log.Warn`, `Log.Error`: Print messages to the engine console and editor log.
+### Scene
+
+```csharp
+public static Entity? FindEntityByTag(string tag);   // null if not found
+public static void    LoadScene(string path);        // e.g. "scenes/level1.chscene"
+public static Entity? GetMainCamera();
+public static Entity? CopyEntity(Entity entity);      // null on failure
+```
+
+### Audio
+
+```csharp
+public static void Play(string path, float volume = 1.0f, float pitch = 1.0f, bool loop = false);
+public static void Stop(string path);
+public static void StopAll();
+```
+
+### Application
+
+```csharp
+public static void Close();   // request application shutdown
+```
+
+### Time
+
+```csharp
+public static int   FPS { get; }
+public static float DeltaTime { get; }
+```
+
+### Physics
+
+```csharp
+public static float GetGravity();   // world gravity from project settings
+```
+
+### AppWindow
+
+```csharp
+public static void   SetSize(int width, int height);
+public static void   SetFullscreen(bool enabled);
+public static void   SetVSync(bool enabled);
+public static void   SetAntialiasing(bool enabled);
+public static void   SetAntiAliasingSamples(int samples);
+public static string GetSupportedResolutions();
+```
+
+---
+
+## 6. Logging
+
+`Log` (`scripting/managed/src/Log.cs`) writes to the same buffered console the editor
+displays. Messages are plain strings — format them yourself with interpolation.
+
+```csharp
+public static void Info(string message);
+public static void Warn(string message);
+public static void Error(string message);
+public static void ClearHistory();
+public static IReadOnlyList<string> History { get; }
+```
+
+```csharp
+Log.Info($"Player spawned at {transform.Translation}");
+Log.Warn("No camera tagged 'Main' in scene");
+Log.Error("Failed to load save file");
+```
+
+---
+
+## 7. In-game UI
+
+The managed UI surface (`scripting/managed/src/UI.cs`) is intentionally minimal today.
+It exposes a single call, used from `OnGUI`:
+
+```csharp
+public static void Text(string text);
+```
+
+```csharp
+public override void OnGUI()
+{
+    UI.Text($"Score: {_score}");
+    UI.Text($"FPS: {Time.FPS}");
+}
+```
+
+For richer player-facing UI, prefer the native declarative path (`WidgetComponent` +
+`SceneTransitionComponent`) described in the README. `UI.Text` is meant for lightweight
+HUD readouts, not full menus.
+
+---
+
+## 8. Worked example
+
+A camera-relative movement controller that reads WASD, moves a rigid body, and jumps.
+This mirrors the shape of the real `PlayerController` in
+`game/chaineddecos/assets/scripts/src/`.
+
+```csharp
+using Chained;
+
+namespace MyGame
+{
+    public class Mover : Script
+    {
+        public float Speed = 15.0f;
+        public float JumpForce = 15.0f;
+
+        public override void OnCreate()
+        {
+            Log.Info("Mover ready");
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            // Camera-relative ground directions.
+            Vector3 forward = Vector3.Zero;
+            Vector3 right = Vector3.Zero;
+
+            Entity? camEntity = Scene.GetMainCamera();
+            CameraComponent? camera = camEntity?.GetComponent<CameraComponent>();
+            if (camera != null)
+            {
+                forward = Vector3.Normalize(new Vector3(camera.Forward.X, 0.0f, camera.Forward.Z));
+                right   = Vector3.Normalize(new Vector3(camera.Right.X,   0.0f, camera.Right.Z));
+            }
+
+            Vector3 dir = Vector3.Zero;
+            if (Input.IsKeyDown(Key.W)) dir += forward;
+            if (Input.IsKeyDown(Key.S)) dir -= forward;
+            if (Input.IsKeyDown(Key.A)) dir -= right;
+            if (Input.IsKeyDown(Key.D)) dir += right;
+
+            RigidBodyComponent? rb = GetComponent<RigidBodyComponent>();
+            if (rb == null)
+                return;
+
+            Vector3 velocity = rb.Velocity;
+
+            if (dir.LengthSquared() > 0.0001f)
+            {
+                dir = Vector3.Normalize(dir);
+                velocity.X = dir.X * Speed;
+                velocity.Z = dir.Z * Speed;
+            }
+            else
+            {
+                velocity.X = 0.0f;
+                velocity.Z = 0.0f;
+            }
+
+            // Jump: physics owns the vertical axis for dynamic bodies.
+            if (Input.IsKeyPressed(Key.Space) && rb.IsGrounded)
+                velocity.Y = JumpForce;
+
+            rb.Velocity = velocity;
+        }
+
+        public override void OnCollisionEnter(ulong otherEntityId)
+        {
+            Entity other = new Entity(otherEntityId);
+            TagComponent? tag = other.GetComponent<TagComponent>();
+            if (tag != null && tag.Tag == "Hazard")
+                Log.Info("Hit a hazard");
+        }
+    }
+}
+```
diff --git a/docs/SCRIPTING_INTEROP.md b/docs/SCRIPTING_INTEROP.md
new file mode 100644
index 000000000..604787ae4
--- /dev/null
+++ b/docs/SCRIPTING_INTEROP.md
@@ -0,0 +1,223 @@
+# Scripting Interop & Roslyn Source Generator Architecture
+
+This document describes how the C++/C# interop bridge works in Chained Engine, how the Roslyn Source Generator (`Chained.Managed.Generator`) automates native bindings, and how to expose new native C++ component functions to C# gameplay scripts.
+
+---
+
+## 1. Overview & Architecture
+
+Chained Engine uses **[Coral](https://github.com/StudioCherno/Coral)** — a C++ wrapper around .NET CoreCLR — for C++/C# interoperability.
+
+```
+┌────────────────────────────────┐         ┌────────────────────────────────┐
+│      Native C++ Engine         │         │       Managed C# Scripts       │
+│                                │         │                                │
+│  script_glue_*.cpp             │         │  src/Components/*.cs           │
+│  extern "C" C++ functions      │         │  [NativeProperty] /            │
+│       │                        │         │  [NativeCall] attributes       │
+│       │                        │         │       │                        │
+│       │ (Function Pointers)    │         │       │ (Roslyn Code Gen)      │
+│       ▼                        │         │       ▼                        │
+│  Coral::Assembly               │         │  .g.cs (Generated File)        │
+│  AddInternalCall("Class",      │ ═══════>│  internal static unsafe        │
+│    "Method_Ptr", &C++Fn)       │ Writes  │    delegate* unmanaged<...>   │
+│  UploadInternalCalls()         │ Pointer │    Method_Ptr;                 │
+└────────────────────────────────┘         └────────────────────────────────┘
+```
+
+### High-level data flow:
+1. **C++ Glue Functions**: Declared as `extern "C"` (using macro `CH_SCRIPT_FUNC`).
+2. **C++ Registration**: `ScriptGlue::RegisterInternalCalls()` binds C++ function pointers to string names (`ClassName.MethodName_Ptr`).
+3. **C# Roslyn Generator**: `NativeCallGenerator` scans `[NativeCall]` and `[NativeProperty]` attributes at compile time and auto-generates `delegate* unmanaged<...>` function pointer fields and C# property getters/setters.
+4. **Coral Binding**: At assembly load time, Coral matches string names against static `_Ptr` fields in C# assemblies and writes C++ function pointers directly into those fields.
+
+---
+
+## 2. Roslyn Source Generator (`Chained.Managed.Generator`)
+
+The generator project lives in `scripting/managed/Chained.Managed.Generator/` and compiles to a Roslyn analyzer DLL (`Chained.Managed.Generator.dll`).
+
+### Attributes
+
+#### `[NativeCall]`
+Declares a single native function binding.
+```csharp
+[NativeCall("Chained.AnimationComponent", "AnimationComponent_CrossFade", "void", "ulong", "int", "float")]
+public partial class AnimationComponent : Component { ... }
+```
+- **Signature format**: `[returnType, param1, param2, ...]`
+- **First parameter**: Always entity ID (`ulong`) for component accessors.
+- **Auto-generates**:
+  ```csharp
+  internal static unsafe delegate* unmanaged<ulong, int, float, void> AnimationComponent_CrossFade_Ptr;
+  ```
+
+#### `[NativeProperty]`
+Declares a full C# property getter/setter **AND** generates the corresponding `_Ptr` fields.
+```csharp
+[NativeProperty("MovementSpeed", "float", "PlayerComponent_GetMovementSpeed", "PlayerComponent_SetMovementSpeed")]
+[NativeProperty("IsKinematic", "bool", "RigidBody_IsKinematic", "RigidBody_SetKinematic")]
+[NativeProperty("Translation", "Vector3", "Transform_GetTranslation", "Transform_SetTranslation")]
+public partial class PlayerComponent : Component { ... }
+```
+- **Auto-generates**:
+  1. Both `Get_Ptr` and `Set_Ptr` unmanaged function pointer fields.
+  2. The full C# property getter/setter with null-checks, `unsafe` blocks, and type marshaling (`bool` $\leftrightarrow$ `byte`, `Vector3*` out-pointer).
+
+---
+
+## 3. Type Mapping Convention (ABI)
+
+The C++ glue functions and C# generator follow strict ABI type mapping rules:
+
+| Logical Type | C++ Type (`script_glue_*.cpp`) | C# Attribute String | Generated C# Type / Pointer |
+|---|---|---|---|
+| Entity ID | `uint64_t` | `"ulong"` | `ulong` |
+| Boolean | `uint8_t` | `"bool"` / `"byte"` | `byte` (`(byte)(value ? 1 : 0)`) |
+| Integer | `int32_t` / `int` | `"int"` | `int` |
+| Unsigned Int | `uint32_t` | `"uint"` | `uint` |
+| Float | `float` | `"float"` | `float` |
+| Double | `double` | `"double"` | `double` |
+| UTF-16 String | `Coral::UCChar*` / `char16_t*` | `"char*"` | `char*` |
+| Vector2 Struct | `glm::vec2*` | `"Vector2"` / `"Vector2*"` | `Chained.Vector2*` (out-pointer) |
+| Vector3 Struct | `glm::vec3*` | `"Vector3"` / `"Vector3*"` | `Chained.Vector3*` (out-pointer) |
+| Vector4 Struct | `glm::vec4*` | `"Vector4"` / `"Vector4*"` | `Chained.Vector4*` (out-pointer) |
+
+> ⚠️ **Important**: Structs (`Vector2`, `Vector3`, `Vector4`) are **always passed by pointer** across the ABI boundary to ensure stack alignment and prevent platform ABI discrepancies.
+
+---
+
+## 4. Glue Generation Pipeline
+
+For simple property get/set, you don't need to write any C++ glue code. The `tools/generate_glue.py` script scans C# `[NativeProperty]` attributes and generates everything automatically.
+
+### How it works
+
+```
+C# [NativeProperty]          Python generator              C++ build
+    attribute          ───>   tools/generate_glue.py   ───>   auto-compiled
+                                                       │
+CMakeLists.txt --classes ──────────────────────────────┘
+```
+
+1. **`tools/generate_glue.py`** reads `engine/scripting/managed/src/Components/*.cs`
+2. Filters by `--classes` parameter (e.g. `PlayerComponent SpawnComponent`)
+3. Generates three files in `engine/scripting/generated/`:
+   - `script_glue_generated.h` — `CH_SCRIPT_FUNC` declarations
+   - `script_glue_generated.cpp` — getter/setter implementations
+   - `script_glue_generated_reg.inl` — `AddInternalCall` registrations (included by `script_glue.cpp`)
+4. CMake custom command runs the generator automatically when C# sources change
+
+### Usage
+
+Add your class to the `--classes` list in `engine/scripting/CMakeLists.txt`:
+
+```cmake
+COMMAND Python3::Interpreter "${GLUE_GENERATOR_SCRIPT}"
+        --cs-dir "${MANAGED_PROJECT_DIR}/src/Components"
+        --output-dir "${GLUE_OUTPUT_DIR}"
+        --classes PlayerComponent SpawnComponent NetworkIdentityComponent YourComponent
+```
+
+Then build normally — the generator runs as part of the build.
+
+### Limitations
+
+The generator handles **simple field access only**: reading/writing a single field on a component. It does NOT handle:
+- Physics synchronization (e.g. updating Jolt body when translation changes)
+- String conversion (e.g. `Coral::UCChar*` ↔ `std::string`)
+- Complex logic (e.g. finding entities by tag, conditional behavior)
+
+For these cases, use `[NativeCall]` and write hand-written glue in `script_glue_*.cpp` — see the manual tutorial below.
+
+---
+
+## 5. Step-by-Step Tutorial: Adding a New Native Property
+
+### Automatic (recommended for simple properties)
+
+Suppose you want to expose a new `Stamina` property on `PlayerComponent`.
+
+**Step 1: Add `[NativeProperty]` to C# Component**
+
+In `scripting/managed/src/Components/PlayerComponent.cs`:
+
+```csharp
+namespace Chained
+{
+    [NativeProperty("MovementSpeed", "float", "PlayerComponent_GetMovementSpeed", "PlayerComponent_SetMovementSpeed")]
+    [NativeProperty("Stamina", "float", "PlayerComponent_GetStamina", "PlayerComponent_SetStamina")]
+    public partial class PlayerComponent : Component
+    {
+    }
+}
+```
+
+**Step 2: Register the class** in `engine/scripting/CMakeLists.txt`:
+
+```cmake
+--classes PlayerComponent SpawnComponent NetworkIdentityComponent
+```
+
+**Step 3: Build**:
+
+```bash
+cmake --build --preset windows-clang-debug --parallel
+```
+
+Done. The generator creates the C++ getter, setter, and registration automatically. The Roslyn Source Generator on the C# side creates the `_Ptr` fields and property body.
+
+### Manual (for complex glue logic)
+
+If your property needs physics sync, string conversion, or other complex behavior, write the C++ glue by hand.
+
+**Step 1: Implement C++ Glue Function**
+
+In `scripting/script_glue_player.cpp`:
+
+```cpp
+CH_SCRIPT_FUNC float PlayerComponent_GetStamina(uint64_t entityID)
+{
+    Entity entity = GetEntity(entityID);
+    if (entity && entity.HasComponent<PlayerComponent>())
+        return entity.GetComponent<PlayerComponent>().Stamina;
+    return 0.0f;
+}
+
+CH_SCRIPT_FUNC void PlayerComponent_SetStamina(uint64_t entityID, float stamina)
+{
+    Entity entity = GetEntity(entityID);
+    if (entity && entity.HasComponent<PlayerComponent>())
+        entity.GetComponent<PlayerComponent>().Stamina = stamina;
+}
+```
+
+**Step 2: Register in `script_glue.cpp`**
+
+In `scripting/script_glue.cpp` under `ScriptGlue::RegisterInternalCalls()`:
+
+```cpp
+assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_GetStamina_Ptr", (void*)&PlayerComponent_GetStamina);
+assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_SetStamina_Ptr", (void*)&PlayerComponent_SetStamina);
+```
+
+**Step 3: Declare in header**
+
+In `scripting/script_glue_entity.h` (or the relevant `script_glue_*.h`):
+
+```cpp
+CH_SCRIPT_FUNC float PlayerComponent_GetStamina(uint64_t entityID);
+CH_SCRIPT_FUNC void PlayerComponent_SetStamina(uint64_t entityID, float stamina);
+```
+
+**Step 4: Add `[NativeProperty]` to C# Component**
+
+Same as the automatic path — the C# Roslyn generator needs the attribute to create the `_Ptr` fields and property body.
+
+---
+
+## 6. Troubleshooting & Generated Files
+
+- **Viewing Generated Code**: During compilation with MSBuild (`/p:EmitCompilerGeneratedFiles=true`), generated C# files are saved under `scripting/managed/obj/GeneratedFiles/Chained.Managed.Generator/`.
+- **Component Must Be `partial`**: Any C# class decorated with `[NativeCall]` or `[NativeProperty]` **must** have the `partial` keyword.
+- **Null Safety**: All generated properties contain defensive `!= null` checks on the `_Ptr` fields. If a function is not registered on the C++ side, the property getter will return `default` instead of crashing with a `NullReferenceException`.
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
new file mode 100644
index 000000000..c460165a9
--- /dev/null
+++ b/docs/USER_GUIDE.md
@@ -0,0 +1,322 @@
+# User Guide
+
+Step-by-step guide for getting started with ChainedEngine.
+
+## Table of Contents
+
+- [Requirements](#requirements)
+- [Building the Engine](#building-the-engine)
+- [Running the Editor](#running-the-editor)
+- [Editor Overview](#editor-overview)
+- [Creating Your First Scene](#creating-your-first-scene)
+- [Writing Your First Script](#writing-your-first-script)
+- [Running the Game](#running-the-game)
+- [Exporting Your Project](#exporting-your-project)
+- [Common Tasks](#common-tasks)
+
+---
+
+## Requirements
+
+| Component | Version |
+|---|---|
+| C++ Compiler | MSVC 17+, Clang 18+, or GCC 14+ |
+| CMake | 3.28+ |
+| .NET SDK | 10.0.x (for C# scripting) |
+| Git | With submodule support |
+
+**Windows:** Visual Studio 2022 or Clang from LLVM.
+**Linux:** `build-essential`, `libx11-dev`, `libxrandr-dev`, `libxinerama-dev`, `libxcursor-dev`, `libxi-dev`, `mesa-common-dev`, `libgl1-mesa-dev`.
+
+## Building the Engine
+
+1. **Clone the repository with submodules:**
+
+```bash
+git clone --recurse-submodules https://github.com/IOleg-crypto/Chained-Engine.git
+cd Chained-Engine
+```
+
+If you already cloned without submodules:
+
+```bash
+git submodule update --init --recursive
+```
+
+2. **Configure with CMake:**
+
+```bash
+# Windows (Clang)
+cmake --preset windows-clang-debug
+
+# Windows (MSVC)
+cmake --preset windows-msvc-debug
+
+# Linux (Clang)
+cmake --preset linux-clang-debug
+```
+
+3. **Build:**
+
+```bash
+cmake --build --preset windows-clang-debug --parallel
+```
+
+4. **Binaries appear in:**
+
+```
+build/<preset>/bin/Debug/
+  ChainedEditor.exe      # The editor
+  ChainedRuntime.exe     # Headless game runner
+  ChainedDecos.exe       # Game executable
+```
+
+## Running the Editor
+
+```bash
+build/windows-clang/bin/Debug/ChainedEditor.exe
+```
+
+The editor opens with a default scene. You can open any `.chproject` file through **File > Open Project**.
+
+## Editor Overview
+
+The editor has these main areas:
+
+| Area | Description |
+|---|---|
+| **Viewport** | 3D preview of the scene. Click to select objects. Gizmos for move/rotate/scale. |
+| **Hierarchy** | Tree view of all entities in the scene. Right-click to add/delete. |
+| **Inspector** | Properties of the selected entity. Edit components here. |
+| **Content Browser** | File browser for assets (models, textures, scripts, scenes). |
+| **Console** | Engine logs and errors. |
+| **Animation Graph** | Visual state machine editor for animations. |
+
+### Simulation Controls
+
+- **Play** — Runs the game inside the editor. Physics and scripts execute.
+- **Simulate** — Runs physics only, no scripts.
+- **Stop** — Returns to edit mode.
+- **Escape** — Leaves simulation and returns to editor interaction.
+
+## Creating Your First Scene
+
+1. **Create a new scene:** File > New Scene (or Ctrl+N).
+
+2. **Add an entity:** Right-click in the Hierarchy > Create Empty.
+
+3. **Rename it:** Double-click the entity in Hierarchy, type a name (e.g., "Player").
+
+4. **Add a Transform:** The entity already has one by default. Adjust Position/Rotation/Scale in the Inspector.
+
+5. **Add a Model:** In the Inspector, click "Add Component" > ModelComponent. Browse to a `.gltf` or `.obj` file.
+
+6. **Add a Camera:** Create another entity, add CameraComponent. Set it as the main camera.
+
+7. **Add Lighting:** Create an entity, add LightComponent. Choose Point, Spot, or Directional.
+
+8. **Save:** File > Save Scene (Ctrl+S).
+
+### Adding Physics
+
+1. Select your entity.
+2. Add **RigidBodyComponent** — choose Static, Dynamic, or Kinematic.
+3. Add **ColliderComponent** — choose Box, Sphere, Capsule, or Mesh shape.
+4. Press **Play** to see it fall under gravity.
+
+## Writing Your First Script
+
+Scripts are written in C# and live in your game's `assets/scripts/src/` folder.
+
+### 1. Create the script file
+
+Create `assets/scripts/src/MyScript.cs`:
+
+```csharp
+using Chained;
+
+namespace MyGame
+{
+    public class MyScript : Script
+    {
+        public float Speed = 5.0f;
+
+        public override void OnCreate()
+        {
+            Log.Info("MyScript created!");
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            if (Input.IsKeyDown(Key.W))
+            {
+                TransformComponent? transform = GetComponent<TransformComponent>();
+                if (transform != null)
+                {
+                    transform.Translation.Z -= Speed * deltaTime;
+                }
+            }
+        }
+    }
+}
+```
+
+### 2. Attach the script to an entity
+
+1. Select the entity in the Hierarchy.
+2. In the Inspector, click "Add Component" > ManagedScriptComponent.
+3. Browse to your compiled script (the engine auto-discovers scripts in the assembly).
+
+### 3. Set public fields
+
+Public fields (like `Speed`) appear in the Inspector. You can edit them without recompiling.
+
+### Script Lifecycle
+
+| Method | When it runs |
+|---|---|
+| `OnCreate()` | Once, when the script is first attached. |
+| `OnStart()` | Once, on the first frame after OnCreate. |
+| `OnUpdate(float dt)` | Every frame while the game runs. |
+| `OnGUI()` | Every frame for in-game UI drawing. |
+| `OnCollisionEnter(ulong id)` | When a physics collision starts. |
+| `OnDestroy()` | When the script or scene is destroyed. |
+
+### Common Patterns
+
+**Move toward a target:**
+```csharp
+Vector3 direction = target - transform.Translation;
+transform.Translation += Vector3.Normalize(direction) * Speed * deltaTime;
+```
+
+**Check collision with a tag:**
+```csharp
+public override void OnCollisionEnter(ulong otherEntityId)
+{
+    Entity other = new Entity(otherEntityId);
+    TagComponent? tag = other.GetComponent<TagComponent>();
+    if (tag?.Tag == "Pickup")
+    {
+        Log.Info("Collected!");
+    }
+}
+```
+
+**Teleport (use ForceSetVelocity for dynamic bodies):**
+```csharp
+RigidBodyComponent? rb = GetComponent<RigidBodyComponent>();
+rb?.ForceSetVelocity(Vector3.Zero);
+transform.Translation = spawnPoint;
+```
+
+## Running the Game
+
+### In the Editor
+
+Press **Play** in the toolbar. The game runs inside the viewport. Press **Stop** to return to edit mode.
+
+### With ChainedRuntime
+
+```bash
+ChainedRuntime.exe --project path/to/mygame.chproject --width 1920 --height 1080
+```
+
+| Flag | Description |
+|---|---|
+| `--project` | Path to the `.chproject` file. |
+| `--name` | Window title (default: project name). |
+| `--width` | Window width in pixels. |
+| `--height` | Window height in pixels. |
+
+### From Command Line
+
+```bash
+ChainedDecos.exe
+```
+
+Opens the default project defined in the `.chproject` file.
+
+## Exporting Your Project
+
+1. In the editor, go to **File > Export Project**.
+2. Choose a **Pack Mode**:
+   - **Fast (LZ4)** — Quick export, larger file.
+   - **Balanced (ZSTD)** — Slower export, smaller file.
+   - **Raw** — No compression.
+3. Adjust **Compression Threshold** if needed (0.0 = compress everything, 1.0 = compress nothing).
+4. Click **Browse Output Folder** and select a destination.
+5. The export starts automatically. Progress is shown in the overlay.
+6. Distribute the exported folder — it contains everything needed to run the game with ChainedRuntime.
+
+## Common Tasks
+
+### Add a Light
+
+1. Create an entity.
+2. Add **LightComponent**.
+3. Choose type: Point (omnidirectional), Spot (cone), or Directional (sun).
+4. Adjust color, intensity, and range in the Inspector.
+
+### Add Audio
+
+1. Create an entity.
+2. Add **AudioComponent**.
+3. Set the audio file path, volume, pitch.
+4. Enable **Spatialized** for 3D positional audio.
+5. Enable **PlayOnStart** to play automatically.
+
+### Create a Scene Transition
+
+1. Create an entity with **SceneTransitionComponent**.
+2. Set **TargetScenePath** to the destination scene.
+3. From a script, set `Triggered = true` when the player reaches the exit.
+
+### Change Window Settings at Runtime
+
+```csharp
+AppWindow.SetSize(1920, 1080);
+AppWindow.SetFullscreen(true);
+AppWindow.SetVSync(false);
+```
+
+### Play a Sound from Script
+
+```csharp
+Audio.Play("assets/sounds/jump.wav", volume: 0.8f, pitch: 1.0f);
+Audio.Stop("assets/sounds/jump.wav");
+Audio.StopAll();
+```
+
+### Find an Entity by Tag
+
+```csharp
+Entity? enemy = Scene.FindEntityByTag("Enemy");
+if (enemy != null)
+{
+    TransformComponent? t = enemy.GetComponent<TransformComponent>();
+}
+```
+
+### Copy an Entity
+
+```csharp
+Entity? clone = Scene.CopyEntity(original);
+```
+
+### Switch Scenes from Script
+
+```csharp
+Scene.LoadScene("assets/scenes/level2.chscene");
+```
+
+### Exit the Game
+
+```csharp
+Application.Close();
+```
+
+---
+
+For the full C# API reference, see [Scripting API Reference](SCRIPTING_API.md).
+For component details, see [Component Reference](COMPONENTS.md).
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
index 7b092aab7..6a30cd6af 100644
--- a/editor/CMakeLists.txt
+++ b/editor/CMakeLists.txt
@@ -1,109 +1,70 @@
 
-add_library(editor_core STATIC)
-
-target_sources(editor_core PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_layer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_layer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_context.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_context.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_panels.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_panels.cpp
-
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_project_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_project_manager.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_scene_manager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_scene_manager.cpp
-
-    # Viewport
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/editor_gizmo.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/editor_gizmo.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/editor_camera.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/editor_camera.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/ui_manipulator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/ui_manipulator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/viewport/ui_manipulator.cpp
-
-    ${CMAKE_CURRENT_SOURCE_DIR}/launcher/editor_launcher.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/launcher/editor_launcher.cpp
-
-    # Panels
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/scene_hierarchy_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/scene_hierarchy_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/inspector_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/property_editor.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/property_editor.cpp
-    
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/content_browser_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/content_browser_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/console_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/console_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/profiler_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/profiler_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/viewport_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/project_browser_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/project_settings_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/project_settings_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/world_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/world_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/effects_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/effects_panel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/material_panel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/panels/material_panel.cpp
-
-    # Undo
-    ${CMAKE_CURRENT_SOURCE_DIR}/undo/command_history.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/undo/command_history.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/undo/editor_command.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/undo/modify_component_command.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/undo/lambda_command.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/undo/entity_commands.h
-
-    # UI
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_gui.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_gui.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_layout.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/editor_layout.cpp
+file(GLOB EDITOR_CORE_SOURCES CONFIGURE_DEPENDS
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/panels/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/panels/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/project/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/project/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/undo/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/undo/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ui/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ui/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/viewport/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/viewport/*.h"
 )
+# NetworkPanel is only compiled when the networking module is enabled
+list(REMOVE_ITEM EDITOR_CORE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/panels/network_panel.cpp")
+# The editor executable entry point is built separately
+list(REMOVE_ITEM EDITOR_CORE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp")
+if(CH_NETWORKING)
+    list(APPEND EDITOR_CORE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/panels/network_panel.cpp")
+endif()
 
+add_library(editor_core STATIC ${EDITOR_CORE_SOURCES})
 
 target_link_libraries(editor_core PUBLIC
-    engine
-    scripting
-    imguilib
-    nfd
+    ChainedEngine::Framework
 )
-target_compile_definitions(editor_core PUBLIC IMGUI_DEFINE_MATH_OPERATORS YAML_CPP_STATIC_DEFINE)
+
+# Pack library — asset packing for shipped builds
+if(TARGET pack-static)
+    target_link_libraries(editor_core PUBLIC pack-static)
+endif()
+
+# WinHTTP — used by NetworkPanel to fetch the public IP from api.ipify.org.
+# Only needed when the networking module is enabled.
+if(WIN32 AND CH_NETWORKING)
+    target_link_libraries(editor_core PUBLIC winhttp)
+endif()
+
 target_include_directories(editor_core PUBLIC 
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/engine
-    ${CMAKE_SOURCE_DIR}/include
-    ${imguizmo_SOURCE_DIR}
 )
 
 # Define the Editor executable
-add_executable(ChainedEditor ${CMAKE_CURRENT_SOURCE_DIR}/editor_main.cpp)
+add_executable(ChainedEditor ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
+        
 target_link_libraries(ChainedEditor PRIVATE editor_core)
-target_include_directories(ChainedEditor PRIVATE 
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}
-)
 
-# Use centralized engine resources
-chained_add_engine_resources_copy()
-add_dependencies(ChainedEditor EngineResources)
+# Packer utility — build-time tool, not linked to the editor
+if(TARGET packer)
+    add_dependencies(ChainedEditor packer)
+endif()
+
+if(TARGET engine_pch)
+    target_link_libraries(editor_core PRIVATE engine_pch)
+    target_link_libraries(ChainedEditor PRIVATE engine_pch)
+endif()
 
-# Apply optimizations
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(editor_core)
-    apply_engine_optimizations(ChainedEditor)
+# Automatically sync resources/ into the correct bin/<Config>/ directory after each build
+if(COMMAND ch_add_resource_sync)
+    ch_add_resource_sync(ChainedEditor)
 endif()
 
 # Installation
-install(TARGETS ChainedEditor editor_core
-    RUNTIME DESTINATION bin COMPONENT Runtime
-    ARCHIVE DESTINATION lib COMPONENT Runtime
-    LIBRARY DESTINATION lib COMPONENT Runtime
+install(TARGETS ChainedEditor
+    RUNTIME DESTINATION bin COMPONENT Editor
 )
 
 # Copy global assets to the install directory if they exist
diff --git a/editor/action_commands.cpp b/editor/action_commands.cpp
new file mode 100644
index 000000000..799dd029f
--- /dev/null
+++ b/editor/action_commands.cpp
@@ -0,0 +1,80 @@
+#include "action_commands.h"
+#include "engine/core/log.h"
+#include <fstream>
+
+namespace Chained
+{
+
+	void EditorActionCommands::RenameAsset(const std::filesystem::path& path, const std::string& newName)
+	{
+		if (!std::filesystem::exists(path))
+		{
+			CH_CORE_WARN("RenameAsset: source does not exist: {}", path.string());
+			return;
+		}
+
+		std::filesystem::path newPath = path.parent_path() / newName;
+		if (std::filesystem::exists(newPath))
+		{
+			CH_CORE_ERROR("RenameAsset: destination already exists: {}", newPath.string());
+			return;
+		}
+
+		std::error_code ec;
+		std::filesystem::rename(path, newPath, ec);
+		if (ec)
+		{
+			CH_CORE_ERROR("RenameAsset: failed to rename '{}' -> '{}': {}", path.string(), newPath.string(),
+						  ec.message());
+		}
+	}
+
+	void EditorActionCommands::DeleteAsset(const std::filesystem::path& path)
+	{
+		if (!std::filesystem::exists(path))
+		{
+			CH_CORE_WARN("DeleteAsset: path does not exist: {}", path.string());
+			return;
+		}
+
+		std::error_code ec;
+		std::filesystem::remove_all(path, ec);
+		if (ec)
+		{
+			CH_CORE_ERROR("DeleteAsset: failed to delete '{}': {}", path.string(), ec.message());
+		}
+	}
+
+	void EditorActionCommands::CreateFolder(const std::filesystem::path& parentPath, const std::string& name)
+	{
+		if (!std::filesystem::exists(parentPath))
+		{
+			CH_CORE_ERROR("CreateFolder: parent does not exist: {}", parentPath.string());
+			return;
+		}
+
+		std::filesystem::path newDir = parentPath / name;
+		if (std::filesystem::exists(newDir))
+		{
+			int i = 1;
+			constexpr int kMaxAttempts = 1000;
+			do
+			{
+				newDir = parentPath / (name + " " + std::to_string(i++));
+				if (i > kMaxAttempts)
+				{
+					CH_CORE_ERROR("CreateFolder: too many conflicts for '{}' in {}", name, parentPath.string());
+					return;
+				}
+			} while (std::filesystem::exists(newDir));
+		}
+
+		std::error_code ec;
+		std::filesystem::create_directory(newDir, ec);
+		if (ec)
+		{
+			CH_CORE_ERROR("CreateFolder: failed to create '{}': {}", newDir.string(), ec.message());
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/action_commands.h b/editor/action_commands.h
new file mode 100644
index 000000000..1ebef6b1b
--- /dev/null
+++ b/editor/action_commands.h
@@ -0,0 +1,17 @@
+#ifndef CH_EDITOR_ACTION_COMMANDS_H
+#define CH_EDITOR_ACTION_COMMANDS_H
+
+#include <filesystem>
+#include <string>
+
+namespace Chained
+{
+	namespace EditorActionCommands
+	{
+		void RenameAsset(const std::filesystem::path& path, const std::string& newName);
+		void DeleteAsset(const std::filesystem::path& path);
+		void CreateFolder(const std::filesystem::path& parentPath, const std::string& name = "New Folder");
+	}; // namespace EditorActionCommands
+} // namespace Chained
+
+#endif // CH_EDITOR_ACTION_COMMANDS_Hs
diff --git a/editor/asset_types.h b/editor/asset_types.h
new file mode 100644
index 000000000..d0f590ea6
--- /dev/null
+++ b/editor/asset_types.h
@@ -0,0 +1,35 @@
+#ifndef CH_EDITOR_ASSET_TYPES_H
+#define CH_EDITOR_ASSET_TYPES_H
+
+#include <cstdint>
+#include <filesystem>
+#include <string>
+
+namespace Chained
+{
+
+	enum class EditorAssetType
+	{
+		Directory,
+		Scene,
+		Script,
+		Model,
+		Texture,
+		Audio,
+		Prefab,
+		Shader,
+		Other
+	};
+
+	struct AssetEntry
+	{
+		std::string name;
+		std::filesystem::path path;
+		EditorAssetType type;
+		uint32_t icon = 0;
+		bool isDirectory = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_ASSET_TYPES_H
diff --git a/editor/editor_colors.h b/editor/editor_colors.h
new file mode 100644
index 000000000..4596b3581
--- /dev/null
+++ b/editor/editor_colors.h
@@ -0,0 +1,49 @@
+#ifndef CH_EDITOR_COLORS_H
+#define CH_EDITOR_COLORS_H
+
+#include "imgui.h"
+
+namespace Chained
+{
+	namespace EditorColors
+	{
+		// Toolbar & buttons
+		inline constexpr ImVec4 TransparentButton = {0.1f, 0.1f, 0.1f, 0.0f};
+		inline constexpr ImVec4 ActiveToolOrange = {0.9f, 0.45f, 0.0f, 1.0f};
+		inline constexpr ImVec4 PlayGreen = {0.3f, 1.0f, 0.3f, 1.0f};
+		inline constexpr ImVec4 SimulateOrange = {1.0f, 0.64f, 0.0f, 1.0f};
+		inline constexpr ImVec4 ActiveSnapBlue = {0.3f, 0.8f, 1.0f, 1.0f};
+
+		// Panel backgrounds
+		inline constexpr ImVec4 ToolbarBg = {0.1f, 0.1f, 0.12f, 0.8f};
+		inline constexpr ImVec4 FloatingToolbarBg = {0.1f, 0.1f, 0.12f, 0.0f};
+
+		// Selection & highlights
+		inline constexpr ImVec4 SelectionYellow = {1.0f, 1.0f, 0.0f, 1.0f};
+		inline constexpr ImVec4 SelectionGreen = {0.0f, 1.0f, 0.0f, 1.0f};
+
+		// Loading overlay
+		inline constexpr ImVec4 LoadingOverlayBg = {0.02f, 0.02f, 0.02f, 0.92f};
+
+		// Content browser / project selector
+		inline constexpr ImVec4 SidebarBg = {0.15f, 0.15f, 0.18f, 1.0f};
+		inline constexpr ImVec4 DarkPanelBg = {0.02f, 0.02f, 0.02f, 1.0f};
+		inline constexpr ImVec4 ProjectCardBg = {0.12f, 0.12f, 0.13f, 1.0f};
+		inline constexpr ImVec4 ProjectCardHover = {0.18f, 0.18f, 0.19f, 1.0f};
+		inline constexpr ImVec4 ProjectCardActive = {0.1f, 0.1f, 0.1f, 1.0f};
+		inline constexpr ImVec4 ProjectCardBorder = {0.18f, 0.18f, 0.20f, 1.0f};
+		inline constexpr ImVec4 ProjectCardBorderHover = {0.26f, 0.26f, 0.28f, 1.0f};
+		inline constexpr ImVec4 ProjectCardBorderActive = {0.14f, 0.14f, 0.16f, 1.0f};
+		inline constexpr ImVec4 SubCardBg = {0.06f, 0.06f, 0.07f, 1.0f};
+		inline constexpr ImVec4 SubCardBorder = {0.14f, 0.14f, 0.16f, 1.0f};
+		inline constexpr ImVec4 SubCardBorderHover = {0.22f, 0.22f, 0.24f, 1.0f};
+		inline constexpr ImVec4 SubCardBorderActive = {0.10f, 0.10f, 0.12f, 1.0f};
+		inline constexpr ImVec4 PrimaryButton = {0.13f, 0.45f, 0.80f, 1.0f};
+		inline constexpr ImVec4 PrimaryButtonHover = {0.20f, 0.55f, 0.92f, 1.0f};
+		inline constexpr ImVec4 PrimaryButtonActive = {0.10f, 0.38f, 0.70f, 1.0f};
+		inline constexpr ImVec4 MutedText = {0.5f, 0.5f, 0.5f, 1.0f};
+		inline constexpr ImVec4 BrightText = {0.9f, 0.9f, 0.9f, 1.0f};
+	} // namespace EditorColors
+} // namespace Chained
+
+#endif // CH_EDITOR_COLORS_H
diff --git a/editor/editor_context.cpp b/editor/editor_context.cpp
deleted file mode 100644
index ecff9039c..000000000
--- a/editor/editor_context.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "editor_context.h"
-
-namespace CHEngine
-{
-EditorState EditorContext::s_State;
-SceneState EditorContext::s_SceneState = SceneState::Edit;
-
-void EditorContext::Init()
-{
-    s_State.DebugRenderFlags.DrawColliders = true;
-    s_State.DebugRenderFlags.DrawLights = true;
-    s_State.DebugRenderFlags.DrawSpawnZones = true;
-}
-
-void EditorContext::Shutdown()
-{
-    s_State.SelectedEntity = {};
-}
-} // namespace CHEngine
diff --git a/editor/editor_context.h b/editor/editor_context.h
deleted file mode 100644
index 411e7c88f..000000000
--- a/editor/editor_context.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef CH_EDITOR_CONTEXT_H
-#define CH_EDITOR_CONTEXT_H
-
-#include "engine/graphics/pipeline/renderer.h"
-#include "engine/scene/scene.h"
-#include <string>
-
-namespace CHEngine
-{
-enum class SceneState : uint8_t
-{
-    Edit = 0, // Editor-only update mode.
-    Play = 1  // Runtime simulation mode.
-};
-
-// Mutable editor session state shared across panels and the editor layer.
-struct EditorState
-{
-    Entity SelectedEntity;
-    bool FullscreenGame = false;
-    bool StandaloneActive = false;
-    bool NeedsLayoutReset = false;
-    int LastHitMeshIndex = -1;
-    DebugRenderFlags DebugRenderFlags;
-    bool IsLoading = false;
-    std::string LoadingStatus = "";
-};
-
-// EditorContext stores global editor state such as the selected entity,
-// scene mode, and debug flags so panels do not need direct EditorLayer access.
-class EditorContext
-{
-public:
-    static void Init();
-    static void Shutdown();
-
-    static Entity GetSelectedEntity()
-    {
-        return s_State.SelectedEntity;
-    }
-    static void SetSelectedEntity(Entity entity)
-    {
-        s_State.SelectedEntity = entity;
-    }
-
-    static SceneState GetSceneState()
-    {
-        return s_SceneState;
-    }
-    static void SetSceneState(SceneState state)
-    {
-        s_SceneState = state;
-    }
-
-    static DebugRenderFlags& GetDebugRenderFlags()
-    {
-        return s_State.DebugRenderFlags;
-    }
-    static EditorState& GetState()
-    {
-        return s_State;
-    }
-
-private:
-    static EditorState s_State;
-    static SceneState s_SceneState;
-};
-} // namespace CHEngine
-
-#endif // CH_EDITOR_CONTEXT_H
diff --git a/editor/editor_events.h b/editor/editor_events.h
deleted file mode 100644
index f039e965f..000000000
--- a/editor/editor_events.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef CH_EDITOR_EVENTS_H
-#define CH_EDITOR_EVENTS_H
-
-#include "engine/core/events.h"
-#include "engine/scene/entity.h"
-
-namespace CHEngine
-{
-// Event to trigger an layout reset.
-class AppResetLayoutEvent : public Event
-{
-public:
-    AppResetLayoutEvent() = default;
-    EVENT_CLASS_TYPE(AppResetLayout)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-// Event to save current window layout.
-class AppSaveLayoutEvent : public Event
-{
-public:
-    AppSaveLayoutEvent() = default;
-    EVENT_CLASS_TYPE(AppSaveLayout)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-// Event to trigger launching the game in runtime mode.
-class AppLaunchRuntimeEvent : public Event
-{
-public:
-    AppLaunchRuntimeEvent() = default;
-    EVENT_CLASS_TYPE(AppLaunchRuntime)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-// Event to signal focusing on a specific entity in the viewport
-class ViewportFocusEntityEvent : public Event
-{
-public:
-    ViewportFocusEntityEvent(Entity entity) : m_Entity(entity) {}
-    Entity GetEntity() const { return m_Entity; }
-
-    EVENT_CLASS_TYPE(ViewportFocusEntity)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-private:
-    Entity m_Entity;
-};
-
-// Undo system events
-class UndoEvent : public Event
-{
-public:
-    UndoEvent() = default;
-    EVENT_CLASS_TYPE(Undo)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-class RedoEvent : public Event
-{
-public:
-    RedoEvent() = default;
-    EVENT_CLASS_TYPE(Redo)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_EVENTS_H
diff --git a/editor/editor_gui.cpp b/editor/editor_gui.cpp
deleted file mode 100644
index 473bfec96..000000000
--- a/editor/editor_gui.cpp
+++ /dev/null
@@ -1,605 +0,0 @@
-#include "editor_gui.h"
-#include "editor/editor_layer.h"
-#include "editor/panels/panel.h"
-#include "editor/panels/viewport_panel.h"
-#include "editor_events.h"
-#include "engine/core/application.h"
-#include "engine/scene/components.h"
-#include "engine/scene/project.h"
-#include "IconsFontAwesome6.h"
-#include "scripting/scriptengine.h"
-
-#define IMGUI_DEFINE_MATH_OPERATORS
-#include "engine/platform/utils/dialogs.h"
-#include "engine/scene/scene_picking.h"
-#include "imgui.h"
-#include "imgui_internal.h"
-#include <cstring>
-#include <filesystem>
-#include <string>
-
-namespace CHEngine
-{
-// --- Internal Helpers ---
-
-static void DrawPropertyLabel(const char* label)
-{
-    if (ImGui::GetCurrentTable() != nullptr)
-    {
-        ImGui::TableNextRow();
-        ImGui::TableSetColumnIndex(0);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(label);
-        ImGui::TableSetColumnIndex(1);
-    }
-    else
-    {
-        ImGui::Text(label);
-        ImGui::SameLine(ImGui::GetContentRegionAvail().x * 0.4f);
-    }
-}
-
-// --- Menu System Implementation ---
-
-void EditorGUI::DrawMenuBar(EditorPanels& panels)
-{
-    if (!ImGui::BeginMenuBar())
-    {
-        return;
-    }
-
-    // File Menu
-    if (ImGui::BeginMenu("File"))
-    {
-        if (ImGui::MenuItem(ICON_FA_FILE " New Project", "Ctrl+Shift+N"))
-        {
-            auto newScene = std::make_shared<Scene>();
-
-            // Ensure every scene starts with a Main Camera
-            Entity camera = newScene->CreateEntity("Main Camera");
-            auto& cc = camera.AddComponent<CameraComponent>();
-            cc.Primary = true;
-            camera.GetComponent<TransformComponent>().Translation = {0, 5, 10};
-
-            EditorLayer::Get().GetSceneManager().SetScene(newScene);
-        }
-        if (ImGui::MenuItem(ICON_FA_FOLDER_OPEN " Open Project", "Ctrl+O"))
-        {
-            std::vector<FileDialogFilter> filters = {{"Chained Scene", "chscene"}};
-            auto result = Dialogs::OpenFile(filters);
-            if (result)
-            {
-                EditorLayer::Get().GetSceneManager().OpenScene(*result);
-            }
-        }
-        if (ImGui::MenuItem(ICON_FA_FLOPPY_DISK " Save Project"))
-        {
-            EditorLayer::Get().GetSceneManager().SaveScene();
-        }
-        if (ImGui::MenuItem(ICON_FA_XMARK " Close Project"))
-        {
-            Project::SetActive(nullptr);
-        }
-        ImGui::Separator();
-        if (ImGui::MenuItem(ICON_FA_FILE_CODE " New Scene", "Ctrl+N"))
-        {
-            EditorLayer::Get().GetSceneManager().NewScene();
-        }
-        if (ImGui::MenuItem(ICON_FA_FLOPPY_DISK " Save Scene", "Ctrl+S"))
-        {
-            EditorLayer::Get().GetSceneManager().SaveScene();
-        }
-        if (ImGui::MenuItem(ICON_FA_FILE_EXPORT " Save Scene As...", "Ctrl+Shift+S"))
-        {
-            EditorLayer::Get().GetSceneManager().SaveSceneAs();
-        }
-        if (ImGui::MenuItem(ICON_FA_FOLDER_OPEN " Load Scene", "Ctrl+L"))
-        {
-            EditorLayer::Get().GetSceneManager().OpenScene();
-        }
-        ImGui::Separator();
-        if (ImGui::MenuItem(ICON_FA_POWER_OFF " Exit"))
-        {
-            Application::Get().Close();
-        }
-        ImGui::EndMenu();
-    }
-
-    // View Menu
-    if (ImGui::BeginMenu("View"))
-    {
-        panels.ForEach([](std::shared_ptr<Panel> panel) {
-            if (panel->GetName() != "Viewport" && panel->GetName() != "Project Browser")
-            {
-                ImGui::MenuItem(panel->GetName().c_str(), nullptr, &panel->IsOpen());
-            }
-        });
-        ImGui::Separator();
-        if (ImGui::MenuItem(ICON_FA_EXPAND " Fullscreen", "F11"))
-        {
-            Application::Get().GetWindow().ToggleFullscreen();
-        }
-        if (ImGui::MenuItem(ICON_FA_ARROWS_ROTATE " Reset Layout"))
-        {
-            AppResetLayoutEvent e;
-            Application::Get().OnEvent(e);
-        }
-        if (ImGui::MenuItem(ICON_FA_FLOPPY_DISK " Save Layout"))
-        {
-            AppSaveLayoutEvent e;
-            Application::Get().OnEvent(e);
-        }
-        ImGui::EndMenu();
-    }
-
-    // Project Menu
-    if (ImGui::BeginMenu("Project"))
-    {
-        if (ImGui::MenuItem(ICON_FA_GEARS " Settings"))
-        {
-            if (auto p = panels.Get("Project Settings"))
-            {
-                p->IsOpen() = true;
-            }
-        }
-        if (ImGui::MenuItem(ICON_FA_ROCKET " Build & Run"))
-        {
-            AppLaunchRuntimeEvent e;
-            Application::Get().OnEvent(e);
-        }
-        ImGui::Separator();
-        if (ImGui::MenuItem(ICON_FA_ARROWS_ROTATE " Reload Shaders"))
-        {
-            Renderer::Get().GetShaderLibrary().ReloadAll();
-        }
-        if (ImGui::MenuItem(ICON_FA_FILE_CODE " Reload Scripts", "Ctrl+R"))
-        {
-            auto& scriptEngine = ScriptEngine::Get();
-            scriptEngine.RequestAssemblyReload("EditorGUI");
-        }
-        ImGui::EndMenu();
-    }
-
-    ImGui::EndMenuBar();
-}
-
-void EditorGUI::BeginPropertyGrid()
-{
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 4));
-    ImGui::BeginTable("PropertyGrid", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_SizingStretchSame);
-    ImGui::TableSetupColumn("Label", ImGuiTableColumnFlags_WidthFixed, 100.0f);
-    ImGui::TableSetupColumn("Control", ImGuiTableColumnFlags_WidthStretch);
-}
-
-void EditorGUI::EndPropertyGrid()
-{
-    ImGui::EndTable();
-    ImGui::PopStyleVar();
-}
-
-void EditorGUI::BeginProperty(const char* label)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    ImGui::PushItemWidth(-1);
-}
-
-void EditorGUI::EndProperty()
-{
-    ImGui::PopItemWidth();
-    ImGui::PopID();
-}
-
-// --- Property Widgets Implementation (New Unified Style) ---
-
-bool EditorGUI::Property(const char* label, bool& value)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    bool changed = ImGui::Checkbox("##prop", &value);
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::Property(const char* label, float& value, float speed, float min, float max)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    bool changed = ImGui::DragFloat("##prop", &value, speed, min, max);
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::Property(const char* label, int& value, int min, int max)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    bool changed = ImGui::DragInt("##prop", &value, 1.0f, min, max);
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::Property(const char* label, uint64_t& value)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    bool changed = ImGui::InputScalar("##prop", ImGuiDataType_U64, &value);
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::Property(const char* label, std::string& value, bool multiline)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    char buffer[1024];
-    memset(buffer, 0, sizeof(buffer));
-    strncpy(buffer, value.c_str(), sizeof(buffer) - 1);
-    bool changed = false;
-    if (multiline)
-    {
-        if (ImGui::InputTextMultiline("##prop", buffer, sizeof(buffer),
-                                      ImVec2(0, ImGui::GetTextLineHeightWithSpacing() * 3)))
-        {
-            value = buffer;
-            changed = true;
-        }
-    }
-    else
-    {
-        if (ImGui::InputText("##prop", buffer, sizeof(buffer)))
-        {
-            value = buffer;
-            changed = true;
-        }
-    }
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::Property(const char* label, Color& value)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    float c[4] = {value.r / 255.0f, value.g / 255.0f, value.b / 255.0f, value.a / 255.0f};
-    bool changed = ImGui::ColorEdit4("##prop", c);
-    if (changed)
-    {
-        value = {(unsigned char)(c[0] * 255), (unsigned char)(c[1] * 255), (unsigned char)(c[2] * 255),
-                 (unsigned char)(c[3] * 255)};
-    }
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::Property(const char* label, glm::vec2& value, float speed, float min, float max)
-{
-    return DrawVec2(label, value, 0.0f);
-}
-bool EditorGUI::Property(const char* label, glm::vec3& value, float speed, float min, float max)
-{
-    return DrawVec3(label, value, 0.0f);
-}
-bool EditorGUI::Property(const char* label, glm::vec4& value, float speed, float min, float max)
-{
-    return DrawVec4(label, value, 0.0f);
-}
-
-bool EditorGUI::Property(const char* label, int& value, const char** items, int itemCount)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    bool changed = ImGui::Combo("##prop", &value, items, itemCount);
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::FileProperty(const char* label, std::string& value, const char* filter)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    float width = ImGui::GetContentRegionAvail().x;
-    float buttonSize = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
-    ImGui::PushItemWidth(width - buttonSize - 5.0f);
-    std::string displayPath = Project::GetRelativePath(value);
-    char buffer[256];
-    memset(buffer, 0, sizeof(buffer));
-    strncpy(buffer, displayPath.c_str(), sizeof(buffer) - 1);
-    
-    bool changed = false;
-    if (ImGui::InputText("##prop", buffer, sizeof(buffer)))
-    {
-        value = Project::GetAbsolutePath(buffer).string();
-        changed = true;
-    }
-    if (ImGui::BeginDragDropTarget())
-    {
-        if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("CONTENT_BROWSER_ITEM"))
-        {
-            const char* dropPath = (const char*)payload->Data;
-            value = Project::GetRelativePath(dropPath);
-            changed = true;
-        }
-        ImGui::EndDragDropTarget();
-    }
-    ImGui::PopItemWidth();
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FOLDER_OPEN, {buttonSize, buttonSize}))
-    {
-        std::vector<FileDialogFilter> filters;
-        if (filter != nullptr && filter[0] != '\0')
-        {
-            filters.push_back({"Files", filter});
-        }
-        auto result = Dialogs::OpenFile(filters);
-        if (result)
-        {
-            value = Project::GetRelativePath(*result);
-            changed = true;
-        }
-    }
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::FileProperty(const char* label, std::string& path, uint32_t textureId, const char* filter)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-    float width = ImGui::GetContentRegionAvail().x;
-    float buttonSize = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
-    float thumbnailSize = buttonSize * 1.5f;
-    if (textureId > 0)
-    {
-        ImGui::Image((void*)(intptr_t)textureId, {thumbnailSize, thumbnailSize}, {0, 1}, {1, 0});
-    }
-    else
-    {
-        ImGui::Button("##empty", {thumbnailSize, thumbnailSize});
-        if (ImGui::IsItemHovered())
-        {
-            ImGui::SetTooltip("No texture loaded");
-        }
-    }
-    ImGui::SameLine();
-    ImGui::PushItemWidth(width - buttonSize - thumbnailSize - 10.0f);
-    
-    std::string displayPath = Project::GetRelativePath(path);
-    char buffer[256];
-    memset(buffer, 0, sizeof(buffer));
-    strncpy(buffer, displayPath.c_str(), sizeof(buffer) - 1);
-    
-    bool changed = false;
-    if (ImGui::InputText("##prop", buffer, sizeof(buffer)))
-    {
-        path = Project::GetAbsolutePath(buffer).string();
-        changed = true;
-    }
-    if (ImGui::BeginDragDropTarget())
-    {
-        if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("CONTENT_BROWSER_ITEM"))
-        {
-            const char* dropPath = (const char*)payload->Data;
-            path = Project::GetRelativePath(dropPath);
-            changed = true;
-        }
-        ImGui::EndDragDropTarget();
-    }
-    ImGui::PopItemWidth();
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FOLDER_OPEN, {buttonSize, buttonSize}))
-    {
-        std::vector<FileDialogFilter> filters;
-        if (filter != nullptr && filter[0] != '\0')
-        {
-            filters.push_back({"Files", filter});
-        }
-        auto result = Dialogs::OpenFile(filters);
-        if (result)
-        {
-            path = Project::GetRelativePath(*result);
-            changed = true;
-        }
-    }
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::ActionButton(const char* icon, const char* label)
-{
-    std::string text = std::string(icon) + " " + label;
-    return ImGui::Button(text.c_str());
-}
-
-static void DrawPropertyControl(const char* id, float& val, ImVec4 color, const char* label, float resetValue,
-                                float width, bool& changed)
-{
-    ImGuiIO& io = ImGui::GetIO();
-    ImGui::PushID(label);
-
-    float lineHeight = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
-    ImVec2 buttonSize = {lineHeight, lineHeight};
-
-    // Label with background color
-    ImGui::PushStyleColor(ImGuiCol_Button, color);
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, color);
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, color);
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-    // Use a button as a colored label
-    if (ImGui::Button(label, buttonSize))
-    {
-        val = resetValue;
-        changed = true;
-    }
-    if (ImGui::IsItemHovered())
-    {
-        ImGui::SetTooltip("Click to reset to %.2f", resetValue);
-    }
-
-    ImGui::PopStyleVar();
-    ImGui::PopStyleColor(3);
-
-    ImGui::SameLine(0, 0); // No spacing between label and input
-
-    ImGui::SetNextItemWidth(width - buttonSize.x);
-    char buf[32];
-    sprintf(buf, "##%s_%s", label, id);
-    if (ImGui::DragFloat(buf, &val, 0.1f, 0.0f, 0.0f, "%.2f"))
-    {
-        changed = true;
-    }
-
-    ImGui::PopID();
-}
-
-bool EditorGUI::DrawVec3(const char* label, glm::vec3& values, float resetValue)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-
-    bool changed = false;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2{4, 0});
-    float width = ImGui::GetContentRegionAvail().x;
-    float itemWidth = (width - 8.0f) / 3.0f; // 4px spacing * 2
-
-    ImGui::BeginGroup();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("x", values.x, {0.8f, 0.1f, 0.15f, 1.0f}, "X", resetValue, itemWidth, changed);
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("y", values.y, {0.2f, 0.7f, 0.2f, 1.0f}, "Y", resetValue, itemWidth, changed);
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("z", values.z, {0.1f, 0.25f, 0.8f, 1.0f}, "Z", resetValue, itemWidth, changed);
-
-    ImGui::EndGroup();
-
-    ImGui::PopStyleVar();
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::DrawVec2(const char* label, glm::vec2& values, float resetValue)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-
-    bool changed = false;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2{4, 0});
-    float width = ImGui::GetContentRegionAvail().x;
-    float itemWidth = (width - 4.0f) / 2.0f;
-
-    ImGui::BeginGroup();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("x", values.x, {0.8f, 0.1f, 0.15f, 1.0f}, "X", resetValue, itemWidth, changed);
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("y", values.y, {0.2f, 0.7f, 0.2f, 1.0f}, "Y", resetValue, itemWidth, changed);
-
-    ImGui::EndGroup();
-
-    ImGui::PopStyleVar();
-    ImGui::PopID();
-    return changed;
-}
-
-bool EditorGUI::DrawVec4(const char* label, glm::vec4& values, float resetValue)
-{
-    DrawPropertyLabel(label);
-    ImGui::PushID(label);
-
-    bool changed = false;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2{4, 0});
-    float width = ImGui::GetContentRegionAvail().x;
-    float itemWidth = (width - 12.0f) / 4.0f;
-
-    ImGui::BeginGroup();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("x", values.x, {0.8f, 0.1f, 0.15f, 1.0f}, "X", resetValue, itemWidth, changed);
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("y", values.y, {0.2f, 0.7f, 0.2f, 1.0f}, "Y", resetValue, itemWidth, changed);
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("z", values.z, {0.1f, 0.25f, 0.8f, 1.0f}, "Z", resetValue, itemWidth, changed);
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(itemWidth);
-    DrawPropertyControl("w", values.w, {0.5f, 0.5f, 0.5f, 1.0f}, "W", resetValue, itemWidth, changed);
-
-    ImGui::EndGroup();
-
-    ImGui::PopStyleVar();
-    ImGui::PopID();
-    return changed;
-}
-
-void EditorGUI::ApplyTheme()
-{
-    ImGuiStyle& style = ImGui::GetStyle();
-    style.WindowRounding = 5.0f;
-    style.FrameRounding = 4.0f;
-    style.PopupRounding = 4.0f;
-    style.ScrollbarRounding = 12.0f;
-    style.GrabRounding = 4.0f;
-    style.TabRounding = 4.0f;
-
-    ImVec4* colors = style.Colors;
-    colors[ImGuiCol_Text] = ImVec4(0.95f, 0.96f, 0.98f, 1.00f);
-    colors[ImGuiCol_TextDisabled] = ImVec4(0.36f, 0.42f, 0.47f, 1.00f);
-    colors[ImGuiCol_WindowBg] = ImVec4(0.10f, 0.12f, 0.14f, 1.00f);
-    colors[ImGuiCol_ChildBg] = ImVec4(0.12f, 0.14f, 0.16f, 1.00f);
-    colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.10f, 0.12f, 0.94f);
-    colors[ImGuiCol_Border] = ImVec4(0.20f, 0.22f, 0.25f, 0.50f);
-    colors[ImGuiCol_FrameBg] = ImVec4(0.18f, 0.20f, 0.22f, 1.00f);
-    colors[ImGuiCol_FrameBgHovered] = ImVec4(0.25f, 0.28f, 0.32f, 1.00f);
-    colors[ImGuiCol_FrameBgActive] = ImVec4(0.22f, 0.24f, 0.26f, 1.00f);
-    colors[ImGuiCol_TitleBg] = ImVec4(0.08f, 0.10f, 0.12f, 1.00f);
-    colors[ImGuiCol_TitleBgActive] = ImVec4(0.06f, 0.08f, 0.10f, 1.00f);
-
-    colors[ImGuiCol_Header] = ImVec4(0.20f, 0.25f, 0.35f, 0.60f);
-    colors[ImGuiCol_HeaderHovered] = ImVec4(0.25f, 0.35f, 0.50f, 0.80f);
-    colors[ImGuiCol_HeaderActive] = ImVec4(0.30f, 0.40f, 0.60f, 1.00f);
-
-    colors[ImGuiCol_Separator] = ImVec4(0.20f, 0.22f, 0.25f, 1.00f);
-    colors[ImGuiCol_CheckMark] = ImVec4(0.40f, 0.60f, 0.90f, 1.00f);
-    colors[ImGuiCol_SliderGrab] = ImVec4(0.40f, 0.60f, 0.90f, 1.00f);
-    colors[ImGuiCol_SliderGrabActive] = ImVec4(0.50f, 0.70f, 1.00f, 1.00f);
-    colors[ImGuiCol_Button] = ImVec4(0.18f, 0.20f, 0.22f, 1.00f);
-    colors[ImGuiCol_ButtonHovered] = ImVec4(0.25f, 0.35f, 0.50f, 1.00f);
-    colors[ImGuiCol_ButtonActive] = ImVec4(0.30f, 0.45f, 0.70f, 1.00f);
-
-    colors[ImGuiCol_Tab] = ImVec4(0.08f, 0.10f, 0.12f, 1.00f);
-    colors[ImGuiCol_TabHovered] = ImVec4(0.25f, 0.35f, 0.50f, 0.80f);
-    colors[ImGuiCol_TabActive] = ImVec4(0.12f, 0.14f, 0.16f, 1.00f);
-    colors[ImGuiCol_TabUnfocused] = ImVec4(0.08f, 0.10f, 0.12f, 1.00f);
-    colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.10f, 0.12f, 0.14f, 1.00f);
-    colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f);
-    colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
-    colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
-    colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
-    colors[ImGuiCol_TextSelectedBg] = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
-    colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
-    colors[ImGuiCol_NavHighlight] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
-    colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f);
-    colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f);
-    colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.35f);
-}
-
-Ray EditorGUI::GetMouseRay(const Camera3D& camera, const glm::vec2& mousePosition, const glm::vec2& viewportSize)
-{
-    return ScenePicker::CreateRayFromViewport(camera, mousePosition, viewportSize);
-}
-
-} // namespace CHEngine
diff --git a/editor/editor_gui.h b/editor/editor_gui.h
deleted file mode 100644
index 2914a46b9..000000000
--- a/editor/editor_gui.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef CH_EDITOR_GUI_H
-#define CH_EDITOR_GUI_H
-
-#include <functional>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "editor_layer.h"
-#include "editor_panels.h"
-#include "engine/core/ch_math.h"
-#include "engine/graphics/pipeline/renderer.h"
-
-
-namespace CHEngine
-{
-// Immediate-mode GUI helpers shared by editor panels and property inspectors.
-class EditorGUI
-{
-public:
-    // Draws the main editor menu bar for the provided panel set.
-    static void DrawMenuBar(EditorPanels& panels);
-
-    // Property layout helpers.
-    static void BeginPropertyGrid();
-    static void EndPropertyGrid();
-    static void BeginProperty(const char* label);
-    static void EndProperty();
-
-    // Simple declarative property widgets that do not use columns.
-    static bool Property(const char* label, bool& value);
-    static bool Property(const char* label, int& value, int min = 0, int max = 0);
-    static bool Property(const char* label, float& value, float speed = 0.1f, float min = 0.0f, float max = 0.0f);
-    static bool Property(const char* label, std::string& value, bool multiline = false);
-    static bool Property(const char* label, CHEngine::Color& value);
-    static bool Property(const char* label, glm::vec2& value, float speed = 0.1f, float min = 0.0f, float max = 0.0f);
-    static bool Property(const char* label, glm::vec3& value, float speed = 0.1f, float min = 0.0f, float max = 0.0f);
-    static bool Property(const char* label, glm::vec4& value, float speed = 0.1f, float min = 0.0f, float max = 0.0f);
-    static bool Property(const char* label, uint64_t& value);
-
-    static bool Property(const char* label, int& value, const char** items, int itemCount);
-
-    // Action widgets.
-    static bool ActionButton(const char* icon, const char* label);
-
-    // File property widgets.
-    static bool FileProperty(const char* label, std::string& value, const char* filter = nullptr);
-    static bool FileProperty(const char* label, std::string& path, uint32_t textureId, const char* filter = nullptr);
-
-    static bool DrawVec2(const char* label, glm::vec2& values, float resetValue = 0.0f);
-    static bool DrawVec3(const char* label, glm::vec3& values, float resetValue = 0.0f);
-    static bool DrawVec4(const char* label, glm::vec4& values, float resetValue = 0.0f);
-    // Applies the editor-wide ImGui style.
-    static void ApplyTheme();
-    // Builds a world ray from screen-space mouse coordinates.
-    static Ray GetMouseRay(const struct Camera3D& camera, const glm::vec2& mousePosition, const glm::vec2& viewportSize);
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_GUI_H
diff --git a/editor/editor_layer.cpp b/editor/editor_layer.cpp
deleted file mode 100644
index cad96069c..000000000
--- a/editor/editor_layer.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-#include "editor_layer.h"
-#include "editor_panels.h"
-#include "editor_layout.h"
-#include "editor_events.h"
-#include "editor_gui.h"
-#include "engine/core/imgui_layer.h"
-#include "engine/core/input.h"
-#include "launcher/editor_launcher.h"
-
-#include "IconsFontAwesome6.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/profiler.h"
-#include "engine/core/thread_pool.h"
-#include "engine/graphics/pipeline/render_command.h"
-#include "engine/graphics/pipeline/ui_renderer.h"
-#include "engine/physics/physics.h"
-#include "engine/platform/utils/dialogs.h"
-#include "engine/scene/project.h"
-#include "engine/scene/project_serializer.h"
-#include "engine/scene/scene_serializer.h"
-#include "panels/console_panel.h"
-#include "panels/content_browser_panel.h"
-#include "panels/project_browser_panel.h"
-#include "panels/property_editor.h"
-#include "panels/viewport_panel.h"
-#include "scripting/scene_scripting.h"
-#include "scripting/scriptengine.h"
-#include <ImGuizmo.h>
-#include <chrono>
-#include <yaml-cpp/yaml.h>
-
-
-namespace CHEngine
-{
-void EditorLayer::DrawLoadingOverlay(const char* title, const char* status)
-{
-    ImGuiViewport* viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(viewport->WorkPos);
-    ImGui::SetNextWindowSize(viewport->WorkSize);
-    ImGui::SetNextWindowViewport(viewport->ID);
-
-    ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                             ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDocking |
-                             ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse |
-                             ImGuiWindowFlags_NoInputs;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.02f, 0.02f, 0.02f, 0.92f));
-
-    if (ImGui::Begin("##EditorLoadingOverlay", nullptr, flags))
-    {
-        const size_t loadingCount = CHEngine::AssetManager::Get().GetLoadingAssetCount();
-        const size_t pendingFinalizeCount = CHEngine::AssetManager::Get().GetPendingFinalizeCount();
-        const size_t totalPending = loadingCount + pendingFinalizeCount;
-
-        ImGui::SetCursorPosY(ImGui::GetWindowHeight() * 0.45f);
-
-        ImVec2 titleSize = ImGui::CalcTextSize(title);
-        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - titleSize.x) * 0.5f);
-        ImGui::TextUnformatted(title);
-
-        ImVec2 statusSize = ImGui::CalcTextSize(status);
-        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - statusSize.x) * 0.5f);
-        ImGui::TextUnformatted(status);
-
-        std::string pendingLine = "Pending assets: " + std::to_string(totalPending);
-        ImVec2 pendingSize = ImGui::CalcTextSize(pendingLine.c_str());
-        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - pendingSize.x) * 0.5f);
-        ImGui::TextUnformatted(pendingLine.c_str());
-    }
-
-    ImGui::End();
-    ImGui::PopStyleColor();
-    ImGui::PopStyleVar();
-}
-
-EditorLayer* EditorLayer::s_Instance = nullptr;
-
-EditorLayer::EditorLayer()
-    : Layer("EditorLayer")
-{
-    // Ensure the engine DLL uses the same ImGui context as the Editor
-    ImGuiLayer::SetContext(ImGui::GetCurrentContext());
-
-    s_Instance = this;
-    EditorContext::Init();
-
-    m_ProjectManager = std::make_unique<EditorProjectManager>();
-    m_SceneManager = std::make_unique<EditorSceneManager>();
-    m_Layout = std::make_unique<EditorLayout>();
-    m_Panels = std::make_unique<EditorPanels>();
-
-    LoadConfig();
-}
-
-EditorLayer::~EditorLayer()
-{
-}
-
-void EditorLayer::LoadConfig()
-{
-    std::filesystem::path configPath = std::filesystem::current_path() / "editor_settings.yaml";
-    if (!std::filesystem::exists(configPath))
-    {
-        return;
-    }
-
-    try
-    {
-        YAML::Node data = YAML::LoadFile(configPath.string());
-        if (data["Editor"])
-        {
-            auto node = data["Editor"];
-            if (node["LastProjectPath"])
-            {
-                std::string lastProj = node["LastProjectPath"].as<std::string>("");
-                m_ProjectManager->SetLastProjectPath(lastProj);
-                m_Config.LastProjectPath = lastProj;
-            }
-            if (node["LastScenePath"])
-            {
-                m_Config.LastScenePath = node["LastScenePath"].as<std::string>("");
-            }
-            if (node["LoadLastProjectOnStartup"])
-            {
-                m_Config.LoadLastProjectOnStartup = node["LoadLastProjectOnStartup"].as<bool>(false);
-            }
-            if (node["AutoSaveEnabled"])
-            {
-                m_Config.AutoSaveEnabled = node["AutoSaveEnabled"].as<bool>(true);
-            }
-            if (node["AutoSaveInterval"])
-            {
-                m_Config.AutoSaveInterval = node["AutoSaveInterval"].as<float>(300.0f);
-            }
-            if (node["RecentProjects"])
-            {
-                m_Config.RecentProjects.clear();
-                for (const auto& entry : node["RecentProjects"])
-                {
-                    m_Config.RecentProjects.push_back(entry.as<std::string>());
-                }
-            }
-        }
-    } catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("EditorLayer: Failed to load editor settings: {}", e.what());
-    }
-}
-
-void EditorLayer::SaveConfig()
-{
-    YAML::Emitter out;
-    out << YAML::BeginMap;
-    out << YAML::Key << "Editor" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "LastProjectPath" << YAML::Value << m_ProjectManager->GetLastProjectPath();
-    m_Config.LastProjectPath = m_ProjectManager->GetLastProjectPath();
-    out << YAML::Key << "LastScenePath" << YAML::Value << m_Config.LastScenePath;
-    out << YAML::Key << "LoadLastProjectOnStartup" << YAML::Value << m_Config.LoadLastProjectOnStartup;
-    out << YAML::Key << "AutoSaveEnabled" << YAML::Value << m_Config.AutoSaveEnabled;
-    out << YAML::Key << "AutoSaveInterval" << YAML::Value << m_Config.AutoSaveInterval;
-
-    out << YAML::Key << "RecentProjects" << YAML::Value << YAML::BeginSeq;
-    for (const auto& path : m_Config.RecentProjects)
-    {
-        out << path;
-    }
-    out << YAML::EndSeq;
-
-    out << YAML::EndMap;
-    out << YAML::EndMap;
-
-    std::filesystem::path configPath = std::filesystem::current_path() / "editor_settings.yaml";
-    std::ofstream fout(configPath);
-    fout << out.c_str();
-}
-
-void EditorLayer::OnAttach()
-{
-    // SetTraceLogCallback removed - now using engine logging
-
-    EditorGUI::ApplyTheme();
-    Log::SetLogCallback(ConsolePanel::AddLog);
-    PropertyEditor::Init();
-    m_Panels->Init();
-
-    m_CommandHistory.SetNotifyCallback(
-        []() { CH_CORE_TRACE("CommandHistory: Scene state changed, notifying editor..."); });
-
-    // Auto-load last project/scene
-    const auto& config = GetConfig();
-
-    if (config.LoadLastProjectOnStartup && !m_ProjectManager->GetLastProjectPath().empty() &&
-        std::filesystem::exists(m_ProjectManager->GetLastProjectPath()))
-    {
-        CH_CORE_INFO("Auto-loading last project: {}", m_ProjectManager->GetLastProjectPath());
-        m_ProjectManager->OpenProject(m_ProjectManager->GetLastProjectPath());
-
-        if (!config.LastScenePath.empty() && std::filesystem::exists(config.LastScenePath))
-        {
-            CH_CORE_INFO("Auto-loading last scene: {}", config.LastScenePath);
-            m_SceneManager->OpenScene(config.LastScenePath);
-        }
-    }
-    else
-    {
-        Project::SetActive(nullptr);
-    }
-
-    // Ensure layout is initialized
-    const char* iniPath = ImGui::GetIO().IniFilename;
-    if (iniPath && !std::filesystem::exists(iniPath))
-    {
-        CH_CORE_INFO("OnAttach: Layout file '{}' not found, will be reset on first frame", iniPath);
-        EditorContext::GetState().NeedsLayoutReset = true;
-    }
-
-    std::string iconPath = AssetManager::Get().ResolvePath("engine/resources/icons/chaineddecosmapeditor.jpg");
-    if (std::filesystem::exists(iconPath))
-    {
-        Application::Get().GetWindow().SetWindowIcon(iconPath);
-    }
-    else
-    {
-        CH_CORE_WARN("Editor icon not found at: {}", iconPath);
-    }
-    CH_CORE_INFO("EditorLayer Attached with modular panels.");
-
-    LoadEditorFonts();
-}
-
-void EditorLayer::LoadEditorFonts()
-{
-
-    ImGuiIO& io = ImGui::GetIO();
-    float fontSize = 16.0f;
-    auto& assetManager = AssetManager::Get();
-
-    // --- Default UI Font (Lato) ---
-    std::string fontPath = assetManager.ResolvePath("engine/resources/font/lato/lato-bold.ttf");
-    if (std::filesystem::exists(fontPath))
-    {
-        io.Fonts->AddFontFromFileTTF(fontPath.c_str(), fontSize);
-        CH_CORE_INFO("Loaded editor font: {}", fontPath);
-    }
-    else
-    {
-        CH_CORE_WARN("Editor font not found: {}. Using default ImGui font.", fontPath);
-        io.Fonts->AddFontDefault();
-    }
-
-    // --- Icon Font (FontAwesome) ---
-    std::string faPath = assetManager.ResolvePath("engine/resources/font/fa-solid-900.ttf");
-    if (std::filesystem::exists(faPath))
-    {
-        static const ImWchar icons_ranges[] = {ICON_MIN_FA, ICON_MAX_16_FA, 0};
-        ImFontConfig icons_config;
-        icons_config.MergeMode = true;
-        icons_config.PixelSnapH = true;
-        io.Fonts->AddFontFromFileTTF(faPath.c_str(), fontSize, &icons_config, icons_ranges);
-        CH_CORE_INFO("Loaded and merged FontAwesome for editor: {}", faPath);
-    }
-
-    unsigned char* pixels;
-    int width, height;
-    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
-}
-
-void EditorLayer::OnDetach()
-{
-    SaveConfig();
-    EditorContext::Shutdown();
-}
-
-void EditorLayer::OnUpdate(Timestep ts)
-{
-    CH_PROFILE_FUNCTION();
-
-    m_SceneManager->OnUpdate(ts);
-
-    // Sync context to panels
-    m_Panels->SetContext(GetActiveScene());
-
-    // Update all panels (includes viewport camera controller)
-    m_Panels->OnUpdate(ts);
-
-    if (auto scene = GetActiveScene())
-    {
-        if (EditorContext::GetSceneState() == SceneState::Play)
-        {
-            auto& scriptEngine = ScriptEngine::Get();
-
-            if (scriptEngine.CanExecuteFrameScripts())
-            {
-                SceneScripting::Update(scene.get(), ts);
-            }
-            scene->OnUpdateRuntime(ts);
-
-            // Handle deferred scene loading requested from C# scripts
-            std::string pendingPath;
-            if (scriptEngine.TryConsumeRequestedScene(pendingPath))
-            {
-                SceneChangeRequestEvent ev(pendingPath);
-                OnEvent(ev);
-            }
-        }
-        else
-        {
-            scene->OnUpdateEditor(ts);
-
-            // Auto-save logic (delegated to SceneManager)
-            if (m_Config.AutoSaveEnabled)
-            {
-                m_SceneManager->AutoSave(m_Config.AutoSaveInterval, ts);
-            }
-        }
-
-        if (Input::IsKeyPressed(Key::F5))
-        {
-            AppLaunchRuntimeEvent e;
-            OnEvent(e);
-        }
-
-        if (Input::IsKeyDown(Key::LeftControl) && Input::IsKeyPressed(Key::R))
-        {
-            auto& scriptEngine = ScriptEngine::Get();
-            scriptEngine.RequestAssemblyReload("EditorLayer");
-        }
-    }
-}
-
-void EditorLayer::OnRender(Timestep ts)
-{
-    RenderCommand::Clear({25, 25, 25, 255});
-}
-
-void EditorLayer::OnImGuiRender()
-{
-    ImGuizmo::SetImGuiContext(ImGui::GetCurrentContext());
-    ImGuizmo::BeginFrame();
-
-    if (EditorContext::GetState().NeedsLayoutReset)
-    {
-        ResetLayout();
-        EditorContext::GetState().NeedsLayoutReset = false;
-    }
-
-    if (Project::GetActive())
-    {
-        if (EditorContext::GetState().FullscreenGame)
-        {
-            if (auto viewportPanel = m_Panels->Get<ViewportPanel>())
-            {
-                viewportPanel->OnImGuiRender(true);
-            }
-        }
-        else
-        {
-            DrawDockSpace();
-        }
-    }
-    else
-    {
-        if (auto projectBrowser = m_Panels->Get<ProjectBrowserPanel>())
-        {
-            projectBrowser->OnImGuiRender();
-        }
-    }
-
-    if (EditorContext::GetState().IsLoading)
-    {
-        DrawLoadingOverlay("Editor Busy", EditorContext::GetState().LoadingStatus.c_str());
-    }
-}
-
-void EditorLayer::ResetLayout()
-{
-    m_Layout->ResetLayout();
-}
-
-void EditorLayer::DrawDockSpace()
-{
-    m_Layout->BeginWorkspace();
-    m_Layout->DrawInterface();
-    m_Layout->EndWorkspace();
-}
-
-// Project and Scene event handlers are now managed by EditorProjectManager and EditorSceneManager.
-
-std::shared_ptr<Scene> EditorLayer::GetActiveScene() const
-{
-    return m_SceneManager->GetActiveScene();
-}
-
-void EditorLayer::OnEvent(Event& e)
-{
-    if (auto scene = GetActiveScene())
-    {
-        SceneScripting::DispatchEvent(scene.get(), e);
-    }
-
-    // Dispatch events to all editor panels
-    m_Panels->OnEvent(e);
-
-    EventDispatcher dispatcher(e);
-
-    // 1. Scene Management
-    dispatcher.Dispatch<SceneOpenedEvent>([this](auto& e) { return m_SceneManager->OnSceneOpened(e); });
-    dispatcher.Dispatch<ScenePlayEvent>([this](auto& e) {
-        m_SceneManager->SetSceneState(SceneState::Play);
-        return true;
-    });
-    dispatcher.Dispatch<SceneStopEvent>([this](auto& e) {
-        m_SceneManager->SetSceneState(SceneState::Edit);
-        return true;
-    });
-
-    // 2. Project Management
-    dispatcher.Dispatch<ProjectOpenedEvent>([this](auto& e) { return m_ProjectManager->OnProjectOpened(e); });
-    dispatcher.Dispatch<AppLaunchRuntimeEvent>([this](auto& e) {
-        LaunchStandalone();
-        return true;
-    });
-
-    // 3. Command/Undo
-    dispatcher.Dispatch<UndoEvent>([this](auto& e) {
-        m_CommandHistory.Undo();
-        return true;
-    });
-    dispatcher.Dispatch<RedoEvent>([this](auto& e) {
-        m_CommandHistory.Redo();
-        return true;
-    });
-
-    // 4. Input
-    dispatcher.Dispatch<KeyPressedEvent>([this](auto& e) { return m_SceneManager->OnKeyPressed(e); });
-    // 3. Layout/System
-    dispatcher.Dispatch<AppResetLayoutEvent>([this](auto& ev) {
-        ResetLayout();
-        return true;
-    });
-    dispatcher.Dispatch<AppSaveLayoutEvent>([this](auto& ev) {
-        m_Layout->SaveDefaultLayout();
-        return true;
-    });
-    dispatcher.Dispatch<SceneChangeRequestEvent>([this](auto& ev) {
-        std::filesystem::path scenePath = ev.GetPath();
-        // If the path is relative, resolve it via Project::GetAssetPath
-        if (scenePath.is_relative() && Project::GetActive())
-        {
-            scenePath = Project::GetAssetPath(ev.GetPath());
-        }
-
-        std::string finalPath = scenePath.string();
-
-        if (EditorContext::GetSceneState() == SceneState::Play)
-        {
-            // Handle mid-play scene change directly or via Manager
-            m_SceneManager->OpenScene(finalPath);
-            return true;
-        }
-        m_SceneManager->OpenScene(finalPath);
-        return true;
-    });
-
-    // 4. Selections/Picking
-    dispatcher.Dispatch<EntitySelectedEvent>([this](auto& ev) {
-        EditorContext::SetSelectedEntity(Entity(ev.GetEntity(), &ev.GetScene()->GetRegistry()));
-        EditorContext::GetState().LastHitMeshIndex = ev.GetMeshIndex();
-        return false;
-    });
-
-    // 6. Raw Input Overrides
-    if (EditorContext::GetSceneState() == SceneState::Play)
-    {
-        // Script events are already dispatched on line 390
-    }
-    else if (e.GetEventType() == EventType::KeyPressed)
-    {
-        auto& ke = (KeyPressedEvent&)e;
-        if (ke.GetKeyCode() == Key::Escape && EditorContext::GetState().FullscreenGame)
-        {
-            EditorContext::GetState().FullscreenGame = false;
-            e.Handled = true;
-        }
-    }
-}
-
-CommandHistory& EditorLayer::GetCommandHistory()
-{
-    return s_Instance->m_CommandHistory;
-}
-
-// File and project operations are now handled by EditorProjectManager.
-
-void EditorLayer::LaunchStandalone()
-{
-    CH_PROFILE_FUNCTION();
-    EditorLauncher::LaunchStandalone(Project::GetActive(), GetActiveScene());
-}
-
-void EditorLayer::ReparentEntity(Entity child, Entity parent)
-{
-    if (child.HasComponent<HierarchyComponent>())
-    {
-        child.GetComponent<HierarchyComponent>().Parent = parent;
-    }
-}
-
-} // namespace CHEngine
diff --git a/editor/editor_layer.h b/editor/editor_layer.h
deleted file mode 100644
index f71e18dd5..000000000
--- a/editor/editor_layer.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef CH_EDITOR_LAYER_H
-#define CH_EDITOR_LAYER_H
-
-#include <filesystem>
-#include <memory>
-#include <future>
-#include <vector>
-#include <string>
-
-
-#include "editor_context.h"
-#include "launcher/editor_launcher.h"
-#include "editor_project_manager.h"
-#include "editor_scene_manager.h"
-#include "engine/core/application.h"
-#include "engine/core/base.h"
-#include "engine/core/layer.h"
-#include "editor_layout.h"
-#include "editor_panels.h"
-#include "engine/graphics/pipeline/renderer.h"
-#include "engine/scene/scene.h"
-#include "engine/scene/scene_events.h"
-#include "imgui.h"
-#include "undo/command_history.h"
-
-namespace CHEngine
-{
-
-struct EditorLayerConfig
-{
-    std::string LastProjectPath = "";
-    std::string LastScenePath = "";
-    bool LoadLastProjectOnStartup = true;
-    bool AutoSaveEnabled = true;
-    float AutoSaveInterval = 300.0f;
-    std::vector<std::string> RecentProjects; // Ordered list of recently opened project paths
-};
-
-// Owns the editor scene pair, viewport state, and project/scene transition flow.
-class EditorLayer : public Layer
-{
-public:
-    EditorLayer();
-    virtual ~EditorLayer();
-
-    virtual void OnAttach() override;
-    virtual void OnDetach() override;
-    virtual void OnUpdate(Timestep ts) override;
-    virtual void OnRender(Timestep ts) override;
-    virtual void OnImGuiRender() override;
-    virtual void OnEvent(Event& e) override;
-
-    // Returns the viewport width currently tracked by the editor.
-    static float GetViewportWidth()
-    {
-        return s_Instance->m_ViewportSize.x;
-    }
-    // Returns the viewport height currently tracked by the editor.
-    static float GetViewportHeight()
-    {
-        return s_Instance->m_ViewportSize.y;
-    }
-
-    // Resets the editor layout to the default dock structure.
-    void ResetLayout();
-    
-    SceneState GetSceneState() const
-    {
-        return EditorContext::GetSceneState();
-    }
-
-    static EditorLayer& Get()
-    {
-        return *s_Instance;
-    }
-    // Draws the main editor docking root.
-    void DrawDockSpace();
-
-    // File and project operations (delegated to ProjectManager).
-    EditorProjectManager& GetProjectManager() { return *m_ProjectManager; }
-
-    // Scene operations (delegated to SceneManager).
-    EditorSceneManager& GetSceneManager() { return *m_SceneManager; }
-
-    void LaunchStandalone();
-
-private:
-    void LoadEditorFonts();
-    void DrawLoadingOverlay(const char* title, const char* status);
-
-public:
-    static EditorLayer* s_Instance;
-public:
-    static CommandHistory& GetCommandHistory();
-    static CommandHistory& History()
-    {
-        return GetCommandHistory();
-    }
-    EditorPanels& GetPanels()
-    {
-        return *m_Panels;
-    }
-
-    Entity GetSelectedEntity() const
-    {
-        return EditorContext::GetSelectedEntity();
-    }
-
-    static void ReparentEntity(Entity child, Entity parent);
-
-    const ImVec2& GetViewportSize() const { return m_ViewportSize; }
-    void SetViewportSize(const ImVec2& size) { m_ViewportSize = size; }
-    void SetLastScenePath(const std::string& path)
-    {
-        m_Config.LastScenePath = path;
-    }
-
-    // Loads the editor config from disk.
-    void LoadConfig();
-    // Saves the editor config to disk.
-    void SaveConfig();
-    const EditorLayerConfig& GetConfig() const
-    {
-        return m_Config;
-    }
-    EditorLayerConfig& GetConfig()
-    {
-        return m_Config;
-    }
-
-    // Returns the scene currently being edited or played, or null while transitions are in flight.
-    std::shared_ptr<Scene> GetActiveScene() const;
-
-private:
-    EditorLayerConfig m_Config;
-
-private:
-    std::unique_ptr<EditorLayout> m_Layout;
-    std::unique_ptr<EditorPanels> m_Panels;
-    std::unique_ptr<EditorProjectManager> m_ProjectManager;
-    std::unique_ptr<EditorSceneManager> m_SceneManager;
-
-    CommandHistory m_CommandHistory;
-    ImVec2 m_ViewportSize = {1280, 720};
-};
-} // namespace CHEngine
-
-#endif // CH_EDITOR_LAYER_H
diff --git a/editor/editor_layout.cpp b/editor/editor_layout.cpp
deleted file mode 100644
index 8dcb20014..000000000
--- a/editor/editor_layout.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-#include "editor_layout.h"
-#include "editor/editor_layer.h"
-#include "editor/panels/panel.h"
-#include "editor_gui.h"
-#include "engine/core/application.h"
-#include "engine/scene/project.h"
-#include "imgui.h"
-#include "imgui_internal.h"
-#include <filesystem>
-#include <fstream>
-
-namespace CHEngine
-{
-
-void EditorLayout::BeginWorkspace()
-{
-    static bool dockspaceOpen = true;
-    static ImGuiDockNodeFlags dockspace_flags = ImGuiDockNodeFlags_PassthruCentralNode;
-    ImGuiWindowFlags window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking;
-
-    ImGuiViewport* viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(viewport->Pos);
-    ImGui::SetNextWindowSize(viewport->Size);
-    ImGui::SetNextWindowViewport(viewport->ID);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-    window_flags |=
-        ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
-    window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
-
-    if (dockspace_flags & ImGuiDockNodeFlags_PassthruCentralNode)
-    {
-        window_flags |= ImGuiWindowFlags_NoBackground;
-    }
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-    ImGui::Begin("MainDockSpaceWindow", &dockspaceOpen, window_flags);
-    ImGui::PopStyleVar();
-    ImGui::PopStyleVar(2);
-
-    ImGuiIO& io = ImGui::GetIO();
-    if (io.ConfigFlags & ImGuiConfigFlags_DockingEnable)
-    {
-        ImGuiID dockspace_id = ImGui::GetID("MyDockSpace");
-        ImGui::DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), dockspace_flags);
-    }
-}
-
-void EditorLayout::EndWorkspace()
-{
-    ImGui::End();
-}
-
-void EditorLayout::DrawInterface()
-{
-    auto& layer = EditorLayer::Get();
-    EditorGUI::DrawMenuBar(layer.GetPanels());
-    
-    // Render all panels
-    bool readOnly = EditorContext::GetSceneState() == SceneState::Play;
-    layer.GetPanels().OnImGuiRender(readOnly);
-}
-
-void EditorLayout::ResetLayout()
-{
-    // Try to load from default template first
-    std::string defaultPath = std::string(PROJECT_ROOT_DIR) + "/imgui_default.ini";
-    if (std::filesystem::exists(defaultPath))
-    {
-        CH_CORE_INFO("EditorLayout: Resetting from template: {}", defaultPath);
-        std::ifstream f(defaultPath);
-        if (f.is_open())
-        {
-            std::string content((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
-            ImGui::LoadIniSettingsFromMemory(content.c_str(), content.size());
-            return;
-        }
-    }
-
-    CH_CORE_WARN("EditorLayout: Template not found at {}, using fallback procedural layout", defaultPath);
-
-    // Fallback procedural layout if no template exists
-    ImGuiID dockspace_id = ImGui::GetID("MyDockSpace");
-    ImGui::DockBuilderRemoveNode(dockspace_id);
-    ImGui::DockBuilderAddNode(dockspace_id, ImGuiDockNodeFlags_DockSpace | ImGuiDockNodeFlags_PassthruCentralNode);
-
-    ImGuiID main = dockspace_id;
-    ImGuiID right = ImGui::DockBuilderSplitNode(main, ImGuiDir_Right, 0.25f, nullptr, &main);
-    ImGuiID left = ImGui::DockBuilderSplitNode(main, ImGuiDir_Left, 0.20f, nullptr, &main);
-    ImGuiID down = ImGui::DockBuilderSplitNode(main, ImGuiDir_Down, 0.30f, nullptr, &main);
-
-    // Ensure Viewport gets the central node
-    ImGui::DockBuilderDockWindow("Viewport", main);
-    
-    // Left side: Hierarchy and Project Browser (tabs)
-    ImGui::DockBuilderDockWindow("Scene Hierarchy", left);
-    ImGui::DockBuilderDockWindow("Content Browser", left);
-    
-    // Right side: Inspector and Settings
-    ImGui::DockBuilderDockWindow("Inspector", right);
-    ImGui::DockBuilderDockWindow("World Settings", right);
-    ImGui::DockBuilderDockWindow("Material Editor", right);
-    
-    // Bottom: Console, Profiler, Effects
-    ImGui::DockBuilderDockWindow("Console", down);
-    ImGui::DockBuilderDockWindow("Profiler", down);
-    ImGui::DockBuilderDockWindow("Effects & Debug", down);
-
-    ImGui::DockBuilderFinish(dockspace_id);
-    CH_CORE_INFO("EditorLayout: Procedural layout applied.");
-}
-
-void EditorLayout::SaveDefaultLayout()
-{
-    size_t size = 0;
-    const char* settings = ImGui::SaveIniSettingsToMemory(&size);
-    if (settings)
-    {
-        std::string defaultPath = std::string(PROJECT_ROOT_DIR) + "/imgui_default.ini";
-        std::ofstream file(defaultPath);
-        if (file.is_open())
-        {
-            file.write(settings, size);
-            CH_CORE_INFO("EditorLayout: Saved current layout as default: {}", defaultPath);
-        }
-        else
-        {
-            CH_CORE_ERROR("EditorLayout: Failed to open {} for writing!", defaultPath);
-        }
-    }
-}
-
-} // namespace CHEngine
diff --git a/editor/editor_layout.h b/editor/editor_layout.h
deleted file mode 100644
index 0d0e4df77..000000000
--- a/editor/editor_layout.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef CH_EDITOR_LAYOUT_H
-#define CH_EDITOR_LAYOUT_H
-
-#include "editor/editor_panels.h"
-#include "engine/core/events.h"
-#include <functional>
-
-namespace CHEngine
-{
-
-class EditorLayout
-{
-public:
-    void BeginWorkspace();
-    void EndWorkspace();
-
-    void DrawInterface();
-    void ResetLayout();
-    void SaveDefaultLayout();
-
-private:
-    void DrawProjectSelector();
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_LAYOUT_H
diff --git a/editor/editor_main.cpp b/editor/editor_main.cpp
deleted file mode 100644
index 54c4dd221..000000000
--- a/editor/editor_main.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "editor_layer.h"
-#include "engine/core/entry_point.h"
-#include "engine/core/project_launcher.h"
-#include "panels/console_panel.h"
-#include "engine/core/log.h"
-#include "scripting/scriptengine.h"
-
-namespace CHEngine
-{
-Application* CreateApplication(ApplicationCommandLineArgs args)
-{
-    Log::SetLogCallback(ConsolePanel::AddLog);
-
-    auto details = ProjectLauncher::PrepareEditor(args);
-
-    details.Spec.InitScripting = []() { ScriptEngine::Init(); };
-    details.Spec.ShutdownScripting = []() { ScriptEngine::Shutdown(); };
-
-    auto app = new Application(details.Spec);
-    app->PushLayer(new EditorLayer());
-    return app;
-}
-} // namespace CHEngine
diff --git a/editor/editor_menu.cpp b/editor/editor_menu.cpp
new file mode 100644
index 000000000..b85b8a120
--- /dev/null
+++ b/editor/editor_menu.cpp
@@ -0,0 +1,930 @@
+#include "editor_menu.h"
+#include "editor/editor_colors.h"
+#include "editor/layer.h"
+#include "editor/panels.h"
+#include "editor/project/project_exporter.h"
+#include "engine/app/application.h"
+#include "engine/common/thread_pool.h"
+#include "engine/core/service_locator.h"
+#include "engine/platform/dialogs/dialogs.h"
+#include "engine/project/project.h"
+#include "events.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "engine/scripting/scriptengine.h"
+#include "editor/scene_manager.h"
+#include "gui.h"
+#include "imgui.h"
+#include "imgui_internal.h"
+#include "engine/assets/asset_manager.h"
+#include "editor/font_choice_gui.h"
+
+#include <filesystem>
+
+namespace Chained
+{
+	constexpr float kPlaybackBarWidth = 330.0f;
+
+	void EditorMenu::DrawMenuBar(EditorPanels& panels)
+	{
+		if (!ImGui::BeginMenuBar())
+		{
+			return;
+		}
+
+		DrawFileMenu();
+		DrawViewMenu(panels);
+		DrawProjectMenu();
+		DrawEditorMenu();
+		DrawPlaybackControls();
+		DrawExportResultPopup();
+		DrawUnsavedChangesPopup();
+
+		ImGui::EndMenuBar();
+	}
+
+	void EditorMenu::DrawFileMenu()
+	{
+		if (ImGui::BeginMenu("File"))
+		{
+			if (ImGui::MenuItem(ICON_FA_FILE " New Project", "Ctrl+Shift+N"))
+			{
+				auto newScene = Scene::CreateDefault();
+				EditorLayer::Get().GetSceneManager().SetScene(newScene);
+			}
+			if (ImGui::MenuItem(ICON_FA_FOLDER_OPEN " Open Project", "Ctrl+O"))
+			{
+				std::vector<DialogFilter> filters = {{"Chained Scene", "chscene"}};
+				auto result = Chained::Dialogs::OpenFile(filters);
+				if (result)
+				{
+					EditorLayer::Get().GetSceneManager().OpenScene(*result);
+				}
+			}
+			if (ImGui::MenuItem(ICON_FA_FLOPPY_DISK " Save Project"))
+			{
+				EditorLayer::Get().GetSceneManager().SaveScene();
+			}
+			if (ImGui::MenuItem(ICON_FA_XMARK " Close Project"))
+			{
+				Project::SetActive(nullptr);
+			}
+			ImGui::Separator();
+			if (ImGui::MenuItem(ICON_FA_FILE_CODE " New Scene", "Ctrl+N"))
+			{
+				EditorLayer::Get().GetSceneManager().NewScene();
+			}
+			if (ImGui::MenuItem(ICON_FA_FLOPPY_DISK " Save Scene", "Ctrl+S"))
+			{
+				EditorLayer::Get().GetSceneManager().SaveScene();
+			}
+			if (ImGui::MenuItem(ICON_FA_FILE_EXPORT " Save Scene As...", "Ctrl+Shift+S"))
+			{
+				EditorLayer::Get().GetSceneManager().SaveSceneAs();
+			}
+			if (ImGui::MenuItem(ICON_FA_FOLDER_OPEN " Load Scene", "Ctrl+L"))
+			{
+				EditorLayer::Get().GetSceneManager().OpenScene();
+			}
+			ImGui::Separator();
+			if (ImGui::MenuItem(ICON_FA_POWER_OFF " Exit"))
+			{
+				Application::Get().Close();
+			}
+			ImGui::EndMenu();
+		}
+	}
+
+	void EditorMenu::DrawViewMenu(EditorPanels& panels)
+	{
+		if (ImGui::BeginMenu("View"))
+		{
+			panels.ForEach([](const std::shared_ptr<Panel>& panel) {
+				if (panel->GetName() != "Project Browser")
+				{
+					ImGui::MenuItem(panel->GetName().c_str(), nullptr, &panel->IsOpen());
+				}
+			});
+			ImGui::Separator();
+			if (ImGui::MenuItem(ICON_FA_EXPAND " Fullscreen", "F11"))
+			{
+				Application::Get().GetWindow().ToggleFullscreen();
+			}
+			ImGui::EndMenu();
+		}
+	}
+
+	void EditorMenu::DrawProjectMenu()
+	{
+		if (ImGui::BeginMenu("Project"))
+		{
+			if (ImGui::MenuItem(ICON_FA_GEARS " Settings"))
+			{
+				if (auto p = EditorLayer::Get().GetPanels().Get("Project Settings"))
+				{
+					p->IsOpen() = true;
+				}
+			}
+			bool isExporting = false;
+			{
+				std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+				isExporting = m_ExportState.IsExporting;
+			}
+
+			if (ImGui::MenuItem(isExporting ? ICON_FA_FILE_EXPORT " Exporting..."
+											: ICON_FA_FILE_EXPORT " Export Project..."))
+			{
+				if (!isExporting)
+				{
+					m_ExportState.CancelRequested.store(false, std::memory_order_relaxed);
+					m_ExportDialog.Open = true;
+					auto project = Project::GetActive();
+					if (project)
+					{
+						m_ExportDialog.SelectedMode = project->GetConfig().Export.Mode;
+						m_ExportDialog.ZipThreshold = project->GetConfig().Export.ZipThreshold;
+						m_ExportDialog.DataVersion = project->GetConfig().Export.DataVersion;
+						m_ExportDialog.SplitSizeMB = project->GetConfig().Export.SplitSizeMB;
+						uint32_t splitSize = m_ExportDialog.SplitSizeMB;
+						m_ExportDialog.SplitCustom =
+							(splitSize != 0 && splitSize != 512 && splitSize != 1024 && splitSize != 2048);
+						m_ExportDialog.PackName = project->GetConfig().Export.PackName;
+					}
+				}
+			}
+			ImGui::Separator();
+			if (ImGui::MenuItem(ICON_FA_ARROWS_ROTATE " Reload Shaders"))
+			{
+				if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+				{
+					renderer->GetShaderLibrary().ReloadAll();
+				}
+			}
+			if (ImGui::MenuItem(ICON_FA_ARROWS_ROTATE " Reload All Stale Assets"))
+			{
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (am)
+				{
+					size_t count = am->ReloadAllStale();
+					CH_CORE_INFO("EditorMenu: Reloaded {} stale assets", count);
+				}
+			}
+			if (ImGui::MenuItem(ICON_FA_TRASH " Clear .chasset Cache"))
+			{
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (am)
+				{
+					size_t count = am->DeleteAllChassets();
+					CH_CORE_INFO("EditorMenu: Deleted {} .chasset file(s)", count);
+				}
+			}
+			if (ImGui::MenuItem(ICON_FA_FILE_CODE " Reload Scripts", "Ctrl+R"))
+			{
+				auto project = Project::GetActive();
+				if (project)
+				{
+					auto assemblyPath = ScriptEngine::ResolveAssemblyPath(project->GetConfig().Scripting,
+																		  project->GetConfig().ProjectDirectory);
+					if (auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>())
+					{
+						scriptEngine->RequestAssemblyReload(assemblyPath.string(), "EditorGUI");
+					}
+				}
+			}
+			ImGui::EndMenu();
+		}
+	}
+
+	void EditorMenu::DrawEditorMenu()
+	{
+		if (ImGui::BeginMenu("Editor"))
+		{
+			if (ImGui::MenuItem(ICON_FA_SLIDERS " Settings"))
+			{
+				m_ShowEditorSettings = true;
+			}
+			ImGui::EndMenu();
+		}
+	}
+
+	void EditorMenu::DrawPlaybackControls()
+	{
+		float barWidth = ImGui::GetWindowWidth();
+		float centerPos = (barWidth - kPlaybackBarWidth) * 0.5f;
+		if (centerPos > ImGui::GetCursorPosX())
+		{
+			ImGui::SameLine(centerPos);
+		}
+
+		SceneState sceneState = EditorLayer::Get().GetSceneManager().GetSceneState();
+		bool isPlaying = (sceneState == SceneState::Play);
+		bool isSimulating = (sceneState == SceneState::Simulate);
+
+		// Play / Stop Button
+		if (isPlaying)
+		{
+			ImGui::PushStyleColor(ImGuiCol_Text, EditorColors::PlayGreen);
+		}
+		if (ImGui::Button(isPlaying ? (ICON_FA_STOP " Stop") : (ICON_FA_PLAY " Play"), ImVec2(65, 20)))
+		{
+			EditorLayer::Get().GetSceneManager().SetSceneState(isPlaying ? SceneState::Edit : SceneState::Play);
+		}
+		if (isPlaying)
+		{
+			ImGui::PopStyleColor();
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip(isPlaying ? "Stop Game" : "Play Game (Run Physics & Scripts)");
+		}
+
+		ImGui::SameLine(0, 5);
+
+		// Simulate / Stop Button
+		if (isSimulating)
+		{
+			ImGui::PushStyleColor(ImGuiCol_Text, EditorColors::SimulateOrange);
+		}
+		if (ImGui::Button(isSimulating ? (ICON_FA_STOP " Stop") : (ICON_FA_GEARS " Simulate"), ImVec2(80, 20)))
+		{
+			EditorLayer::Get().GetSceneManager().SetSceneState(isSimulating ? SceneState::Edit : SceneState::Simulate);
+		}
+		if (isSimulating)
+		{
+			ImGui::PopStyleColor();
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip(isSimulating ? "Stop Simulation" : "Simulate (Physics Only)");
+		}
+	}
+
+	void EditorMenu::DrawExportResultPopup()
+	{
+		bool shouldOpenExportPopup = false;
+		{
+			std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+			if (m_ExportState.Open)
+			{
+				m_ExportResultSuccess = m_ExportState.Success;
+				m_ExportResultMessage = m_ExportState.Message;
+				m_ExportResultOutDir = m_ExportState.OutDir;
+				m_ExportState.Open = false;
+				shouldOpenExportPopup = true;
+			}
+		}
+		if (shouldOpenExportPopup)
+		{
+			ImGui::OpenPopup("Export Result");
+		}
+		if (ImGui::BeginPopupModal("Export Result", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
+		{
+			if (m_ExportResultSuccess)
+			{
+				ImGui::TextColored(ImVec4(0.3f, 0.9f, 0.3f, 1.0f), ICON_FA_CIRCLE_INFO " Success");
+			}
+			else
+			{
+				ImGui::TextColored(ImVec4(0.9f, 0.3f, 0.3f, 1.0f), ICON_FA_CIRCLE_EXCLAMATION " Failed");
+			}
+			ImGui::Spacing();
+			ImGui::TextWrapped("%s", m_ExportResultMessage.c_str());
+			if (!m_ExportResultOutDir.empty())
+			{
+				ImGui::Spacing();
+				ImGui::Text("Output: ");
+				ImGui::SameLine();
+				ImGui::TextDisabled("%s", m_ExportResultOutDir.c_str());
+			}
+			ImGui::Spacing();
+			ImGui::Separator();
+			if (ImGui::Button("OK", ImVec2(120.f, 0.f)) || ImGui::IsKeyPressed(ImGuiKey_Escape) ||
+				ImGui::IsKeyPressed(ImGuiKey_Enter))
+			{
+				m_ExportState.CancelRequested.store(false, std::memory_order_relaxed);
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::EndPopup();
+		}
+	}
+
+	void EditorMenu::DrawUnsavedChangesPopup()
+	{
+		auto& sceneMgr = EditorLayer::Get().GetSceneManager();
+		if (sceneMgr.IsConfirmPending())
+		{
+			ImGui::OpenPopup("Unsaved Changes");
+		}
+		if (ImGui::BeginPopupModal("Unsaved Changes", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
+		{
+			ImGui::Text("Scene has unsaved changes.");
+			ImGui::Spacing();
+			ImGui::TextDisabled("Do you want to save before continuing?");
+			ImGui::Spacing();
+			ImGui::Separator();
+
+			if (ImGui::Button("Save", ImVec2(120.f, 0.f)))
+			{
+				sceneMgr.SaveScene();
+				sceneMgr.ConfirmPendingAction();
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::SameLine();
+			if (ImGui::Button("Don't Save", ImVec2(120.f, 0.f)))
+			{
+				sceneMgr.ConfirmPendingAction();
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::SameLine();
+			if (ImGui::Button("Cancel", ImVec2(120.f, 0.f)))
+			{
+				sceneMgr.CancelPendingAction();
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::EndPopup();
+		}
+	}
+
+	void EditorMenu::DrawExportDialog()
+	{
+		if (!m_ExportDialog.Open)
+		{
+			return;
+		}
+
+		ImGui::SetNextWindowSize(ImVec2(480, 0), ImGuiCond_Once);
+		if (ImGui::Begin("Export Project", &m_ExportDialog.Open))
+		{
+			ImGui::TextUnformatted("Choose export mode:");
+			ImGui::Spacing();
+
+			struct ModeInfo
+			{
+				PackMode mode;
+				const char* label;
+				const char* desc;
+				const char* icon;
+			};
+			ModeInfo modes[] = {
+				{PackMode::Fast, "Fast", "LZ4 HC compression.\nFast export, larger pack.", ICON_FA_BOLT},
+				{PackMode::Balanced, "Balanced", "ZSTD compression.\nBalanced speed and size.", ICON_FA_CUBES},
+				{PackMode::Max, "Max", "ZSTD ultra compression.\nSmallest pack, slowest export.", ICON_FA_GEARS},
+				{PackMode::Raw, "Raw", "No compression.\nStored as-is, fastest.", ICON_FA_FOLDER_OPEN},
+			};
+			constexpr size_t modeCount = 4;
+
+			const float avail = ImGui::GetContentRegionAvail().x;
+			const float spacing = ImGui::GetStyle().ItemSpacing.x;
+			const float modeWidth = (avail - spacing * 3.0f) / 4.0f;
+
+			for (size_t i = 0; i < modeCount; ++i)
+			{
+				const auto& m = modes[i];
+				const bool selected = (m_ExportDialog.SelectedMode == m.mode);
+				ImGui::PushID(static_cast<int>(m.mode));
+
+				ImGui::PushStyleColor(ImGuiCol_Button,
+									  selected ? ImVec4(0.20f, 0.62f, 0.78f, 1.0f) : ImVec4(0.18f, 0.20f, 0.24f, 1.0f));
+				ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
+									  selected ? ImVec4(0.28f, 0.72f, 0.88f, 1.0f) : ImVec4(0.22f, 0.24f, 0.29f, 1.0f));
+				ImGui::PushStyleColor(ImGuiCol_ButtonActive,
+									  selected ? ImVec4(0.16f, 0.52f, 0.68f, 1.0f) : ImVec4(0.14f, 0.16f, 0.20f, 1.0f));
+				ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8.0f, 12.0f));
+
+				std::string btnLabel = std::string(m.icon) + " " + m.label;
+				if (ImGui::Button(btnLabel.c_str(), ImVec2(modeWidth, 0)))
+				{
+					m_ExportDialog.SelectedMode = m.mode;
+				}
+
+				ImGui::PopStyleVar();
+				ImGui::PopStyleColor(3);
+				ImGui::PopID();
+
+				if (i + 1 < modeCount)
+				{
+					ImGui::SameLine();
+				}
+			}
+
+			// Description for selected mode
+			ImGui::Spacing();
+			for (size_t i = 0; i < modeCount; ++i)
+			{
+				if (m_ExportDialog.SelectedMode == modes[i].mode)
+				{
+					ImGui::TextColored(ImVec4(0.6f, 0.75f, 0.85f, 1.0f), "%s", modes[i].desc);
+					break;
+				}
+			}
+
+			ImGui::Spacing();
+			ImGui::Separator();
+			ImGui::Spacing();
+
+			ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8.0f, 6.0f));
+			if (m_ExportDialog.SelectedMode != PackMode::Raw)
+			{
+				ImGui::SliderFloat("Compression Threshold", &m_ExportDialog.ZipThreshold, 0.0f, 1.0f, "%.2f");
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Files with compression ratio above this threshold stay uncompressed.\n0.0 = "
+									  "compress everything, 1.0 = compress nothing.");
+				}
+			}
+
+			{
+				int dataVersion = static_cast<int>(m_ExportDialog.DataVersion);
+				if (ImGui::InputInt("Data Version", &dataVersion))
+				{
+					m_ExportDialog.DataVersion = static_cast<uint32_t>(dataVersion);
+				}
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Increment to invalidate cached packs at runtime.");
+				}
+			}
+
+			if (m_ExportDialog.SelectedMode != PackMode::Raw)
+			{
+				// Reserve 128 chars for the pack name buffer
+				static char packNameBuf[128] = {};
+				if (ImGui::IsWindowAppearing())
+				{
+					std::strncpy(packNameBuf, m_ExportDialog.PackName.c_str(), sizeof(packNameBuf) - 1);
+					packNameBuf[sizeof(packNameBuf) - 1] = '\0';
+				}
+				if (ImGui::InputText("Pack Name", packNameBuf, sizeof(packNameBuf)))
+				{
+					std::string newName = packNameBuf;
+					// Strip spaces and extension characters that would break the filename
+					newName.erase(std::remove_if(newName.begin(), newName.end(),
+												 [](char c) { return c == '.' || c == '/' || c == '\\' || c == ':'; }),
+								  newName.end());
+					if (!newName.empty())
+					{
+						m_ExportDialog.PackName = newName;
+					}
+				}
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Base name for the .pack file(s).\nResult: %s.pack, %s_1.pack, ...",
+									  m_ExportDialog.PackName.c_str(), m_ExportDialog.PackName.c_str());
+				}
+			}
+
+			if (m_ExportDialog.SelectedMode != PackMode::Raw)
+			{
+				const char* splitLabels[] = {"Single File (No Split)", "512 MB per pack", "1 GB (1024 MB)",
+											 "2 GB (2048 MB)", "Custom Size..."};
+
+				// Determine which preset slot is active, respecting the explicit custom flag
+				int currentSplitIdx = 0;
+				if (m_ExportDialog.SplitCustom)
+				{
+					currentSplitIdx = 4;
+				}
+				else if (m_ExportDialog.SplitSizeMB == 0)
+				{
+					currentSplitIdx = 0;
+				}
+				else if (m_ExportDialog.SplitSizeMB == 512)
+				{
+					currentSplitIdx = 1;
+				}
+				else if (m_ExportDialog.SplitSizeMB == 1024)
+				{
+					currentSplitIdx = 2;
+				}
+				else if (m_ExportDialog.SplitSizeMB == 2048)
+				{
+					currentSplitIdx = 3;
+				}
+				else
+				{
+					currentSplitIdx = 4; // unknown preset → treat as custom
+				}
+
+				if (ImGui::BeginCombo("Split Pack Size", splitLabels[currentSplitIdx]))
+				{
+					if (ImGui::Selectable(splitLabels[0], currentSplitIdx == 0))
+					{
+						m_ExportDialog.SplitSizeMB = 0;
+						m_ExportDialog.SplitCustom = false;
+					}
+					if (ImGui::Selectable(splitLabels[1], currentSplitIdx == 1))
+					{
+						m_ExportDialog.SplitSizeMB = 512;
+						m_ExportDialog.SplitCustom = false;
+					}
+					if (ImGui::Selectable(splitLabels[2], currentSplitIdx == 2))
+					{
+						m_ExportDialog.SplitSizeMB = 1024;
+						m_ExportDialog.SplitCustom = false;
+					}
+					if (ImGui::Selectable(splitLabels[3], currentSplitIdx == 3))
+					{
+						m_ExportDialog.SplitSizeMB = 2048;
+						m_ExportDialog.SplitCustom = false;
+					}
+					if (ImGui::Selectable(splitLabels[4], currentSplitIdx == 4))
+					{
+						m_ExportDialog.SplitCustom = true;
+						// Keep current SplitSizeMB value so the user sees a sensible default
+						if (m_ExportDialog.SplitSizeMB == 0)
+						{
+							m_ExportDialog.SplitSizeMB = 1024;
+						}
+					}
+					ImGui::EndCombo();
+				}
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Split exported assets across multiple .pack files (%s.pack, %s_1.pack, etc.).",
+									  m_ExportDialog.PackName.c_str(), m_ExportDialog.PackName.c_str());
+				}
+
+				// Show custom input only when "Custom Size..." is selected
+				if (m_ExportDialog.SplitCustom)
+				{
+					int customMB = static_cast<int>(m_ExportDialog.SplitSizeMB);
+					if (ImGui::InputInt("Chunk Size (MB)", &customMB))
+					{
+						m_ExportDialog.SplitSizeMB = static_cast<uint32_t>(std::max(1, customMB));
+					}
+					if (ImGui::IsItemHovered())
+					{
+						ImGui::SetTooltip("Maximum uncompressed size per chunk in MB.\nActual .pack file will be "
+										  "smaller after compression.");
+					}
+				}
+			}
+
+			ImGui::Spacing();
+			ImGui::Checkbox("Force repack", &m_ExportDialog.ForceRepack);
+			if (ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip("Rebuild resources.pack even when it is already up to date.\nBy default the pack is "
+								  "reused if no source file changed.");
+			}
+			ImGui::PopStyleVar();
+
+			ImGui::Spacing();
+			ImGui::Separator();
+			ImGui::Spacing();
+
+			ImGui::TextDisabled("Output folder");
+			if (ImGui::Button("Browse Output Folder...", ImVec2(-1, 0)))
+			{
+				auto outDir = Dialogs::PickFolder();
+				if (outDir)
+				{
+					m_ExportDialog.OutputDir = outDir->string();
+
+					// Save export settings to project config
+					auto project = Project::GetActive();
+					if (project)
+					{
+						project->GetConfig().Export.Mode = m_ExportDialog.SelectedMode;
+						project->GetConfig().Export.ZipThreshold = m_ExportDialog.ZipThreshold;
+						project->GetConfig().Export.DataVersion = m_ExportDialog.DataVersion;
+						project->GetConfig().Export.SplitSizeMB = m_ExportDialog.SplitSizeMB;
+						project->GetConfig().Export.PackName = m_ExportDialog.PackName;
+					}
+
+					m_ExportDialog.Open = false;
+
+					// Start the export
+					{
+						std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+						m_ExportState.IsExporting = true;
+						m_ExportState.PackedFiles = 0;
+						m_ExportState.TotalFiles = 0;
+						m_ExportState.CurrentFile.clear();
+					}
+					m_ExportState.CancelRequested.store(false, std::memory_order_relaxed);
+
+					auto* threadPool = ServiceLocator::TryGet<ThreadPool>();
+					if (!threadPool)
+					{
+						CH_CORE_ERROR("EditorMenu: ThreadPool not available, cannot export");
+						std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+						m_ExportState.IsExporting = false;
+					}
+					else
+					{
+						std::string outDirPath = m_ExportDialog.OutputDir;
+						bool forceRepack = m_ExportDialog.ForceRepack;
+						threadPool->QueueTask([outDirPath, forceRepack, this]() {
+							ExportProgressCallback progressCb = [this](uint64_t packed, uint64_t total,
+																	   const std::string& file) {
+								std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+								m_ExportState.PackedFiles = packed;
+								m_ExportState.TotalFiles = total;
+								m_ExportState.CurrentFile = file;
+							};
+							auto result = ProjectExporter::ExportTo(outDirPath, progressCb,
+																	&m_ExportState.CancelRequested, forceRepack);
+							std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+							m_ExportState.Success = result.Success;
+							m_ExportState.Message = result.Cancelled  ? "Export cancelled."
+													: !result.Success ? ("Export failed: " + result.Error)
+													: result.PackSkipped
+														? "Export complete! (pack reused — no asset changes)"
+														: "Export complete!";
+							m_ExportState.OutDir = result.Cancelled ? "" : result.OutDir.string();
+							m_ExportState.Open = true;
+							m_ExportState.IsExporting = false;
+						});
+					}
+				}
+			}
+
+			ImGui::End();
+		}
+	}
+
+	void EditorMenu::DrawExportProgressOverlay()
+	{
+		bool showProgress = false;
+		uint64_t packed = 0, total = 0;
+		std::string currentFile;
+		{
+			std::lock_guard<std::mutex> lock(m_ExportState.Mutex);
+			showProgress = m_ExportState.IsExporting;
+			packed = m_ExportState.PackedFiles;
+			total = m_ExportState.TotalFiles;
+			currentFile = m_ExportState.CurrentFile;
+		}
+
+		if (!showProgress)
+		{
+			return;
+		}
+
+		// Position: bottom-right corner with a small margin.
+		ImGuiViewport* vp = ImGui::GetMainViewport();
+		const float margin = 16.0f;
+		const float windowW = 400.0f;
+		ImVec2 winPos =
+			ImVec2(vp->WorkPos.x + vp->WorkSize.x - windowW - margin, vp->WorkPos.y + vp->WorkSize.y - margin);
+		ImGui::SetNextWindowPos(winPos, ImGuiCond_Always, ImVec2(0.0f, 1.0f));
+		ImGui::SetNextWindowSize(ImVec2(windowW, 0.0f), ImGuiCond_Always);
+		ImGui::SetNextWindowBgAlpha(0.92f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 8.0f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(14.0f, 12.0f));
+
+		if (ImGui::Begin("##ExportProgress", nullptr,
+						 ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
+							 ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysAutoResize))
+		{
+			// ── Title
+			ImGui::TextColored(ImVec4(0.55f, 0.85f, 1.0f, 1.0f), ICON_FA_FILE_EXPORT "  Exporting Project");
+			ImGui::Spacing();
+
+			// ── File counter
+			if (total > 0)
+			{
+				ImGui::Text("Packed %llu of %llu files", (unsigned long long)packed, (unsigned long long)total);
+			}
+			else
+			{
+				ImGui::TextDisabled("Preparing...");
+			}
+
+			ImGui::Spacing();
+
+			// ── Progress bar
+			float fraction = (total > 0) ? static_cast<float>(packed) / static_cast<float>(total) : 0.0f;
+			ImGui::PushStyleColor(ImGuiCol_PlotHistogram, ImVec4(0.25f, 0.65f, 1.0f, 1.0f));
+			ImGui::ProgressBar(fraction, ImVec2(-1.0f, 8.0f), "");
+			ImGui::PopStyleColor();
+
+			// ── Current file hint
+			if (!currentFile.empty())
+			{
+				ImGui::Spacing();
+				ImGui::TextDisabled("%s", currentFile.c_str());
+			}
+
+			ImGui::Spacing();
+			ImGui::Separator();
+			ImGui::Spacing();
+
+			// ── Cancel button
+			bool alreadyCancelling = m_ExportState.CancelRequested.load(std::memory_order_relaxed);
+			if (alreadyCancelling)
+			{
+				ImGui::BeginDisabled();
+			}
+
+			if (ImGui::Button(alreadyCancelling ? ICON_FA_BOLT " Cancelling..." : ICON_FA_BOLT " Cancel",
+							  ImVec2(-1.0f, 0.0f)))
+			{
+				m_ExportState.CancelRequested.store(true, std::memory_order_relaxed);
+			}
+
+			if (alreadyCancelling)
+			{
+				ImGui::EndDisabled();
+			}
+		}
+		ImGui::End();
+		ImGui::PopStyleVar(2);
+	}
+
+	void EditorMenu::DrawEditorSettings()
+	{
+
+		if (!m_ShowEditorSettings)
+		{
+			return;
+		}
+
+		ImGui::SetNextWindowSize(ImVec2(700, 480), ImGuiCond_FirstUseEver);
+		auto& config = EditorLayer::Get().GetConfig();
+
+		if (ImGui::Begin(ICON_FA_SLIDERS " Editor Settings", &m_ShowEditorSettings))
+		{
+			static int selectedCategory = 0;
+			const char* categories[] = {ICON_FA_PALETTE " Appearance",	  ICON_FA_CAMERA " Camera",
+										ICON_FA_VIDEO " Viewport",		  ICON_FA_IMAGE " Content Browser",
+										ICON_FA_FLOPPY_DISK " Auto-Save", ICON_FA_ROCKET " Startup",
+										ICON_FA_GEAR " General"};
+
+			float buttonRowHeight = ImGui::GetFrameHeightWithSpacing();
+
+			// --- Left sidebar ---
+			ImGui::BeginChild("EditorSettingsSidebar", ImVec2(180, -buttonRowHeight), ImGuiChildFlags_NavFlattened);
+			for (int i = 0; i < IM_ARRAYSIZE(categories); i++)
+			{
+				if (ImGui::Selectable(categories[i], selectedCategory == i))
+				{
+					selectedCategory = i;
+				}
+			}
+			ImGui::EndChild();
+
+			ImGui::SameLine();
+
+			// --- Right content ---
+			ImGui::BeginChild("EditorSettingsContent", ImVec2(0, -buttonRowHeight), ImGuiChildFlags_NavFlattened);
+			ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4, 4));
+
+			if (selectedCategory == 0) // Appearance
+			{
+				ImGui::TextDisabled("Font");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				const auto& fontChoices = GetEditorFontChoices();
+				int currentFont = -1;
+				for (int i = 0; i < (int)fontChoices.size(); i++)
+				{
+					if (config.FontPath == fontChoices[i].Path)
+					{
+						currentFont = i;
+						break;
+					}
+				}
+				const char* preview = currentFont >= 0 ? fontChoices[currentFont].Label.c_str() : "Custom";
+				if (ImGui::BeginCombo("Editor Font", preview))
+				{
+					for (int i = 0; i < (int)fontChoices.size(); i++)
+					{
+						bool sel = (currentFont == i);
+						if (ImGui::Selectable(fontChoices[i].Label.c_str(), sel))
+						{
+							config.FontPath = fontChoices[i].Path;
+						}
+						if (sel)
+						{
+							ImGui::SetItemDefaultFocus();
+						}
+					}
+					ImGui::EndCombo();
+				}
+
+				ImGui::DragFloat("Font Size", &config.FontSize, 0.25f, 8.0f, 48.0f, "%.0f px");
+
+				ImGui::Spacing();
+				ImGui::Spacing();
+				ImGui::TextDisabled("Viewport Icons");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::DragFloat("Icon Scale", &config.IconSizeScale, 0.005f, 0.01f, 1.0f, "%.3f");
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("How fast gizmo icons grow with camera distance.");
+				}
+				ImGui::DragFloat("Icon Min Size", &config.IconSizeMin, 0.05f, 0.1f, config.IconSizeMax, "%.2f");
+				ImGui::DragFloat("Icon Max Size", &config.IconSizeMax, 0.05f, config.IconSizeMin, 40.0f, "%.2f");
+			}
+			else if (selectedCategory == 1) // Camera
+			{
+				ImGui::TextDisabled("Editor Camera (Edit Mode)");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::SliderFloat("Move Speed", &config.CameraMoveSpeed, 0.1f, 100.0f, "%.1f");
+				ImGui::SliderFloat("Boost Multiplier", &config.CameraBoostMultiplier, 1.0f, 10.0f, "%.1f");
+				ImGui::SliderFloat("Rotation Speed", &config.CameraRotationSpeed, 0.1f, 5.0f, "%.1f");
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("How fast the camera rotates when holding right-click.");
+				}
+				ImGui::SliderFloat("Zoom Speed", &config.CameraZoomSpeedMultiplier, 0.1f, 5.0f, "%.1f");
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Multiplier for mouse wheel zoom speed.");
+				}
+				ImGui::DragFloat("FOV", &config.CameraFovDegrees, 0.5f, 20.0f, 120.0f, "%.1f deg");
+				ImGui::DragFloat("Near Clip", &config.CameraNearClip, 0.01f, 0.001f, 10.0f, "%.3f");
+				ImGui::DragFloat("Far Clip", &config.CameraFarClip, 100.0f, 100.0f, 100000.0f, "%.0f");
+				ImGui::Checkbox("Disable Camera Zoom", &config.DisableCameraZoom);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Prevent the mouse wheel from zooming the editor camera.");
+				}
+			}
+			else if (selectedCategory == 2) // Viewport
+			{
+				ImGui::TextDisabled("Viewport");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::Checkbox("Show Editor Icons", &config.ShowEditorIcons);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Show camera, light, and spawn zone icons in the viewport.");
+				}
+				ImGui::DragFloat("Gizmo Scale", &config.GizmoScale, 0.05f, 0.5f, 3.0f, "%.2f");
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Scale of the transform gizmo in the viewport.");
+				}
+			}
+			else if (selectedCategory == 3) // Content Browser
+			{
+				ImGui::TextDisabled("Content Browser");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::DragFloat("Thumbnail Size", &config.DefaultThumbnailSize, 4.0f, 32.0f, 256.0f, "%.0f px");
+				const char* sortNames[] = {"Name", "Date", "Size"};
+				ImGui::Combo("Sort Order", &config.DefaultSortOrder, sortNames, 3);
+				ImGui::Checkbox("Show File Extensions", &config.ShowFileExtensions);
+			}
+			else if (selectedCategory == 4) // Auto-Save
+			{
+				ImGui::TextDisabled("Auto-Save");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::Checkbox("Enable Auto-Save", &config.AutoSaveEnabled);
+				ImGui::DragFloat("Interval (s)", &config.AutoSaveInterval, 1.0f, 10.0f, 3600.0f, "%.0f");
+			}
+			else if (selectedCategory == 5) // Startup
+			{
+				ImGui::TextDisabled("Startup");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::Checkbox("Load Last Project on Startup", &config.LoadLastProjectOnStartup);
+				ImGui::Spacing();
+				ImGui::TextDisabled("Last project:");
+				ImGui::SameLine();
+				ImGui::TextWrapped("%s", config.LastProjectPath.empty() ? "(none)" : config.LastProjectPath.c_str());
+			}
+			else if (selectedCategory == 6) // General
+			{
+				ImGui::TextDisabled("General");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::Checkbox("Confirm on Scene Close", &config.ConfirmOnSceneClose);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Show a warning when closing/switching a scene with unsaved changes.");
+				}
+				ImGui::DragInt("Max Recent Projects", &config.MaxRecentProjects, 1, 1, 50);
+			}
+
+			ImGui::PopStyleVar();
+			ImGui::EndChild();
+
+			if (ImGui::Button(ICON_FA_FLOPPY_DISK " Save Settings", ImVec2(-1, 0)))
+			{
+				EditorLayer::Get().SaveConfig();
+				EditorGUI::ApplyTheme();
+				EditorLayer::Get().RequestEditorFontReload();
+			}
+			if (ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip("Save and apply all settings.");
+			}
+		}
+		ImGui::End();
+	}
+
+} // namespace Chained
diff --git a/editor/editor_menu.h b/editor/editor_menu.h
new file mode 100644
index 000000000..70c959a02
--- /dev/null
+++ b/editor/editor_menu.h
@@ -0,0 +1,90 @@
+#ifndef CH_EDITOR_MENU_H
+#define CH_EDITOR_MENU_H
+
+#include "engine/project/project.h"
+#include <string>
+#include <mutex>
+#include <atomic>
+#include <cstdint>
+
+namespace Chained
+{
+
+	class EditorPanels;
+	class EditorLayer;
+
+	/// @brief Handles the top-level editor menu bar and associated overlays/settings.
+	class EditorMenu
+	{
+	public:
+		EditorMenu() = default;
+		~EditorMenu() = default;
+
+		/// @brief Draws the main menu bar.
+		/// @param panels The editor panels to potentially toggle via the menu.
+		void DrawMenuBar(EditorPanels& panels);
+
+		/// @brief Draws the standalone Editor Settings window (if active).
+		void DrawEditorSettings();
+
+		/// @brief Draws the export progress overlay (if an export is running).
+		void DrawExportProgressOverlay();
+
+		/// @brief Draws the export settings dialog.
+		void DrawExportDialog();
+
+	private:
+		void DrawFileMenu();
+		void DrawViewMenu(EditorPanels& panels);
+		void DrawProjectMenu();
+		void DrawEditorMenu();
+		void DrawPlaybackControls();
+		void DrawExportResultPopup();
+		void DrawUnsavedChangesPopup();
+
+		// State for the Export Project feature
+		struct ExportState
+		{
+			bool Open = false;
+			bool Success = false;
+			std::string Message;
+			std::string OutDir;
+			std::mutex Mutex;
+			bool IsExporting = false;
+
+			// Progress tracking (updated from background thread under Mutex)
+			uint64_t PackedFiles = 0;
+			uint64_t TotalFiles = 0;
+			std::string CurrentFile;
+
+			// Cancel flag (written by GUI, read by worker thread)
+			std::atomic<bool> CancelRequested{false};
+		};
+
+		// Export dialog state
+		struct ExportDialogState
+		{
+			bool Open = false;
+			PackMode SelectedMode = PackMode::Balanced;
+			float ZipThreshold = 0.05f;
+			uint32_t DataVersion = 0;
+			uint32_t SplitSizeMB = 0;
+			bool SplitCustom = false; // true when "Custom Size..." is explicitly selected
+			std::string PackName = "resources";
+			bool ForceRepack = false;
+			std::string OutputDir;
+		};
+
+		ExportState m_ExportState;
+		ExportDialogState m_ExportDialog;
+		bool m_ShowEditorSettings = false;
+
+		// Export result popup state
+		bool m_ExportResultSuccess = false;
+		std::string m_ExportResultMessage;
+		std::string m_ExportResultOutDir;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_MENU_H
diff --git a/editor/editor_panels.cpp b/editor/editor_panels.cpp
deleted file mode 100644
index 01adf5f26..000000000
--- a/editor/editor_panels.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "editor_panels.h"
-#include "panels/console_panel.h"
-#include "panels/content_browser_panel.h"
-#include "panels/world_panel.h"
-#include "panels/effects_panel.h"
-#include "panels/material_panel.h"
-#include "panels/inspector_panel.h"
-#include "panels/panel.h"
-#include "panels/profiler_panel.h"
-#include "panels/project_browser_panel.h"
-#include "panels/project_settings_panel.h"
-#include "panels/scene_hierarchy_panel.h"
-#include "panels/viewport_panel.h"
-
-namespace CHEngine
-{
-
-void EditorPanels::Init()
-{
-    Register<ViewportPanel>();
-    Register<SceneHierarchyPanel>();
-    Register<InspectorPanel>();
-    Register<ContentBrowserPanel>();
-    Register<ConsolePanel>();
-    Register<WorldPanel>();
-    Register<EffectsPanel>();
-    Register<MaterialPanel>();
-    Register<ProfilerPanel>();
-    Register<ProjectBrowserPanel>();
-    Register<ProjectSettingsPanel>();
-}
-
-void EditorPanels::OnUpdate(Timestep ts)
-{
-    for (auto& panel : m_Panels)
-    {
-        panel->OnUpdate(ts);
-    }
-}
-
-void EditorPanels::OnImGuiRender(bool readOnly)
-{
-    for (auto& panel : m_Panels)
-    {
-        if (panel->GetName() == "Project Browser")
-        {
-            continue;
-        }
-
-        panel->OnImGuiRender(readOnly);
-    }
-}
-
-void EditorPanels::OnEvent(Event& e)
-{
-    for (auto& panel : m_Panels)
-    {
-        panel->OnEvent(e);
-    }
-}
-
-void EditorPanels::SetContext(const std::shared_ptr<Scene>& context)
-{
-    for (auto& panel : m_Panels)
-    {
-        panel->SetContext(context);
-    }
-}
-
-} // namespace CHEngine
diff --git a/editor/editor_panels.h b/editor/editor_panels.h
deleted file mode 100644
index 426c48f92..000000000
--- a/editor/editor_panels.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef CH_EDITOR_PANELS_H
-#define CH_EDITOR_PANELS_H
-
-#include "engine/core/timestep.h"
-#include "panels/panel.h"
-#include <memory>
-#include <typeindex>
-#include <vector>
-
-namespace CHEngine
-{
-
-class EditorPanels
-{
-public:
-    EditorPanels() = default;
-    ~EditorPanels() = default;
-
-public:
-    void Init();
-
-public:
-    template <typename T, typename... Args> std::shared_ptr<T> Register(Args&&... args)
-    {
-        auto panel = std::make_shared<T>(std::forward<Args>(args)...);
-        m_Panels.push_back(panel);
-        return panel;
-    }
-
-    template <typename T> std::shared_ptr<T> Get()
-    {
-        for (auto& panel : m_Panels)
-        {
-            if (auto p = std::dynamic_pointer_cast<T>(panel))
-            {
-                return p;
-            }
-        }
-        return nullptr;
-    }
-
-    std::shared_ptr<Panel> Get(const std::string& name)
-    {
-        for (auto& panel : m_Panels)
-        {
-            if (panel->GetName() == name)
-            {
-                return panel;
-            }
-        }
-        return nullptr;
-    }
-
-    template <typename F> void ForEach(F&& func)
-    {
-        for (auto& panel : m_Panels)
-        {
-            func(panel);
-        }
-    }
-
-public:
-    void OnUpdate(Timestep ts);
-    void OnImGuiRender(bool readOnly);
-    void OnEvent(Event& e);
-    void SetContext(const std::shared_ptr<Scene>& context);
-
-    std::vector<std::shared_ptr<Panel>>& GetPanels()
-    {
-        return m_Panels;
-    }
-
-private:
-    std::vector<std::shared_ptr<Panel>> m_Panels;
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_PANELS_H
diff --git a/editor/editor_project_manager.cpp b/editor/editor_project_manager.cpp
deleted file mode 100644
index 380a8a247..000000000
--- a/editor/editor_project_manager.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "editor_project_manager.h"
-#include "editor_layer.h"
-#include "engine/scene/project.h"
-#include "engine/scene/project_serializer.h"
-#include "engine/graphics/pipeline/renderer.h"
-#include "engine/graphics/pipeline/ui_renderer.h"
-#include "engine/core/application.h"
-#include "engine/scene/scene_events.h"
-#include "engine/platform/utils/dialogs.h"
-#include "scripting/scriptengine.h"
-#include <algorithm>
-
-namespace CHEngine
-{
-
-EditorProjectManager::EditorProjectManager()
-{
-}
-
-void EditorProjectManager::NewProject()
-{
-    // Simple default: close active project to show Project Browser
-    Project::SetActive(nullptr);
-}
-
-void EditorProjectManager::NewProject(const std::string& name, const std::string& path)
-{
-    Project::New();
-    auto project = Project::GetActive();
-    project->GetConfig().Name = name;
-    project->GetConfig().ProjectDirectory = path;
-
-    ProjectSerializer serializer(project);
-    serializer.Serialize((std::filesystem::path(path) / (name + ".chproject")).string());
-
-    // Load engine shaders and resources for the dynamic newly created project
-    Renderer::LoadEngineResources();
-    UIRenderer::Get().LoadProjectFonts();
-}
-
-void EditorProjectManager::OpenProject()
-{
-    std::vector<FileDialogFilter> filters = {{"Chained Project", "chproject"}};
-    auto result = Dialogs::OpenFile(filters);
-    if (result)
-    {
-        OpenProject(*result);
-    }
-}
-
-void EditorProjectManager::OpenProject(const std::filesystem::path& path)
-{
-    if (Project::Load(path))
-    {
-        m_LastProjectPath = path.string();
-
-        // Load engine shaders and resources
-        Renderer::LoadEngineResources();
-        UIRenderer::Get().LoadProjectFonts();
-
-        ProjectOpenedEvent e(path.string());
-        Application::Get().OnEvent(e);
-    }
-}
-
-void EditorProjectManager::SaveProject()
-{
-    auto project = Project::GetActive();
-    if (!project) return;
-    
-    ProjectSerializer serializer(project);
-    serializer.Serialize((project->GetConfig().ProjectDirectory / (project->GetConfig().Name + ".chproject")).string());
-}
-
-bool EditorProjectManager::OnProjectOpened(ProjectOpenedEvent& e)
-{
-    auto project = Project::GetActive();
-    if (project)
-    {
-        m_LastProjectPath = e.GetPath();
-
-        // Track in recent projects list (move to front, cap at 10)
-        auto& config = EditorLayer::Get().GetConfig();
-        auto& recents = config.RecentProjects;
-        recents.erase(std::remove(recents.begin(), recents.end(), m_LastProjectPath), recents.end());
-        recents.insert(recents.begin(), m_LastProjectPath);
-        if (recents.size() > 10)
-            recents.resize(10);
-
-        EditorLayer::Get().SaveConfig();
-
-        // Auto-load script assembly if configured
-        auto& scripting = project->GetConfig().Scripting;
-        if (scripting.AutoLoad && !scripting.ModuleName.empty())
-        {
-            std::string dllName = scripting.ModuleName;
-            if (dllName.find(".dll") == std::string::npos)
-                dllName += ".dll";
-
-            std::filesystem::path dllPath = scripting.ModuleDirectory / dllName;
-            if (dllPath.is_relative())
-                dllPath = project->GetConfig().ProjectDirectory / dllPath;
-
-            if (std::filesystem::exists(dllPath))
-            {
-                ScriptEngine::Get().LoadAppAssembly(dllPath.string());
-                CH_CORE_INFO("EditorProjectManager: Auto-loaded script assembly '{}'.", dllPath.string());
-            }
-            else
-            {
-                CH_CORE_WARN("EditorProjectManager: Script assembly not found at '{}'. Build the C# project first.",
-                             dllPath.string());
-            }
-        }
-
-        // Auto-load scene if available
-        std::filesystem::path sceneToLoad;
-
-        // 1. Try loading ActiveScene
-        if (!project->GetConfig().ActiveScenePath.empty())
-        {
-            sceneToLoad = project->GetConfig().ProjectDirectory / project->GetConfig().ActiveScenePath;
-        }
-
-        // 2. Fallback to StartScene
-        if (sceneToLoad.empty() || !std::filesystem::exists(sceneToLoad))
-        {
-            if (!project->GetConfig().StartScene.empty())
-            {
-                sceneToLoad = project->GetConfig().ProjectDirectory / project->GetConfig().AssetDirectory /
-                              project->GetConfig().StartScene;
-            }
-        }
-
-        // 3. Load the scene if found
-        if (!sceneToLoad.empty() && std::filesystem::exists(sceneToLoad))
-        {
-            CH_CORE_INFO("EditorProjectManager: Auto-loading scene: {}", sceneToLoad.string());
-            EditorLayer::Get().GetSceneManager().OpenScene(sceneToLoad);
-        }
-        return true;
-    }
-    return false;
-}
-
-} // namespace CHEngine
diff --git a/editor/editor_project_manager.h b/editor/editor_project_manager.h
deleted file mode 100644
index d2c45e116..000000000
--- a/editor/editor_project_manager.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CH_EDITOR_PROJECT_MANAGER_H
-#define CH_EDITOR_PROJECT_MANAGER_H
-
-#include "engine/scene/scene.h"
-#include "engine/scene/scene_events.h"
-#include "editor_context.h"
-#include "engine/core/base.h"
-#include "editor_events.h"
-#include <filesystem>
-#include <string>
-
-namespace CHEngine
-{
-
-class EditorProjectManager
-{
-public:
-    EditorProjectManager();
-    ~EditorProjectManager() = default;
-
-    void NewProject();
-    void NewProject(const std::string& name, const std::string& path);
-    void OpenProject();
-    void OpenProject(const std::filesystem::path& path);
-    void SaveProject();
-
-    bool OnProjectOpened(ProjectOpenedEvent& e);
-
-    const std::string& GetLastProjectPath() const { return m_LastProjectPath; }
-    void SetLastProjectPath(const std::string& path) { m_LastProjectPath = path; }
-
-private:
-    std::string m_LastProjectPath;
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_PROJECT_MANAGER_H
diff --git a/editor/editor_scene_manager.cpp b/editor/editor_scene_manager.cpp
deleted file mode 100644
index 0b4a8de04..000000000
--- a/editor/editor_scene_manager.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-#include "editor_scene_manager.h"
-#include "editor_layer.h"
-#include "engine/scene/project.h"
-#include "engine/scene/scene_serializer.h"
-#include "engine/core/thread_pool.h"
-#include "engine/core/application.h"
-#include "engine/core/input.h"
-#include "engine/core/key_codes.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/platform/utils/dialogs.h"
-#include "scripting/scene_scripting.h"
-#include "engine/scene/scene_events.h"
-
-namespace CHEngine
-{
-
-EditorSceneManager::EditorSceneManager()
-{
-}
-
-void EditorSceneManager::NewScene()
-{
-    SetScene(Scene::CreateDefault());
-}
-
-void EditorSceneManager::OpenScene()
-{
-    std::vector<FileDialogFilter> filters = {{"Chained Scene", "chscene"}};
-    auto result = Dialogs::OpenFile(filters);
-    if (result)
-    {
-        OpenScene(*result);
-    }
-}
-
-void EditorSceneManager::OpenScene(const std::filesystem::path& path)
-{
-    m_IsPlayModeSceneLoad = (EditorContext::GetSceneState() == SceneState::Play);
-    StartSceneOpenTransition(path);
-}
-
-void EditorSceneManager::SaveScene()
-{
-    auto scene = GetActiveScene();
-    if (!scene) return;
-
-    if (scene->GetSettings().ScenePath.empty())
-    {
-        SaveSceneAs();
-        return;
-    }
-
-    SceneSerializer serializer(scene.get());
-    serializer.Serialize(scene->GetSettings().ScenePath);
-    CH_INFO("Scene saved to {0}", scene->GetSettings().ScenePath);
-}
-
-void EditorSceneManager::SaveSceneAs()
-{
-    std::vector<FileDialogFilter> filters = {{"Chained Scene", "chscene"}};
-    auto result = Dialogs::SaveFile(filters);
-    if (result)
-    {
-        auto scene = GetActiveScene();
-        if (!scene) return;
-
-        scene->GetSettings().ScenePath = result->string();
-        SceneSerializer serializer(scene.get());
-        serializer.Serialize(result->string());
-    }
-}
-
-void EditorSceneManager::AutoSave(float interval, float ts)
-{
-    auto scene = GetActiveScene();
-    if (!scene || scene->GetSettings().ScenePath.empty())
-    {
-        return;
-    }
-
-    m_AutoSaveTimer += ts;
-    if (m_AutoSaveTimer < interval)
-        return;
-
-    m_AutoSaveTimer = 0.0f;
-    SceneSerializer serializer(scene.get());
-    serializer.Serialize(scene->GetSettings().ScenePath);
-    CH_TRACE("Scene auto-saved to {0}", scene->GetSettings().ScenePath);
-}
-
-void EditorSceneManager::SetScene(std::shared_ptr<Scene> scene)
-{
-    CancelPlayModeTransition();
-    CancelSceneOpenTransition();
-    m_EditorScene = scene;
-    EditorContext::SetSelectedEntity({});
-}
-
-void EditorSceneManager::SetSceneState(SceneState state)
-{
-    if (state == SceneState::Play)
-    {
-        if (m_PlayModeStartRequested || m_IsPlayModeLoading || m_IsSceneOpenLoading ||
-            EditorContext::GetSceneState() == SceneState::Play)
-        {
-            return;
-        }
-
-        if (!m_EditorScene)
-        {
-            CH_CORE_WARN("EditorSceneManager::SetSceneState - No editor scene available for play mode.");
-            return;
-        }
-
-        m_PlayModeStartRequested = true;
-        CH_CORE_INFO("Editor: Play mode requested.");
-    }
-    else
-    {
-        if (m_PlayModeStartRequested || m_IsPlayModeLoading)
-        {
-            CancelPlayModeTransition();
-        }
-
-        if (m_IsSceneOpenLoading)
-        {
-            CancelSceneOpenTransition();
-        }
-
-        if (EditorContext::GetSceneState() == SceneState::Edit)
-        {
-            return;
-        }
-
-        CH_CORE_INFO("Editor: Play Mode Stopped");
-        if (m_RuntimeScene)
-        {
-            CH_CORE_INFO("Editor: Cleaning up runtime scene...");
-            SceneScripting::OnRuntimeStop(m_RuntimeScene.get());
-            SceneScripting::Stop(m_RuntimeScene.get());
-            m_RuntimeScene->OnRuntimeStop();
-            m_RuntimeScene.reset();
-        }
-
-        EditorContext::SetSceneState(SceneState::Edit);
-    }
-}
-
-std::shared_ptr<Scene> EditorSceneManager::GetActiveScene() const
-{
-    return (EditorContext::GetSceneState() == SceneState::Play) ? m_RuntimeScene : m_EditorScene;
-}
-
-void EditorSceneManager::OnUpdate(Timestep ts)
-{
-    if (m_PlayModeStartRequested)
-    {
-        StartPlayModeTransition();
-    }
-
-    if (m_IsPlayModeLoading)
-    {
-        UpdatePlayModeTransition();
-    }
-
-    if (m_IsSceneOpenLoading)
-    {
-        UpdateSceneOpenTransition();
-    }
-
-    EditorContext::GetState().IsLoading = IsLoading();
-    EditorContext::GetState().LoadingStatus = m_LoadingStatus;
-}
-
-void EditorSceneManager::OnViewportResize(uint32_t width, uint32_t height)
-{
-    if (m_EditorScene)
-    {
-        m_EditorScene->OnViewportResize(width, height);
-    }
-
-    if (m_RuntimeScene)
-    {
-        m_RuntimeScene->OnViewportResize(width, height);
-    }
-}
-
-void EditorSceneManager::StartSceneOpenTransition(const std::filesystem::path& path)
-{
-    if (path.empty()) return;
-    if (m_IsSceneOpenLoading) return;
-
-    CancelPlayModeTransition();
-
-    std::filesystem::path scenePath = path;
-    if (scenePath.is_relative() && Project::GetActive())
-    {
-        scenePath = Project::GetAssetPath(scenePath);
-    }
-
-    m_PendingSceneOpenPath = scenePath;
-    m_SceneOpenSceneReady = false;
-    m_LoadingStatus = "Loading scene...";
-
-    try
-    {
-        m_SceneOpenFuture = ThreadPool::Get().Enqueue([scenePath]() {
-            auto newScene = std::make_shared<Scene>();
-            SceneSerializer serializer(newScene.get());
-            if (!serializer.Deserialize(scenePath.string()))
-            {
-                return std::shared_ptr<Scene>{};
-            }
-            return newScene;
-        });
-
-        m_IsSceneOpenLoading = true;
-        CH_CORE_INFO("Editor: Loading scene '{}' on a worker thread.", scenePath.string());
-    } catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("Editor: Failed to start scene load: {}", e.what());
-        CancelSceneOpenTransition();
-    }
-}
-
-void EditorSceneManager::UpdateSceneOpenTransition()
-{
-    if (!m_IsSceneOpenLoading) return;
-
-    if (!m_SceneOpenSceneReady)
-    {
-        if (m_SceneOpenFuture.valid() &&
-            m_SceneOpenFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
-        {
-            try
-            {
-                if (m_IsPlayModeSceneLoad)
-                {
-                    if (m_RuntimeScene)
-                    {
-                        CH_CORE_INFO("Editor: Stopping current runtime scene to load '{}'.", m_PendingSceneOpenPath.string());
-                        SceneScripting::OnRuntimeStop(m_RuntimeScene.get());
-                        SceneScripting::Stop(m_RuntimeScene.get());
-                        m_RuntimeScene->OnRuntimeStop();
-                    }
-
-                    m_RuntimeScene = m_SceneOpenFuture.get();
-                    if (!m_RuntimeScene)
-                    {
-                        CH_CORE_ERROR("Editor: Runtime Scene load returned null for '{}'.", m_PendingSceneOpenPath.string());
-                        CancelSceneOpenTransition();
-                        return;
-                    }
-                }
-                else
-                {
-                    m_EditorScene = m_SceneOpenFuture.get();
-                    if (!m_EditorScene)
-                    {
-                        CH_CORE_ERROR("Editor: Scene load returned null for '{}'.", m_PendingSceneOpenPath.string());
-                        CancelSceneOpenTransition();
-                        return;
-                    }
-                }
-                m_SceneOpenSceneReady = true;
-            } catch (const std::exception& e)
-            {
-                CH_CORE_ERROR("Editor: Scene load failed with exception: {}", e.what());
-                CancelSceneOpenTransition();
-                return;
-            } catch (...)
-            {
-                CH_CORE_ERROR("Editor: Scene load failed with unknown exception.");
-                CancelSceneOpenTransition();
-                return;
-            }
-        }
-    }
-
-    if (m_SceneOpenSceneReady && (m_EditorScene || m_RuntimeScene) && !AssetManager::Get().HasBackgroundWork())
-    {
-        auto targetScene = m_IsPlayModeSceneLoad ? m_RuntimeScene : m_EditorScene;
-
-        if (Project::GetActive() && Project::GetActive()->GetEnvironment())
-        {
-            // Only override if the loaded scene has no environment defined
-            bool hasEnvironment = targetScene->GetSettings().Environment && 
-                                 (!targetScene->GetSettings().Environment->GetPath().empty() ||
-                                  (!targetScene->GetSettings().Environment->GetSettings().Skybox.TexturePath.empty()));
-            
-            if (!hasEnvironment)
-            {
-                CH_CORE_INFO("Editor: Applying project environment to scene '{}'.", targetScene->GetSettings().ScenePath);
-                targetScene->GetSettings().Environment = Project::GetActive()->GetEnvironment();
-            }
-        }
-
-        targetScene->GetSettings().ScenePath = m_PendingSceneOpenPath.string();
-        
-        if (m_IsPlayModeSceneLoad)
-        {
-            CH_CORE_INFO("Editor: Activating new runtime scene '{}'.", m_PendingSceneOpenPath.string());
-            SceneScripting::OnRuntimeStart(m_RuntimeScene.get());
-            m_RuntimeScene->OnRuntimeStart();
-        }
-        else
-        {
-            CH_CORE_INFO("Editor: Activating new editor scene '{}'.", m_PendingSceneOpenPath.string());
-            SceneOpenedEvent e(m_PendingSceneOpenPath.string());
-            EditorLayer::Get().SetLastScenePath(m_PendingSceneOpenPath.string());
-            Application::Get().OnEvent(e);
-        }
-
-        m_IsSceneOpenLoading = false;
-        m_SceneOpenSceneReady = false;
-        m_SceneOpenFuture = {};
-
-        EditorContext::SetSelectedEntity({});
-        
-        m_PendingSceneOpenPath.clear();
-        m_LoadingStatus = "";
-        m_IsPlayModeSceneLoad = false;
-        CH_CORE_INFO("Editor: Scene transition complete.");
-    }
-}
-
-void EditorSceneManager::CancelSceneOpenTransition()
-{
-    m_IsSceneOpenLoading = false;
-    m_SceneOpenSceneReady = false;
-    m_SceneOpenFuture = {};
-    m_PendingSceneOpenPath.clear();
-    m_LoadingStatus = "";
-}
-
-void EditorSceneManager::StartPlayModeTransition()
-{
-    if (!m_PlayModeStartRequested || m_IsPlayModeLoading || !m_EditorScene)
-    {
-        m_PlayModeStartRequested = false;
-        return;
-    }
-
-    m_PlayModeStartRequested = false;
-    m_PlayModeSceneReady = false;
-    m_RuntimeScene.reset();
-    m_LoadingStatus = "Preparing Play Mode...";
-
-    auto editorScene = m_EditorScene;
-    try {
-        m_PlayModeCopyFuture = ThreadPool::Get().Enqueue([editorScene]() { return Scene::Copy(editorScene); });
-        m_IsPlayModeLoading = true;
-        CH_CORE_INFO("Editor: Copying scene for play mode on a worker thread.");
-    } catch (...) {
-        CancelPlayModeTransition();
-    }
-}
-
-void EditorSceneManager::UpdatePlayModeTransition()
-{
-    if (!m_IsPlayModeLoading) return;
-
-    if (!m_PlayModeSceneReady)
-    {
-        if (m_PlayModeCopyFuture.valid() &&
-            m_PlayModeCopyFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
-        {
-            try {
-                m_RuntimeScene = m_PlayModeCopyFuture.get();
-                if (!m_RuntimeScene) {
-                    CancelPlayModeTransition();
-                    return;
-                }
-                m_PlayModeSceneReady = true;
-            } catch (...) {
-                CancelPlayModeTransition();
-                return;
-            }
-        }
-    }
-
-    if (m_PlayModeSceneReady && m_RuntimeScene && !AssetManager::Get().HasBackgroundWork())
-    {
-        EditorContext::SetSceneState(SceneState::Play);
-        SceneScripting::OnRuntimeStart(m_RuntimeScene.get());
-        m_RuntimeScene->OnRuntimeStart();
-
-        m_IsPlayModeLoading = false;
-        m_PlayModeSceneReady = false;
-        m_PlayModeCopyFuture = {};
-        m_LoadingStatus = "";
-        CH_CORE_INFO("Editor: Play Mode Started");
-    }
-}
-
-void EditorSceneManager::CancelPlayModeTransition()
-{
-    m_PlayModeStartRequested = false;
-    m_IsPlayModeLoading = false;
-    m_PlayModeSceneReady = false;
-    m_PlayModeCopyFuture = {};
-    m_RuntimeScene.reset();
-    m_LoadingStatus = "";
-}
-
-bool EditorSceneManager::OnSceneOpened(SceneOpenedEvent& e)
-{
-    // Sync project path
-    auto project = Project::GetActive();
-    if (project && !e.GetPath().empty())
-    {
-        project->SetActiveScenePath(std::filesystem::relative(e.GetPath(), project->GetProjectDirectory()));
-        EditorLayer::Get().GetProjectManager().SaveProject();
-
-        EditorLayer::Get().GetConfig().LastScenePath = e.GetPath();
-        EditorLayer::Get().SaveConfig();
-        return true;
-    }
-    return false;
-}
-
-bool EditorSceneManager::OnKeyPressed(KeyPressedEvent& e)
-{
-    if (e.IsRepeat())
-    {
-        return false;
-    }
-
-    bool ctrl = Input::IsKeyDown(Key::LeftControl) || Input::IsKeyDown(Key::RightControl);
-    bool shift = Input::IsKeyDown(Key::LeftShift) || Input::IsKeyDown(Key::RightShift);
-
-    auto keyCode = e.GetKeyCode();
-
-    if (ctrl)
-    {
-        switch (keyCode)
-        {
-        case Key::N:
-            NewScene();
-            return true;
-        case Key::O:
-            OpenScene();
-            return true;
-        case Key::S:
-            if (shift)
-            {
-                SaveSceneAs();
-            }
-            else
-            {
-                SaveScene();
-            }
-            return true;
-        case Key::Z:
-            EditorLayer::Get().GetCommandHistory().Undo();
-            return true;
-        case Key::Y:
-            EditorLayer::Get().GetCommandHistory().Redo();
-            return true;
-        }
-    }
-
-    if (keyCode == Key::F5)
-    {
-        EditorLayer::Get().LaunchStandalone();
-        return true;
-    }
-
-    return false;
-}
-} // namespace CHEngine
diff --git a/editor/editor_scene_manager.h b/editor/editor_scene_manager.h
deleted file mode 100644
index e972bd919..000000000
--- a/editor/editor_scene_manager.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef CH_EDITOR_SCENE_MANAGER_H
-#define CH_EDITOR_SCENE_MANAGER_H
-
-#include "editor_context.h"
-#include "engine/scene/scene.h"
-#include "engine/scene/scene_events.h"
-#include <filesystem>
-#include <future>
-#include <memory>
-
-namespace CHEngine
-{
-
-class EditorSceneManager
-{
-public:
-    EditorSceneManager();
-    ~EditorSceneManager() = default;
-
-    void NewScene();
-    void OpenScene();
-    void OpenScene(const std::filesystem::path& path);
-    void SaveScene();
-    void SaveSceneAs();
-    void AutoSave(float interval, float ts);
-
-    void SetScene(std::shared_ptr<Scene> scene);
-    void SetSceneState(SceneState state);
-    std::shared_ptr<Scene> GetActiveScene() const;
-
-    void OnUpdate(Timestep ts);
-    void OnViewportResize(uint32_t width, uint32_t height);
-
-    bool OnSceneOpened(SceneOpenedEvent& e);
-    bool OnKeyPressed(KeyPressedEvent& e);
-
-    bool IsLoading() const
-    {
-        return m_IsPlayModeLoading || m_IsSceneOpenLoading;
-    }
-    const std::string& GetLoadingStatus() const
-    {
-        return m_LoadingStatus;
-    }
-
-private:
-    void StartSceneOpenTransition(const std::filesystem::path& path);
-    void UpdateSceneOpenTransition();
-    void CancelSceneOpenTransition();
-    void StartPlayModeTransition();
-    void UpdatePlayModeTransition();
-    void CancelPlayModeTransition();
-
-private:
-    std::shared_ptr<Scene> m_EditorScene;
-    std::shared_ptr<Scene> m_RuntimeScene;
-
-    // Async state
-    std::future<std::shared_ptr<Scene>> m_PlayModeCopyFuture;
-    std::future<std::shared_ptr<Scene>> m_SceneOpenFuture;
-    std::filesystem::path m_PendingSceneOpenPath;
-
-    bool m_IsPlayModeLoading = false;
-    bool m_IsSceneOpenLoading = false;
-    bool m_PlayModeSceneReady = false;
-    bool m_SceneOpenSceneReady = false;
-    bool m_PlayModeStartRequested = false;
-    bool m_IsPlayModeSceneLoad = false;
-
-    std::string m_LoadingStatus = "";
-
-    float m_AutoSaveTimer = 0.0f;
-    float m_LastAutoSaveTime = 0.0f;
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_SCENE_MANAGER_H
diff --git a/editor/events.cpp b/editor/events.cpp
new file mode 100644
index 000000000..dc917f9dc
--- /dev/null
+++ b/editor/events.cpp
@@ -0,0 +1,20 @@
+#include "events.h"
+#include "engine/app/application.h"
+#include "engine/scene/scene_events.h"
+
+namespace Chained
+{
+
+	void SelectEntity(Entity entity, Scene* scene)
+	{
+		EntitySelectedEvent e((entt::entity)entity, scene);
+		Application::Get().OnEvent(e);
+	}
+
+	void DeselectEntity(Scene* scene)
+	{
+		EntitySelectedEvent e(entt::null, scene);
+		Application::Get().OnEvent(e);
+	}
+
+} // namespace Chained
diff --git a/editor/events.h b/editor/events.h
new file mode 100644
index 000000000..8fce080d1
--- /dev/null
+++ b/editor/events.h
@@ -0,0 +1,55 @@
+#ifndef CH_EDITOR_EVENTS_H
+#define CH_EDITOR_EVENTS_H
+
+#include "engine/core/events/events.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// Forward declarations to avoid heavy includes in header.
+	class Scene;
+
+	void SelectEntity(Entity entity, Scene* scene);
+	void DeselectEntity(Scene* scene);
+
+	// Event to trigger an layout reset.
+	class AppResetLayoutEvent : public Event
+	{
+	public:
+		AppResetLayoutEvent() = default;
+		EVENT_CLASS_TYPE(AppResetLayout)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	};
+
+	// Event to trigger launching the game in runtime mode.
+	class AppLaunchRuntimeEvent : public Event
+	{
+	public:
+		AppLaunchRuntimeEvent() = default;
+		EVENT_CLASS_TYPE(AppLaunchRuntime)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	};
+
+	// Event to signal focusing on a specific entity in the viewport
+	class ViewportFocusEntityEvent : public Event
+	{
+	public:
+		ViewportFocusEntityEvent(Entity entity)
+			: m_Entity(entity)
+		{
+		}
+		Entity GetEntity() const
+		{
+			return m_Entity;
+		}
+
+		EVENT_CLASS_TYPE(ViewportFocusEntity)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	private:
+		Entity m_Entity;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_EVENTS_H
diff --git a/editor/font_choice_gui.cpp b/editor/font_choice_gui.cpp
new file mode 100644
index 000000000..c3d2e4d42
--- /dev/null
+++ b/editor/font_choice_gui.cpp
@@ -0,0 +1,97 @@
+#include "font_choice_gui.h"
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+
+namespace Chained
+{
+	const std::vector<FontChoice>& GetEditorFontChoices()
+	{
+		static std::vector<FontChoice> s_Choices;
+		static bool s_Scanned = false;
+		if (s_Scanned)
+		{
+			return s_Choices;
+		}
+		s_Scanned = true;
+
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+		if (!assetManager)
+		{
+			CH_CORE_WARN("EditorGUI: AssetManager not available; font picker will be empty.");
+			return s_Choices;
+		}
+		auto engineRoot = assetManager->GetEngineRoot();
+		const std::filesystem::path fontDir = engineRoot / "resources" / "font";
+
+		std::error_code ec;
+		if (!std::filesystem::exists(fontDir, ec) || ec)
+		{
+			CH_CORE_WARN("EditorGUI: Font directory '{}' not found; font picker will be empty.", fontDir.string());
+			return s_Choices;
+		}
+
+		for (std::filesystem::recursive_directory_iterator
+				 it(fontDir, std::filesystem::directory_options::skip_permission_denied, ec),
+			 end;
+			 it != end && !ec; it.increment(ec))
+		{
+			if (!it->is_regular_file(ec))
+			{
+				ec.clear();
+				continue;
+			}
+
+			std::string ext = it->path().extension().string();
+			std::transform(ext.begin(), ext.end(), ext.begin(), [](unsigned char c) { return (char)std::tolower(c); });
+			if (ext != ".ttf" && ext != ".otf")
+			{
+				continue;
+			}
+
+			// Skip icon fonts (merged separately in LoadEditorFonts).
+			std::string stem = it->path().stem().string();
+			if (stem.rfind("fa-", 0) == 0)
+			{
+				continue;
+			}
+
+			auto rel = std::filesystem::relative(it->path(), engineRoot, ec);
+			if (ec)
+			{
+				ec.clear();
+				continue;
+			}
+
+			// Store with the "engine/" prefix so the path resolves against EngineRoot consistently.
+			s_Choices.push_back({MakeFontLabel(it->path()), "engine/" + rel.generic_string()});
+		}
+
+		std::sort(s_Choices.begin(), s_Choices.end(),
+				  [](const FontChoice& a, const FontChoice& b) { return a.Label < b.Label; });
+
+		CH_CORE_INFO("EditorGUI: Discovered {} editor font(s) in '{}'.", s_Choices.size(), fontDir.string());
+		return s_Choices;
+	}
+
+	std::string MakeFontLabel(const std::filesystem::path& file)
+	{
+		std::string stem = file.stem().string();
+		std::string label;
+		label.reserve(stem.size());
+		bool upperNext = true;
+		for (char c : stem)
+		{
+			if (c == '-' || c == '_')
+			{
+				label += ' ';
+				upperNext = true;
+			}
+			else
+			{
+				label += upperNext ? (char)std::toupper((unsigned char)c) : c;
+				upperNext = false;
+			}
+		}
+		return label;
+	}
+} // namespace Chained
diff --git a/editor/font_choice_gui.h b/editor/font_choice_gui.h
new file mode 100644
index 000000000..ad429262b
--- /dev/null
+++ b/editor/font_choice_gui.h
@@ -0,0 +1,25 @@
+#ifndef CH_FONT_CHOICE_H
+#define CH_FONT_CHOICE_H
+#include <string>
+#include <vector>
+#include <filesystem>
+
+namespace Chained
+{
+
+	struct FontChoice
+	{
+		std::string Label; // e.g. "Lato Bold" (derived from filename)
+		std::string Path;  // relative to the engine root, prefixed with "engine/", e.g.
+						   // "engine/resources/font/lato/lato-bold.ttf"
+	};
+
+	// Turns "lato-bold" / "AlanSans_Medium" into "Lato Bold" / "AlanSans Medium".
+	std::string MakeFontLabel(const std::filesystem::path& file);
+
+	// Scans <EngineRoot>/resources/font recursively; cached after the first call.
+	// FontAwesome icon fonts are excluded — merging them as the main UI font breaks text.
+	const std::vector<FontChoice>& GetEditorFontChoices();
+} // namespace Chained
+
+#endif /* CH_FONT_CHOICE_H */
diff --git a/editor/font_manager.cpp b/editor/font_manager.cpp
new file mode 100644
index 000000000..ec8cc74d8
--- /dev/null
+++ b/editor/font_manager.cpp
@@ -0,0 +1,108 @@
+#include "font_manager.h"
+#include "gui.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "engine/ui/ui_font_registry.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/imgui/imgui_layer.h"
+#include "thirdparty/IconsFontAwesome6.h"
+
+namespace Chained
+{
+
+	FontManager::FontManager(EditorConfig& config)
+		: m_Config(config)
+	{
+	}
+
+	void FontManager::AddFontsToAtlas()
+	{
+		auto* imguiLayer = Application::Get().GetImGuiLayer();
+		if (!imguiLayer)
+		{
+			return;
+		}
+
+		float fontSize = m_Config.FontSize > 0.0f ? m_Config.FontSize : 16.0f;
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+		if (!assetManager)
+		{
+			return;
+		}
+		std::string relFont =
+			!m_Config.FontPath.empty() ? m_Config.FontPath : "engine/resources/font/lato/lato-bold.ttf";
+		std::string fontPath = assetManager->ResolvePath(relFont);
+
+		bool baseFontLoaded = false;
+
+		if (std::filesystem::exists(fontPath))
+		{
+			imguiLayer->AddFontFromFile(fontPath, fontSize, nullptr, ImGui::GetIO().Fonts->GetGlyphRangesCyrillic());
+			CH_CORE_INFO("Loaded editor font: {} @ {}px (with Cyrillic)", fontPath, fontSize);
+			baseFontLoaded = true;
+		}
+		else
+		{
+			CH_CORE_WARN("Editor font not found: {}. Using default ImGui font.", fontPath);
+			ImGui::GetIO().Fonts->AddFontDefault();
+		}
+
+		// --- Icon Font (FontAwesome) ---
+		std::string faPath = assetManager->ResolvePath("engine/resources/font/fa-solid-900.ttf");
+		if (baseFontLoaded && std::filesystem::exists(faPath))
+		{
+			ImFontConfig icons_config;
+			icons_config.MergeMode = true;
+			icons_config.PixelSnapH = true;
+
+			static const ImWchar* font_awesome_ranges = nullptr;
+			if (!font_awesome_ranges)
+			{
+				static const ImWchar ranges[] = {ICON_MIN_FA, ICON_MAX_16_FA, 0};
+				font_awesome_ranges = ranges;
+			}
+
+			imguiLayer->AddFontFromFile(faPath, fontSize, &icons_config, font_awesome_ranges);
+			CH_CORE_INFO("Loaded and merged FontAwesome for editor: {}", faPath);
+		}
+	}
+
+	void FontManager::LoadFonts()
+	{
+		AddFontsToAtlas();
+		Application::Get().GetImGuiLayer()->RefreshFontAtlasTexture();
+	}
+
+	void FontManager::ReloadFonts()
+	{
+		auto* imguiLayer = Application::Get().GetImGuiLayer();
+		if (!imguiLayer)
+		{
+			return;
+		}
+
+		imguiLayer->ClearFonts();
+
+		if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+		{
+			fontRegistry->Clear();
+		}
+
+		AddFontsToAtlas();
+		EditorGUI::ApplyTheme();
+
+		if (auto* widgetRenderer = ServiceLocator::TryGet<WidgetRenderer>())
+		{
+			widgetRenderer->LoadProjectFonts();
+		}
+
+		imguiLayer->RefreshFontAtlasTexture();
+	}
+
+	void FontManager::RequestReload()
+	{
+		m_PendingReload = true;
+	}
+
+} // namespace Chained
diff --git a/editor/font_manager.h b/editor/font_manager.h
new file mode 100644
index 000000000..3c427e48c
--- /dev/null
+++ b/editor/font_manager.h
@@ -0,0 +1,35 @@
+#ifndef CH_FONT_MANAGER_H
+#define CH_FONT_MANAGER_H
+
+#include "editor/project/editor_settings.h"
+
+namespace Chained
+{
+
+	class FontManager
+	{
+	public:
+		explicit FontManager(EditorConfig& config);
+
+		void LoadFonts();
+		void ReloadFonts();
+		void AddFontsToAtlas();
+		void RequestReload();
+
+		bool HasPendingReload() const
+		{
+			return m_PendingReload;
+		}
+		void ClearPendingReload()
+		{
+			m_PendingReload = false;
+		}
+
+	private:
+		EditorConfig& m_Config;
+		bool m_PendingReload = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_FONT_MANAGER_H
diff --git a/editor/gui.cpp b/editor/gui.cpp
new file mode 100644
index 000000000..9e6d1c0c4
--- /dev/null
+++ b/editor/gui.cpp
@@ -0,0 +1,485 @@
+#include "gui.h"
+#include "editor/layer.h"
+#include "editor/panels/panel.h"
+#include "editor/panels/viewport_panel.h"
+#include "editor/project/project_exporter.h"
+#include "engine/app/application.h"
+#include "engine/core/service_locator.h"
+#include "engine/platform/dialogs/dialogs.h"
+#include "engine/project/project.h"
+#include "events.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "misc/cpp/imgui_stdlib.h"
+
+#define IMGUI_DEFINE_MATH_OPERATORS
+#include "engine/common/thread_pool.h"
+#include "thirdparty/imgui/imgui_internal.h"
+#include "engine/scripting/scriptengine.h"
+#include "editor/font_choice_gui.h"
+#include <cstring>
+#include <filesystem>
+#include <mutex>
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+
+	static float GetButtonSize()
+	{
+		return ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
+	}
+
+	static float GetThumbnailSize(float buttonSize)
+	{
+		return buttonSize * 1.5f;
+	}
+
+	void EditorGUI::DrawPropertyLabel(const char* label)
+	{
+		const char* displayLabel = label ? label : "Unknown";
+		if (ImGui::GetCurrentTable() != nullptr)
+		{
+			ImGui::TableNextRow();
+			ImGui::TableSetColumnIndex(0);
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("%s", displayLabel);
+			ImGui::TableSetColumnIndex(1);
+		}
+		else
+		{
+			ImGui::Text("%s", displayLabel);
+			ImGui::SameLine(ImGui::GetContentRegionAvail().x * 0.4f);
+		}
+	}
+
+	void EditorGUI::BeginPropertyGrid()
+	{
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 6));
+		ImGui::BeginTable("PropertyGrid", 2,
+						  ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_RowBg |
+							  ImGuiTableFlags_SizingStretchSame);
+
+		ImGui::TableSetupColumn("Label", ImGuiTableColumnFlags_WidthFixed, 120.0f);
+		ImGui::TableSetupColumn("Control", ImGuiTableColumnFlags_WidthStretch);
+	}
+
+	void EditorGUI::EndPropertyGrid()
+	{
+		ImGui::EndTable();
+		ImGui::PopStyleVar();
+	}
+
+	// --- Property Widgets Implementation ---
+
+	template <typename F> bool EditorGUI::PropertyWidget(const char* label, F&& widgetFn)
+	{
+		if (!label)
+		{
+			return false;
+		}
+		DrawPropertyLabel(label);
+		ImGui::PushID(label);
+		bool changed = widgetFn();
+		ImGui::PopID();
+		return changed;
+	}
+
+	bool EditorGUI::Property(const char* label, bool& value)
+	{
+		return PropertyWidget(label, [&]() { return ImGui::Checkbox("##prop", &value); });
+	}
+
+	bool EditorGUI::Property(const char* label, float& value, float speed, float min, float max)
+	{
+		return PropertyWidget(label, [&]() { return ImGui::DragFloat("##prop", &value, speed, min, max); });
+	}
+
+	bool EditorGUI::Property(const char* label, int& value, int min, int max)
+	{
+		return PropertyWidget(label, [&]() { return ImGui::DragInt("##prop", &value, 1.0f, min, max); });
+	}
+
+	bool EditorGUI::Property(const char* label, uint64_t& value)
+	{
+		return PropertyWidget(label, [&]() { return ImGui::InputScalar("##prop", ImGuiDataType_U64, &value); });
+	}
+
+	bool EditorGUI::Property(const char* label, std::string& value, bool multiline)
+	{
+		if (!label)
+		{
+			return false;
+		}
+		DrawPropertyLabel(label);
+		ImGui::PushID(label);
+		bool changed;
+		if (multiline)
+		{
+			changed = ImGui::InputTextMultiline("##prop", &value, ImVec2(0, ImGui::GetTextLineHeightWithSpacing() * 3));
+		}
+		else
+		{
+			changed = ImGui::InputText("##prop", &value);
+		}
+		ImGui::PopID();
+		return changed;
+	}
+
+	bool EditorGUI::Property(const char* label, Color& value)
+	{
+		return PropertyWidget(label, [&]() {
+			float c[4] = {value.r / 255.0f, value.g / 255.0f, value.b / 255.0f, value.a / 255.0f};
+			ImGuiColorEditFlags flags =
+				ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayRGB;
+			bool changed = ImGui::ColorEdit4("##prop", c, flags);
+			if (changed)
+			{
+				value = {(unsigned char)(c[0] * 255), (unsigned char)(c[1] * 255), (unsigned char)(c[2] * 255),
+						 (unsigned char)(c[3] * 255)};
+			}
+			return changed;
+		});
+	}
+
+	bool EditorGUI::Property(const char* label, glm::vec2& value)
+	{
+		return DrawVec2(label, value, 0.0f);
+	}
+
+	bool EditorGUI::Property(const char* label, glm::vec3& value)
+	{
+		return DrawVec3(label, value, 0.0f);
+	}
+
+	bool EditorGUI::Property(const char* label, glm::vec4& value)
+	{
+		return DrawVec4(label, value, 0.0f);
+	}
+
+	bool EditorGUI::PropertyColor(const char* label, glm::vec4& value, bool hdr)
+	{
+		return PropertyWidget(label, [&]() {
+			ImGuiColorEditFlags flags = ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_DisplayRGB;
+			if (hdr)
+			{
+				flags |= ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_Float;
+			}
+			return ImGui::ColorEdit4("##prop", &value.x, flags);
+		});
+	}
+
+	bool EditorGUI::Property(const char* label, int& value, const char** items, int itemCount)
+	{
+		if (!label)
+		{
+			return false;
+		}
+		return PropertyWidget(label, [&]() {
+			if (!items || itemCount <= 0)
+			{
+				return false;
+			}
+			return ImGui::Combo("##prop", &value, items, itemCount);
+		});
+	}
+
+	bool EditorGUI::FilePropertyImpl(const char* label, std::string& value, const char* filter,
+									 std::function<void()> thumbnailFn, const char* placeholder)
+	{
+		if (!label)
+		{
+			return false;
+		}
+		DrawPropertyLabel(label);
+		ImGui::PushID(label);
+
+		float width = ImGui::GetContentRegionAvail().x;
+		float buttonSize = GetButtonSize();
+
+		float thumbnailSize = 0.0f;
+		if (thumbnailFn)
+		{
+			thumbnailSize = GetThumbnailSize(buttonSize);
+			thumbnailFn();
+			ImGui::SameLine();
+		}
+
+		ImGui::PushItemWidth(width - buttonSize - thumbnailSize - (thumbnailFn ? 10.0f : 5.0f));
+
+		auto project = Project::GetActive();
+		std::string displayPath = project ? project->GetRelativePath(value) : value;
+		char inputTextBuf[256];
+		memset(inputTextBuf, 0, sizeof(inputTextBuf));
+		strncpy(inputTextBuf, displayPath.c_str(), sizeof(inputTextBuf) - 1);
+
+		bool changed = false;
+		const char* hint = placeholder ? placeholder : "";
+		if (ImGui::InputTextWithHint("##prop", hint, inputTextBuf, sizeof(inputTextBuf)))
+		{
+			value = project ? project->GetRelativePath(inputTextBuf) : std::string(inputTextBuf);
+			changed = true;
+		}
+		if (ImGui::BeginDragDropTarget())
+		{
+			if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("CONTENT_BROWSER_ITEM"))
+			{
+				const char* dropPath = static_cast<const char*>(payload->Data);
+				if (dropPath)
+				{
+					value = project ? project->GetRelativePath(dropPath) : std::string(dropPath);
+					changed = true;
+				}
+			}
+			ImGui::EndDragDropTarget();
+		}
+		ImGui::PopItemWidth();
+		ImGui::SameLine();
+		if (ImGui::Button(ICON_FA_FOLDER_OPEN, {buttonSize, buttonSize}))
+		{
+			std::vector<DialogFilter> filters;
+			if (filter != nullptr && filter[0] != '\0')
+			{
+				filters.push_back({"Files", filter});
+			}
+			auto result = Chained::Dialogs::OpenFile(filters);
+			if (result)
+			{
+				value = project ? project->GetRelativePath(*result) : result->string();
+				changed = true;
+			}
+		}
+
+		ImGui::PopID();
+		return changed;
+	}
+
+	bool EditorGUI::FileProperty(const char* label, std::string& value, const char* filter)
+	{
+		return FilePropertyImpl(label, value, filter, nullptr, nullptr);
+	}
+
+	bool EditorGUI::FileProperty(const char* label, std::string& path, uint32_t textureId, const char* filter)
+	{
+		const char* placeholder = (textureId > 0 && path.empty()) ? "<embedded>" : nullptr;
+		return FilePropertyImpl(
+			label, path, filter,
+			[textureId]() {
+				float buttonSize = GetButtonSize();
+				float thumbnailSize = GetThumbnailSize(buttonSize);
+				if (textureId > 0)
+				{
+					ImGui::Image((void*)(intptr_t)textureId, {thumbnailSize, thumbnailSize}, {0, 1}, {1, 0});
+				}
+				else
+				{
+					ImGui::Button("##empty", {thumbnailSize, thumbnailSize});
+					if (ImGui::IsItemHovered())
+					{
+						ImGui::SetTooltip("No texture loaded");
+					}
+				}
+			},
+			placeholder);
+	}
+
+	bool EditorGUI::ActionButton(const char* icon, const char* label)
+	{
+		std::string text;
+		if (icon && icon[0] != '\0')
+		{
+			text = std::string(icon) + " " + (label ? label : "");
+		}
+		else
+		{
+			text = (label ? label : "");
+		}
+		return ImGui::Button(text.c_str());
+	}
+
+	static void DrawPropertyControl(const char* id, float& val, ImVec4 color, const char* label, float resetValue,
+									float width, bool& changed)
+	{
+		if (!label || !id)
+		{
+			return;
+		}
+		ImGui::PushID(label);
+
+		float lineHeight = GetButtonSize();
+		ImVec2 buttonSize = {lineHeight, lineHeight};
+
+		ImGui::PushStyleColor(ImGuiCol_Button, color);
+		ImGui::PushStyleColor(ImGuiCol_ButtonHovered, color);
+		ImGui::PushStyleColor(ImGuiCol_ButtonActive, color);
+		ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+
+		if (ImGui::Button(label, buttonSize))
+		{
+			val = resetValue;
+			changed = true;
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("Click to reset to %.2f", resetValue);
+		}
+
+		ImGui::PopStyleVar();
+		ImGui::PopStyleColor(3);
+
+		ImGui::SameLine(0, 0);
+
+		ImGui::SetNextItemWidth(width - buttonSize.x);
+		char buf[32];
+		snprintf(buf, sizeof(buf), "##%.8s_%.8s", label, id);
+		if (ImGui::DragFloat(buf, &val, 0.1f, 0.0f, 0.0f, "%.2f"))
+		{
+			changed = true;
+		}
+
+		ImGui::PopID();
+	}
+
+	template <int N>
+	bool EditorGUI::DrawVecImpl(const char* label, float* values, float resetValue, const ImVec4* colors,
+								const char* componentLabels[N])
+	{
+		if (!label)
+		{
+			return false;
+		}
+		DrawPropertyLabel(label);
+		ImGui::PushID(label);
+
+		bool changed = false;
+
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2{4, 0});
+		float width = ImGui::GetContentRegionAvail().x;
+		float spacing = 4.0f * (N - 1);
+		float itemWidth = (width - spacing) / N;
+
+		ImGui::BeginGroup();
+
+		for (int i = 0; i < N; ++i)
+		{
+			if (i > 0)
+			{
+				ImGui::SameLine();
+			}
+			ImGui::SetNextItemWidth(itemWidth);
+			DrawPropertyControl(componentLabels[i], values[i], colors[i], componentLabels[i], resetValue, itemWidth,
+								changed);
+		}
+
+		ImGui::EndGroup();
+
+		ImGui::PopStyleVar();
+		ImGui::PopID();
+		return changed;
+	}
+
+	bool EditorGUI::DrawVec2(const char* label, glm::vec2& values, float resetValue)
+	{
+		float arr[2] = {values.x, values.y};
+		ImVec4 colors[2] = {{0.8f, 0.1f, 0.15f, 1.0f}, {0.2f, 0.7f, 0.2f, 1.0f}};
+		const char* labels[2] = {"X", "Y"};
+		bool changed = DrawVecImpl<2>(label, arr, resetValue, colors, labels);
+		if (changed)
+		{
+			values.x = arr[0];
+			values.y = arr[1];
+		}
+		return changed;
+	}
+
+	bool EditorGUI::DrawVec3(const char* label, glm::vec3& values, float resetValue)
+	{
+		float arr[3] = {values.x, values.y, values.z};
+		ImVec4 colors[3] = {{0.8f, 0.1f, 0.15f, 1.0f}, {0.2f, 0.7f, 0.2f, 1.0f}, {0.1f, 0.25f, 0.8f, 1.0f}};
+		const char* labels[3] = {"X", "Y", "Z"};
+		bool changed = DrawVecImpl<3>(label, arr, resetValue, colors, labels);
+		if (changed)
+		{
+			values.x = arr[0];
+			values.y = arr[1];
+			values.z = arr[2];
+		}
+		return changed;
+	}
+
+	bool EditorGUI::DrawVec4(const char* label, glm::vec4& values, float resetValue)
+	{
+		float arr[4] = {values.x, values.y, values.z, values.w};
+		ImVec4 colors[4] = {
+			{0.8f, 0.1f, 0.15f, 1.0f}, {0.2f, 0.7f, 0.2f, 1.0f}, {0.1f, 0.25f, 0.8f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}};
+		const char* labels[4] = {"X", "Y", "Z", "W"};
+		bool changed = DrawVecImpl<4>(label, arr, resetValue, colors, labels);
+		if (changed)
+		{
+			values.x = arr[0];
+			values.y = arr[1];
+			values.z = arr[2];
+			values.w = arr[3];
+		}
+		return changed;
+	}
+
+	void EditorGUI::ApplyTheme()
+	{
+		ImGuiStyle& style = ImGui::GetStyle();
+		style = ImGuiStyle(); // Reset to clean defaults to prevent ScaleAllSizes from accumulating
+
+		style.WindowRounding = 5.0f;
+		style.FrameRounding = 4.0f;
+		style.PopupRounding = 4.0f;
+		style.ScrollbarRounding = 12.0f;
+		style.GrabRounding = 4.0f;
+		style.TabRounding = 4.0f;
+
+		ImVec4* colors = style.Colors;
+		colors[ImGuiCol_Text] = ImVec4(0.95f, 0.96f, 0.98f, 1.00f);
+		colors[ImGuiCol_TextDisabled] = ImVec4(0.36f, 0.42f, 0.47f, 1.00f);
+		colors[ImGuiCol_WindowBg] = ImVec4(0.10f, 0.12f, 0.14f, 1.00f);
+		colors[ImGuiCol_ChildBg] = ImVec4(0.12f, 0.14f, 0.16f, 1.00f);
+		colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.10f, 0.12f, 0.94f);
+		colors[ImGuiCol_Border] = ImVec4(0.20f, 0.22f, 0.25f, 0.50f);
+		colors[ImGuiCol_FrameBg] = ImVec4(0.18f, 0.20f, 0.22f, 1.00f);
+		colors[ImGuiCol_FrameBgHovered] = ImVec4(0.25f, 0.28f, 0.32f, 1.00f);
+		colors[ImGuiCol_FrameBgActive] = ImVec4(0.22f, 0.24f, 0.26f, 1.00f);
+		colors[ImGuiCol_TitleBg] = ImVec4(0.08f, 0.10f, 0.12f, 1.00f);
+		colors[ImGuiCol_TitleBgActive] = ImVec4(0.06f, 0.08f, 0.10f, 1.00f);
+
+		colors[ImGuiCol_Header] = ImVec4(0.20f, 0.25f, 0.35f, 0.60f);
+		colors[ImGuiCol_HeaderHovered] = ImVec4(0.25f, 0.35f, 0.50f, 0.80f);
+		colors[ImGuiCol_HeaderActive] = ImVec4(0.30f, 0.40f, 0.60f, 1.00f);
+
+		colors[ImGuiCol_Separator] = ImVec4(0.20f, 0.22f, 0.25f, 1.00f);
+		colors[ImGuiCol_CheckMark] = ImVec4(0.40f, 0.60f, 0.90f, 1.00f);
+		colors[ImGuiCol_SliderGrab] = ImVec4(0.40f, 0.60f, 0.90f, 1.00f);
+		colors[ImGuiCol_SliderGrabActive] = ImVec4(0.50f, 0.70f, 1.00f, 1.00f);
+		colors[ImGuiCol_Button] = ImVec4(0.18f, 0.20f, 0.22f, 1.00f);
+		colors[ImGuiCol_ButtonHovered] = ImVec4(0.25f, 0.35f, 0.50f, 1.00f);
+		colors[ImGuiCol_ButtonActive] = ImVec4(0.30f, 0.45f, 0.70f, 1.00f);
+
+		colors[ImGuiCol_Tab] = ImVec4(0.08f, 0.10f, 0.12f, 1.00f);
+		colors[ImGuiCol_TabHovered] = ImVec4(0.25f, 0.35f, 0.50f, 0.80f);
+		colors[ImGuiCol_TabActive] = ImVec4(0.12f, 0.14f, 0.16f, 1.00f);
+		colors[ImGuiCol_TabUnfocused] = ImVec4(0.08f, 0.10f, 0.12f, 1.00f);
+		colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.10f, 0.12f, 0.14f, 1.00f);
+		colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f);
+		colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
+		colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
+		colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
+		colors[ImGuiCol_TextSelectedBg] = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
+		colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
+		colors[ImGuiCol_NavHighlight] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
+		colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f);
+		colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f);
+		colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.10f, 0.12f, 0.14f, 0.73f);
+
+		float fontSize = EditorLayer::Get().GetConfig().FontSize;
+		float scale = fontSize > 0.0f ? (fontSize / 13.0f) : 1.0f;
+		style.ScaleAllSizes(scale);
+	}
+
+} // namespace Chained
diff --git a/editor/gui.h b/editor/gui.h
new file mode 100644
index 000000000..d347f732c
--- /dev/null
+++ b/editor/gui.h
@@ -0,0 +1,65 @@
+#ifndef CH_EDITOR_GUI_H
+#define CH_EDITOR_GUI_H
+
+#include <functional>
+#include <string>
+#include "editor/layer.h"
+#include "editor/panels.h"
+#include "engine/common/color.h"
+
+namespace Chained
+{
+
+	// Immediate-mode GUI helpers shared by editor panels and property inspectors.
+	class EditorGUI
+	{
+	public:
+		/// @brief Begins a 2-column property grid.
+		static void BeginPropertyGrid();
+		static void EndPropertyGrid();
+		static void DrawPropertyLabel(const char* label);
+
+		// Simple property widgets that do not use columns.
+		static bool Property(const char* label, bool& value);
+		static bool Property(const char* label, int& value, int min = 0, int max = 0);
+		static bool Property(const char* label, float& value, float speed = 0.1f, float min = 0.0f, float max = 0.0f);
+		static bool Property(const char* label, std::string& value, bool multiline = false);
+		static bool Property(const char* label, Color& value);
+		static bool Property(const char* label, glm::vec2& value);
+		static bool Property(const char* label, glm::vec3& value);
+		static bool Property(const char* label, glm::vec4& value);
+		static bool Property(const char* label, uint64_t& value);
+
+		// Renders a glm::vec4 as an RGBA color swatch/picker instead of raw X/Y/Z/W drag fields.
+		static bool PropertyColor(const char* label, glm::vec4& value, bool hdr = false);
+
+		static bool Property(const char* label, int& value, const char** items, int itemCount);
+
+		// Action widgets.
+		static bool ActionButton(const char* icon, const char* label);
+
+		// File property widgets.
+		static bool FileProperty(const char* label, std::string& value, const char* filter = nullptr);
+		static bool FileProperty(const char* label, std::string& path, uint32_t textureId,
+								 const char* filter = nullptr);
+
+		static bool DrawVec2(const char* label, glm::vec2& values, float resetValue = 0.0f);
+		static bool DrawVec3(const char* label, glm::vec3& values, float resetValue = 0.0f);
+		static bool DrawVec4(const char* label, glm::vec4& values, float resetValue = 0.0f);
+		// Applies the editor-wide ImGui style.
+		static void ApplyTheme();
+
+	private:
+		template <typename F> static bool PropertyWidget(const char* label, F&& widgetFn);
+
+		static bool FilePropertyImpl(const char* label, std::string& value, const char* filter,
+									 std::function<void()> thumbnailFn, const char* placeholder = nullptr);
+
+		template <int N>
+		static bool DrawVecImpl(const char* label, float* values, float resetValue, const ImVec4* colors,
+								const char* componentLabels[N]);
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_GUI_H
diff --git a/editor/icons.h b/editor/icons.h
new file mode 100644
index 000000000..23e58c2d1
--- /dev/null
+++ b/editor/icons.h
@@ -0,0 +1,21 @@
+
+#ifndef CH_EDITOR_ICONS_H
+#define CH_EDITOR_ICONS_H
+
+#include <memory>
+
+namespace Chained
+{
+	class TextureAsset;
+
+	// Cached editor icon textures used during scene rendering.
+	struct EditorIcons
+	{
+		std::shared_ptr<TextureAsset> LightIcon;
+		std::shared_ptr<TextureAsset> SpawnIcon;
+		std::shared_ptr<TextureAsset> CameraIcon;
+		std::shared_ptr<TextureAsset> AudioIcon;
+	};
+} // namespace Chained
+
+#endif // CH_EDITOR_ICONS_H
diff --git a/editor/launcher/editor_launcher.cpp b/editor/launcher/editor_launcher.cpp
deleted file mode 100644
index 3adf23419..000000000
--- a/editor/launcher/editor_launcher.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-#include "editor_launcher.h"
-#include "engine/core/base.h"
-#include "engine/core/profiler.h"
-#include "engine/scene/project.h"
-#include "engine/scene/project_serializer.h"
-#include "engine/scene/scene_serializer.h"
-#if CH_PLATFORM_WINDOWS
-#include <windows.h>
-#include <shellapi.h>
-#endif
-#include <algorithm>
-#include <format>
-
-namespace CHEngine
-{
-
-void EditorLauncher::LaunchStandalone(std::shared_ptr<Project> project, std::shared_ptr<Scene> editorScene)
-{
-    CH_PROFILE_FUNCTION();
-
-    if (!project)
-    {
-        CH_CORE_ERROR("EditorLauncher: No active project to launch!");
-        return;
-    }
-
-    auto& config = project->GetConfig();
-    std::string sceneArgument;
-
-    if (editorScene)
-    {
-        std::filesystem::path scenePath = editorScene->GetSettings().ScenePath;
-        if (scenePath.empty())
-        {
-            scenePath = config.ActiveScenePath;
-        }
-
-        if (!scenePath.empty())
-        {
-            // Sync scene to disk before launching standalone
-            if (!editorScene->GetSettings().ScenePath.empty())
-            {
-                SceneSerializer serializer(editorScene.get());
-                if (!serializer.Serialize(editorScene->GetSettings().ScenePath))
-                {
-                    CH_CORE_ERROR("EditorLauncher: Failed to save current editor scene before launching.");
-                    return;
-                }
-            }
-
-            if (scenePath.is_relative())
-            {
-                scenePath = Project::GetAssetPath(scenePath);
-            }
-
-            scenePath = std::filesystem::absolute(scenePath);
-            project->SetActiveScenePath(Project::GetRelativePath(scenePath));
-            sceneArgument = std::format(" --scene \"{}\"", scenePath.string());
-        }
-    }
-
-    // Save project specifically to persist active scene path
-    ProjectSerializer pSerializer(project);
-    pSerializer.Serialize((project->GetProjectDirectory() / (project->GetConfig().Name + ".chproject")).string());
-
-    std::string runtimePath;
-    std::string arguments;
-
-    if (!config.LaunchProfiles.empty() && config.ActiveLaunchProfileIndex >= 0 &&
-        config.ActiveLaunchProfileIndex < (int)config.LaunchProfiles.size())
-    {
-        const auto& profile = config.LaunchProfiles[config.ActiveLaunchProfileIndex];
-        runtimePath = ResolveLaunchVariables(profile.BinaryPath, project);
-        arguments = ResolveLaunchVariables(profile.Arguments, project);
-
-        if (profile.UseDefaultArgs)
-        {
-            std::filesystem::path projectFile =
-                project->GetProjectDirectory() / (project->GetConfig().Name + ".chproject");
-            arguments += std::format(" \"{}\"", std::filesystem::absolute(projectFile).string());
-        }
-
-        if (!sceneArgument.empty())
-        {
-            arguments += sceneArgument;
-        }
-    }
-    else
-    {
-        // Fallback to old heuristic if no profiles
-        CH_CORE_WARN("EditorLauncher: No active launch profile. Falling back to heuristic search.");
-        std::string configStr = (config.BuildConfig == Configuration::Release) ? "Release" : "Debug";
-        runtimePath = FindRuntimeExecutable(config.Name, configStr).string();
-
-        std::filesystem::path projectFile = project->GetProjectDirectory() / (project->GetConfig().Name + ".chproject");
-        arguments = std::format("\"{}\"", std::filesystem::absolute(projectFile).string());
-
-        if (!sceneArgument.empty())
-        {
-            arguments += sceneArgument;
-        }
-    }
-
-    if (runtimePath.empty() || !std::filesystem::exists(runtimePath))
-    {
-        CH_CORE_WARN("EditorLauncher: Profile binary not found at '{}'. Searching heuristic...", runtimePath);
-        std::string configStr = (config.BuildConfig == Configuration::Release) ? "Release" : "Debug";
-        runtimePath = FindRuntimeExecutable(config.Name, configStr).string();
-
-        if (runtimePath.empty())
-        {
-            CH_CORE_ERROR("EditorLauncher: Runtime executable not found!");
-            return;
-        }
-    }
-
-#if CH_PLATFORM_WINDOWS
-    // Normalize slashes for Windows (start command and ShellExecute prefer \)
-    std::string normalizedRuntime = runtimePath;
-    std::replace(normalizedRuntime.begin(), normalizedRuntime.end(), '/', '\\');
-
-    std::string normalizedArgs = arguments;
-    std::replace(normalizedArgs.begin(), normalizedArgs.end(), '/', '\\');
-
-    CH_CORE_INFO("EditorLauncher: Executing via ShellExecute: {} {}", normalizedRuntime, normalizedArgs);
-
-    // Use ShellExecute instead of system to be truly non-blocking and avoid cmd window issues
-    HINSTANCE result = ShellExecuteA(NULL, "open", normalizedRuntime.c_str(), normalizedArgs.c_str(), NULL, SW_SHOW);
-    if ((uintptr_t)result <= 32)
-    {
-        CH_CORE_ERROR("EditorLauncher: ShellExecute failed with error code: {}", (uintptr_t)result);
-    }
-#else
-    std::string command = std::format("\"{}\" {} &", runtimePath, arguments);
-    CH_CORE_INFO("EditorLauncher: Executing: {}", command);
-    system(command.c_str());
-#endif
-}
-
-std::filesystem::path EditorLauncher::FindRuntimeExecutable(const std::string& projectName,
-                                                            const std::string& configStr)
-{
-    CH_PROFILE_FUNCTION();
-
-    std::filesystem::path root;
-#ifdef PROJECT_ROOT_DIR
-    root = PROJECT_ROOT_DIR;
-#else
-    root = std::filesystem::current_path();
-    while (root.has_parent_path() && !std::filesystem::exists(root / "CMakeLists.txt"))
-    {
-        root = root.parent_path();
-    }
-#endif
-
-    if (!std::filesystem::exists(root))
-    {
-        CH_CORE_ERROR("EditorLauncher: Root path not found: {}", root.string());
-        return {};
-    }
-
-#if CH_PLATFORM_WINDOWS
-    const std::string targetName = "ChainedRuntime.exe";
-#else
-    const std::string targetName = "ChainedRuntime";
-#endif
-
-    // 1. Check current working directory
-    std::filesystem::path currentBin = std::filesystem::current_path() / targetName;
-    if (std::filesystem::exists(currentBin))
-    {
-        return currentBin;
-    }
-
-    // 2. Fast common output locations
-    std::vector<std::string> searchSubdirs = {"build/bin", "bin", "out/bin", "cmake-build-debug/bin",
-                                              "cmake-build-release/bin"};
-
-    // Auto-discover build folders in project root
-    if (std::filesystem::exists(root / "build"))
-    {
-        for (const auto& entry : std::filesystem::directory_iterator(root / "build"))
-        {
-            if (entry.is_directory())
-            {
-                if (std::filesystem::exists(entry.path() / "bin" / targetName))
-                {
-                    searchSubdirs.push_back("build/" + entry.path().filename().string() + "/bin");
-                }
-            }
-        }
-    }
-
-    for (const auto& sub : searchSubdirs)
-    {
-        std::filesystem::path p = root / sub / targetName;
-        if (std::filesystem::exists(p))
-        {
-            CH_CORE_INFO("EditorLauncher: Path found at: {}", p.string());
-            return p;
-        }
-    }
-
-    // 3. Fallback: careful recursive search excluding noisy folders
-    CH_CORE_INFO("EditorLauncher: Fast path failed, starting scoped recursive search...");
-    try
-    {
-        for (auto it = std::filesystem::recursive_directory_iterator(root);
-             it != std::filesystem::recursive_directory_iterator(); ++it)
-        {
-            const auto& entry = *it;
-            auto filename = entry.path().filename().string();
-
-            if (entry.is_directory())
-            {
-                if (filename == ".git" || filename == ".cache" || filename == ".idea" || filename == "include" ||
-                    filename == "engine")
-                {
-                    it.disable_recursion_pending();
-                    continue;
-                }
-            }
-
-            if (entry.is_regular_file() && filename == targetName)
-            {
-                CH_CORE_INFO("EditorLauncher: Deep search found at: {}", entry.path().string());
-                return entry.path();
-            }
-        }
-    } catch (const std::exception& e)
-    {
-        CH_CORE_WARN("EditorLauncher: Deep search error: {}", e.what());
-    }
-
-    return {};
-}
-
-std::string EditorLauncher::ResolveLaunchVariables(std::string str, std::shared_ptr<Project> project)
-{
-    CH_PROFILE_FUNCTION();
-
-    if (!project)
-    {
-        return str;
-    }
-
-    std::filesystem::path root;
-#ifdef PROJECT_ROOT_DIR
-    root = PROJECT_ROOT_DIR;
-#else
-    root = std::filesystem::current_path();
-    while (root.has_parent_path() && !std::filesystem::exists(root / "CMakeLists.txt"))
-    {
-        root = root.parent_path();
-    }
-#endif
-
-    std::filesystem::path projectFile = project->GetProjectDirectory() / (project->GetConfig().Name + ".chproject");
-    std::string projectPathStr = std::filesystem::absolute(projectFile).string();
-
-    auto replaceAll = [&](const std::string& from, const std::string& to) {
-        size_t pos = 0;
-        while ((pos = str.find(from)) != std::string::npos)
-        {
-            str.replace(pos, from.length(), to);
-        }
-    };
-
-    replaceAll("${ROOT}", std::filesystem::absolute(root).string());
-    replaceAll("${PROJECT_FILE}", projectPathStr);
-
-    if (str.find("${BUILD}") != std::string::npos)
-    {
-        std::string configStr = (project->GetConfig().BuildConfig == Configuration::Release) ? "Release" : "Debug";
-        std::filesystem::path exePath = FindRuntimeExecutable(project->GetConfig().Name, configStr);
-        std::filesystem::path buildPath = exePath.parent_path();
-
-        if (buildPath.empty())
-        {
-            std::vector<std::string> searchSubdirs = {"build/bin", "bin", "out/bin", "cmake-build-debug/bin",
-                                                      "cmake-build-release/bin"};
-            for (const auto& sub : searchSubdirs)
-            {
-                if (std::filesystem::exists(root / sub))
-                {
-                    buildPath = root / sub;
-                    break;
-                }
-            }
-        }
-
-        replaceAll("${BUILD}", std::filesystem::absolute(buildPath).string());
-    }
-
-    return str;
-}
-
-} // namespace CHEngine
diff --git a/editor/launcher/editor_launcher.h b/editor/launcher/editor_launcher.h
deleted file mode 100644
index eceec36ea..000000000
--- a/editor/launcher/editor_launcher.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef CH_EDITOR_LAUNCHER_H
-#define CH_EDITOR_LAUNCHER_H
-
-#include "engine/scene/project.h"
-#include "engine/scene/scene.h"
-#include <memory>
-#include <string>
-#include <filesystem>
-
-namespace CHEngine {
-
-    class EditorLauncher {
-    public:
-        /**
-         * @brief Launches the standalone runtime for the given project and scene.
-         * Resolves project-defined launch profiles or uses default heuristics.
-         * @param project The active project.
-         * @param editorScene The current editor scene (to sync before launch).
-         */
-        static void LaunchStandalone(std::shared_ptr<Project> project, std::shared_ptr<Scene> editorScene);
-
-    private:
-        static std::filesystem::path FindRuntimeExecutable(const std::string& projectName, const std::string& configStr);
-        static std::string ResolveLaunchVariables(std::string str, std::shared_ptr<Project> project);
-    };
-
-} // namespace CHEngine
-#endif
diff --git a/editor/layer.cpp b/editor/layer.cpp
new file mode 100644
index 000000000..cd40aede7
--- /dev/null
+++ b/editor/layer.cpp
@@ -0,0 +1,662 @@
+#include "layer.h"
+#include "editor_colors.h"
+#include "editor/font_manager.h"
+#include "engine/core/input.h"
+#include "engine/core/events/input_events.h"
+#include "engine/core/key_codes.h"
+#include "engine/core/service_locator.h"
+#include "engine/imgui/imgui_layer.h"
+#include "events.h"
+#include "gui.h"
+#include "editor_menu.h"
+#include "layout.h"
+#include "panels.h"
+
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/profiler.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/ui/ui_font_registry.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/project/project.h"
+#include "panels/property_editor.h"
+#include "panels/viewport_panel.h"
+#include "engine/scripting/scriptengine.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/graphics/api/framebuffer.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "ui/project_selector_ui.h"
+#include <ImGuizmo.h>
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <glad/gl.h>
+#include <GLFW/glfw3.h>
+#include <yaml-cpp/yaml.h>
+
+namespace Chained
+{
+	void EditorLayer::DrawLoadingOverlay(const char* title, const char* status)
+	{
+		ImGuiViewport* viewport = ImGui::GetMainViewport();
+		ImGui::SetNextWindowPos(viewport->WorkPos);
+		ImGui::SetNextWindowSize(viewport->WorkSize);
+		ImGui::SetNextWindowViewport(viewport->ID);
+
+		ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+								 ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDocking |
+								 ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse |
+								 ImGuiWindowFlags_NoInputs;
+
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
+		ImGui::PushStyleColor(ImGuiCol_WindowBg, EditorColors::LoadingOverlayBg);
+
+		if (ImGui::Begin("##EditorLoadingOverlay", nullptr, flags))
+		{
+			float windowWidth = ImGui::GetWindowWidth();
+			float windowHeight = ImGui::GetWindowHeight();
+
+			ImGui::SetCursorPosY(windowHeight * 0.42f);
+
+			if (title && title[0] != '\0')
+			{
+				ImVec2 titleSize = ImGui::CalcTextSize(title);
+				ImGui::SetCursorPosX((windowWidth - titleSize.x) * 0.5f);
+				ImGui::TextUnformatted(title);
+				ImGui::Spacing();
+			}
+
+			if (status && status[0] != '\0')
+			{
+				ImVec2 statusSize = ImGui::CalcTextSize(status);
+				ImGui::SetCursorPosX((windowWidth - statusSize.x) * 0.5f);
+				ImGui::TextColored(ImVec4(0.75f, 0.75f, 0.75f, 1.0f), "%s", status);
+				ImGui::Spacing();
+			}
+
+			// Animated progress bar
+			float barWidth = std::min(320.0f, windowWidth * 0.4f);
+			float barHeight = 4.0f;
+			ImGui::SetCursorPosX((windowWidth - barWidth) * 0.5f);
+
+			float time = (float)ImGui::GetTime();
+			float animFraction = fmodf(time * 0.8f, 1.0f);
+			ImGui::ProgressBar(animFraction, ImVec2(barWidth, barHeight), "");
+
+			auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+			uint32_t totalPending = assetManager ? (uint32_t)assetManager->GetPendingFinalizeCount() : 0;
+			if (totalPending > 0)
+			{
+				ImGui::Spacing();
+				char pendingBuffer[64];
+				snprintf(pendingBuffer, sizeof(pendingBuffer), "Finalizing assets: %u", totalPending);
+
+				ImVec2 pendingSize = ImGui::CalcTextSize(pendingBuffer);
+				ImGui::SetCursorPosX((windowWidth - pendingSize.x) * 0.5f);
+				ImGui::TextColored(ImVec4(0.55f, 0.55f, 0.55f, 1.0f), "%s", pendingBuffer);
+			}
+		}
+
+		ImGui::End();
+		ImGui::PopStyleColor();
+		ImGui::PopStyleVar();
+	}
+
+	EditorLayer::EditorLayer()
+		: Layer("EditorLayer")
+	{
+		s_Instance = this;
+
+		m_ProjectManager = std::make_unique<EditorProjectManager>();
+		m_SceneManager = std::make_unique<EditorSceneManager>();
+
+		m_Menu = std::make_unique<EditorMenu>();
+		m_Panels = std::make_unique<EditorPanels>();
+
+		m_Layout = std::make_unique<EditorLayout>(*m_Panels);
+		m_ProjectSelectorUI = std::make_unique<ProjectSelectorUI>(*m_ProjectManager);
+		m_FontManager = std::make_unique<FontManager>(m_Config);
+
+		LoadConfig();
+	}
+
+	EditorLayer::~EditorLayer()
+	{
+		SetSelectedEntity({});
+		s_Instance = nullptr;
+	}
+
+	template <typename T> static void LoadYAMLField(const YAML::Node& node, const char* key, T& target)
+	{
+		if (node[key])
+		{
+			target = node[key].as<T>(target);
+		}
+	}
+
+	// Single source of truth for all YAML fields — used by both LoadConfig and SaveConfig.
+	// Each macro expansion: (YAML_KEY, STRUCT_FIELD)
+#define EDITOR_CONFIG_FIELDS(X)                                                                                        \
+	X("LastScenePath", LastScenePath)                                                                                  \
+	X("LoadLastProjectOnStartup", LoadLastProjectOnStartup)                                                            \
+	X("AutoSaveEnabled", AutoSaveEnabled)                                                                              \
+	X("AutoSaveInterval", AutoSaveInterval)                                                                            \
+	X("FontPath", FontPath)                                                                                            \
+	X("FontSize", FontSize)                                                                                            \
+	X("IconSizeScale", IconSizeScale)                                                                                  \
+	X("IconSizeMin", IconSizeMin)                                                                                      \
+	X("IconSizeMax", IconSizeMax)                                                                                      \
+	X("CameraMoveSpeed", CameraMoveSpeed)                                                                              \
+	X("CameraBoostMultiplier", CameraBoostMultiplier)                                                                  \
+	X("DisableCameraZoom", DisableCameraZoom)                                                                          \
+	X("CameraRotationSpeed", CameraRotationSpeed)                                                                      \
+	X("CameraZoomSpeedMultiplier", CameraZoomSpeedMultiplier)                                                          \
+	X("CameraFovDegrees", CameraFovDegrees)                                                                            \
+	X("CameraNearClip", CameraNearClip)                                                                                \
+	X("CameraFarClip", CameraFarClip)                                                                                  \
+	X("ShowEditorIcons", ShowEditorIcons)                                                                              \
+	X("GizmoScale", GizmoScale)                                                                                        \
+	X("DefaultThumbnailSize", DefaultThumbnailSize)                                                                    \
+	X("DefaultSortOrder", DefaultSortOrder)                                                                            \
+	X("ShowFileExtensions", ShowFileExtensions)                                                                        \
+	X("ConfirmOnSceneClose", ConfirmOnSceneClose)                                                                      \
+	X("MaxRecentProjects", MaxRecentProjects)
+
+	void EditorLayer::LoadConfig()
+	{
+		std::filesystem::path configPath = std::filesystem::current_path() / "editor_settings.yaml";
+		if (!std::filesystem::exists(configPath))
+		{
+			return;
+		}
+
+		try
+		{
+			YAML::Node data = YAML::LoadFile(configPath.string());
+			if (data["Editor"])
+			{
+				auto node = data["Editor"];
+				if (node["LastProjectPath"])
+				{
+					std::string lastProj = node["LastProjectPath"].as<std::string>("");
+					m_ProjectManager->RestoreLastProjectPath(lastProj);
+					m_Config.LastProjectPath = lastProj;
+				}
+#define LOAD_FIELD(yamlKey, field) LoadYAMLField(node, yamlKey, m_Config.field);
+				EDITOR_CONFIG_FIELDS(LOAD_FIELD)
+#undef LOAD_FIELD
+
+				if (node["RecentProjects"])
+				{
+					m_Config.RecentProjects.clear();
+					for (const auto& entry : node["RecentProjects"])
+					{
+						m_Config.RecentProjects.push_back(entry.as<std::string>());
+					}
+				}
+			}
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("EditorLayer: Failed to load editor settings: {}", e.what());
+		}
+	}
+
+	void EditorLayer::SaveConfig()
+	{
+		YAML::Emitter out;
+		out << YAML::BeginMap;
+		out << YAML::Key << "Editor" << YAML::Value << YAML::BeginMap;
+		out << YAML::Key << "LastProjectPath" << YAML::Value << m_ProjectManager->GetLastProjectPath();
+		m_Config.LastProjectPath = m_ProjectManager->GetLastProjectPath();
+
+#define SAVE_FIELD(yamlKey, field) out << YAML::Key << yamlKey << YAML::Value << m_Config.field;
+		EDITOR_CONFIG_FIELDS(SAVE_FIELD)
+#undef SAVE_FIELD
+
+		out << YAML::Key << "RecentProjects" << YAML::Value << YAML::BeginSeq;
+		for (const auto& path : m_Config.RecentProjects)
+		{
+			out << path;
+		}
+		out << YAML::EndSeq;
+
+		out << YAML::EndMap;
+		out << YAML::EndMap;
+
+		std::filesystem::path configPath = std::filesystem::current_path() / "editor_settings.yaml";
+		std::ofstream fout(configPath);
+		if (!fout.is_open())
+		{
+			CH_CORE_ERROR("EditorLayer: Failed to open editor settings for writing: {}", configPath.string());
+			return;
+		}
+		fout << out.c_str();
+	}
+
+	void EditorLayer::OnAttach()
+	{
+		// Ensure this module (EXE) uses the same ImGui context as the engine DLL
+		auto& app = Application::Get();
+		ImGui::SetCurrentContext(static_cast<ImGuiContext*>(app.GetImGuiLayer()->GetContext()));
+
+		// SetTraceLogCallback removed - now using engine logging
+
+		EditorGUI::ApplyTheme();
+		PropertyEditor::Init();
+		m_Panels->Init();
+
+		// Load editor fonts BEFORE project auto-load.
+		// OnProjectOpened will clear + rebuild the atlas (editor + project fonts together).
+		// LoadEditorFonts must run first so there is a valid atlas for the initial UI frame.
+		LoadEditorFonts();
+
+		// Auto-load last project/scene
+		const auto& config = GetConfig();
+
+		if (config.LoadLastProjectOnStartup && !m_ProjectManager->GetLastProjectPath().empty() &&
+			std::filesystem::exists(m_ProjectManager->GetLastProjectPath()))
+		{
+			CH_CORE_INFO("Auto-loading last project: {}", m_ProjectManager->GetLastProjectPath());
+			m_ProjectManager->OpenProject(m_ProjectManager->GetLastProjectPath());
+			// No ImGui frame is in flight during OnAttach, so it is safe (and
+			// required — the scene below needs asset dirs set) to process now.
+			m_ProjectManager->ProcessPendingProjectOpen();
+
+			if (!config.LastScenePath.empty() && std::filesystem::exists(config.LastScenePath))
+			{
+				CH_CORE_INFO("Auto-loading last scene: {}", config.LastScenePath);
+				m_SceneManager->OpenScene(config.LastScenePath);
+			}
+		}
+		else
+		{
+			Project::SetActive(nullptr);
+		}
+
+		// Ensure layout is initialized
+		const char* iniPath = ImGui::GetIO().IniFilename;
+		if (iniPath && !std::filesystem::exists(iniPath))
+		{
+			CH_CORE_INFO("OnAttach: Layout file '{}' not found, will be reset on first frame", iniPath);
+			GetEditorState().NeedsLayoutReset = true;
+		}
+
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+		if (assetManager)
+		{
+			std::string iconPath = assetManager->ResolvePath("engine/resources/icons/chaineddecosmapeditor.jpg");
+			if (std::filesystem::exists(iconPath))
+			{
+				app.GetWindow().SetWindowIcon(iconPath);
+			}
+			else
+			{
+				CH_CORE_WARN("Editor icon not found at: {}", iconPath);
+			}
+		}
+		CH_CORE_INFO("EditorLayer Attached with modular panels.");
+	}
+
+	void EditorLayer::LoadEditorFonts()
+	{
+		m_FontManager->LoadFonts();
+	}
+
+	void EditorLayer::ReloadEditorFonts()
+	{
+		m_FontManager->ReloadFonts();
+	}
+
+	void EditorLayer::RequestEditorFontReload()
+	{
+		m_FontManager->RequestReload();
+	}
+
+	void EditorLayer::OnDetach()
+	{
+		if (auto scene = GetActiveScene())
+		{
+			if (scene->GetSceneState() != SceneState::Edit)
+			{
+				scene->OnRuntimeStop();
+			}
+		}
+		// Explicitly save the ImGui panel layout before shutdown.
+		// ImGui's built-in autosave runs on a timer (io.IniSavingRate, default 5s) and
+		// may not fire before the process exits — especially if OnDetach is called after
+		// the GLFW window is already destroyed. Saving here guarantees the layout is
+		// always written regardless of shutdown timing.
+		if (m_Layout)
+		{
+			ImGui::SaveIniSettingsToDisk(ImGui::GetIO().IniFilename);
+		}
+		SaveConfig();
+	}
+
+	void EditorLayer::OnUpdate(Timestep ts)
+	{
+		CH_PROFILE_FUNCTION();
+
+		m_ProjectManager->ProcessPendingProjectOpen();
+
+		if (m_FontManager->HasPendingReload())
+		{
+			auto* imguiLayer = Application::Get().GetImGuiLayer();
+			if (imguiLayer)
+			{
+				imguiLayer->ExecuteNextFrame([this]() {
+					ReloadEditorFonts();
+					ImGuiIO& io = ImGui::GetIO();
+					if (!io.Fonts->Fonts.empty())
+					{
+						io.FontDefault = io.Fonts->Fonts[0];
+					}
+				});
+			}
+			m_FontManager->ClearPendingReload();
+		}
+
+		if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+		{
+			if (fontRegistry->NeedsAtlasRebuild())
+			{
+				auto* imguiLayer = Application::Get().GetImGuiLayer();
+				if (imguiLayer)
+				{
+					imguiLayer->ExecuteNextFrame([imguiLayer]() { imguiLayer->RefreshFontAtlasTexture(); });
+				}
+				fontRegistry->ClearRebuildFlag();
+			}
+		}
+
+		if (!m_PendingSceneTransitionPath.empty())
+		{
+			m_SceneManager->OpenScene(m_PendingSceneTransitionPath);
+
+			// Ensure play mode continues after scene load
+			m_SceneManager->SetSceneState(SceneState::Play);
+
+			m_PendingSceneTransitionPath.clear();
+		}
+
+		// 1. Scene manager updates internal transitions and the current active scene
+		m_SceneManager->OnUpdate(ts);
+
+		// 2. Update panels
+		m_Panels->SetContext(GetActiveScene());
+		m_Panels->OnUpdate(ts);
+
+		// 3. If loading — skip everything else
+		if (m_SceneManager->IsLoading())
+		{
+			return;
+		}
+
+		// 4. Logic update (Play/Simulate/Edit) is now handled by the scene
+		// We just call OnUpdate on the active scene
+		if (auto scene = GetActiveScene())
+		{
+			// Detect Edit->Play transition. The same physical click that pressed the
+			// Play toolbar button is still reported by ImGui::IsMouseClicked this
+			// frame, so suppress UI input once to stop it leaking into game widgets.
+			SceneState state = scene->GetSceneState();
+			if (state == SceneState::Play && m_PrevSceneState != SceneState::Play)
+			{
+				m_SuppressNextUIInput = true;
+			}
+			m_PrevSceneState = state;
+
+			// If scene is in Play mode, ask ScriptEngine to execute scripts
+			if (state == SceneState::Play)
+			{
+				// Process UI input before scripts read widget state, unconditionally
+				// each frame (see WidgetRenderer::ProcessInput). Keeps a one-frame
+				// click edge from sticking when the viewport canvas isn't drawn.
+				if (auto* uiRenderer = ServiceLocator::TryGet<WidgetRenderer>())
+				{
+					bool suppress = m_SuppressNextUIInput;
+					m_SuppressNextUIInput = false;
+					uiRenderer->ProcessInput(scene.get(), suppress);
+				}
+
+				auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>();
+				if (scriptEngine && scriptEngine->GetHost().IsInitialized() && scriptEngine->CanExecuteFrameScripts())
+				{
+					scene->OnUpdateRuntime(ts);
+				}
+
+				if (!scene->GetPendingScenePath().empty())
+				{
+					std::string path = scene->GetPendingScenePath();
+					scene->ClearPendingScenePath();
+					m_SceneManager->OpenScene(path);
+				}
+			}
+			else if (scene->GetSceneState() == SceneState::Simulate)
+			{
+				scene->OnUpdateSimulation(ts);
+
+				if (!scene->GetPendingScenePath().empty())
+				{
+					std::string path = scene->GetPendingScenePath();
+					scene->ClearPendingScenePath();
+					m_SceneManager->OpenScene(path);
+				}
+			}
+			else
+			{
+				scene->OnUpdateEditor(ts);
+
+				if (m_Config.AutoSaveEnabled)
+				{
+					m_SceneManager->AutoSave(m_Config.AutoSaveInterval, ts);
+				}
+			}
+		}
+	}
+
+	void EditorLayer::OnRender(Timestep ts)
+	{
+		GraphicsDevice::Get().Clear({25, 25, 25, 255});
+	}
+
+	void EditorLayer::OnImGuiRender()
+	{
+		// ImGuizmo context sync only — BeginFrame() is already called in ImGuiLayer::Begin()
+		ImGuizmo::SetImGuiContext(ImGui::GetCurrentContext());
+
+		if (GetEditorState().NeedsLayoutReset)
+		{
+			ResetLayout();
+			GetEditorState().NeedsLayoutReset = false;
+		}
+
+		bool hasProject = Project::GetActive() != nullptr;
+
+		if (hasProject && GetEditorState().FullscreenGame)
+		{
+			if (auto viewportPanel = m_Panels->Get<ViewportPanel>())
+			{
+				viewportPanel->OnImGuiRender(true);
+			}
+		}
+		else if (hasProject)
+		{
+			m_Layout->OnImGuiRender();
+		}
+		else
+		{
+			m_ProjectSelectorUI->OnImGuiRender();
+		}
+
+		if (m_SceneManager->IsLoading())
+		{
+			DrawLoadingOverlay("Editor Busy", m_SceneManager->GetLoadingStatus().c_str());
+		}
+	}
+
+	void EditorLayer::ResetLayout()
+	{
+		m_Layout->ResetLayout();
+	}
+
+	// Project and Scene event handlers are now managed by EditorProjectManager and EditorSceneManager.
+
+	std::shared_ptr<Scene> EditorLayer::GetActiveScene() const
+	{
+		return m_SceneManager->GetActiveScene();
+	}
+
+	void EditorLayer::OnEvent(Event& e)
+	{
+		if (auto scene = GetActiveScene())
+		{
+			scene->OnEvent(e);
+		}
+
+		// Dispatch events to all editor panels
+		m_Panels->OnEvent(e);
+
+		EventDispatcher dispatcher(e);
+
+		// 1. Scene Management
+		dispatcher.Dispatch<SceneOpenedEvent>([this](auto& e) { return m_SceneManager->OnSceneOpened(e); });
+		dispatcher.Dispatch<ScenePlayEvent>([this](auto& e) {
+			m_SceneManager->SetSceneState(SceneState::Play);
+			return true;
+		});
+		dispatcher.Dispatch<SceneSimulateEvent>([this](auto& e) {
+			m_SceneManager->SetSceneState(SceneState::Simulate);
+			return true;
+		});
+		dispatcher.Dispatch<SceneStopEvent>([this](auto& e) {
+			m_SceneManager->SetSceneState(SceneState::Edit);
+			return true;
+		});
+		dispatcher.Dispatch<SceneModifiedEvent>([this](auto& e) {
+			m_SceneManager->MarkSceneDirty();
+			return true;
+		});
+
+		// 2. Project Management
+		dispatcher.Dispatch<ProjectOpenedEvent>([this](auto& e) { return m_ProjectManager->OnProjectOpened(e); });
+		dispatcher.Dispatch<AppLaunchRuntimeEvent>([this](auto& e) {
+			if (GetSceneState() != SceneState::Play)
+			{
+				m_SceneManager->SetSceneState(SceneState::Play);
+			}
+			else
+			{
+				m_SceneManager->SetSceneState(SceneState::Edit);
+			}
+			return true;
+		});
+
+		// 3. Keyboard shortcuts
+		dispatcher.Dispatch<KeyPressedEvent>([this](KeyPressedEvent& e) { return HandleKeyboardShortcut(e); });
+
+		// 4. Layout/System
+		dispatcher.Dispatch<AppResetLayoutEvent>([this](auto& ev) {
+			ResetLayout();
+			return true;
+		});
+		dispatcher.Dispatch<SceneChangeRequestEvent>([this](auto& ev) {
+			std::filesystem::path scenePath = ev.GetPath();
+			if (scenePath.is_relative() && Project::GetActive())
+			{
+				scenePath = Project::GetActive()->GetAssetPath(ev.GetPath());
+			}
+			m_PendingSceneTransitionPath = scenePath.string();
+			return true;
+		});
+
+		// 5. Selections/Picking
+		dispatcher.Dispatch<EntitySelectedEvent>([this](auto& ev) {
+			if (Scene* scene = ev.GetScene())
+			{
+				SetSelectedEntity(Entity(ev.GetEntity(), &scene->GetRegistry()));
+			}
+			GetEditorState().LastHitMeshIndex = ev.GetMeshIndex();
+			return false;
+		});
+
+		// 6. Raw Input Overrides
+		if (e.GetEventType() == EventType::KeyPressed)
+		{
+			auto& ke = (KeyPressedEvent&)e;
+			if (ke.GetKeyCode() == KeyCode::Escape && GetEditorState().FullscreenGame)
+			{
+				GetEditorState().FullscreenGame = false;
+				e.Handled = true;
+			}
+			else if (ke.GetKeyCode() == KeyCode::F11)
+			{
+				Application::Get().GetWindow().ToggleFullscreen();
+				e.Handled = true;
+			}
+		}
+	}
+
+	bool EditorLayer::HandleKeyboardShortcut(KeyPressedEvent& e)
+	{
+		if (e.IsRepeat())
+		{
+			return false;
+		}
+
+		bool ctrl = Core::Input::IsKeyDown(KeyCode::LeftControl) || Core::Input::IsKeyDown(KeyCode::RightControl);
+		bool shift = Core::Input::IsKeyDown(KeyCode::LeftShift) || Core::Input::IsKeyDown(KeyCode::RightShift);
+		auto keyCode = e.GetKeyCode();
+
+		if (ctrl)
+		{
+			switch (keyCode)
+			{
+			case KeyCode::N:
+				if (GetSceneState() != SceneState::Play)
+				{
+					m_SceneManager->NewScene();
+				}
+				return true;
+			case KeyCode::O:
+				if (GetSceneState() != SceneState::Play)
+				{
+					m_SceneManager->OpenScene();
+				}
+				return true;
+			case KeyCode::S:
+				if (GetSceneState() != SceneState::Play)
+				{
+					shift ? m_SceneManager->SaveSceneAs() : m_SceneManager->SaveScene();
+				}
+				return true;
+			case KeyCode::Z:
+				if (GetSceneState() != SceneState::Play)
+				{
+					m_CommandHistory.Undo();
+				}
+				return true;
+			case KeyCode::Y:
+				if (GetSceneState() != SceneState::Play)
+				{
+					m_CommandHistory.Redo();
+				}
+				return true;
+			}
+		}
+
+		if (keyCode == KeyCode::F5)
+		{
+			m_ProjectManager->LaunchStandalone(m_SceneManager->GetActiveScene());
+			return true;
+		}
+
+		return false;
+	}
+
+	CommandHistory& EditorLayer::GetCommandHistory()
+	{
+		return m_CommandHistory;
+	}
+
+} // namespace Chained
diff --git a/editor/layer.h b/editor/layer.h
new file mode 100644
index 000000000..dd548b097
--- /dev/null
+++ b/editor/layer.h
@@ -0,0 +1,168 @@
+#ifndef CH_EDITOR_LAYER_H
+#define CH_EDITOR_LAYER_H
+
+#include <memory>
+#include <string>
+#include "imgui.h"
+
+#include "engine/scene/scene.h"
+#include "editor/project_manager.h"
+#include "editor/types.h"
+#include "editor/scene_manager.h"
+#include "engine/app/application.h"
+#include "engine/core/layer.h"
+#include "editor/layout.h"
+#include "editor/panels.h"
+#include "editor/undo/command_history.h"
+
+namespace Chained
+{
+
+	class ProjectSelectorUI;
+	class EditorMenu;
+	class KeyPressedEvent;
+	class FontManager;
+	class Framebuffer;
+	class SceneRenderer;
+
+	class EditorLayer : public Layer
+	{
+	public:
+		static EditorLayer& Get()
+		{
+			return *s_Instance;
+		}
+
+		EditorLayer();
+		virtual ~EditorLayer();
+
+		virtual void OnAttach() override;
+		virtual void OnDetach() override;
+		virtual void OnUpdate(Timestep ts) override;
+		virtual void OnRender(Timestep ts) override;
+		virtual void OnImGuiRender() override;
+		virtual void OnEvent(Event& e) override;
+
+		void ResetLayout();
+
+		EditorSceneManager& GetSceneManager()
+		{
+			return *m_SceneManager;
+		}
+		EditorProjectManager& GetProjectManager()
+		{
+			return *m_ProjectManager;
+		}
+
+		Entity GetSelectedEntity() const
+		{
+			return m_EditorState.SelectedEntity;
+		}
+		void SetSelectedEntity(Entity entity)
+		{
+			m_EditorState.SelectedEntity = entity;
+		}
+
+		DebugRenderFlags& GetDebugRenderFlags()
+		{
+			return m_EditorState.DebugRenderFlags;
+		}
+		EditorState& GetEditorState()
+		{
+			return m_EditorState;
+		}
+
+		SceneState GetSceneState() const
+		{
+			return m_SceneManager->GetSceneState();
+		}
+		void SetSceneState(SceneState state)
+		{
+			m_SceneManager->SetSceneState(state);
+		}
+
+	private:
+		void LoadEditorFonts();
+		void DrawLoadingOverlay(const char* title, const char* status);
+		bool HandleKeyboardShortcut(KeyPressedEvent& e);
+
+	public:
+		CommandHistory& GetCommandHistory();
+		EditorPanels& GetPanels()
+		{
+			return *m_Panels;
+		}
+		EditorMenu& GetMenu()
+		{
+			return *m_Menu;
+		}
+
+		ImVec2 GetViewportSize() const
+		{
+			return m_ViewportSize;
+		}
+		ImVec2& GetViewportSizeRef()
+		{
+			return m_ViewportSize;
+		}
+		void OnViewportResized(const ImVec2& size)
+		{
+			m_ViewportSize = size;
+		}
+		void SetLastScenePath(const std::string& path)
+		{
+			m_Config.LastScenePath = path;
+		}
+
+		void LoadConfig();
+		void SaveConfig();
+		const EditorConfig& GetConfig() const
+		{
+			return m_Config;
+		}
+		EditorConfig& GetConfig()
+		{
+			return m_Config;
+		}
+
+		void ReloadEditorFonts();
+		void RequestEditorFontReload();
+		FontManager& GetFontManager()
+		{
+			return *m_FontManager;
+		}
+
+		std::shared_ptr<Scene> GetActiveScene() const;
+		EditorLayout* GetLayout() const
+		{
+			return m_Layout.get();
+		}
+
+	private:
+		EditorConfig m_Config;
+		EditorState m_EditorState;
+
+		std::unique_ptr<EditorLayout> m_Layout;
+		std::unique_ptr<EditorPanels> m_Panels;
+		std::unique_ptr<EditorProjectManager> m_ProjectManager;
+		std::unique_ptr<EditorSceneManager> m_SceneManager;
+		std::unique_ptr<ProjectSelectorUI> m_ProjectSelectorUI;
+		std::unique_ptr<EditorMenu> m_Menu;
+		std::unique_ptr<FontManager> m_FontManager;
+		CommandHistory m_CommandHistory;
+
+		std::string m_PendingSceneTransitionPath;
+		ImVec2 m_ViewportSize = {1280, 720};
+
+		// Tracks the scene state seen on the previous frame so we can detect the
+		// Edit->Play transition. On the first Play frame we suppress UI input so the
+		// physical mouse click that pressed the Play toolbar button (still reported
+		// as IsMouseClicked this frame) does not leak through to game widgets.
+		SceneState m_PrevSceneState = SceneState::Edit;
+		bool m_SuppressNextUIInput = false;
+
+		static inline EditorLayer* s_Instance = nullptr;
+	};
+} // namespace Chained
+
+#endif // CH_EDITOR_LAYER_H
\ No newline at end of file
diff --git a/editor/layout.cpp b/editor/layout.cpp
new file mode 100644
index 000000000..8db104a51
--- /dev/null
+++ b/editor/layout.cpp
@@ -0,0 +1,130 @@
+#include "layer.h"
+#include "editor_menu.h"
+#include "layout.h"
+
+#include "gui.h"
+#include "imgui.h"
+#include "imgui_internal.h"
+#include "engine/core/log.h"
+#include <filesystem>
+
+namespace Chained
+{
+
+	constexpr float kLeftDockRatio = 0.20f;
+
+	EditorLayout::EditorLayout(EditorPanels& panels)
+		: m_Panels(panels)
+	{
+		// Rebuild the default DockBuilder arrangement only when no saved layout exists.
+		// If imgui.ini is present, honor it so the user's arrangement persists across launches.
+		const char* iniPath = ImGui::GetIO().IniFilename;
+		m_NeedsRebuild = !(iniPath != nullptr && std::filesystem::exists(iniPath));
+	}
+
+	void EditorLayout::ResetLayout()
+	{
+		// Delete saved layout and rebuild the default DockBuilder arrangement
+		const char* iniPath = ImGui::GetIO().IniFilename;
+		if (iniPath != nullptr && std::filesystem::exists(iniPath))
+		{
+			std::filesystem::remove(iniPath);
+		}
+		m_NeedsRebuild = true;
+	}
+
+	void EditorLayout::OnImGuiRender()
+	{
+		static bool dockspaceOpen = true;
+		static ImGuiDockNodeFlags dockspace_flags = ImGuiDockNodeFlags_PassthruCentralNode;
+		ImGuiWindowFlags window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking;
+
+		ImGuiViewport* viewport = ImGui::GetMainViewport();
+		ImGui::SetNextWindowPos(viewport->WorkPos);
+		ImGui::SetNextWindowSize(viewport->WorkSize);
+		ImGui::SetNextWindowViewport(viewport->ID);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+		window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize |
+						ImGuiWindowFlags_NoMove;
+		window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
+
+		if (dockspace_flags & ImGuiDockNodeFlags_PassthruCentralNode)
+		{
+			window_flags |= ImGuiWindowFlags_NoBackground;
+		}
+
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
+		ImGui::Begin("MainDockSpaceWindow", &dockspaceOpen, window_flags);
+		ImGui::PopStyleVar();
+		ImGui::PopStyleVar(2);
+
+		ImGuiIO& io = ImGui::GetIO();
+		if (io.ConfigFlags & ImGuiConfigFlags_DockingEnable)
+		{
+			m_DockSpaceID = ImGui::GetID("MyDockSpace");
+
+			if (m_NeedsRebuild)
+			{
+				m_NeedsRebuild = false;
+
+				ImGui::DockBuilderRemoveNode(m_DockSpaceID);
+				ImGui::DockBuilderAddNode(m_DockSpaceID, dockspace_flags | ImGuiDockNodeFlags_DockSpace);
+				ImGui::DockBuilderSetNodeSize(m_DockSpaceID, viewport->WorkSize);
+
+				ImGuiID dock_main_id = m_DockSpaceID;
+
+				// Layout:
+				// dock_left: Scene Hierarchy, World Settings below it
+				// dock_right: Inspector, Material Editor
+				// dock_bottom: Content Browser, Console
+				// Center: Viewport
+
+				// Build the layout splits
+				ImGuiID dock_left =
+					ImGui::DockBuilderSplitNode(dock_main_id, ImGuiDir_Left, kLeftDockRatio, nullptr, &dock_main_id);
+				ImGuiID dock_right =
+					ImGui::DockBuilderSplitNode(dock_main_id, ImGuiDir_Right, 0.25f, nullptr, &dock_main_id);
+				ImGuiID dock_bottom =
+					ImGui::DockBuilderSplitNode(dock_main_id, ImGuiDir_Down, 0.25f, nullptr, &dock_main_id);
+				ImGuiID dock_left_bottom =
+					ImGui::DockBuilderSplitNode(dock_left, ImGuiDir_Down, 0.5f, nullptr, &dock_left);
+
+				// Assign windows to locations
+				ImGui::DockBuilderDockWindow("Scene Hierarchy", dock_left);
+				ImGui::DockBuilderDockWindow("World Settings", dock_left_bottom);
+
+				ImGui::DockBuilderDockWindow("Inspector", dock_right);
+				ImGui::DockBuilderDockWindow("Material Editor", dock_right); // grouped with Inspector
+				ImGui::DockBuilderDockWindow("Network", dock_right);		 // grouped with Inspector
+
+				ImGui::DockBuilderDockWindow("Content Browser", dock_bottom);
+				ImGui::DockBuilderDockWindow("Console", dock_bottom);		  // grouped with Content Browser
+				ImGui::DockBuilderDockWindow("Animation Graph", dock_bottom); // grouped with Content Browser
+				ImGui::DockBuilderDockWindow("Effects & Debug", dock_bottom); // grouped with Content Browser
+				ImGui::DockBuilderDockWindow("Profiler", dock_bottom);		  // grouped with Content Browser
+
+				ImGui::DockBuilderDockWindow("Project Settings", dock_left_bottom); // grouped with World Settings
+
+				ImGui::DockBuilderDockWindow("Viewport", dock_main_id); // remainder
+
+				ImGui::DockBuilderFinish(m_DockSpaceID);
+			}
+
+			ImGui::DockSpace(m_DockSpaceID, ImVec2(0.0f, 0.0f), dockspace_flags);
+		}
+
+		auto& menu = EditorLayer::Get().GetMenu();
+		menu.DrawMenuBar(m_Panels);
+
+		bool readOnly = EditorLayer::Get().GetSceneState() == SceneState::Play;
+		m_Panels.OnImGuiRender(readOnly);
+
+		menu.DrawEditorSettings();
+		menu.DrawExportDialog();
+		menu.DrawExportProgressOverlay();
+
+		ImGui::End();
+	}
+
+} // namespace Chained
diff --git a/editor/layout.h b/editor/layout.h
new file mode 100644
index 000000000..3c2d7cb7b
--- /dev/null
+++ b/editor/layout.h
@@ -0,0 +1,28 @@
+#ifndef CH_EDITOR_LAYOUT_H
+#define CH_EDITOR_LAYOUT_H
+
+#include "editor/panels.h"
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+
+	class EditorLayout
+	{
+	public:
+		EditorLayout(EditorPanels& panels);
+
+		void ResetLayout();
+
+		void OnImGuiRender();
+
+	private:
+		EditorPanels& m_Panels;
+		uint32_t m_DockSpaceID = 0;
+		bool m_NeedsRebuild = true;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_LAYOUT_H
diff --git a/editor/main.cpp b/editor/main.cpp
new file mode 100644
index 000000000..31d53bd97
--- /dev/null
+++ b/editor/main.cpp
@@ -0,0 +1,31 @@
+#include "engine/app/entry_point.h"
+#include "engine/core/platform.h"
+#include "layer.h"
+
+namespace Chained
+{
+	Application* CreateApplication(ApplicationCommandLineArgs args)
+	{
+		ApplicationSpecification spec;
+		spec.Name = "ChainedEditor";
+		spec.CommandLineArgs = args;
+		spec.Headless = false;
+
+		// Default editor window settings
+		spec.Window.Width = 0;
+		spec.Window.Height = 0;
+		spec.Window.Fullscreen = false;
+		spec.EnableScripting = true;
+
+		// Set engine root to the executable directory so AssetManager can find
+		// resources/shaders, resources/icons, resources/font etc.
+		spec.EngineRoot = Platform::GetExecutableDirectory();
+		spec.WorkingDirectory = Platform::GetExecutableDirectory().string();
+
+		auto* app = new Application(spec);
+
+		app->PushLayer(std::make_unique<EditorLayer>());
+
+		return app;
+	}
+} // namespace Chained
diff --git a/editor/panels.cpp b/editor/panels.cpp
new file mode 100644
index 000000000..5a538578e
--- /dev/null
+++ b/editor/panels.cpp
@@ -0,0 +1,85 @@
+#include "panels.h"
+#include "layer.h"
+#include "panels/console_panel.h"
+#include "panels/content_browser_panel.h"
+#include "panels/world_panel.h"
+#include "panels/effects_panel.h"
+#include "panels/material_panel.h"
+#include "panels/inspector_panel.h"
+#include "panels/panel.h"
+#include "panels/profiler_panel.h"
+#include "panels/project_settings_panel.h"
+#include "panels/scene_hierarchy_panel.h"
+#include "panels/viewport_panel.h"
+#include "panels/anim_graph_panel.h"
+#include "panels/network_panel.h"
+
+namespace Chained
+{
+
+	void EditorPanels::Init()
+	{
+		Register<ViewportPanel>(EditorLayer::Get().GetViewportSizeRef());
+		Register<SceneHierarchyPanel>();
+		Register<InspectorPanel>();
+		Register<ContentBrowserPanel>();
+		Register<ConsolePanel>();
+		Register<WorldPanel>();
+		Register<EffectsPanel>();
+		Register<MaterialPanel>();
+		Register<ProfilerPanel>();
+		Register<ProjectSettingsPanel>();
+		Register<AnimGraphPanel>();
+		Register<NetworkPanel>();
+	}
+
+	void EditorPanels::OnUpdate(Timestep ts)
+	{
+		for (auto& panel : m_Panels)
+		{
+			if (!panel->IsPendingKill())
+			{
+				panel->OnUpdate(ts);
+			}
+		}
+
+		m_Panels.erase(std::remove_if(m_Panels.begin(), m_Panels.end(),
+									  [](const std::shared_ptr<Panel>& panel) { return panel->IsPendingKill(); }),
+					   m_Panels.end());
+	}
+
+	void EditorPanels::OnImGuiRender(bool readOnly)
+	{
+		for (auto& panel : m_Panels)
+		{
+			if (!panel->IsPendingKill())
+			{
+				panel->OnImGuiRender(readOnly);
+			}
+		}
+	}
+
+	void EditorPanels::OnEvent(Event& e)
+	{
+		for (auto& panel : m_Panels)
+		{
+			if (e.Handled)
+			{
+				break;
+			}
+			if (!panel->IsPendingKill())
+			{
+				panel->OnEvent(e);
+			}
+		}
+	}
+
+	void EditorPanels::SetContext(const std::shared_ptr<Scene>& context)
+	{
+		for (auto& panel : m_Panels)
+		{
+			panel->SetContext(context);
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/panels.h b/editor/panels.h
new file mode 100644
index 000000000..17f9804ff
--- /dev/null
+++ b/editor/panels.h
@@ -0,0 +1,76 @@
+#ifndef CH_EDITOR_PANELS_H
+#define CH_EDITOR_PANELS_H
+
+#include "engine/common/timestep.h"
+#include "panels/panel.h"
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+
+	class EditorPanels
+	{
+	public:
+		EditorPanels() = default;
+		~EditorPanels() = default;
+
+		void Init();
+
+		template <typename T, typename... Args> std::shared_ptr<T> Register(Args&&... args)
+		{
+			auto panel = std::make_shared<T>(std::forward<Args>(args)...);
+			m_Panels.push_back(panel);
+			return panel;
+		}
+
+		template <typename T> std::shared_ptr<T> Get()
+		{
+			for (auto& panel : m_Panels)
+			{
+				if (auto cast = std::dynamic_pointer_cast<T>(panel))
+				{
+					return cast;
+				}
+			}
+			return nullptr;
+		}
+
+		std::shared_ptr<Panel> Get(const std::string& name)
+		{
+			for (auto& panel : m_Panels)
+			{
+				if (panel->GetName() == name)
+				{
+					return panel;
+				}
+			}
+			return nullptr;
+		}
+
+		template <typename F> void ForEach(F&& func)
+		{
+			for (auto& panel : m_Panels)
+			{
+				func(panel);
+			}
+		}
+
+		void OnUpdate(Timestep ts);
+		void OnImGuiRender(bool readOnly);
+		void OnEvent(Event& e);
+		void SetContext(const std::shared_ptr<Scene>& context);
+
+		std::vector<std::shared_ptr<Panel>>& GetPanels()
+		{
+			return m_Panels;
+		}
+
+	private:
+		std::vector<std::shared_ptr<Panel>> m_Panels;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_PANELS_H
diff --git a/editor/panels/anim_graph_panel.cpp b/editor/panels/anim_graph_panel.cpp
new file mode 100644
index 000000000..1b859383b
--- /dev/null
+++ b/editor/panels/anim_graph_panel.cpp
@@ -0,0 +1,1079 @@
+#include <imgui.h>
+#include <GraphEditor.h>
+#include "engine/assets/types/animation_graph_asset.h"
+#include "engine/scene/components/animation/animation_component.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/loaders/anim_graph_loader.h"
+#include "engine/core/service_locator.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "editor/panels/anim_graph_panel.h"
+#include "editor/layer.h"
+
+namespace Chained
+{
+
+	static const char* s_InputNames[] = {"In"};
+	static const char* s_OutputNames[] = {"Out"};
+
+	static const GraphEditor::Template s_Templates[] = {
+		// 0: Entry node — gold header, no inputs, 1 output
+		{IM_COL32(255, 200, 0, 255), IM_COL32(60, 60, 40, 255), IM_COL32(80, 80, 50, 255), 0, nullptr, nullptr, 1,
+		 s_OutputNames, nullptr},
+		// 1: State node — blue header, 1 input, 1 output
+		{IM_COL32(100, 150, 200, 255), IM_COL32(60, 80, 100, 255), IM_COL32(70, 90, 110, 255), 1, s_InputNames, nullptr,
+		 1, s_OutputNames, nullptr}};
+
+	// ── Delegate ──────────────────────────────────────────────────────
+
+	void AnimGraphPanel::Delegate::SyncSelection()
+	{
+		if (!graph)
+		{
+			nodeSelected.clear();
+			return;
+		}
+		nodeSelected.resize(graph->Nodes.size(), false);
+	}
+
+	bool AnimGraphPanel::Delegate::AllowedLink(GraphEditor::NodeIndex from, GraphEditor::NodeIndex to)
+	{
+		return from != to;
+	}
+
+	void AnimGraphPanel::Delegate::SelectNode(GraphEditor::NodeIndex nodeIndex, bool selected)
+	{
+		if (nodeIndex < nodeSelected.size())
+		{
+			nodeSelected[nodeIndex] = selected;
+		}
+
+		// Override/restore animation preview in main viewport
+		if (panel)
+		{
+			Entity entity = EditorLayer::Get().GetSelectedEntity();
+			if (selected)
+			{
+				panel->ApplyPreview(graph, (int)nodeIndex, entity);
+			}
+			else
+			{
+				panel->RestorePreview();
+			}
+		}
+	}
+
+	void AnimGraphPanel::Delegate::MoveSelectedNodes(const ImVec2 delta)
+	{
+		if (!graph)
+		{
+			return;
+		}
+		for (size_t i = 0; i < graph->Nodes.size(); i++)
+		{
+			if (i < nodeSelected.size() && nodeSelected[i])
+			{
+				graph->Nodes[i].EditorX += delta.x;
+				graph->Nodes[i].EditorY += delta.y;
+			}
+		}
+	}
+
+	void AnimGraphPanel::Delegate::AddLink(GraphEditor::NodeIndex inputNodeIndex, GraphEditor::SlotIndex,
+										   GraphEditor::NodeIndex outputNodeIndex, GraphEditor::SlotIndex)
+	{
+		if (!graph)
+		{
+			return;
+		}
+		if (inputNodeIndex >= graph->Nodes.size() || outputNodeIndex >= graph->Nodes.size())
+		{
+			return;
+		}
+
+		AnimTransition tr;
+		tr.ID = graph->NextLinkID++;
+		tr.SourceNodeID = graph->Nodes[outputNodeIndex].ID;
+		tr.TargetNodeID = graph->Nodes[inputNodeIndex].ID;
+		tr.BlendDuration = 0.2f;
+		graph->Transitions.push_back(tr);
+		if (changedFlag)
+		{
+			*changedFlag = true;
+		}
+	}
+
+	void AnimGraphPanel::Delegate::DelLink(GraphEditor::LinkIndex linkIndex)
+	{
+		if (!graph || linkIndex >= graph->Transitions.size())
+		{
+			return;
+		}
+		graph->Transitions.erase(graph->Transitions.begin() + linkIndex);
+		if (changedFlag)
+		{
+			*changedFlag = true;
+		}
+	}
+
+	void AnimGraphPanel::Delegate::RightClick(GraphEditor::NodeIndex, GraphEditor::SlotIndex, GraphEditor::SlotIndex)
+	{
+		// Because Delegate is abstract class , but don`t implement any right now.
+	}
+
+	void AnimGraphPanel::Delegate::CustomDraw(ImDrawList* drawList, ImRect rectangle, GraphEditor::NodeIndex nodeIndex)
+	{
+		if (!graph || nodeIndex >= graph->Nodes.size())
+		{
+			return;
+		}
+
+		auto& node = graph->Nodes[nodeIndex];
+		ImVec2 textPos = rectangle.Min + ImVec2(8, 28);
+
+		if (node.ID == graph->EntryNodeID)
+		{
+			drawList->AddText(textPos, IM_COL32(255, 220, 80, 255), "[Entry]");
+			textPos.y += 16;
+		}
+		else
+		{
+			char buf[64];
+			snprintf(buf, sizeof(buf), "Anim: %d", node.AnimationIndex);
+			drawList->AddText(textPos, IM_COL32(200, 200, 200, 200), buf);
+			textPos.y += 16;
+		}
+
+		// Frame range
+		char rangeBuf[64];
+		if (node.EndFrame < 0)
+		{
+			snprintf(rangeBuf, sizeof(rangeBuf), "Frames: %d-end", node.StartFrame);
+		}
+		else
+		{
+			snprintf(rangeBuf, sizeof(rangeBuf), "Frames: %d-%d", node.StartFrame, node.EndFrame);
+		}
+		drawList->AddText(textPos, IM_COL32(160, 160, 160, 200), rangeBuf);
+		textPos.y += 14;
+
+		// Speed
+		if (node.Speed != 1.0f)
+		{
+			char spdBuf[32];
+			snprintf(spdBuf, sizeof(spdBuf), "Speed: %.1fx", node.Speed);
+			drawList->AddText(textPos, IM_COL32(180, 220, 180, 200), spdBuf);
+		}
+	}
+
+	const size_t AnimGraphPanel::Delegate::GetTemplateCount()
+	{
+		return 2;
+	}
+
+	const GraphEditor::Template AnimGraphPanel::Delegate::GetTemplate(GraphEditor::TemplateIndex index)
+	{
+		if (index < 2)
+		{
+			return s_Templates[index];
+		}
+		return s_Templates[1];
+	}
+
+	const size_t AnimGraphPanel::Delegate::GetNodeCount()
+	{
+		return graph ? graph->Nodes.size() : 0;
+	}
+
+	const GraphEditor::Node AnimGraphPanel::Delegate::GetNode(GraphEditor::NodeIndex index)
+	{
+		if (!graph || index >= graph->Nodes.size())
+		{
+			return {};
+		}
+
+		auto& node = graph->Nodes[index];
+		GraphEditor::TemplateIndex tpl = (node.ID == graph->EntryNodeID) ? 0 : 1;
+		bool sel = (index < nodeSelected.size()) ? nodeSelected[index] : false;
+
+		return {node.Name.c_str(), tpl,
+				ImRect(ImVec2(node.EditorX, node.EditorY), ImVec2(node.EditorX + 180, node.EditorY + 80)), sel};
+	}
+
+	const size_t AnimGraphPanel::Delegate::GetLinkCount()
+	{
+		return graph ? graph->Transitions.size() : 0;
+	}
+
+	const GraphEditor::Link AnimGraphPanel::Delegate::GetLink(GraphEditor::LinkIndex index)
+	{
+		if (!graph || index >= graph->Transitions.size())
+		{
+			return {};
+		}
+
+		auto& tr = graph->Transitions[index];
+
+		auto findIndex = [&](int nodeID) -> GraphEditor::NodeIndex {
+			for (size_t i = 0; i < graph->Nodes.size(); i++)
+			{
+				if (graph->Nodes[i].ID == nodeID)
+				{
+					return i;
+				}
+			}
+			return 0;
+		};
+
+		return {findIndex(tr.TargetNodeID), 0, findIndex(tr.SourceNodeID), 0};
+	}
+
+	// ── Panel ─────────────────────────────────────────────────────────
+
+	AnimGraphPanel::AnimGraphPanel()
+	{
+		m_Name = "Animation Graph";
+		m_Delegate.panel = this;
+	}
+
+	AnimGraphPanel::~AnimGraphPanel()
+	{
+		RestorePreview();
+	}
+
+	void AnimGraphPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		ImGui::Begin("Animation Graph", &m_IsOpen);
+
+		Entity selectedEntity = EditorLayer::Get().GetSelectedEntity();
+
+		// Restore preview if entity changed
+		if (m_PreviewNodeIdx >= 0 && m_PreviewEntity != selectedEntity)
+		{
+			RestorePreview();
+		}
+
+		if (!selectedEntity || !selectedEntity.HasComponent<AnimationComponent>())
+		{
+			ImGui::Text("Select an entity with an AnimationComponent.");
+			ImGui::End();
+			return;
+		}
+
+		if (!selectedEntity.HasComponent<ModelComponent>())
+		{
+			ImGui::Text("Entity must have a ModelComponent.");
+			ImGui::End();
+			return;
+		}
+
+		auto& animComp = selectedEntity.GetComponent<AnimationComponent>();
+
+		AnimationGraphAsset* graph = nullptr;
+		if (!animComp.GraphPath.empty())
+		{
+			auto* assets = ServiceLocator::TryGet<AssetManager>();
+			if (assets)
+			{
+				auto asset = assets->Get<AnimationGraphAsset>(animComp.GraphPath);
+				if (asset)
+				{
+					graph = asset.get();
+				}
+			}
+		}
+
+		if (!graph)
+		{
+			RestorePreview();
+			ImGui::TextDisabled("No animation graph loaded.");
+
+			// Generate unique name for entity
+			std::string baseName = "anim_graph";
+			if (selectedEntity.HasComponent<TagComponent>())
+			{
+				std::string tag = selectedEntity.GetComponent<TagComponent>().Tag;
+				if (!tag.empty())
+				{
+					std::string cleanTag = tag;
+					std::replace(cleanTag.begin(), cleanTag.end(), ' ', '_');
+					std::replace(cleanTag.begin(), cleanTag.end(), '/', '_');
+					std::replace(cleanTag.begin(), cleanTag.end(), '\\', '_');
+					std::replace(cleanTag.begin(), cleanTag.end(), '#', '_');
+					std::transform(cleanTag.begin(), cleanTag.end(), cleanTag.begin(), ::tolower);
+					baseName = cleanTag + "_graph";
+				}
+			}
+			else if (selectedEntity.HasComponent<ModelComponent>())
+			{
+				std::string mPath = selectedEntity.GetComponent<ModelComponent>().ModelPath;
+				if (!mPath.empty())
+				{
+					baseName = std::filesystem::path(mPath).stem().string() + "_graph";
+				}
+			}
+
+			auto* assets = ServiceLocator::TryGet<AssetManager>();
+			std::string uniqueGraphPath = "animations/" + baseName + ".chag";
+			if (assets)
+			{
+				int counter = 1;
+				while (std::filesystem::exists(assets->ResolvePath(uniqueGraphPath)))
+				{
+					uniqueGraphPath = "animations/" + baseName + "_" + std::to_string(counter++) + ".chag";
+				}
+			}
+
+			if (ImGui::Button("Create New Graph"))
+			{
+				animComp.GraphPath = uniqueGraphPath;
+				animComp.GraphAssetHandle = 0;
+				m_ChangedGraph = true;
+
+				AnimationGraphAsset newGraph;
+				SaveGraph(&newGraph, animComp.GraphPath);
+				if (assets)
+				{
+					assets->Invalidate(animComp.GraphPath);
+				}
+			}
+			ImGui::End();
+			return;
+		}
+
+		// Toolbar
+		{
+			ImVec4 btnColor = m_ChangedGraph ? ImVec4(0.8f, 0.4f, 0.1f, 1.0f) : ImVec4(0.3f, 0.3f, 0.3f, 1.0f);
+			ImGui::PushStyleColor(ImGuiCol_Button, btnColor);
+			if (ImGui::Button(ICON_FA_FLOPPY_DISK " Save"))
+			{
+				SaveGraph(graph, animComp.GraphPath);
+				m_ChangedGraph = false;
+			}
+			ImGui::PopStyleColor();
+
+			ImGui::SameLine();
+			if (ImGui::Button(ICON_FA_COPY " Clone Graph"))
+			{
+				auto* assets = ServiceLocator::TryGet<AssetManager>();
+				if (assets && !animComp.GraphPath.empty())
+				{
+					std::filesystem::path p(animComp.GraphPath);
+					std::string newPath = (p.parent_path() / (p.stem().string() + "_copy.chag")).generic_string();
+					int counter = 1;
+					while (std::filesystem::exists(assets->ResolvePath(newPath)))
+					{
+						newPath =
+							(p.parent_path() / (p.stem().string() + "_copy" + std::to_string(counter++) + ".chag"))
+								.generic_string();
+					}
+					SaveGraph(graph, newPath);
+					animComp.GraphPath = newPath;
+					animComp.GraphAssetHandle = 0;
+					assets->Invalidate(newPath);
+					m_ChangedGraph = false;
+				}
+			}
+
+			ImGui::SameLine();
+			if (ImGui::Button("Add State"))
+			{
+				AnimNode newNode;
+				newNode.ID = graph->NextNodeID++;
+				newNode.Name = "State " + std::to_string(newNode.ID);
+				newNode.EditorX = 100.0f + (graph->Nodes.size() % 3) * 220.0f;
+				newNode.EditorY = 100.0f + (graph->Nodes.size() / 3) * 120.0f;
+				graph->Nodes.push_back(newNode);
+				m_Delegate.nodeSelected.push_back(false);
+				m_ChangedGraph = true;
+			}
+
+			ImGui::SameLine();
+			if (ImGui::Button("Fit All"))
+			{
+				m_Fit = GraphEditor::Fit_AllNodes;
+			}
+
+			ImGui::SameLine();
+			if (ImGui::Button("Fit Selected"))
+			{
+				m_Fit = GraphEditor::Fit_SelectedNodes;
+			}
+
+			ImGui::SameLine();
+			ImGui::TextDisabled("File: %s", animComp.GraphPath.c_str());
+		}
+
+		// Graph editor | Properties side-by-side
+		m_Delegate.graph = graph;
+		m_Delegate.changedFlag = &m_ChangedGraph;
+		m_Delegate.SyncSelection();
+
+		float avail = ImGui::GetContentRegionAvail().x;
+		float graphWidth = avail * 0.72f;
+
+		ImGui::BeginChild("GraphEditor", ImVec2(graphWidth, 0));
+		GraphEditor::Show(m_Delegate, m_Options, m_ViewState, true, &m_Fit);
+		ImGui::EndChild();
+
+		ImGui::SameLine();
+
+		ImGui::BeginChild("Properties", ImVec2(0, 0));
+		DrawProperties(graph, selectedEntity);
+		ImGui::EndChild();
+
+		ImGui::End();
+	}
+
+	void AnimGraphPanel::RestorePreview()
+	{
+		if (!m_PreviewEntity || !m_PreviewEntity.HasComponent<AnimationComponent>())
+		{
+			return;
+		}
+		auto& anim = m_PreviewEntity.GetComponent<AnimationComponent>();
+		anim.CurrentAnimationIndex = m_OrigAnimIndex;
+		anim.CurrentFrame = m_OrigFrame;
+		anim.StartFrame = m_OrigStartFrame;
+		anim.EndFrame = m_OrigEndFrame;
+		anim.Speed = m_OrigSpeed;
+		anim.IsLooping = m_OrigIsLooping;
+		anim.IsPlaying = m_OrigIsPlaying;
+		m_PreviewNodeIdx = -1;
+	}
+
+	void AnimGraphPanel::ApplyPreview(AnimationGraphAsset* graph, int nodeIdx, Entity entity)
+	{
+		if (!graph || nodeIdx < 0 || nodeIdx >= (int)graph->Nodes.size())
+		{
+			return;
+		}
+		if (!entity || !entity.HasComponent<AnimationComponent>())
+		{
+			return;
+		}
+
+		auto& anim = entity.GetComponent<AnimationComponent>();
+		auto& node = graph->Nodes[nodeIdx];
+
+		// Save original state
+		m_OrigAnimIndex = anim.CurrentAnimationIndex;
+		m_OrigFrame = anim.CurrentFrame;
+		m_OrigStartFrame = anim.StartFrame;
+		m_OrigEndFrame = anim.EndFrame;
+		m_OrigSpeed = anim.Speed;
+		m_OrigIsLooping = anim.IsLooping;
+		m_OrigIsPlaying = anim.IsPlaying;
+		m_PreviewEntity = entity;
+
+		// Override with node's animation
+		anim.CurrentNodeID = node.ID;
+		anim.CurrentAnimationIndex = node.AnimationIndex;
+		anim.StartFrame = node.StartFrame;
+		anim.EndFrame = node.EndFrame;
+		anim.Speed = (node.Speed > 0.0f) ? node.Speed : 1.0f;
+		anim.IsLooping = node.IsLooping;
+		anim.CurrentFrame = node.StartFrame;
+		anim.IsPlaying = true;
+
+		m_PreviewNodeIdx = nodeIdx;
+	}
+
+	void AnimGraphPanel::DrawProperties(AnimationGraphAsset* graph, Entity entity)
+	{
+		if (!entity || !entity.HasComponent<AnimationComponent>())
+		{
+			return;
+		}
+		auto& animComp = entity.GetComponent<AnimationComponent>();
+
+		ImGui::Text("Is Playing");
+		ImGui::SameLine(120);
+		ImGui::Checkbox("##isPlaying", &animComp.IsPlaying);
+
+		ImGui::Separator();
+
+		ImGui::Text("Properties");
+		ImGui::Separator();
+
+		// Find first selected node
+		int selectedIdx = -1;
+		for (size_t i = 0; i < m_Delegate.nodeSelected.size(); i++)
+		{
+			if (m_Delegate.nodeSelected[i])
+			{
+				selectedIdx = (int)i;
+				break;
+			}
+		}
+
+		if (selectedIdx != -1 && selectedIdx < (int)graph->Nodes.size())
+		{
+			AnimNode& node = graph->Nodes[selectedIdx];
+
+			// Keep entity preview synced to selected node in Edit mode
+			bool isSimulation = EditorLayer::Get().GetSceneState() != SceneState::Edit;
+			if (!isSimulation)
+			{
+				animComp.CurrentNodeID = node.ID;
+				animComp.CurrentAnimationIndex = node.AnimationIndex;
+				animComp.StartFrame = node.StartFrame;
+				animComp.EndFrame = node.EndFrame;
+				animComp.Speed = (node.Speed > 0.0f) ? node.Speed : 1.0f;
+				animComp.IsLooping = node.IsLooping;
+			}
+
+			char buffer[256];
+			strncpy(buffer, node.Name.c_str(), sizeof(buffer));
+			buffer[sizeof(buffer) - 1] = '\0';
+			if (ImGui::InputText("Name", buffer, sizeof(buffer)))
+			{
+				node.Name = buffer;
+				m_ChangedGraph = true;
+			}
+
+			if (node.ID == graph->EntryNodeID)
+			{
+				ImGui::TextColored(ImVec4(1.0f, 0.85f, 0.0f, 1.0f), "Entry Node");
+			}
+			else
+			{
+				if (ImGui::Button("Set as Entry"))
+				{
+					graph->EntryNodeID = node.ID;
+					m_ChangedGraph = true;
+				}
+			}
+
+			// Animation picker
+			{
+				bool foundModel = false;
+				if (entity.HasComponent<ModelComponent>())
+				{
+					auto& modelComp = entity.GetComponent<ModelComponent>();
+					auto* assets = ServiceLocator::TryGet<AssetManager>();
+					if (assets)
+					{
+						auto modelAsset = assets->Get<ModelAsset>(modelComp.ModelPath);
+						if (modelAsset && modelAsset->GetAnimationCount() > 0)
+						{
+							foundModel = true;
+							int animCount = modelAsset->GetAnimationCount();
+							int idx = node.AnimationIndex;
+							if (idx < 0 || idx >= animCount)
+							{
+								idx = 0;
+							}
+
+							char labelBuf[128];
+							std::string animName = modelAsset->GetAnimationName(idx);
+							if (animName.empty())
+							{
+								snprintf(labelBuf, sizeof(labelBuf), "Animation %d", idx);
+							}
+							else
+							{
+								snprintf(labelBuf, sizeof(labelBuf), "%s (%d)", animName.c_str(), idx);
+							}
+
+							if (ImGui::BeginCombo("Animation", labelBuf))
+							{
+								for (int i = 0; i < animCount; i++)
+								{
+									bool isSel = (idx == i);
+									std::string name = modelAsset->GetAnimationName(i);
+									char itemBuf[128];
+									if (name.empty())
+									{
+										snprintf(itemBuf, sizeof(itemBuf), "Animation %d", i);
+									}
+									else
+									{
+										snprintf(itemBuf, sizeof(itemBuf), "%s (%d)", name.c_str(), i);
+									}
+									if (ImGui::Selectable(itemBuf, isSel))
+									{
+										node.AnimationIndex = i;
+										node.StartFrame = 0;
+										node.EndFrame = -1;
+										m_ChangedGraph = true;
+									}
+								}
+								ImGui::EndCombo();
+							}
+
+							// Show frame range info
+							const auto& rawAnims = modelAsset->GetAnimations();
+							if (idx >= 0 && idx < (int)rawAnims.size())
+							{
+								int totalFrames = rawAnims[idx].frameCount;
+								float fps = rawAnims[idx].frameRate;
+								float duration = (float)totalFrames / fps;
+								ImGui::TextDisabled("Total: %d frames (%.2fs @ %.0f fps)", totalFrames, duration, fps);
+
+								// Start Frame
+								int sf = node.StartFrame;
+								if (ImGui::DragInt("Start Frame", &sf, 1, 0, totalFrames - 1))
+								{
+									node.StartFrame = std::clamp(sf, 0, totalFrames - 1);
+									if (node.EndFrame >= 0 && node.EndFrame < node.StartFrame)
+									{
+										node.EndFrame = node.StartFrame;
+									}
+									m_ChangedGraph = true;
+								}
+
+								// End Frame
+								int ef = node.EndFrame;
+								const char* endLabel = (node.EndFrame < 0) ? "End Frame (auto)" : "End Frame";
+								if (ImGui::DragInt(endLabel, &ef, 1, -1, totalFrames - 1))
+								{
+									node.EndFrame = ef;
+									if (node.EndFrame >= 0 && node.EndFrame < node.StartFrame)
+									{
+										node.EndFrame = node.StartFrame;
+									}
+									m_ChangedGraph = true;
+								}
+
+								// Duration preview
+								int endFrame = (node.EndFrame < 0) ? (totalFrames - 1) : node.EndFrame;
+								int clipLength = endFrame - node.StartFrame + 1;
+								float clipDuration = (float)clipLength / fps;
+								float speedDuration = (node.Speed > 0.0f) ? clipDuration / node.Speed : clipDuration;
+								ImGui::Text("Clip: %d frames (%.2fs)", clipLength, clipDuration);
+								if (node.Speed != 1.0f)
+								{
+									ImGui::Text("Effective: %.2fs (speed %.1fx)", speedDuration, node.Speed);
+								}
+							}
+						}
+					}
+				}
+				if (!foundModel)
+				{
+					if (ImGui::InputInt("Animation Index", &node.AnimationIndex))
+					{
+						m_ChangedGraph = true;
+					}
+					if (ImGui::InputInt("Start Frame", &node.StartFrame))
+					{
+						m_ChangedGraph = true;
+					}
+					if (ImGui::InputInt("End Frame", &node.EndFrame))
+					{
+						m_ChangedGraph = true;
+					}
+				}
+			}
+
+			if (ImGui::Checkbox("Is Looping", &node.IsLooping))
+			{
+				m_ChangedGraph = true;
+			}
+
+			if (ImGui::DragFloat("Speed", &node.Speed, 0.05f, 0.01f, 10.0f, "%.2f"))
+			{
+				m_ChangedGraph = true;
+			}
+
+			if (m_ChangedGraph)
+			{
+				animComp.CurrentNodeID = node.ID;
+				animComp.CurrentAnimationIndex = node.AnimationIndex;
+				animComp.StartFrame = node.StartFrame;
+				animComp.EndFrame = node.EndFrame;
+				animComp.Speed = (node.Speed > 0.0f) ? node.Speed : 1.0f;
+				animComp.IsLooping = node.IsLooping;
+				if (animComp.CurrentFrame < animComp.StartFrame ||
+					(animComp.EndFrame >= 0 && animComp.CurrentFrame > animComp.EndFrame))
+				{
+					animComp.CurrentFrame = animComp.StartFrame;
+				}
+			}
+
+			ImGui::Separator();
+			if (ImGui::Button("Delete Node"))
+			{
+				int nodeId = node.ID;
+				graph->Nodes.erase(std::remove_if(graph->Nodes.begin(), graph->Nodes.end(),
+												  [nodeId](const AnimNode& n) { return n.ID == nodeId; }),
+								   graph->Nodes.end());
+				graph->Transitions.erase(std::remove_if(graph->Transitions.begin(), graph->Transitions.end(),
+														[nodeId](const AnimTransition& t) {
+															return t.SourceNodeID == nodeId || t.TargetNodeID == nodeId;
+														}),
+										 graph->Transitions.end());
+				if (graph->EntryNodeID == nodeId)
+				{
+					graph->EntryNodeID = -1;
+				}
+				m_Delegate.SyncSelection();
+				m_ChangedGraph = true;
+			}
+		}
+		else
+		{
+			ImGui::TextDisabled("Select a node to edit properties");
+		}
+
+		// Transitions section
+		ImGui::Spacing();
+		ImGui::Separator();
+		ImGui::Text("Transitions");
+		ImGui::Separator();
+
+		if (ImGui::Button("+ Add Transition"))
+		{
+			AnimTransition tr;
+			tr.ID = graph->NextLinkID++;
+			tr.BlendDuration = 0.2f;
+			graph->Transitions.push_back(tr);
+			m_ChangedGraph = true;
+		}
+
+		for (size_t i = 0; i < graph->Transitions.size(); i++)
+		{
+			AnimTransition& tr = graph->Transitions[i];
+
+			auto findNodeName = [&](int nodeID) -> std::string {
+				for (auto& n : graph->Nodes)
+				{
+					if (n.ID == nodeID)
+					{
+						return n.Name;
+					}
+				}
+				return "Unknown";
+			};
+
+			ImGui::PushID((int)i);
+
+			bool open = ImGui::TreeNode("##tr", "%s -> %s", findNodeName(tr.SourceNodeID).c_str(),
+										findNodeName(tr.TargetNodeID).c_str());
+			if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(0))
+			{
+				// Select this transition
+			}
+
+			if (open)
+			{
+				// Source node picker
+				{
+					int srcIdx = -1;
+					for (size_t j = 0; j < graph->Nodes.size(); j++)
+					{
+						if (graph->Nodes[j].ID == tr.SourceNodeID)
+						{
+							srcIdx = (int)j;
+							break;
+						}
+					}
+
+					char srcLabel[128];
+					snprintf(srcLabel, sizeof(srcLabel), "%s###src",
+							 (srcIdx >= 0) ? graph->Nodes[srcIdx].Name.c_str() : "None");
+					if (ImGui::BeginCombo("From", srcLabel))
+					{
+						for (size_t j = 0; j < graph->Nodes.size(); j++)
+						{
+							bool isSel = ((int)j == srcIdx);
+							if (ImGui::Selectable(graph->Nodes[j].Name.c_str(), isSel))
+							{
+								tr.SourceNodeID = graph->Nodes[j].ID;
+								m_ChangedGraph = true;
+							}
+						}
+						ImGui::EndCombo();
+					}
+				}
+
+				// Target node picker
+				{
+					int tgtIdx = -1;
+					for (size_t j = 0; j < graph->Nodes.size(); j++)
+					{
+						if (graph->Nodes[j].ID == tr.TargetNodeID)
+						{
+							tgtIdx = (int)j;
+							break;
+						}
+					}
+
+					char tgtLabel[128];
+					snprintf(tgtLabel, sizeof(tgtLabel), "%s###tgt",
+							 (tgtIdx >= 0) ? graph->Nodes[tgtIdx].Name.c_str() : "None");
+					if (ImGui::BeginCombo("To", tgtLabel))
+					{
+						for (size_t j = 0; j < graph->Nodes.size(); j++)
+						{
+							bool isSel = ((int)j == tgtIdx);
+							if (ImGui::Selectable(graph->Nodes[j].Name.c_str(), isSel))
+							{
+								tr.TargetNodeID = graph->Nodes[j].ID;
+								m_ChangedGraph = true;
+							}
+						}
+						ImGui::EndCombo();
+					}
+				}
+
+				if (ImGui::DragFloat("Blend Duration", &tr.BlendDuration, 0.01f, 0.0f, 5.0f, "%.2f s"))
+				{
+					m_ChangedGraph = true;
+				}
+
+				if (ImGui::Checkbox("Has Exit Time", &tr.HasExitTime))
+				{
+					m_ChangedGraph = true;
+				}
+
+				if (tr.HasExitTime)
+				{
+					if (ImGui::DragFloat("Exit Time", &tr.ExitTime, 0.01f, 0.0f, 1.0f, "%.2f"))
+					{
+						m_ChangedGraph = true;
+					}
+				}
+
+				// Conditions
+				ImGui::Text("Conditions:");
+				if (ImGui::Button("+ Condition"))
+				{
+					AnimCondition cond;
+					cond.Op = AnimConditionOp::Greater;
+					tr.Conditions.push_back(cond);
+					m_ChangedGraph = true;
+				}
+
+				for (size_t c = 0; c < tr.Conditions.size(); c++)
+				{
+					AnimCondition& cond = tr.Conditions[c];
+					ImGui::PushID((int)c);
+
+					char varBuf[128];
+					strncpy(varBuf, cond.VariableName.c_str(), sizeof(varBuf));
+					varBuf[sizeof(varBuf) - 1] = '\0';
+					if (ImGui::InputText("Var", varBuf, sizeof(varBuf)))
+					{
+						cond.VariableName = varBuf;
+						m_ChangedGraph = true;
+					}
+
+					const char* ops[] = {"==", "!=", ">", "<", ">=", "<="};
+					int opIdx = (int)cond.Op;
+					if (ImGui::Combo("Op", &opIdx, ops, IM_ARRAYSIZE(ops)))
+					{
+						cond.Op = (AnimConditionOp)opIdx;
+						m_ChangedGraph = true;
+					}
+
+					if (ImGui::DragFloat("Value", &cond.Value, 0.01f))
+					{
+						m_ChangedGraph = true;
+					}
+
+					ImGui::SameLine();
+					if (ImGui::SmallButton("X"))
+					{
+						tr.Conditions.erase(tr.Conditions.begin() + c);
+						m_ChangedGraph = true;
+						ImGui::PopID();
+						break;
+					}
+
+					ImGui::PopID();
+				}
+
+				if (ImGui::SmallButton("Delete Transition"))
+				{
+					graph->Transitions.erase(graph->Transitions.begin() + i);
+					m_ChangedGraph = true;
+					ImGui::TreePop();
+					ImGui::PopID();
+					break;
+				}
+
+				ImGui::TreePop();
+			}
+
+			ImGui::PopID();
+		}
+
+		// Variables section
+		ImGui::Spacing();
+		ImGui::Separator();
+		ImGui::Text("Variables");
+		ImGui::Separator();
+
+		// Two buttons: + Float  |  + Bool
+		if (ImGui::Button("+ Float"))
+		{
+			std::string key = "new_float";
+			int idx = 0;
+			while (animComp.Variables.count(key))
+			{
+				key = "new_float_" + std::to_string(++idx);
+			}
+			animComp.Variables[key] = 0.0f;
+			graph->DefaultVariables[key] = 0.0f; // sync to graph schema
+			m_VariableTypes[key] = VarType::Float;
+			m_ChangedGraph = true;
+		}
+		ImGui::SameLine();
+		if (ImGui::Button("+ Bool"))
+		{
+			std::string key = "new_bool";
+			int idx = 0;
+			while (animComp.Variables.count(key))
+			{
+				key = "new_bool_" + std::to_string(++idx);
+			}
+			animComp.Variables[key] = 0.0f;
+			graph->DefaultVariables[key] = 0.0f; // sync to graph schema
+			m_VariableTypes[key] = VarType::Bool;
+			m_ChangedGraph = true;
+		}
+
+		auto it = animComp.Variables.begin();
+		while (it != animComp.Variables.end())
+		{
+			ImGui::PushID(it->first.c_str());
+
+			// Infer type: if not in our map, guess by name
+			if (m_VariableTypes.find(it->first) == m_VariableTypes.end())
+			{
+				std::string lowerKey = it->first;
+				std::transform(lowerKey.begin(), lowerKey.end(), lowerKey.begin(), ::tolower);
+
+				bool looksLikeBool =
+					(lowerKey.rfind("is", 0) == 0 || lowerKey.rfind("has", 0) == 0 || lowerKey.rfind("can", 0) == 0 ||
+					 lowerKey.rfind("should", 0) == 0 || lowerKey.find("bool") != std::string::npos ||
+					 lowerKey.find("flag") != std::string::npos);
+				m_VariableTypes[it->first] = looksLikeBool ? VarType::Bool : VarType::Float;
+			}
+
+			VarType varType = m_VariableTypes[it->first];
+
+			// Type badge button: clickable [F] or [B] to toggle type
+			if (varType == VarType::Float)
+			{
+				ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.2f, 0.4f, 0.7f, 1.0f));
+				if (ImGui::Button("[F]"))
+				{
+					m_VariableTypes[it->first] = VarType::Bool;
+				}
+				ImGui::PopStyleColor();
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Float (Click to switch to Bool)");
+				}
+			}
+			else
+			{
+				ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.8f, 0.5f, 0.1f, 1.0f));
+				if (ImGui::Button("[B]"))
+				{
+					m_VariableTypes[it->first] = VarType::Float;
+				}
+				ImGui::PopStyleColor();
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Bool (Click to switch to Float)");
+				}
+			}
+			ImGui::SameLine();
+
+			// Name field
+			char varBuf[128];
+			strncpy(varBuf, it->first.c_str(), sizeof(varBuf));
+			varBuf[sizeof(varBuf) - 1] = '\0';
+			ImGui::SetNextItemWidth(120.0f);
+			if (ImGui::InputText("##name", varBuf, sizeof(varBuf), ImGuiInputTextFlags_EnterReturnsTrue))
+			{
+				float val = it->second;
+				VarType t = m_VariableTypes[it->first];
+				std::string oldKey = it->first;
+				std::string newKey = varBuf;
+				if (newKey == oldKey || (!graph->DefaultVariables.count(newKey) && !animComp.Variables.count(newKey)))
+				{
+					m_VariableTypes.erase(oldKey);
+					// Rename in graph DefaultVariables
+					graph->DefaultVariables.erase(oldKey);
+					graph->DefaultVariables[newKey] = val;
+					animComp.Variables.erase(it);
+					animComp.Variables[newKey] = val;
+					m_VariableTypes[newKey] = t;
+					m_ChangedGraph = true;
+				}
+				ImGui::PopID();
+				break;
+			}
+			ImGui::SameLine();
+
+			// Value widget: checkbox for bool, drag for float
+			if (varType == VarType::Bool)
+			{
+				bool bval = (it->second >= 0.5f);
+				if (ImGui::Checkbox("##val", &bval))
+				{
+					it->second = bval ? 1.0f : 0.0f;
+				}
+			}
+			else
+			{
+				float val = it->second;
+				ImGui::SetNextItemWidth(80.0f);
+				if (ImGui::DragFloat("##val", &val, 0.01f))
+				{
+					it->second = val;
+				}
+			}
+
+			ImGui::SameLine();
+			if (ImGui::SmallButton("X"))
+			{
+				graph->DefaultVariables.erase(it->first); // sync to graph schema
+				m_VariableTypes.erase(it->first);
+				it = animComp.Variables.erase(it);
+				m_ChangedGraph = true;
+				ImGui::PopID();
+			}
+			else
+			{
+				++it;
+				ImGui::PopID();
+			}
+		}
+	}
+
+	void AnimGraphPanel::SaveGraph(AnimationGraphAsset* graph, const std::string& path)
+	{
+		if (!graph || path.empty())
+		{
+			return;
+		}
+
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (assets)
+		{
+			std::string resolved = assets->ResolvePath(path);
+			AnimGraphLoader loader;
+			if (loader.Save(*graph, resolved))
+			{
+				CH_CORE_INFO("Animation graph saved: {}", resolved);
+			}
+			else
+			{
+				CH_CORE_ERROR("Failed to save animation graph: {}", resolved);
+			}
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/panels/anim_graph_panel.h b/editor/panels/anim_graph_panel.h
new file mode 100644
index 000000000..c466bf969
--- /dev/null
+++ b/editor/panels/anim_graph_panel.h
@@ -0,0 +1,87 @@
+#ifndef CH_ANIM_GRAPH_PANEL_H
+#define CH_ANIM_GRAPH_PANEL_H
+
+#include "engine/scene/entity.h"
+#include "engine/assets/types/animation_graph_asset.h"
+#include <GraphEditor.h>
+#include <vector>
+#include <string>
+#include <unordered_map>
+
+#include "editor/panels/panel.h"
+#include <imgui.h>
+
+namespace Chained
+{
+
+	class AnimGraphPanel : public Panel
+	{
+	public:
+		AnimGraphPanel();
+		~AnimGraphPanel() override;
+
+		void OnImGuiRender(bool readOnly = false) override;
+
+	private:
+		bool m_ChangedGraph = false;
+
+		enum class VarType
+		{
+			Float,
+			Bool
+		};
+		std::unordered_map<std::string, VarType> m_VariableTypes; // tracks type per variable name
+		bool m_AddVarAsFloat = true;							  // which type to add next
+
+		GraphEditor::ViewState m_ViewState;
+		GraphEditor::Options m_Options;
+		GraphEditor::FitOnScreen m_Fit = GraphEditor::Fit_None;
+
+		struct Delegate : public GraphEditor::Delegate
+		{
+			AnimGraphPanel* panel = nullptr;
+			AnimationGraphAsset* graph = nullptr;
+			bool* changedFlag = nullptr;
+			std::vector<bool> nodeSelected;
+
+			void SyncSelection();
+
+			bool AllowedLink(GraphEditor::NodeIndex from, GraphEditor::NodeIndex to) override;
+			void SelectNode(GraphEditor::NodeIndex nodeIndex, bool selected) override;
+			void MoveSelectedNodes(const ImVec2 delta) override;
+			void AddLink(GraphEditor::NodeIndex inputNodeIndex, GraphEditor::SlotIndex inputSlotIndex,
+						 GraphEditor::NodeIndex outputNodeIndex, GraphEditor::SlotIndex outputSlotIndex) override;
+			void DelLink(GraphEditor::LinkIndex linkIndex) override;
+			void RightClick(GraphEditor::NodeIndex nodeIndex, GraphEditor::SlotIndex slotIndexInput,
+							GraphEditor::SlotIndex slotIndexOutput) override;
+			void CustomDraw(ImDrawList* drawList, ImRect rectangle, GraphEditor::NodeIndex nodeIndex) override;
+
+			const size_t GetTemplateCount() override;
+			const GraphEditor::Template GetTemplate(GraphEditor::TemplateIndex index) override;
+			const size_t GetNodeCount() override;
+			const GraphEditor::Node GetNode(GraphEditor::NodeIndex index) override;
+			const size_t GetLinkCount() override;
+			const GraphEditor::Link GetLink(GraphEditor::LinkIndex index) override;
+		};
+
+		Delegate m_Delegate;
+
+		// Preview state: temporarily override AnimationComponent when node is selected
+		int m_PreviewNodeIdx = -1;
+		int m_OrigAnimIndex = 0;
+		int m_OrigFrame = 0;
+		int m_OrigStartFrame = 0;
+		int m_OrigEndFrame = -1;
+		float m_OrigSpeed = 1.0f;
+		bool m_OrigIsLooping = true;
+		bool m_OrigIsPlaying = true;
+		Entity m_PreviewEntity;
+
+		void RestorePreview();
+		void ApplyPreview(AnimationGraphAsset* graph, int nodeIdx, Entity entity);
+		void DrawProperties(AnimationGraphAsset* graph, Entity entity);
+		void SaveGraph(AnimationGraphAsset* graph, const std::string& path);
+	};
+
+} // namespace Chained
+#endif
diff --git a/editor/panels/console_panel.cpp b/editor/panels/console_panel.cpp
index a732023ba..b3eeae2d4 100644
--- a/editor/panels/console_panel.cpp
+++ b/editor/panels/console_panel.cpp
@@ -1,220 +1,199 @@
 #include "console_panel.h"
+#include "engine/app/application.h"
 #include "imgui.h"
+#include <algorithm>
+#include <cctype>
 
-namespace CHEngine
+namespace Chained
 {
-ConsolePanel* ConsolePanel::s_Instance = nullptr;
-std::deque<ConsoleLogEntry> ConsolePanel::s_Buffer;
-std::mutex ConsolePanel::s_BufferMutex;
-
-ConsolePanel::ConsolePanel()
-{
-    s_Instance = this;
-    m_Name = "Console";
-
-    // Flush static buffer to this instance
-    std::lock_guard<std::mutex> lock(s_BufferMutex);
-    while (!s_Buffer.empty())
-    {
-        m_Messages.push_back(std::move(s_Buffer.front()));
-        s_Buffer.pop_front();
-    }
-}
-
-ConsolePanel::~ConsolePanel()
-{
-    if (s_Instance == this)
-    {
-        s_Instance = nullptr;
-    }
-}
-
-void ConsolePanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
-
-    ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(10, 10));
-
-    if (ImGui::Begin(m_Name.c_str(), &m_IsOpen))
-    {
-        // Control Panel
-        ImGui::BeginDisabled(readOnly);
-        if (ImGui::Button("Clear"))
-        {
-            Clear();
-        }
-        ImGui::SameLine();
-
-        ImGui::SetNextItemWidth(150);
-        ImGui::InputTextWithHint("##filter", "Filter...", m_FilterBuffer, sizeof(m_FilterBuffer));
-        ImGui::SameLine();
-
-        const char* levels[] = {"TRACE", "INFO", "WARNING", "ERROR", "FATAL", "NONE"};
-        ImGui::SetNextItemWidth(120);
-        ImGui::Combo("Level", &m_LogLevel, levels, IM_ARRAYSIZE(levels));
-
-        ImGui::EndDisabled();
-
-        ImGui::Separator();
-
-        // Rebuild visible indices if needed
-        {
-            std::lock_guard<std::mutex> lock(m_LogMutex);
-            m_VisibleIndices.clear();
-            std::string filterStr = m_FilterBuffer;
-            std::transform(filterStr.begin(), filterStr.end(), filterStr.begin(), ::tolower);
-
-            for (int i = 0; i < (int)m_Messages.size(); i++)
-            {
-                if (m_LogLevel != (int)ConsoleLogLevel::None && (int)m_Messages[i].level < m_LogLevel)
-                {
-                    continue;
-                }
-
-                if (!filterStr.empty())
-                {
-                    std::string msgLower = m_Messages[i].message;
-                    std::transform(msgLower.begin(), msgLower.end(), msgLower.begin(), ::tolower);
-                    if (msgLower.find(filterStr) == std::string::npos)
-                    {
-                        continue;
-                    }
-                }
-                m_VisibleIndices.push_back(i);
-            }
-        }
-
-        const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
-        ImGui::BeginChild("ScrollingRegion", ImVec2(0, -footer_height_to_reserve), false,
-                          ImGuiWindowFlags_HorizontalScrollbar);
-
-        {
-            std::lock_guard<std::mutex> lock(m_LogMutex);
-
-            ImGuiListClipper clipper;
-            clipper.Begin((int)m_VisibleIndices.size());
-
-            while (clipper.Step())
-            {
-                for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
-                {
-                    int msgIdx = m_VisibleIndices[i];
-                    const auto& msg = m_Messages[msgIdx];
-
-                    ImVec4 color;
-                    switch (msg.level)
-                    {
-                    case ConsoleLogLevel::Trace:
-                        color = {0.7f, 0.7f, 0.7f, 1.0f};
-                        break;
-                    case ConsoleLogLevel::Info:
-                        color = {1.0f, 1.0f, 1.0f, 1.0f};
-                        break;
-                    case ConsoleLogLevel::Warn:
-                        color = {1.0f, 0.8f, 0.0f, 1.0f};
-                        break;
-                    case ConsoleLogLevel::Error:
-                        color = {1.0f, 0.2f, 0.2f, 1.0f};
-                        break;
-                    case ConsoleLogLevel::Fatal:
-                        color = {1.0f, 0.0f, 1.0f, 1.0f};
-                        break;
-                    default:
-                        color = {1.0f, 1.0f, 1.0f, 1.0f};
-                        break;
-                    }
-
-                    // Timestamp
-                    ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.5f, 0.5f, 0.5f, 1.0f));
-                    ImGui::TextUnformatted(msg.timestamp.c_str());
-                    ImGui::PopStyleColor();
-                    ImGui::SameLine();
-
-                    ImGui::PushStyleColor(ImGuiCol_Text, color);
-                    ImGui::TextUnformatted(msg.message.c_str());
-                    ImGui::PopStyleColor();
-                }
-            }
-        }
-
-        if (m_ScrollToBottom || (ImGui::GetScrollY() >= ImGui::GetScrollMaxY()))
-        {
-            ImGui::SetScrollHereY(1.0f);
-        }
-        m_ScrollToBottom = false;
-
-        ImGui::EndChild();
-    }
-    ImGui::End();
-    ImGui::PopStyleVar();
-}
-void ConsolePanel::Log(const std::string& message, ConsoleLogLevel level)
-{
-    std::lock_guard<std::mutex> lock(m_LogMutex);
-
-    // Форматуємо час (наприклад, "14:20:05")
-    std::string timeStr = GetCurrentTimestamp();
-
-    m_Messages.push_back({level, message, timeStr});
-
-    if (m_Messages.size() > MAX_MESSAGES)
-    {
-        m_Messages.pop_front();
-    }
-
-    m_ScrollToBottom = true; // Сигнал для OnImGuiRender
-}
-
-void ConsolePanel::Clear()
-{
-    std::lock_guard<std::mutex> lock(m_LogMutex);
-    m_Messages.clear();
-}
-
-void ConsolePanel::AddLog(const char* message, int level)
-{
-    if (s_Instance)
-    {
-        s_Instance->Log(message, (ConsoleLogLevel)level);
-    }
-    else
-    {
-        // Buffer logs until ConsolePanel is initialized
-        std::lock_guard<std::mutex> lock(s_BufferMutex);
-        if (s_Buffer.size() < MAX_MESSAGES)
-        {
-            s_Buffer.push_back({(ConsoleLogLevel)level, message, GetCurrentTimestamp()});
-        }
-    }
-}
-
-std::string ConsolePanel::GetCurrentTimestamp()
-{
-    using namespace std::chrono;
-
-    auto now = system_clock::now();
-    auto in_time_t = system_clock::to_time_t(now);
-
-    std::tm time_info;
-#if defined(_MSC_VER)
-    localtime_s(&time_info, &in_time_t);
-#elif defined(_WIN32)
-    std::tm* tm_ptr = std::localtime(&in_time_t);
-    if (tm_ptr)
-    {
-        time_info = *tm_ptr;
-    }
-#else
-    localtime_r(&in_time_t, &time_info);
-#endif
-
-    std::stringstream ss;
-    ss << "[" << std::put_time(&time_info, "%H:%M:%S") << "] ";
-    return ss.str();
-}
-
-} // namespace CHEngine
+	ConsolePanel::ConsolePanel()
+	{
+		m_Name = "Console";
+
+		// Consume initially buffered messages before UI loop starts
+		auto bufferedMessages = Log::ConsumeBufferedMessages();
+		for (auto& entry : bufferedMessages)
+		{
+			m_Messages.push_back(std::move(entry));
+		}
+
+		m_ScrollToBottom = !m_Messages.empty();
+	}
+
+	ConsolePanel::~ConsolePanel() = default;
+
+	void ConsolePanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(10, 10));
+
+		if (ImGui::Begin(m_Name.c_str(), &m_IsOpen))
+		{
+			bool filtersChanged = false;
+
+			// --- 1. Control Panel ---
+			ImGui::BeginDisabled(readOnly);
+
+			if (ImGui::Button("Clear"))
+			{
+				Clear();
+				filtersChanged = true;
+			}
+			ImGui::SameLine();
+
+			ImGui::SetNextItemWidth(150);
+			// If user types into filter, we flag that index rebuild is required
+			if (ImGui::InputTextWithHint("##filter", "Filter...", m_FilterBuffer, sizeof(m_FilterBuffer)))
+			{
+				filtersChanged = true;
+			}
+			ImGui::SameLine();
+
+			const char* levels[] = {"TRACE", "INFO", "WARNING", "ERROR", "FATAL", "NONE"};
+			ImGui::SetNextItemWidth(120);
+			if (ImGui::Combo("Level", &m_LogLevel, levels, IM_ARRAYSIZE(levels)))
+			{
+				filtersChanged = true;
+			}
+
+			ImGui::EndDisabled();
+			ImGui::Separator();
+
+			// --- 2. Ingest New Logs ---
+			auto bufferedMessages = Log::ConsumeBufferedMessages();
+			bool hasNewMessages = !bufferedMessages.empty();
+
+			if (hasNewMessages || filtersChanged)
+			{
+				std::lock_guard<std::mutex> lock(m_LogMutex);
+
+				if (hasNewMessages)
+				{
+					for (auto& entry : bufferedMessages)
+					{
+						m_Messages.push_back(std::move(entry));
+					}
+
+					while (m_Messages.size() > MAX_MESSAGES)
+					{
+						m_Messages.pop_front();
+					}
+
+					m_ScrollToBottom = true;
+				}
+
+				// --- 3. Optimized Rebuild of Visible Indices ---
+				// We only rebuild when new logs arrive OR UI filter parameters change.
+				m_VisibleIndices.clear();
+
+				std::string filterStr = m_FilterBuffer;
+				std::transform(filterStr.begin(), filterStr.end(), filterStr.begin(),
+							   [](unsigned char ch) { return static_cast<char>(std::tolower(ch)); });
+
+				for (int i = 0; i < static_cast<int>(m_Messages.size()); ++i)
+				{
+					if (m_LogLevel != static_cast<int>(LogLevel::LogNone) &&
+						static_cast<int>(m_Messages[i].level) < m_LogLevel)
+					{
+						continue;
+					}
+
+					if (!filterStr.empty())
+					{
+						// Case-insensitive substring match without heavy allocation
+						auto it =
+							std::search(m_Messages[i].message.begin(), m_Messages[i].message.end(), filterStr.begin(),
+										filterStr.end(), [](unsigned char ch1, unsigned char ch2) {
+											return std::tolower(ch1) == ch2; // filterStr is already lower
+										});
+
+						if (it == m_Messages[i].message.end())
+						{
+							continue;
+						}
+					}
+					m_VisibleIndices.push_back(i);
+				}
+			}
+
+			// --- 4. Content Scrolling Region ---
+			const float footerHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
+			ImGui::BeginChild("ScrollingRegion", ImVec2(0, -footerHeight), false, ImGuiWindowFlags_HorizontalScrollbar);
+
+			{
+				std::lock_guard<std::mutex> lock(m_LogMutex);
+
+				ImGuiListClipper clipper;
+				clipper.Begin(static_cast<int>(m_VisibleIndices.size()));
+
+				while (clipper.Step())
+				{
+					for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i)
+					{
+						const int msgIdx = m_VisibleIndices[i];
+						const auto& msg = m_Messages[msgIdx];
+
+						ImVec4 color;
+						switch (msg.level)
+						{
+						case LogLevel::LogTrace:
+							color = ImVec4(0.7f, 0.7f, 0.7f, 1.0f);
+							break;
+						case LogLevel::LogInfo:
+							color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+							break;
+						case LogLevel::LogWarning:
+							color = ImVec4(1.0f, 0.8f, 0.0f, 1.0f);
+							break;
+						case LogLevel::LogError:
+							color = ImVec4(1.0f, 0.2f, 0.2f, 1.0f);
+							break;
+						case LogLevel::LogFatal:
+							color = ImVec4(1.0f, 0.0f, 1.0f, 1.0f);
+							break;
+						default:
+							color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+							break;
+						}
+
+						// Render Timestamp (Gray color)
+						ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.5f, 0.5f, 0.5f, 1.0f));
+						ImGui::TextUnformatted(msg.timestamp.c_str());
+						ImGui::PopStyleColor();
+
+						ImGui::SameLine();
+
+						// Render Log Message
+						ImGui::PushStyleColor(ImGuiCol_Text, color);
+						ImGui::TextUnformatted(msg.message.c_str());
+						ImGui::PopStyleColor();
+					}
+				}
+			}
+
+			// Stick to bottom if scrolled down or explicitly triggered
+			if (m_ScrollToBottom || (ImGui::GetScrollY() >= ImGui::GetScrollMaxY()))
+			{
+				ImGui::SetScrollHereY(1.0f);
+			}
+			m_ScrollToBottom = false;
+
+			ImGui::EndChild();
+		}
+		ImGui::End();
+		ImGui::PopStyleVar();
+	}
+
+	void ConsolePanel::Clear()
+	{
+		std::lock_guard<std::mutex> lock(m_LogMutex);
+		m_Messages.clear();
+		m_VisibleIndices.clear();
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/editor/panels/console_panel.h b/editor/panels/console_panel.h
index ba64735cc..430ab30a5 100644
--- a/editor/panels/console_panel.h
+++ b/editor/panels/console_panel.h
@@ -1,71 +1,75 @@
 #ifndef CH_CONSOLE_PANEL_H
 #define CH_CONSOLE_PANEL_H
 
-#include <deque>
+#include "engine/core/log.h"
+#include "panel.h"
 #include <cstdint>
+#include <deque>
 #include <mutex>
 #include <string>
 #include <vector>
-#include <chrono>
-#include <sstream>
-#include <iomanip>
-#include <ctime>
-
-#include "panel.h"
 
-namespace CHEngine
+namespace Chained
 {
-// Extend log levels for engine/editor compatibility
+	/**
+	 * @class ConsolePanel
+	 * @brief A developer tool panel that displays system log messages in real-time using ImGui.
+	 *
+	 * This panel supports live filtering by log severity levels (LogLevel) and text substrings,
+	 * handles automatic scrolling, and ensures thread-safe access to underlying log entries.
+	 */
+	class ConsolePanel : public Panel
+	{
+	public:
+		/**
+		 * @brief Constructs the ConsolePanel and initializes the UI state.
+		 */
+		ConsolePanel();
 
-enum class ConsoleLogLevel : uint32_t
-{
-    Trace = 0,
-    Info,
-    Warn,
-    Error,
-    Fatal,
-    None
-};
+		/**
+		 * @brief Destructs the ConsolePanel and releases its resources.
+		 */
+		~ConsolePanel();
 
-struct ConsoleLogEntry
-{
-    ConsoleLogLevel level;
-    std::string message;
-    std::string timestamp; // Додаємо час для зручності
-};
+		/**
+		 * @brief Renders the console interface using ImGui commands.
+		 * @param readOnly If true, disables control elements such as the clear button and filters input.
+		 */
+		void OnImGuiRender(bool readOnly = false) override;
 
-class ConsolePanel : public Panel
-{
-public:
-    ConsolePanel();
-    ~ConsolePanel();
+		/**
+		 * @brief Clears all accumulated log messages from the buffer and resets visible indices.
+		 */
+		void Clear();
+
+	private:
+		/// @brief Thread-safe double-ended queue storing raw log entries. Deque enables efficient pop_front when
+		/// exceeding limits.
+		std::deque<BufferedLogEntry> m_Messages;
 
-    void OnImGuiRender(bool readOnly = false) override;
-    void Log(const std::string& message, ConsoleLogLevel level = ConsoleLogLevel::Info);
-    void Clear();
+		/// @brief Cached indices of messages from m_Messages that successfully passed active filters. Optimizes render
+		/// passes.
+		std::vector<int> m_VisibleIndices;
 
-    static void AddLog(const char* message, int level = (int)ConsoleLogLevel::Info);
+		/// @brief Mutex to guarantee thread-safe operations when background threads submit logs while the main thread
+		/// renders them.
+		std::mutex m_LogMutex;
 
-    static ConsolePanel* s_Instance;
-    static std::deque<ConsoleLogEntry> s_Buffer;
-    static std::mutex s_BufferMutex;
+		// --- UI State ---
 
-private:
-    
-    std::deque<ConsoleLogEntry> m_Messages;
-    std::vector<int> m_VisibleIndices; // Indices of messages that pass the filter
-    std::mutex m_LogMutex;
+		/// @brief Currently selected minimum severity level cutoff for rendering messages.
+		int m_LogLevel = (int)LogLevel::LogInfo;
 
-    // UI State
-    int m_LogLevel = (int)ConsoleLogLevel::Info; 
-    bool m_ScrollToBottom = false;
-    char m_FilterBuffer[128] = { 0 }; 
+		/// @brief Flag to trigger the ImGui container window to scroll down to the latest message.
+		bool m_ScrollToBottom = false;
 
-    static constexpr size_t MAX_MESSAGES = 10000;
+		/// @brief Character buffer containing the text substring query for filtering.
+		char m_FilterBuffer[128] = {0};
 
-    // Допоміжний метод для отримання поточного часу
-    static std::string GetCurrentTimestamp();
-};
-} // namespace CHEngine
+		/// @brief The hard limit of history retention. Prevents memory leaks by discarding the oldest logs upon
+		/// overflow.
+		const size_t MAX_MESSAGES = 25000;
+	};
+} // namespace Chained
 
 #endif // CH_CONSOLE_PANEL_H
\ No newline at end of file
diff --git a/editor/panels/content_browser_panel.cpp b/editor/panels/content_browser_panel.cpp
index c2e74d2aa..96a7d68bc 100644
--- a/editor/panels/content_browser_panel.cpp
+++ b/editor/panels/content_browser_panel.cpp
@@ -1,492 +1,496 @@
-#include "content_browser_panel.h"
-
-#include "engine/core/base.h"
-#include "editor/editor_layer.h"
+#include "editor/panels/content_browser_panel.h"
+#include "editor/action_commands.h"
+#include "editor/events.h"
+#include "editor/layer.h"
 #include "engine/core/log.h"
-#include "engine/scene/project.h"
+#include "engine/project/project.h"
+#include "engine/scene/components.h"
+#include "engine/scene/prefab_serializer.h"
 #include "engine/scene/scene_events.h"
-#include "IconsFontAwesome6.h"
-
 #include "imgui.h"
+#include "thirdparty/IconsFontAwesome6.h"
 #include <algorithm>
-#include <fstream>
 #include <unordered_map>
 
-namespace CHEngine
-{
-ContentBrowserPanel::ContentBrowserPanel()
-{
-    m_Name = "Content Browser";
-
-    auto project = Project::GetActive();
-    if (project)
-    {
-        m_RootDirectory = Project::GetAssetDirectory();
-    }
-    else
-    {
-        // Fallback: use project root if project not loaded yet
-        m_RootDirectory = std::filesystem::current_path() / "assets";
-    }
-
-    m_CurrentDirectory = m_RootDirectory;
-    RefreshDirectory();
-}
-
-ContentBrowserPanel::~ContentBrowserPanel()
-{
-    // Unload textures if they were loaded
-}
-
-void ContentBrowserPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
-
-    ImGui::BeginDisabled(readOnly);
-    RenderToolbar();
-    ImGui::Separator();
-    RenderGridView();
-
-    ImGui::EndDisabled();
-    ImGui::End();
-}
-
-void ContentBrowserPanel::OnEvent(Event& e)
+namespace Chained
 {
-    EventDispatcher dispatcher(e);
-    dispatcher.Dispatch<ProjectOpenedEvent>([this](ProjectOpenedEvent& e) {
-        SetRootDirectory(Project::GetAssetDirectory());
-        return false;
-    });
-}
-
-void ContentBrowserPanel::RenderToolbar()
-{
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 2));
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemInnerSpacing, ImVec2(0, 0));
-
-    // Navigation Buttons
-    if (m_CurrentDirectory != m_RootDirectory)
-    {
-        if (ImGui::Button(ICON_FA_ARROW_LEFT))
-        {
-            m_CurrentDirectory = m_CurrentDirectory.parent_path();
-            RefreshDirectory();
-        }
-    }
-    else
-    {
-        ImGui::BeginDisabled(true);
-        ImGui::Button(ICON_FA_ARROW_LEFT);
-        ImGui::EndDisabled();
-    }
-
-    ImGui::SameLine();
-    ImGui::SetNextItemWidth(200);
-
-    // Search Filter
-    if (ImGui::InputTextWithHint("##Search", ICON_FA_MAGNIFYING_GLASS " Search...", m_FilterBuffer,
-                                 sizeof(m_FilterBuffer)))
-    {
-        RefreshDirectory();
-    }
-
-    ImGui::SameLine();
-
-    // Type Filter Dropdown
-    ImGui::SetNextItemWidth(150);
-    const char* filterNames[] = {"All Types", "Scenes", "Prefabs", "Models", "Textures", "Scripts", "Audio"};
-    if (ImGui::BeginCombo("##TypeFilter", filterNames[m_FilterType]))
-    {
-        for (int i = 0; i < IM_ARRAYSIZE(filterNames); i++)
-        {
-            bool isSelected = (m_FilterType == i);
-            if (ImGui::Selectable(filterNames[i], isSelected))
-            {
-                m_FilterType = i;
-                RefreshDirectory();
-            }
-            if (isSelected)
-            {
-                ImGui::SetItemDefaultFocus();
-            }
-        }
-        ImGui::EndCombo();
-    }
-
-    ImGui::SameLine();
-
-    // Breadcrumbs
-    std::error_code ec;
-    auto relPath = std::filesystem::relative(m_CurrentDirectory, m_RootDirectory, ec);
-    
-    if (ImGui::Button("Assets"))
-    {
-        m_CurrentDirectory = m_RootDirectory;
-        RefreshDirectory();
-    }
-
-    if (!ec && !relPath.empty() && relPath != ".")
-    {
-        std::filesystem::path accumulated = m_RootDirectory;
-        for (const auto& part : relPath)
-        {
-            ImGui::SameLine();
-            ImGui::Text("/");
-            ImGui::SameLine();
-            
-            accumulated /= part;
-            if (ImGui::Button(part.string().c_str()))
-            {
-                m_CurrentDirectory = accumulated;
-                RefreshDirectory();
-                break;
-            }
-        }
-    }
-
-    // Icon Scale Slider (Right aligned)
-    ImGui::SameLine(ImGui::GetWindowWidth() - 160.0f);
-    ImGui::SetNextItemWidth(150.0f);
-    ImGui::SliderFloat("##IconScale", &m_IconScale, 0.5f, 2.0f, ICON_FA_IMAGE);
-
-    ImGui::PopStyleVar(2);
-}
-
-void ContentBrowserPanel::RenderGridView()
-{
-    float cellSize = (m_ThumbnailSize * m_IconScale) + m_Padding;
-    float panelWidth = ImGui::GetContentRegionAvail().x;
-    int columnCount = (int)(panelWidth / cellSize);
-    if (columnCount < 1)
-    {
-        columnCount = 1;
-    }
-
-    ImGui::Columns(columnCount, nullptr, false);
-
-    int i = 0;
-    for (auto& asset : m_CurrentAssets)
-    {
-        ImGui::PushID(i++);
-
-        const char* icon = asset.isDirectory ? ICON_FA_FOLDER : ICON_FA_FILE;
-
-        // Custom Icons per type
-        if (!asset.isDirectory)
-        {
-            switch (asset.type)
-            {
-            case EditorAssetType::Scene:
-                icon = ICON_FA_CUBES;
-                break;
-            case EditorAssetType::Prefab:
-                icon = ICON_FA_CUBE;
-                break;
-            case EditorAssetType::Model:
-                icon = ICON_FA_SHAPES;
-                break;
-            case EditorAssetType::Texture:
-                icon = ICON_FA_IMAGE;
-                break;
-            case EditorAssetType::Script:
-                icon = ICON_FA_FILE_CODE;
-                break;
-            case EditorAssetType::Audio:
-                icon = ICON_FA_MUSIC;
-                break;
-            default:
-                icon = ICON_FA_FILE;
-                break;
-            }
-        }
-
-        ImGui::BeginGroup();
-        
-        // Thumbnail/Icon
-        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-        float currentThumbnailSize = m_ThumbnailSize * m_IconScale;
-        
-        if (ImGui::Button(icon, {cellSize - m_Padding, currentThumbnailSize}))
-        {
-            // Clicked
-        }
-
-        if (ImGui::BeginPopupContextItem())
-        {
-            if (ImGui::MenuItem(ICON_FA_PEN " Rename"))
-            {
-                m_RenamingPath = asset.path;
-                strncpy(m_RenameBuffer, asset.name.c_str(), sizeof(m_RenameBuffer));
-                ImGui::OpenPopup("RenameAsset");
-            }
-            if (ImGui::MenuItem(ICON_FA_TRASH " Delete"))
-            {
-                m_PathToDelete = asset.path;
-                ImGui::OpenPopup("DeleteAsset?");
-            }
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::BeginPopupModal("RenameAsset", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
-        {
-            ImGui::Text("Enter new name for %s:", m_RenamingPath.filename().string().c_str());
-            ImGui::InputText("##NewName", m_RenameBuffer, sizeof(m_RenameBuffer));
-            if (ImGui::Button("OK", {120, 0}))
-            {
-                std::filesystem::path newPath = m_RenamingPath.parent_path() / m_RenameBuffer;
-                std::error_code ec;
-                std::filesystem::rename(m_RenamingPath, newPath, ec);
-                RefreshDirectory();
-                ImGui::CloseCurrentPopup();
-            }
-            ImGui::SameLine();
-            if (ImGui::Button("Cancel", {120, 0})) { ImGui::CloseCurrentPopup(); }
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::BeginPopupModal("DeleteAsset?", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
-        {
-            ImGui::Text("Are you sure you want to delete %s?\nThis operation cannot be undone!", m_PathToDelete.filename().string().c_str());
-            if (ImGui::Button("Delete", {120, 0}))
-            {
-                std::error_code ec;
-                std::filesystem::remove_all(m_PathToDelete, ec);
-                RefreshDirectory();
-                ImGui::CloseCurrentPopup();
-            }
-            ImGui::SameLine();
-            if (ImGui::Button("Cancel", {120, 0})) { ImGui::CloseCurrentPopup(); }
-            ImGui::EndPopup();
-        }
-
-        if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
-        {
-            OnAssetDoubleClicked(asset);
-        }
-
-        if (ImGui::BeginDragDropSource())
-        {
-            std::string pathStr = asset.path.string();
-            ImGui::SetDragDropPayload("CONTENT_BROWSER_ITEM", pathStr.c_str(), pathStr.size() + 1);
-            ImGui::Text("%s %s", icon, asset.name.c_str());
-            ImGui::EndDragDropSource();
-        }
-
-        ImGui::PopStyleColor();
-
-        // Metadata/Label
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 2));
-        
-        ImGui::SetNextItemWidth(cellSize - m_Padding);
-        ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + cellSize - m_Padding);
-        
-        float textWidth = ImGui::CalcTextSize(asset.name.c_str()).x;
-        if (textWidth < cellSize - m_Padding)
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() + (cellSize - m_Padding - textWidth) * 0.5f);
-            
-        ImGui::TextUnformatted(asset.name.c_str());
-        ImGui::PopTextWrapPos();
-        
-        // Type Label
-        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.5f, 0.5f, 0.5f, 1.0f));
-        const char* typeLabel = asset.isDirectory ? "FOLDER" : "FILE";
-        if (asset.type == EditorAssetType::Model) typeLabel = "MESH";
-        else if (asset.type == EditorAssetType::Scene) typeLabel = "SCENE";
-        else if (asset.type == EditorAssetType::Script) typeLabel = "SCRIPT";
-        
-        float typeLabelWidth = ImGui::CalcTextSize(typeLabel).x;
-        ImGui::SetCursorPosX(ImGui::GetCursorPosX() + (cellSize - m_Padding - typeLabelWidth) * 0.5f);
-        ImGui::TextDisabled("%s", typeLabel);
-        ImGui::PopStyleColor();
-        
-        ImGui::PopStyleVar();
-        ImGui::EndGroup();
-
-        ImGui::NextColumn();
-        ImGui::PopID();
-    }
-
-    ImGui::Columns(1);
-
-    // Empty space context menu
-    if (ImGui::BeginPopupContextWindow(0, 1 | ImGuiPopupFlags_NoOpenOverItems))
-    {
-        if (ImGui::BeginMenu(ICON_FA_PLUS " Create"))
-        {
-            if (ImGui::MenuItem(ICON_FA_FOLDER " New Folder"))
-            {
-                std::filesystem::path newDir = m_CurrentDirectory / "New Folder";
-                int i = 1;
-                while (std::filesystem::exists(newDir))
-                    newDir = m_CurrentDirectory / ("New Folder " + std::to_string(i++));
-                std::filesystem::create_directory(newDir);
-                RefreshDirectory();
-            }
-            if (ImGui::MenuItem(ICON_FA_FILE_CODE " New C# Script"))
-            {
-                std::filesystem::path newScript = m_CurrentDirectory / "NewScript.cs";
-                int i = 1;
-                while (std::filesystem::exists(newScript))
-                    newScript = m_CurrentDirectory / ("NewScript" + std::to_string(i++) + ".cs");
-                
-                std::string className = newScript.stem().string();
-                std::string templateContent = 
-                    "using CHEngine;\n\n"
-                    "namespace ChainedDecos.Scripts\n"
-                    "{\n"
-                    "    public class " + className + " : Script\n"
-                    "    {\n"
-                    "        public override void OnCreate()\n"
-                    "        {\n"
-                    "        }\n\n"
-                    "        public override void OnUpdate(float deltaTime)\n"
-                    "        {\n"
-                    "        }\n"
-                    "    }\n"
-                    "}\n";
-                
-                std::ofstream ofs(newScript);
-                ofs << templateContent;
-                ofs.close();
-                RefreshDirectory();
-            }
-            ImGui::EndMenu();
-        }
-        ImGui::EndPopup();
-    }
-}
-
-void ContentBrowserPanel::OnAssetDoubleClicked(AssetEntry& entry)
-{
-    if (entry.isDirectory)
-    {
-        m_CurrentDirectory = entry.path;
-        RefreshDirectory();
-    }
-    else if (entry.type == EditorAssetType::Scene)
-    {
-        EditorLayer::Get().GetSceneManager().OpenScene(entry.path);
-    }
-}
-
-void ContentBrowserPanel::RefreshDirectory()
-{
-    ScanCurrentDirectory();
-}
 
-void ContentBrowserPanel::ScanCurrentDirectory()
-{
-    m_CurrentAssets.clear();
-    std::error_code ec;
-
-    if (!std::filesystem::exists(m_CurrentDirectory, ec))
-    {
-        return;
-    }
-
-    std::string searchFilter = m_FilterBuffer;
-    // Case-insensitive search
-    std::transform(searchFilter.begin(), searchFilter.end(), searchFilter.begin(), ::tolower);
-
-    for (auto& p : std::filesystem::directory_iterator(m_CurrentDirectory, ec))
-    {
-        AssetEntry entry;
-        entry.name = p.path().filename().string();
-        entry.path = p.path();
-        entry.isDirectory = p.is_directory();
-        entry.type = DetermineAssetType(p.path());
-
-        // 1. Name Filter
-        std::string nameLower = entry.name;
-        std::transform(nameLower.begin(), nameLower.end(), nameLower.begin(), ::tolower);
-        if (!searchFilter.empty() && nameLower.find(searchFilter) == std::string::npos)
-        {
-            continue;
-        }
-
-        // 2. Type Filter (Directories always shown)
-        if (!entry.isDirectory && m_FilterType > 0)
-        {
-            // "All Types", "Scenes", "Prefabs", "Models", "Textures", "Scripts", "Audio"
-            bool match = false;
-            switch (m_FilterType)
-            {
-            case 1:
-                match = (entry.type == EditorAssetType::Scene);
-                break;
-            case 2:
-                match = (entry.type == EditorAssetType::Prefab);
-                break;
-            case 3:
-                match = (entry.type == EditorAssetType::Model);
-                break;
-            case 4:
-                match = (entry.type == EditorAssetType::Texture);
-                break;
-            case 5:
-                match = (entry.type == EditorAssetType::Script);
-                break;
-            case 6:
-                match = (entry.type == EditorAssetType::Audio);
-                break;
-            }
-            if (!match)
-            {
-                continue;
-            }
-        }
-
-        m_CurrentAssets.push_back(entry);
-    }
-
-    // Sort: Directories first, then alphabetical
-    std::sort(m_CurrentAssets.begin(), m_CurrentAssets.end(), [](const AssetEntry& a, const AssetEntry& b) {
-        if (a.isDirectory != b.isDirectory)
-        {
-            return a.isDirectory > b.isDirectory;
-        }
-        return a.name < b.name;
-    });
-}
-
-EditorAssetType ContentBrowserPanel::DetermineAssetType(const std::filesystem::path& path)
-{
-    if (std::filesystem::is_directory(path))
-    {
-        return EditorAssetType::Directory;
-    }
-
-    static const std::unordered_map<std::string, EditorAssetType> s_ExtensionMap = {
-        {".chscene", EditorAssetType::Scene},   {".chmap", EditorAssetType::Scene},
-        {".chprefab", EditorAssetType::Prefab}, {".h", EditorAssetType::Script},
-        {".cpp", EditorAssetType::Script},      {".obj", EditorAssetType::Model},
-        {".gltf", EditorAssetType::Model},      {".glb", EditorAssetType::Model},
-        {".png", EditorAssetType::Texture},     {".jpg", EditorAssetType::Texture},
-        {".tga", EditorAssetType::Texture},     {".wav", EditorAssetType::Audio},
-        {".ogg", EditorAssetType::Audio},       {".mp3", EditorAssetType::Audio}};
-
-    std::string ext = path.extension().string();
-    // ToLower extension
-    std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
-
-    auto it = s_ExtensionMap.find(ext);
-    if (it != s_ExtensionMap.end())
-    {
-        return it->second;
-    }
-
-    return EditorAssetType::Other;
-}
-
-void ContentBrowserPanel::SetRootDirectory(const std::filesystem::path& path)
-{
-    m_RootDirectory = path;
-    m_CurrentDirectory = path;
-    RefreshDirectory();
-}
-} // namespace CHEngine
+	ContentBrowserPanel::ContentBrowserPanel()
+	{
+		m_Name = "Content Browser";
+
+		if (auto project = Project::GetActive())
+		{
+			SetRoot(project->GetConfig().ProjectDirectory / project->GetConfig().AssetDirectory);
+		}
+		else
+		{
+			SetRoot(std::filesystem::current_path() / "assets");
+		}
+
+		m_ThumbnailSize = EditorLayer::Get().GetConfig().DefaultThumbnailSize;
+	}
+
+	ContentBrowserPanel::~ContentBrowserPanel() = default;
+
+	void ContentBrowserPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_NextDirectory.empty())
+		{
+			Navigate(m_NextDirectory);
+			m_NextDirectory.clear();
+		}
+
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		ImGui::Begin(m_Name.c_str(), &m_IsOpen);
+		ImGui::BeginDisabled(readOnly);
+
+		RenderToolbar();
+		ImGui::Separator();
+		RenderGridView();
+
+		ImGui::EndDisabled();
+		ImGui::End();
+	}
+
+	void ContentBrowserPanel::OnEvent(Event& e)
+	{
+		EventDispatcher dispatcher(e);
+		dispatcher.Dispatch<ProjectOpenedEvent>([this](ProjectOpenedEvent& e) {
+			if (auto project = Project::GetActive())
+			{
+				SetRoot(project->GetConfig().ProjectDirectory / project->GetConfig().AssetDirectory);
+			}
+			return false;
+		});
+	}
+
+	void ContentBrowserPanel::RenderToolbar()
+	{
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 2));
+		ImGui::PushStyleVar(ImGuiStyleVar_ItemInnerSpacing, ImVec2(0, 0));
+
+		if (GetCurrentDirectory() != GetRootDirectory())
+		{
+			if (ImGui::Button(ICON_FA_ARROW_LEFT))
+			{
+				GoUp();
+			}
+		}
+		else
+		{
+			ImGui::BeginDisabled(true);
+			ImGui::Button(ICON_FA_ARROW_LEFT);
+			ImGui::EndDisabled();
+		}
+
+		ImGui::SameLine();
+		ImGui::SetNextItemWidth(200);
+
+		if (ImGui::InputTextWithHint("##Search", ICON_FA_MAGNIFYING_GLASS " Search...", m_FilterBuffer,
+									 sizeof(m_FilterBuffer)))
+		{
+			SetFilter(m_FilterBuffer, m_FilterType);
+		}
+
+		ImGui::SameLine();
+		ImGui::SetNextItemWidth(150);
+		const char* filterNames[] = {"All Types", "Scenes", "Prefabs", "Models", "Textures", "Scripts", "Audio"};
+		if (ImGui::BeginCombo("##TypeFilter", filterNames[m_FilterType]))
+		{
+			for (int i = 0; i < IM_ARRAYSIZE(filterNames); i++)
+			{
+				if (ImGui::Selectable(filterNames[i], m_FilterType == i))
+				{
+					m_FilterType = i;
+					SetFilter(m_FilterBuffer, m_FilterType);
+				}
+			}
+			ImGui::EndCombo();
+		}
+
+		ImGui::SameLine();
+		if (ImGui::Button("Assets"))
+		{
+			GoToRoot();
+		}
+
+		// Breadcrumbs
+		std::error_code ec;
+		auto relPath = std::filesystem::relative(GetCurrentDirectory(), GetRootDirectory(), ec);
+		if (!ec && !relPath.empty() && relPath != ".")
+		{
+			std::filesystem::path accumulated = GetRootDirectory();
+			for (const auto& part : relPath)
+			{
+				ImGui::SameLine();
+				ImGui::Text("/");
+				ImGui::SameLine();
+				accumulated /= part;
+				if (ImGui::Button(part.string().c_str()))
+				{
+					Navigate(accumulated);
+					break;
+				}
+			}
+		}
+
+		ImGui::SameLine(ImGui::GetWindowWidth() - 160.0f);
+		ImGui::SetNextItemWidth(150.0f);
+		ImGui::SliderFloat("##IconScale", &m_IconScale, 0.5f, 2.0f, ICON_FA_IMAGE);
+
+		ImGui::PopStyleVar(2);
+	}
+
+	void ContentBrowserPanel::RenderGridView()
+	{
+		float cellSize = (m_ThumbnailSize * m_IconScale) + m_Padding;
+		float panelWidth = ImGui::GetContentRegionAvail().x;
+		int columnCount = std::max(1, (int)(panelWidth / cellSize));
+
+		ImGui::Columns(columnCount, nullptr, false);
+
+		const auto& assets = GetAssets();
+		if (assets.empty())
+		{
+			ImGui::TextDisabled("Empty directory or No assets found matching filters.");
+			ImGui::Columns(1);
+		}
+		else
+		{
+			int i = 0;
+			for (const auto& asset : assets)
+			{
+				ImGui::PushID(i++);
+				const char* icon = ICON_FA_FOLDER;
+				if (!asset.isDirectory)
+				{
+					switch (asset.type)
+					{
+					case EditorAssetType::Scene:
+						icon = ICON_FA_CUBES;
+						break;
+					case EditorAssetType::Script:
+						icon = ICON_FA_FILE_CODE;
+						break;
+					case EditorAssetType::Model:
+						icon = ICON_FA_SHAPES;
+						break;
+					case EditorAssetType::Texture:
+						icon = ICON_FA_IMAGE;
+						break;
+					case EditorAssetType::Audio:
+						icon = ICON_FA_MUSIC;
+						break;
+					case EditorAssetType::Prefab:
+						icon = ICON_FA_CUBE;
+						break;
+					case EditorAssetType::Shader:
+						icon = ICON_FA_CODE;
+						break;
+					default:
+						icon = ICON_FA_FILE;
+						break;
+					}
+				}
+
+				ImGui::BeginGroup();
+				ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
+				ImGui::Button(icon, {cellSize - m_Padding, m_ThumbnailSize * m_IconScale});
+
+				if (ImGui::BeginPopupContextItem())
+				{
+					if (ImGui::MenuItem(ICON_FA_PEN " Rename"))
+					{
+						m_RenamingPath = asset.path;
+						strncpy(m_RenameBuffer, asset.name.c_str(), sizeof(m_RenameBuffer) - 1);
+						m_RenameBuffer[sizeof(m_RenameBuffer) - 1] = '\0';
+						m_OpenRenamePopup = true;
+					}
+					if (ImGui::MenuItem(ICON_FA_TRASH " Delete"))
+					{
+						m_PathToDelete = asset.path;
+						m_OpenDeletePopup = true;
+					}
+					ImGui::EndPopup();
+				}
+
+				if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
+				{
+					OnAssetDoubleClicked(asset);
+				}
+
+				if (ImGui::BeginDragDropSource())
+				{
+					std::string pathStr = asset.path.string();
+					ImGui::SetDragDropPayload("CONTENT_BROWSER_ITEM", pathStr.c_str(), pathStr.size() + 1);
+					ImGui::Text("%s %s", icon, asset.name.c_str());
+					ImGui::EndDragDropSource();
+				}
+
+				ImGui::PopStyleColor();
+				ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 2));
+				ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + cellSize - m_Padding);
+				ImGui::TextUnformatted(asset.name.c_str());
+				ImGui::PopTextWrapPos();
+				ImGui::PopStyleVar();
+				ImGui::EndGroup();
+
+				ImGui::NextColumn();
+				ImGui::PopID();
+			}
+			ImGui::Columns(1);
+		}
+
+		if (m_OpenRenamePopup)
+		{
+			ImGui::OpenPopup("RenameAsset");
+			m_OpenRenamePopup = false;
+		}
+		if (m_OpenDeletePopup)
+		{
+			ImGui::OpenPopup("DeleteAsset?");
+			m_OpenDeletePopup = false;
+		}
+
+		if (ImGui::BeginPopupModal("RenameAsset", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
+		{
+			ImGui::Text("Enter new name:");
+			ImGui::InputText("##NewName", m_RenameBuffer, sizeof(m_RenameBuffer));
+			if (ImGui::Button("OK", {120, 0}))
+			{
+				EditorActionCommands::RenameAsset(m_RenamingPath, m_RenameBuffer);
+				m_PendingRefresh = true;
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::SameLine();
+			if (ImGui::Button("Cancel", {120, 0}))
+			{
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::EndPopup();
+		}
+
+		if (ImGui::BeginPopupModal("DeleteAsset?", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
+		{
+			ImGui::Text("Delete %s?", m_PathToDelete.filename().string().c_str());
+			if (ImGui::Button("Delete", {120, 0}))
+			{
+				EditorActionCommands::DeleteAsset(m_PathToDelete);
+				m_PendingRefresh = true;
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::SameLine();
+			if (ImGui::Button("Cancel", {120, 0}))
+			{
+				ImGui::CloseCurrentPopup();
+			}
+			ImGui::EndPopup();
+		}
+
+		if (ImGui::BeginPopupContextWindow(0, ImGuiPopupFlags_MouseButtonRight | ImGuiPopupFlags_NoOpenOverItems))
+		{
+			if (ImGui::BeginMenu(ICON_FA_PLUS " Create"))
+			{
+				if (ImGui::MenuItem(ICON_FA_FOLDER " New Folder"))
+				{
+					EditorActionCommands::CreateFolder(GetCurrentDirectory());
+					m_PendingRefresh = true;
+				}
+				ImGui::EndMenu();
+			}
+			ImGui::EndPopup();
+		}
+
+		if (m_PendingRefresh)
+		{
+			m_PendingRefresh = false;
+			Refresh();
+		}
+	}
+
+	void ContentBrowserPanel::OnAssetDoubleClicked(const AssetEntry& entry)
+	{
+		if (entry.isDirectory)
+		{
+			m_NextDirectory = entry.path;
+			return;
+		}
+
+		if (entry.type == EditorAssetType::Scene)
+		{
+			EditorLayer::Get().GetSceneManager().OpenScene(entry.path);
+			return;
+		}
+
+		auto scene = EditorLayer::Get().GetSceneManager().GetActiveScene();
+		if (!scene)
+		{
+			return;
+		}
+
+		if (entry.type == EditorAssetType::Prefab)
+		{
+			PrefabSerializer::Deserialize(scene.get(), entry.path.string());
+		}
+		if (entry.type == EditorAssetType::Model)
+		{
+			Entity entity = scene->CreateEntity(entry.name);
+			auto& modelcomp = entity.AddComponent<ModelComponent>();
+			modelcomp.ModelPath = Project::GetActive()->GetRelativePath(entry.path);
+			SelectEntity(entity, scene.get());
+		}
+		if (entry.type == EditorAssetType::Texture)
+		{
+			Entity entity = scene->CreateEntity(entry.name);
+			auto& sprite = entity.AddComponent<SpriteComponent>();
+			sprite.TexturePath = Project::GetActive()->GetRelativePath(entry.path);
+			SelectEntity(entity, scene.get());
+		}
+		if (entry.type == EditorAssetType::Audio)
+		{
+			Entity entity = scene->CreateEntity(entry.name);
+			auto& audiocomp = entity.AddComponent<AudioComponent>();
+			audiocomp.SoundPath = entry.path.string();
+			SelectEntity(entity, scene.get());
+		}
+		if (entry.type == EditorAssetType::Shader)
+		{
+			Entity entity = scene->CreateEntity(entry.name);
+			auto& shader = entity.AddComponent<ShaderComponent>();
+			shader.ShaderPath = Project::GetActive()->GetRelativePath(entry.path);
+			SelectEntity(entity, scene.get());
+		}
+	}
+
+	void ContentBrowserPanel::SetRoot(const std::filesystem::path& path)
+	{
+		m_RootDirectory = path;
+		m_CurrentDirectory = path;
+		Scan();
+	}
+
+	void ContentBrowserPanel::SetFilter(const std::string& query, int typeFilter)
+	{
+		m_FilterQuery = query;
+		std::transform(m_FilterQuery.begin(), m_FilterQuery.end(), m_FilterQuery.begin(), ::tolower);
+		m_ContentFilterType = typeFilter;
+		Scan();
+	}
+
+	void ContentBrowserPanel::Refresh()
+	{
+		Scan();
+	}
+
+	void ContentBrowserPanel::Navigate(const std::filesystem::path& path)
+	{
+		m_CurrentDirectory = path;
+		Scan();
+	}
+
+	void ContentBrowserPanel::GoUp()
+	{
+		if (m_CurrentDirectory != m_RootDirectory)
+		{
+			m_CurrentDirectory = m_CurrentDirectory.parent_path();
+			Scan();
+		}
+	}
+
+	void ContentBrowserPanel::GoToRoot()
+	{
+		m_CurrentDirectory = m_RootDirectory;
+		Scan();
+	}
+
+	void ContentBrowserPanel::Scan()
+	{
+		m_CurrentAssets.clear();
+		std::error_code ec;
+
+		if (!std::filesystem::exists(m_CurrentDirectory, ec))
+		{
+			return;
+		}
+
+		for (auto& p : std::filesystem::directory_iterator(m_CurrentDirectory, ec))
+		{
+			AssetEntry entry;
+			entry.name = p.path().filename().string();
+			entry.path = p.path();
+			entry.isDirectory = p.is_directory();
+			entry.type = DetermineAssetType(p.path());
+
+			if (!m_FilterQuery.empty())
+			{
+				std::string nameLower = entry.name;
+				std::transform(nameLower.begin(), nameLower.end(), nameLower.begin(), ::tolower);
+				if (nameLower.find(m_FilterQuery) == std::string::npos)
+				{
+					continue;
+				}
+			}
+
+			if (!entry.isDirectory && m_ContentFilterType > 0)
+			{
+				static constexpr EditorAssetType kFilterTypes[] = {EditorAssetType::Scene,	EditorAssetType::Prefab,
+																   EditorAssetType::Model,	EditorAssetType::Texture,
+																   EditorAssetType::Script, EditorAssetType::Audio};
+				static constexpr int kFilterTypeCount = sizeof(kFilterTypes) / sizeof(kFilterTypes[0]);
+
+				bool match = false;
+				if (m_ContentFilterType - 1 < kFilterTypeCount)
+				{
+					match = (entry.type == kFilterTypes[m_ContentFilterType - 1]);
+				}
+				if (!match)
+				{
+					continue;
+				}
+			}
+
+			m_CurrentAssets.push_back(entry);
+		}
+
+		std::sort(m_CurrentAssets.begin(), m_CurrentAssets.end(), [](const AssetEntry& a, const AssetEntry& b) {
+			if (a.isDirectory != b.isDirectory)
+			{
+				return a.isDirectory > b.isDirectory;
+			}
+			return a.name < b.name;
+		});
+	}
+
+	EditorAssetType ContentBrowserPanel::DetermineAssetType(const std::filesystem::path& path)
+	{
+		if (std::filesystem::is_directory(path))
+		{
+			return EditorAssetType::Directory;
+		}
+
+		static const std::unordered_map<std::string, EditorAssetType> s_ExtensionMap = {
+			{".chscene", EditorAssetType::Scene},	{".chmap", EditorAssetType::Scene},
+			{".chprefab", EditorAssetType::Prefab}, {".h", EditorAssetType::Script},
+			{".cpp", EditorAssetType::Script},		{".cs", EditorAssetType::Script},
+			{".obj", EditorAssetType::Model},		{".gltf", EditorAssetType::Model},
+			{".glb", EditorAssetType::Model},		{".png", EditorAssetType::Texture},
+			{".jpg", EditorAssetType::Texture},		{".tga", EditorAssetType::Texture},
+			{".bmp", EditorAssetType::Texture},		{".wav", EditorAssetType::Audio},
+			{".ogg", EditorAssetType::Audio},		{".mp3", EditorAssetType::Audio},
+			{".glsl", EditorAssetType::Shader},		{".vs", EditorAssetType::Shader},
+			{".fs", EditorAssetType::Shader},		{".vert", EditorAssetType::Shader},
+			{".frag", EditorAssetType::Shader}};
+
+		std::string ext = path.extension().string();
+		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+		auto it = s_ExtensionMap.find(ext);
+		return (it != s_ExtensionMap.end()) ? it->second : EditorAssetType::Other;
+	}
+
+} // namespace Chained
diff --git a/editor/panels/content_browser_panel.h b/editor/panels/content_browser_panel.h
index 5f784a580..e704d36de 100644
--- a/editor/panels/content_browser_panel.h
+++ b/editor/panels/content_browser_panel.h
@@ -1,78 +1,75 @@
 #ifndef CH_CONTENT_BROWSER_PANEL_H
 #define CH_CONTENT_BROWSER_PANEL_H
 
+#include "editor/asset_types.h"
 #include "panel.h"
-#include <filesystem>
-#include <functional>
-#include <string>
 #include <vector>
 
-namespace CHEngine
+namespace Chained
 {
-enum class EditorAssetType
-{
-    Directory,
-    Scene,
-    Script,
-    Model,
-    Texture,
-    Audio,
-    Prefab,
-    Other
-};
-
-struct AssetEntry
-{
-    std::string name;
-    std::filesystem::path path;
-    EditorAssetType type;
-    uint32_t icon;
-    bool isDirectory;
-};
-
-class ContentBrowserPanel : public Panel
-{
-public:
-    ContentBrowserPanel();
-    ~ContentBrowserPanel();
-
-    virtual void OnImGuiRender(bool readOnly = false) override;
-    virtual void OnEvent(Event& e) override;
-    void SetRootDirectory(const std::filesystem::path& path);
-
-private:
-    void RenderToolbar();
-    void RenderGridView();
-    void RefreshDirectory();
-    void ScanCurrentDirectory();
-
-private:
-    EditorAssetType DetermineAssetType(const std::filesystem::path& path);
-    void LoadDefaultIcons();
-    uint32_t GetIconForAsset(const AssetEntry& entry);
-    void OnAssetDoubleClicked(AssetEntry& entry);
-
-private:
-    std::filesystem::path m_RootDirectory;
-    std::filesystem::path m_CurrentDirectory;
-    std::vector<AssetEntry> m_CurrentAssets;
-
-    float m_ThumbnailSize = 96.0f;
-    float m_Padding = 16.0f;
-
-    // Filtering
-    char m_FilterBuffer[128] = "";
-    int m_FilterType = 0; // 0 = All, or specific type
-
-    uint32_t m_FolderIcon = 0;
-    uint32_t m_FileIcon = 0;
-    float m_IconScale = 1.0f;
-
-    // Asset Management
-    std::filesystem::path m_RenamingPath;
-    char m_RenameBuffer[256] = "";
-    std::filesystem::path m_PathToDelete;
-};
-} // namespace CHEngine
+
+	class ContentBrowserPanel : public Panel
+	{
+	public:
+		ContentBrowserPanel();
+		~ContentBrowserPanel() override;
+
+		void OnImGuiRender(bool readOnly = false) override;
+		void OnEvent(Event& e) override;
+
+	private:
+		void RenderToolbar();
+		void RenderGridView();
+
+		void OnAssetDoubleClicked(const AssetEntry& entry);
+
+		void Scan();
+		EditorAssetType DetermineAssetType(const std::filesystem::path& path);
+
+		const std::vector<AssetEntry>& GetAssets() const
+		{
+			return m_CurrentAssets;
+		}
+		const std::filesystem::path& GetCurrentDirectory() const
+		{
+			return m_CurrentDirectory;
+		}
+		const std::filesystem::path& GetRootDirectory() const
+		{
+			return m_RootDirectory;
+		}
+
+		void SetRoot(const std::filesystem::path& path);
+		void SetFilter(const std::string& query, int typeFilter);
+		void Refresh();
+		void Navigate(const std::filesystem::path& path);
+		void GoUp();
+		void GoToRoot();
+
+	private:
+		std::filesystem::path m_RootDirectory;
+		std::filesystem::path m_CurrentDirectory;
+		std::vector<AssetEntry> m_CurrentAssets;
+
+		std::string m_FilterQuery;
+		int m_ContentFilterType = 0;
+
+		float m_ThumbnailSize = 96.0f;
+		float m_Padding = 16.0f;
+		float m_IconScale = 1.0f;
+
+		char m_FilterBuffer[128] = "";
+		int m_FilterType = 0;
+
+		std::filesystem::path m_RenamingPath;
+		char m_RenameBuffer[256] = "";
+		std::filesystem::path m_PathToDelete;
+		std::filesystem::path m_NextDirectory;
+		bool m_OpenRenamePopup = false;
+		bool m_OpenDeletePopup = false;
+		bool m_PendingRefresh = false;
+	};
+
+} // namespace Chained
 
 #endif // CH_CONTENT_BROWSER_PANEL_H
diff --git a/editor/panels/effects_panel.cpp b/editor/panels/effects_panel.cpp
index 70396c02d..235cfac72 100644
--- a/editor/panels/effects_panel.cpp
+++ b/editor/panels/effects_panel.cpp
@@ -1,68 +1,75 @@
 #include "effects_panel.h"
-#include "editor/editor_layer.h"
+#include "editor/layer.h"
 #include "engine/graphics/pipeline/renderer.h"
 #include "scene/scene.h"
+#include "engine/core/service_locator.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-EffectsPanel::EffectsPanel()
-{
-    m_Name = "Effects & Debug";
-}
-
-void EffectsPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
+	EffectsPanel::EffectsPanel()
+	{
+		m_Name = "Effects & Debug";
+		m_IsOpen = false;
+	}
 
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
+	void EffectsPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
 
-    if (!m_Context)
-    {
-        ImGui::Text("No active scene.");
-        ImGui::End();
-        return;
-    }
+		ImGui::Begin(m_Name.c_str(), &m_IsOpen);
 
-    if (ImGui::CollapsingHeader("Viewport Settings", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        const char* diagnosticModes[] = {"Full Render", "Normals", "Lighting only", "Albedo only"};
-        int currentDiag = (int)m_Context->GetSettings().DiagnosticMode;
-        if (ImGui::Combo("Diagnostic Mode", &currentDiag, diagnosticModes, 4))
-        {
-            m_Context->GetSettings().DiagnosticMode = (float)currentDiag;
-            Renderer::Get().SetDiagnosticMode((float)currentDiag);
-        }
-    }
+		if (!m_Context)
+		{
+			ImGui::Text("No active scene.");
+			ImGui::End();
+			return;
+		}
 
-    if (ImGui::CollapsingHeader("Debug Visualization", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        auto& debugFlags = m_Context->GetSettings().DebugFlags;
-        ImGui::Checkbox("Physics (Colliders)", &debugFlags.DrawColliders);
-        if (debugFlags.DrawColliders)
-        {
-            const char* wireModes[] = {"Wireframe", "Solid"};
-            ImGui::Combo("Wireframe Mode", &debugFlags.SetCollisionWireframeMode, wireModes, 2);
-        }
-        ImGui::Checkbox("AABB Boxes", &debugFlags.DrawCollisionModelBox);
-        ImGui::Checkbox("Lights", &debugFlags.DrawLights);
-        ImGui::Checkbox("Spawn Zones", &debugFlags.DrawSpawnZones);
-        ImGui::Checkbox("Draw Grid", &debugFlags.DrawGrid);
+		if (ImGui::CollapsingHeader("Viewport Settings", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			const char* diagnosticModes[] = {"Full Render", "Normals", "Lighting only", "Albedo only"};
+			int currentDiag = (int)m_Context->GetSettings().DiagnosticMode;
+			if (ImGui::Combo("Diagnostic Mode", &currentDiag, diagnosticModes, 4))
+			{
+				m_Context->GetSettings().DiagnosticMode = (float)currentDiag;
+				if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+				{
+					renderer->SetDiagnosticMode((float)currentDiag);
+				}
+			}
+		}
 
-        if (debugFlags.DrawGrid)
-        {
-            auto& grid = m_Context->GetSettings().Grid;
-            ImGui::Indent(12.0f);
-            ImGui::DragInt("Slices", &grid.Slices, 1, 4, 200);
-            ImGui::DragFloat("Spacing", &grid.Spacing, 0.1f, 0.1f, 50.0f);
-            ImGui::Unindent(12.0f);
-        }
-    }
+		if (ImGui::CollapsingHeader("Debug Visualization", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			auto& debugFlags = m_Context->GetSettings().DebugFlags;
+			ImGui::Checkbox("Physics (Colliders)", &debugFlags.DrawColliders);
+			if (debugFlags.DrawColliders)
+			{
+				const char* wireModes[] = {"Wireframe", "Solid", "Solid + Wireframe"};
+				ImGui::Combo("Visual Mode", &debugFlags.SetCollisionWireframeMode, wireModes, 3);
+			}
+			ImGui::Checkbox("Lights", &debugFlags.DrawLights);
+			ImGui::Checkbox("Spawn Zones", &debugFlags.DrawSpawnZones);
+			ImGui::Checkbox("Draw Grid", &debugFlags.DrawGrid);
+			if (debugFlags.DrawGrid)
+			{
+				auto& grid = m_Context->GetSettings().Grid;
+				ImGui::Indent(12.0f);
+				ImGui::DragFloat("Spacing", &grid.Spacing, 0.1f, 0.01f, 50.0f);
+				ImGui::DragFloat("Secondary Spacing", &grid.SecondarySpacing, 1.0f, 1.0f, 100.0f);
+				ImGui::ColorEdit4("Color", &grid.Color.x);
+				ImGui::DragFloat("Fade Start", &grid.FadeStart, 10.0f, 0.0f, 10000.0f);
+				ImGui::DragFloat("Fade End", &grid.FadeEnd, 10.0f, 100.0f, 50000.0f);
+				ImGui::DragFloat("Plane Size", &grid.PlaneSize, 100.0f, 100.0f, 50000.0f);
+				ImGui::Unindent(12.0f);
+			}
+		}
 
-    ImGui::End();
-}
+		ImGui::End();
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/editor/panels/effects_panel.h b/editor/panels/effects_panel.h
index 3637234f9..d1e2704a3 100644
--- a/editor/panels/effects_panel.h
+++ b/editor/panels/effects_panel.h
@@ -3,16 +3,16 @@
 
 #include "panel.h"
 
-namespace CHEngine
+namespace Chained
 {
-class EffectsPanel : public Panel
-{
-public:
-    EffectsPanel();
+	class EffectsPanel : public Panel
+	{
+	public:
+		EffectsPanel();
 
-public:
-    virtual void OnImGuiRender(bool readOnly = false) override;
-};
-} // namespace CHEngine
+	public:
+		virtual void OnImGuiRender(bool readOnly = false) override;
+	};
+} // namespace Chained
 
 #endif // CH_EFFECTS_PANEL_H
diff --git a/editor/panels/inspector_panel.cpp b/editor/panels/inspector_panel.cpp
index 204bced7c..0b90bce70 100644
--- a/editor/panels/inspector_panel.cpp
+++ b/editor/panels/inspector_panel.cpp
@@ -1,94 +1,96 @@
 #include "inspector_panel.h"
-#include "IconsFontAwesome6.h"
-#include "editor_gui.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/model_asset.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "gui.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
 #include "engine/scene/components.h"
-#include "engine/scene/project.h"
+#include "engine/project/project.h"
 #include "engine/scene/scene_events.h"
 
 #include "imgui.h"
 #include "property_editor.h"
 
-namespace CHEngine
+namespace Chained
 {
-InspectorPanel::InspectorPanel()
-{
-    m_Name = "Inspector";
-}
+	InspectorPanel::InspectorPanel()
+	{
+		m_Name = "Inspector";
+	}
 
-void InspectorPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
+	void InspectorPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
 
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
+		ImGui::Begin(m_Name.c_str(), &m_IsOpen);
 
-    if (m_SelectedEntity && !m_SelectedEntity.IsValid())
-    {
-        m_SelectedEntity = {};
-    }
+		if (m_SelectedEntity && (!m_Context || m_SelectedEntity.GetRegistryPtr() != m_Context->GetRegistryPtr() ||
+								 !m_SelectedEntity.IsValid()))
+		{
+			m_SelectedEntity = {};
+		}
 
-    if (m_SelectedEntity && m_SelectedEntity.IsValid())
-    {
+		if (m_SelectedEntity)
+		{
 
-        DrawComponents(m_SelectedEntity, readOnly);
-    }
-    else
-    {
-        ImGui::Text("Selection: None");
-        ImGui::TextDisabled("Select an entity in the Hierarchy to view its components.");
-    }
-    ImGui::End();
-}
+			bool isTransitioning = EditorLayer::Get().GetSceneManager().IsTransitioning();
+			DrawComponents(m_SelectedEntity, readOnly || isTransitioning);
+		}
+		else
+		{
+			ImGui::Text("Selection: None");
+			ImGui::TextDisabled("Select an entity in the Hierarchy to view its components.");
+		}
+		ImGui::End();
+	}
 
-void InspectorPanel::OnEvent(Event& e)
-{
-    EventDispatcher dispatcher(e);
-    dispatcher.Dispatch<EntitySelectedEvent>([this](EntitySelectedEvent& ev) {
-        if (m_Context && ev.GetEntity() != entt::null)
-        {
-            m_SelectedEntity = Entity(ev.GetEntity(), m_Context->GetRegistry());
-        }
-        else
-        {
-            m_SelectedEntity = {};
-        }
-        m_SelectedMeshIndex = ev.GetMeshIndex();
-        return false;
-    });
-}
+	void InspectorPanel::OnEvent(Event& e)
+	{
+		EventDispatcher dispatcher(e);
+		dispatcher.Dispatch<EntitySelectedEvent>([this](EntitySelectedEvent& ev) {
+			if (m_Context && ev.GetEntity() != entt::null)
+			{
+				m_SelectedEntity = Entity(ev.GetEntity(), m_Context->GetRegistryPtr());
+			}
+			else
+			{
+				m_SelectedEntity = {};
+			}
+			m_SelectedMeshIndex = ev.GetMeshIndex();
+			return false;
+		});
+	}
 
-void InspectorPanel::SetContext(const std::shared_ptr<Scene>& context)
-{
-    if (m_Context.get() != context.get())
-    {
-        m_SelectedEntity = {};
-    }
-    Panel::SetContext(context);
-}
+	void InspectorPanel::SetContext(const std::shared_ptr<Scene>& context)
+	{
+		if (m_Context.get() != context.get())
+		{
+			m_SelectedEntity = {};
+		}
+		Panel::SetContext(context);
+	}
 
-void InspectorPanel::DrawComponents(Entity entity, bool readOnly)
-{
-    ImGui::PushID((uint32_t)entity);
+	void InspectorPanel::DrawComponents(Entity entity, bool readOnly)
+	{
+		ImGui::PushID((uint32_t)entity);
 
-    if (entity.HasComponent<IDComponent>())
-    {
-        uint64_t uuid = (uint64_t)entity.GetComponent<IDComponent>().ID;
-        ImGui::TextDisabled("UUID: %llu", uuid);
-    }
+		if (entity.HasComponent<IDComponent>())
+		{
+			uint64_t uuid = (uint64_t)entity.GetComponent<IDComponent>().ID;
+			ImGui::TextDisabled("UUID: %llu", uuid);
+		}
 
-    PropertyEditor::DrawEntityHeader(entity);
+		PropertyEditor::DrawEntityHeader(entity);
 
-    // Delegate all component drawing logic to PropertyEditor registry
-    PropertyEditor::DrawEntityProperties(entity);
+		// Delegate all component drawing logic to PropertyEditor registry
+		PropertyEditor::DrawEntityProperties(entity);
 
-    ImGui::PopID();
-}
-void InspectorPanel::SetSelectedMeshIndex(int index)
-{
-    m_SelectedMeshIndex = index;
-}
-} // namespace CHEngine
+		ImGui::PopID();
+	}
+	void InspectorPanel::SetSelectedMeshIndex(int index)
+	{
+		m_SelectedMeshIndex = index;
+	}
+} // namespace Chained
diff --git a/editor/panels/inspector_panel.h b/editor/panels/inspector_panel.h
index 22e804a9a..fada1b47e 100644
--- a/editor/panels/inspector_panel.h
+++ b/editor/panels/inspector_panel.h
@@ -3,25 +3,26 @@
 
 #include "panel.h"
 
-namespace CHEngine
+namespace Chained
 {
-class InspectorPanel : public Panel
-{
-public:
-    InspectorPanel();
-    virtual void OnImGuiRender(bool readOnly = false) override;
-    virtual void OnEvent(Event& e) override;
-    virtual void SetContext(const std::shared_ptr<Scene>& context) override;
-public:
-    void SetSelectedMeshIndex(int index);
+	class InspectorPanel : public Panel
+	{
+	public:
+		InspectorPanel();
+		virtual void OnImGuiRender(bool readOnly = false) override;
+		virtual void OnEvent(Event& e) override;
+		virtual void SetContext(const std::shared_ptr<Scene>& context) override;
+
+	public:
+		void SetSelectedMeshIndex(int index);
 
-private:
-    void DrawComponents(Entity entity, bool readOnly);
+	private:
+		void DrawComponents(Entity entity, bool readOnly);
 
-private:
-    Entity m_SelectedEntity;
-    int m_SelectedMeshIndex = -1;
-};
-} // namespace CHEngine
+	private:
+		Entity m_SelectedEntity;
+		int m_SelectedMeshIndex = -1;
+	};
+} // namespace Chained
 
 #endif // CH_INSPECTOR_PANEL_H
diff --git a/editor/panels/material_panel.cpp b/editor/panels/material_panel.cpp
index 19d75ea57..14d462c8d 100644
--- a/editor/panels/material_panel.cpp
+++ b/editor/panels/material_panel.cpp
@@ -1,163 +1,539 @@
 #include "material_panel.h"
-#include "engine/scene/components/mesh_component.h"
+#include "engine/scene/components/render/model_component.h"
 #include "engine/scene/scene_events.h"
 #include "imgui.h"
 #include "property_editor.h"
 #include "ui_properties.h"
-#include "engine/graphics/texture_system.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/types/material_asset.h"
+#include "editor/layer.h"
+#include <filesystem>
 
-namespace CHEngine
+namespace Chained
 {
 
-MaterialPanel::MaterialPanel()
-{
-    m_Name = "Material Editor";
-}
+	MaterialPanel::MaterialPanel()
+	{
+		m_Name = "Material Editor";
+	}
 
-static uint32_t GetTextureID(const std::string& path)
-{
-    if (path.empty()) return 0;
-    auto textureHandle = TextureSystem::Get().LoadTexture(path);
-    return TextureSystem::Get().GetRendererID(textureHandle);
-}
+	static uint32_t GetTextureID(const std::shared_ptr<Texture>& map, const std::string& path)
+	{
+		if (map)
+		{
+			return map->GetNativeHandle();
+		}
+		if (path.empty())
+		{
+			return 0;
+		}
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am)
+		{
+			auto texAsset = am->Get<TextureAsset>(path);
+			if (texAsset && texAsset->IsReady())
+			{
+				auto gpuTex = texAsset->GetTexture();
+				if (gpuTex)
+				{
+					return gpuTex->GetNativeHandle();
+				}
+			}
+		}
+		return 0;
+	}
 
-void MaterialPanel::DrawMaterialSlot(MaterialSlot& slot)
-{
-    MaterialInstance& mat = slot.Material;
-    
-    if (ImGui::CollapsingHeader(ICON_FA_IMAGE " Albedo", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        EditorGUI::Property("Color", mat.AlbedoColor);
-        mat.OverrideAlbedo |= EditorGUI::FileProperty("Texture", mat.AlbedoPath, GetTextureID(mat.AlbedoPath), "png,jpg,tga");
-        ImGui::Checkbox("Override Albedo", &mat.OverrideAlbedo);
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_WATER " Normals", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        mat.OverrideNormal |= EditorGUI::FileProperty("Normal Map", mat.NormalMapPath, GetTextureID(mat.NormalMapPath), "png,jpg,tga");
-        ImGui::Checkbox("Override Normal", &mat.OverrideNormal);
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_CIRCLE_HALF_STROKE " PBR (Metal/Rough)", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::Columns(2);
-        ImGui::SetColumnWidth(0, 100.0f);
-        
-        ImGui::Text("Metalness"); ImGui::NextColumn();
-        ImGui::SliderFloat("##metal", &mat.Metalness, 0.0f, 1.0f); ImGui::NextColumn();
-        
-        ImGui::Text("Roughness"); ImGui::NextColumn();
-        ImGui::SliderFloat("##rough", &mat.Roughness, 0.0f, 1.0f); ImGui::NextColumn();
-        
-        ImGui::Columns(1);
-        
-        mat.OverrideMetallicRoughness |= EditorGUI::FileProperty("PBR Map", mat.MetallicRoughnessPath, GetTextureID(mat.MetallicRoughnessPath), "png,jpg,tga");
-        ImGui::Checkbox("Override PBR", &mat.OverrideMetallicRoughness);
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_SUN " Emissive", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        EditorGUI::Property("Emissive Color", mat.EmissiveColor);
-        EditorGUI::Property("Intensity", mat.EmissiveIntensity);
-        mat.OverrideEmissive |= EditorGUI::FileProperty("Emissive Map", mat.EmissivePath, GetTextureID(mat.EmissivePath), "png,jpg,tga");
-        ImGui::Checkbox("Override Emissive", &mat.OverrideEmissive);
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_GEARS " Settings"))
-    {
-        ImGui::Checkbox("Double Sided", &mat.DoubleSided);
-        ImGui::Checkbox("Transparent", &mat.Transparent);
-        ImGui::SliderFloat("Alpha", &mat.Alpha, 0.0f, 1.0f);
-    }
-}
-
-void MaterialPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen) return;
-
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
-
-    if (m_SelectedEntity && (!m_SelectedEntity.IsValid() || m_SelectedEntity.GetRegistry().ctx().get<Scene*>() != m_Context.get()))
-    {
-        m_SelectedEntity = {};
-    }
-
-    if (m_SelectedEntity && m_SelectedEntity.IsValid())
-    {
-        ImGui::BeginDisabled(readOnly);
-
-        std::vector<MaterialSlot>* materials = nullptr;
-
-        if (m_SelectedEntity.HasComponent<MaterialComponent>())
-            materials = &m_SelectedEntity.GetComponent<MaterialComponent>().Materials;
-        else if (m_SelectedEntity.HasComponent<ModelComponent>())
-            materials = &m_SelectedEntity.GetComponent<ModelComponent>().Materials;
-
-        if (materials && !materials->empty())
-        {
-            // Material Selection Sidebar / List
-            ImGui::BeginChild("MaterialList", ImVec2(150, 0), true);
-            for (int i = 0; i < (int)materials->size(); i++)
-            {
-                std::string label = (*materials)[i].Name;
-                if (label.empty()) label = "Material " + std::to_string(i);
-                
-                if (ImGui::Selectable(label.c_str(), m_SelectedMaterialIndex == i))
-                    m_SelectedMaterialIndex = i;
-            }
-            ImGui::EndChild();
-            
-            ImGui::SameLine();
-            
-            // Material Properties
-            ImGui::BeginChild("MaterialProperties");
-            if (m_SelectedMaterialIndex < (int)materials->size())
-            {
-                ImGui::TextColored({0.2f, 0.8f, 1.0f, 1.0f}, "Editing: %s", (*materials)[m_SelectedMaterialIndex].Name.c_str());
-                ImGui::Separator();
-                DrawMaterialSlot((*materials)[m_SelectedMaterialIndex]);
-            }
-            else
-            {
-                m_SelectedMaterialIndex = 0;
-            }
-            ImGui::EndChild();
-        }
-        else
-        {
-            ImGui::TextColored({0.8f, 0.8f, 0.2f, 1.0f}, ICON_FA_CIRCLE_INFO " No Materials found for this entity");
-            if (ImGui::Button(ICON_FA_PLUS " Add Materials Override Component"))
-            {
-                m_SelectedEntity.AddComponent<MaterialComponent>();
-            }
-        }
-
-        ImGui::EndDisabled();
-    }
-    else
-    {
-        ImGui::Text("No entity selected.");
-        ImGui::TextDisabled("Select an entity in the Hierarchy to edit its materials.");
-    }
-
-    ImGui::End();
-}
-
-void MaterialPanel::OnEvent(Event& e)
-{
-    EventDispatcher dispatcher(e);
-    dispatcher.Dispatch<EntitySelectedEvent>([this](EntitySelectedEvent& ev) {
-        m_SelectedEntity = Entity(ev.GetEntity(), &ev.GetScene()->GetRegistry());
-        m_SelectedMeshIndex = ev.GetMeshIndex();
-        m_SelectedMaterialIndex = 0;
-        return false;
-    });
-}
-
-void MaterialPanel::SetContext(const std::shared_ptr<Scene>& context)
-{
-    Panel::SetContext(context);
-    m_SelectedEntity = {};
-}
+	static void UpdateTextureFromPath(std::shared_ptr<Texture>& outMap, const std::string& path)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am || path.empty())
+		{
+			return;
+		}
+		auto texAsset = am->Get<TextureAsset>(path);
+		if (texAsset && texAsset->IsReady())
+		{
+			outMap = texAsset->GetTexture();
+		}
+	}
+
+	static bool DrawSectionHeader(const char* icon, const char* label)
+	{
+		ImGui::PushStyleColor(ImGuiCol_Header, {0.2f, 0.25f, 0.35f, 0.8f});
+		ImGui::PushStyleColor(ImGuiCol_HeaderActive, {0.3f, 0.4f, 0.6f, 1.0f});
+		ImGui::PushStyleColor(ImGuiCol_HeaderHovered, {0.25f, 0.35f, 0.5f, 1.0f});
+		bool open = ImGui::CollapsingHeader(label, ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed);
+		ImGui::PopStyleColor(3);
+		return open;
+	}
+
+	void MaterialPanel::DrawMaterialSlot(Material& mat)
+	{
+		if (DrawSectionHeader(ICON_FA_IMAGE, ICON_FA_IMAGE " Albedo"))
+		{
+			ImGui::Indent();
+			EditorGUI::BeginPropertyGrid();
+			EditorGUI::PropertyColor("Color", mat.AlbedoColor);
+			if (EditorGUI::FileProperty("Texture", mat.AlbedoPath, GetTextureID(mat.AlbedoMap, mat.AlbedoPath),
+										"png,jpg,tga"))
+			{
+				UpdateTextureFromPath(mat.AlbedoMap, mat.AlbedoPath);
+			}
+			EditorGUI::EndPropertyGrid();
+			ImGui::Unindent();
+		}
+
+		if (DrawSectionHeader(ICON_FA_WATER, ICON_FA_WATER " Normals"))
+		{
+			ImGui::Indent();
+			EditorGUI::BeginPropertyGrid();
+			if (EditorGUI::FileProperty("Normal Map", mat.NormalPath, GetTextureID(mat.NormalMap, mat.NormalPath),
+										"png,jpg,tga"))
+			{
+				UpdateTextureFromPath(mat.NormalMap, mat.NormalPath);
+			}
+			EditorGUI::EndPropertyGrid();
+			ImGui::Unindent();
+		}
+
+		if (DrawSectionHeader(ICON_FA_CIRCLE_HALF_STROKE, ICON_FA_CIRCLE_HALF_STROKE " PBR (Metal/Rough)"))
+		{
+			ImGui::Indent();
+			EditorGUI::BeginPropertyGrid();
+			EditorGUI::Property("Metalness", mat.Metalness, 0.01f, 0.0f, 1.0f);
+			EditorGUI::Property("Roughness", mat.Roughness, 0.01f, 0.0f, 1.0f);
+			if (EditorGUI::FileProperty("PBR Map", mat.MetallicRoughnessPath,
+										GetTextureID(mat.MetallicRoughnessMap, mat.MetallicRoughnessPath),
+										"png,jpg,tga"))
+			{
+				UpdateTextureFromPath(mat.MetallicRoughnessMap, mat.MetallicRoughnessPath);
+			}
+			EditorGUI::EndPropertyGrid();
+			ImGui::TextDisabled("PBR map: G = Roughness, B = Metalness (glTF convention)");
+			ImGui::Unindent();
+		}
+
+		if (DrawSectionHeader(ICON_FA_SUN, ICON_FA_SUN " Emissive"))
+		{
+			ImGui::Indent();
+			EditorGUI::BeginPropertyGrid();
+			EditorGUI::PropertyColor("Color", mat.EmissiveColor, /*hdr*/ true);
+			EditorGUI::Property("Intensity", mat.EmissiveIntensity, 0.05f, 0.0f, 1000.0f);
+			if (EditorGUI::FileProperty("Emissive Map", mat.EmissivePath,
+										GetTextureID(mat.EmissiveMap, mat.EmissivePath), "png,jpg,tga"))
+			{
+				UpdateTextureFromPath(mat.EmissiveMap, mat.EmissivePath);
+			}
+			EditorGUI::EndPropertyGrid();
+			ImGui::Unindent();
+		}
+
+		if (DrawSectionHeader(ICON_FA_GEARS, ICON_FA_GEARS " Settings"))
+		{
+			ImGui::Indent();
+			EditorGUI::BeginPropertyGrid();
+			EditorGUI::Property("Transparent", mat.Transparent);
+			ImGui::BeginDisabled(!mat.Transparent);
+			EditorGUI::Property("Alpha", mat.Alpha, 0.01f, 0.0f, 1.0f);
+			ImGui::EndDisabled();
+			EditorGUI::EndPropertyGrid();
+			ImGui::Unindent();
+		}
+	}
+
+	void MaterialPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		ImGui::Begin(m_Name.c_str(), &m_IsOpen);
+
+		if (m_SelectedEntity && (!m_Context || m_SelectedEntity.GetRegistryPtr() != m_Context->GetRegistryPtr() ||
+								 !m_SelectedEntity.IsValid()))
+		{
+			m_SelectedEntity = {};
+		}
+
+		if (m_SelectedEntity)
+		{
+			ImGui::BeginDisabled(readOnly);
+
+			std::vector<Material>* materials = nullptr;
+
+			if (m_SelectedEntity.HasComponent<ModelComponent>())
+			{
+				auto& mc = m_SelectedEntity.GetComponent<ModelComponent>();
+
+				// Reload materials if: path changed, or materials not yet loaded while asset is ready.
+				bool pathChanged = (mc.ModelPath != m_LoadedModelPath);
+				bool shouldLoad = !mc.ModelPath.empty() && (pathChanged || m_Materials.empty());
+				if (shouldLoad)
+				{
+					auto* assetMgr = ServiceLocator::TryGet<AssetManager>();
+					if (assetMgr)
+					{
+						auto asset = assetMgr->Get<ModelAsset>(mc.ModelPath);
+						if (asset && asset->IsReady())
+						{
+							m_Materials = asset->GetMaterials();
+							m_LoadedModelPath = mc.ModelPath;
+
+							std::filesystem::path modelPath(mc.ModelPath);
+							std::string modelName = modelPath.stem().string();
+							std::filesystem::path modelDir = modelPath.parent_path();
+
+							for (size_t i = 0; i < m_Materials.size(); ++i)
+							{
+								if (i < mc.MaterialPaths.size() && !mc.MaterialPaths[i].empty())
+								{
+									auto matAsset = assetMgr->Get<MaterialAsset>(mc.MaterialPaths[i]);
+									if (matAsset && matAsset->IsReady())
+									{
+										m_Materials[i] = matAsset->GetMaterial();
+									}
+								}
+								else
+								{
+									std::string matFileName = modelName + "_material_" + std::to_string(i) + ".chmat";
+									std::string autoMatRel = (modelDir / matFileName).generic_string();
+									if (assetMgr->FileExists(autoMatRel))
+									{
+										auto matAsset = assetMgr->Get<MaterialAsset>(autoMatRel);
+										if (matAsset && matAsset->IsReady())
+										{
+											m_Materials[i] = matAsset->GetMaterial();
+											if (i >= mc.MaterialPaths.size())
+											{
+												mc.MaterialPaths.resize(i + 1);
+											}
+											mc.MaterialPaths[i] = autoMatRel;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+
+				materials = &m_Materials;
+			}
+
+			if (materials && !materials->empty())
+			{
+				// Material Selection Sidebar / List
+				ImGui::BeginChild("MaterialList", ImVec2(180, 0), true);
+				ImGui::SetNextItemWidth(-1.0f);
+				ImGui::InputTextWithHint("##MatFilter", ICON_FA_MAGNIFYING_GLASS " Search...", m_FilterBuffer,
+										 sizeof(m_FilterBuffer));
+				ImGui::Separator();
+
+				std::string filterStr = m_FilterBuffer;
+				std::transform(filterStr.begin(), filterStr.end(), filterStr.begin(), ::tolower);
+
+				for (int i = 0; i < (int)materials->size(); i++)
+				{
+					const Material& m = (*materials)[i];
+					std::string label = m.Name;
+					if (label.empty())
+					{
+						label = "Material " + std::to_string(i);
+					}
+
+					if (!filterStr.empty())
+					{
+						std::string lowerLabel = label;
+						std::transform(lowerLabel.begin(), lowerLabel.end(), lowerLabel.begin(), ::tolower);
+						if (lowerLabel.find(filterStr) == std::string::npos)
+						{
+							continue;
+						}
+					}
+
+					ImGui::PushID(i);
+					uint32_t texHandle = GetTextureID(m.AlbedoMap, m.AlbedoPath);
+					if (texHandle != 0)
+					{
+						ImGui::Image((ImTextureID)(uintptr_t)texHandle, ImVec2(14, 14));
+					}
+					else
+					{
+						ImVec4 swatch = {m.AlbedoColor.r, m.AlbedoColor.g, m.AlbedoColor.b, 1.0f};
+						ImGui::ColorButton("##swatch", swatch,
+										   ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoPicker |
+											   ImGuiColorEditFlags_NoBorder,
+										   {14, 14});
+					}
+					ImGui::SameLine();
+					if (ImGui::Selectable(label.c_str(), m_SelectedMaterialIndex == i))
+					{
+						m_SelectedMaterialIndex = i;
+					}
+					ImGui::PopID();
+				}
+				ImGui::EndChild();
+
+				ImGui::SameLine();
+
+				// Material Properties — leave room for Save button
+				float availH = ImGui::GetContentRegionAvail().y;
+				float buttonArea = 50.0f;
+				ImGui::BeginChild("MaterialProperties", ImVec2(0, availH - buttonArea));
+				if (m_SelectedMaterialIndex < (int)materials->size())
+				{
+					Material& selected = (*materials)[m_SelectedMaterialIndex];
+					std::string title =
+						selected.Name.empty() ? ("Material " + std::to_string(m_SelectedMaterialIndex)) : selected.Name;
+					ImGui::TextColored({0.2f, 0.8f, 1.0f, 1.0f}, ICON_FA_PALETTE " Editing: %s", title.c_str());
+					ImGui::Separator();
+					ImGui::Spacing();
+					DrawMaterialSlot(selected);
+
+					// Live update in memory so the viewport reflects changes immediately
+					if (auto* assetMgr = ServiceLocator::TryGet<AssetManager>())
+					{
+						if (m_SelectedEntity.HasComponent<ModelComponent>())
+						{
+							auto& mc = m_SelectedEntity.GetComponent<ModelComponent>();
+							auto modelAsset = assetMgr->Get<ModelAsset>(mc.ModelPath);
+							if (modelAsset)
+							{
+								modelAsset->GetMaterials() = m_Materials;
+							}
+							if (m_SelectedMaterialIndex < (int)mc.MaterialPaths.size() &&
+								!mc.MaterialPaths[m_SelectedMaterialIndex].empty())
+							{
+								auto matAsset = assetMgr->Get<MaterialAsset>(mc.MaterialPaths[m_SelectedMaterialIndex]);
+								if (matAsset)
+								{
+									matAsset->SetMaterial(selected);
+								}
+							}
+						}
+					}
+				}
+				else
+				{
+					m_SelectedMaterialIndex = 0;
+				}
+				ImGui::EndChild();
+
+				// Save & Delete buttons
+				ImGui::Separator();
+				float buttonWidth = ImGui::GetContentRegionAvail().x * 0.5f - 4.0f;
+				if (ImGui::Button(ICON_FA_FLOPPY_DISK " Save Materials", ImVec2(buttonWidth, 0)))
+				{
+					SaveMaterials();
+					ImGui::OpenPopup("Materials Saved");
+				}
+
+				if (ImGui::BeginPopup("Materials Saved"))
+				{
+					ImGui::Text("Materials saved successfully!");
+					ImGui::EndPopup();
+				}
+
+				ImGui::SameLine();
+				ImGui::PushStyleColor(ImGuiCol_Button, {0.7f, 0.2f, 0.2f, 1.0f});
+				ImGui::PushStyleColor(ImGuiCol_ButtonHovered, {0.85f, 0.3f, 0.3f, 1.0f});
+				ImGui::PushStyleColor(ImGuiCol_ButtonActive, {0.6f, 0.15f, 0.15f, 1.0f});
+				if (ImGui::Button(ICON_FA_TRASH " Delete .chmat", ImVec2(-1, 0)))
+				{
+					DeleteMaterials();
+					ImGui::OpenPopup("Materials Deleted");
+				}
+				ImGui::PopStyleColor(3);
+
+				if (ImGui::BeginPopup("Materials Deleted"))
+				{
+					ImGui::Text("Deleted .chmat files and restored model defaults!");
+					ImGui::EndPopup();
+				}
+			}
+			else
+			{
+				ImGui::TextColored({0.8f, 0.8f, 0.2f, 1.0f}, ICON_FA_CIRCLE_INFO " No Materials found for this entity");
+			}
+
+			ImGui::EndDisabled();
+		}
+		else
+		{
+			ImGui::Text("No entity selected.");
+			ImGui::TextDisabled("Select an entity in the Hierarchy to edit its materials.");
+		}
+
+		ImGui::End();
+	}
+
+	void MaterialPanel::SaveMaterials()
+	{
+		if (!m_SelectedEntity || !m_SelectedEntity.IsValid())
+		{
+			return;
+		}
+
+		if (!m_SelectedEntity.HasComponent<ModelComponent>())
+		{
+			return;
+		}
+		if (m_Materials.empty())
+		{
+			return;
+		}
+
+		auto& mc = m_SelectedEntity.GetComponent<ModelComponent>();
+		std::filesystem::path modelPath(mc.ModelPath);
+		std::string modelName = modelPath.stem().string();
+		std::filesystem::path modelDir = modelPath.parent_path();
+
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		for (int i = 0; i < (int)m_Materials.size(); i++)
+		{
+			std::string matFileName = modelName + "_material_" + std::to_string(i) + ".chmat";
+			std::string matPath;
+
+			if (i < (int)mc.MaterialPaths.size() && !mc.MaterialPaths[i].empty())
+			{
+				matPath = mc.MaterialPaths[i];
+			}
+			else
+			{
+				matPath = (modelDir / matFileName).generic_string();
+			}
+
+			auto matAsset = std::make_shared<MaterialAsset>();
+			matAsset->SetMaterial(m_Materials[i]);
+			matAsset->SaveToFile(assets->ResolvePath(matPath));
+
+			if (i >= (int)mc.MaterialPaths.size())
+			{
+				mc.MaterialPaths.resize(i + 1);
+			}
+			mc.MaterialPaths[i] = matPath;
+
+			// Invalidate asset cache and update loaded instance
+			assets->Invalidate(matPath);
+			auto loadedMat = assets->Get<MaterialAsset>(matPath);
+			if (loadedMat)
+			{
+				loadedMat->SetMaterial(m_Materials[i]);
+			}
+		}
+
+		// Write back to ModelAsset so renderer picks up changes immediately
+		auto modelAsset = assets->Get<ModelAsset>(mc.ModelPath);
+		if (modelAsset)
+		{
+			modelAsset->GetMaterials() = m_Materials;
+		}
+
+		m_SelectedEntity.GetRegistry().patch<ModelComponent>(m_SelectedEntity, [](ModelComponent&) {});
+		EditorLayer::Get().GetSceneManager().MarkSceneDirty();
+	}
+
+	void MaterialPanel::DeleteMaterials()
+	{
+		if (!m_SelectedEntity || !m_SelectedEntity.IsValid())
+		{
+			return;
+		}
+
+		if (!m_SelectedEntity.HasComponent<ModelComponent>())
+		{
+			return;
+		}
+
+		auto& mc = m_SelectedEntity.GetComponent<ModelComponent>();
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		// Delete all .chmat and .meta files associated with this component
+		for (const auto& matPath : mc.MaterialPaths)
+		{
+			if (!matPath.empty())
+			{
+				std::string resolved = assets->ResolvePath(matPath);
+				std::error_code ec;
+				std::filesystem::remove(resolved, ec);
+				std::filesystem::remove(resolved + ".meta", ec);
+				assets->Invalidate(matPath);
+			}
+		}
+
+		// Also clean standard naming pattern <modelName>_material_*.chmat
+		std::filesystem::path modelPath(mc.ModelPath);
+		std::string modelName = modelPath.stem().string();
+		std::filesystem::path modelDir = modelPath.parent_path();
+		for (int i = 0; i < 64; ++i)
+		{
+			std::string matFileName = modelName + "_material_" + std::to_string(i) + ".chmat";
+			std::string matRel = (modelDir / matFileName).generic_string();
+			std::string resolved = assets->ResolvePath(matRel);
+			if (std::filesystem::exists(resolved))
+			{
+				std::error_code ec;
+				std::filesystem::remove(resolved, ec);
+				std::filesystem::remove(resolved + ".meta", ec);
+				assets->Invalidate(matRel);
+			}
+		}
+
+		mc.MaterialPaths.clear();
+
+		// Invalidate model asset and reload its original native materials
+		assets->Invalidate(mc.ModelPath);
+		auto modelAsset = assets->Get<ModelAsset>(mc.ModelPath);
+		if (modelAsset && modelAsset->IsReady())
+		{
+			m_Materials = modelAsset->GetMaterials();
+		}
+		else
+		{
+			m_Materials.clear();
+		}
+
+		m_SelectedEntity.GetRegistry().patch<ModelComponent>(m_SelectedEntity, [](ModelComponent&) {});
+		EditorLayer::Get().GetSceneManager().MarkSceneDirty();
+	}
+
+	void MaterialPanel::OnEvent(Event& e)
+	{
+		EventDispatcher dispatcher(e);
+		dispatcher.Dispatch<EntitySelectedEvent>([this](EntitySelectedEvent& ev) {
+			if (Scene* scene = ev.GetScene())
+			{
+				m_SelectedEntity = Entity(ev.GetEntity(), &scene->GetRegistry());
+			}
+			m_SelectedMeshIndex = ev.GetMeshIndex();
+			m_SelectedMaterialIndex = 0;
+			m_Materials.clear();
+			m_LoadedModelPath.clear();
+			return false;
+		});
+	}
+
+	void MaterialPanel::SetContext(const std::shared_ptr<Scene>& context)
+	{
+		if (m_Context != context)
+		{
+			Panel::SetContext(context);
+			m_SelectedEntity = {};
+			m_Materials.clear();
+			m_LoadedModelPath.clear();
+		}
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/editor/panels/material_panel.h b/editor/panels/material_panel.h
index 5348fa7f6..90117d468 100644
--- a/editor/panels/material_panel.h
+++ b/editor/panels/material_panel.h
@@ -3,26 +3,32 @@
 
 #include "panel.h"
 #include "engine/scene/entity.h"
-#include "engine/scene/components/mesh_component.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/graphics/api/renderer_types.h"
 
-namespace CHEngine
+namespace Chained
 {
-class MaterialPanel : public Panel
-{
-public:
-    MaterialPanel();
-    virtual void OnImGuiRender(bool readOnly = false) override;
-    virtual void OnEvent(Event& e) override;
-    virtual void SetContext(const std::shared_ptr<Scene>& context) override;
+	class MaterialPanel : public Panel
+	{
+	public:
+		MaterialPanel();
+		virtual void OnImGuiRender(bool readOnly = false) override;
+		virtual void OnEvent(Event& e) override;
+		virtual void SetContext(const std::shared_ptr<Scene>& context) override;
 
-private:
-    void DrawMaterialSlot(MaterialSlot& slot);
+	private:
+		void DrawMaterialSlot(Material& slot);
+		void SaveMaterials();
+		void DeleteMaterials();
 
-private:
-    Entity m_SelectedEntity;
-    int m_SelectedMeshIndex = -1;
-    int m_SelectedMaterialIndex = 0;
-};
-} // namespace CHEngine
+	private:
+		Entity m_SelectedEntity;
+		std::vector<Material> m_Materials;
+		std::string m_LoadedModelPath; ///< Model path whose materials are currently in m_Materials.
+		int m_SelectedMeshIndex = -1;
+		int m_SelectedMaterialIndex = 0;
+		char m_FilterBuffer[128] = "";
+	};
+} // namespace Chained
 
 #endif // CH_MATERIAL_PANEL_H
diff --git a/editor/panels/network_panel.cpp b/editor/panels/network_panel.cpp
new file mode 100644
index 000000000..b2bc6afcb
--- /dev/null
+++ b/editor/panels/network_panel.cpp
@@ -0,0 +1,510 @@
+#include "network_panel.h"
+#include "engine/networking/network_service.h"
+#include "engine/scene/systems/network_system.h"
+#include "engine/core/service_locator.h"
+#include "imgui.h"
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <future>
+#include <chrono>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winhttp.h>
+#pragma comment(lib, "winhttp.lib")
+#endif
+
+namespace Chained
+{
+
+	/// Performs a blocking HTTP GET to api.ipify.org and returns the plain-text
+	/// public IP. Called from a background thread via std::async — must not touch
+	/// ImGui or any engine state.
+	/// @param useIPv6 If true, fetches IPv6 address from ipv6.api.ipify.org
+	static std::string FetchPublicIPBlocking(bool useIPv6 = false)
+	{
+#ifdef _WIN32
+		const wchar_t* host = useIPv6 ? L"ipv6.api.ipify.org" : L"api.ipify.org";
+		HINTERNET hSession = WinHttpOpen(L"ChainedEditor/1.0", WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY,
+										 WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
+		if (!hSession)
+		{
+			return "(error: WinHttpOpen)";
+		}
+
+		HINTERNET hConnect = WinHttpConnect(hSession, host, INTERNET_DEFAULT_HTTP_PORT, 0);
+		if (!hConnect)
+		{
+			WinHttpCloseHandle(hSession);
+			return "(error: WinHttpConnect)";
+		}
+
+		HINTERNET hRequest = WinHttpOpenRequest(hConnect, L"GET", L"/?format=text", nullptr, WINHTTP_NO_REFERER,
+												WINHTTP_DEFAULT_ACCEPT_TYPES, 0);
+		if (!hRequest)
+		{
+			WinHttpCloseHandle(hConnect);
+			WinHttpCloseHandle(hSession);
+			return "(error: WinHttpOpenRequest)";
+		}
+
+		BOOL sent = WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0);
+		if (!sent || !WinHttpReceiveResponse(hRequest, nullptr))
+		{
+			WinHttpCloseHandle(hRequest);
+			WinHttpCloseHandle(hConnect);
+			WinHttpCloseHandle(hSession);
+			return "(error: send/receive)";
+		}
+
+		std::string result;
+		DWORD bytesAvail = 0;
+		while (WinHttpQueryDataAvailable(hRequest, &bytesAvail) && bytesAvail > 0)
+		{
+			std::string chunk(bytesAvail, '\0');
+			DWORD bytesRead = 0;
+			if (WinHttpReadData(hRequest, chunk.data(), bytesAvail, &bytesRead))
+			{
+				result.append(chunk.data(), bytesRead);
+			}
+		}
+
+		WinHttpCloseHandle(hRequest);
+		WinHttpCloseHandle(hConnect);
+		WinHttpCloseHandle(hSession);
+		return result.empty() ? "(empty response)" : result;
+#else
+		const char* url = useIPv6 ? "https://ipv6.api.ipify.org" : "https://api.ipify.org";
+		char cmd[256];
+		snprintf(cmd, sizeof(cmd), "curl -s --max-time 5 %s 2>/dev/null", url);
+		FILE* pipe = popen(cmd, "r");
+		if (!pipe)
+		{
+			return "(install curl)";
+		}
+		char buf[128] = {};
+		fgets(buf, sizeof(buf), pipe);
+		pclose(pipe);
+		std::string r(buf);
+		while (!r.empty() && (r.back() == '\n' || r.back() == '\r'))
+		{
+			r.pop_back();
+		}
+		return r.empty() ? "(empty response)" : r;
+#endif
+	}
+
+	NetworkPanel::NetworkPanel()
+	{
+		m_Name = "Network";
+	}
+
+	NetworkPanel::~NetworkPanel() = default;
+
+	void NetworkPanel::OnImGuiRender(bool /*readOnly*/)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		ImGui::SetNextWindowSize(ImVec2(420, 380), ImGuiCond_FirstUseEver);
+
+		if (ImGui::Begin(m_Name.c_str(), &m_IsOpen))
+		{
+			auto* net = ServiceLocator::TryGet<Network>();
+
+			// --- Status bar ---
+			if (net && net->IsConnected())
+			{
+				const char* roleStr = net->IsHost() ? "HOST" : "CLIENT";
+				ImGui::Text("Status: %s", roleStr);
+				ImGui::SameLine();
+				ImGui::TextDisabled("(%zu connected)", net->GetClientCount());
+			}
+			else
+			{
+				ImGui::TextDisabled("Status: Offline");
+			}
+
+			ImGui::Separator();
+
+			// --- Tab Bar ---
+			if (ImGui::BeginTabBar("##NetworkTabs"))
+			{
+				if (ImGui::BeginTabItem("Host"))
+				{
+					DrawHostTab();
+					ImGui::EndTabItem();
+				}
+
+				if (ImGui::BeginTabItem("Connect"))
+				{
+					DrawConnectTab();
+					ImGui::EndTabItem();
+				}
+
+				if (ImGui::BeginTabItem("Players"))
+				{
+					DrawPlayersTab();
+					ImGui::EndTabItem();
+				}
+
+				ImGui::EndTabBar();
+			}
+
+			// --- Status message ---
+			if (!m_StatusMessage.empty())
+			{
+				ImGui::Separator();
+				if (m_StatusIsError)
+				{
+					ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "%s", m_StatusMessage.c_str());
+				}
+				else
+				{
+					ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "%s", m_StatusMessage.c_str());
+				}
+			}
+		}
+
+		ImGui::End();
+	}
+
+	void NetworkPanel::DrawHostTab()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+
+		// --- Poll async public IP result ---
+		if (m_FetchingIP && m_IpFuture.valid())
+		{
+			if (m_IpFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
+			{
+				m_PublicIP = m_IpFuture.get();
+				m_FetchingIP = false;
+			}
+		}
+
+		// --- Poll async IPv6 public IP result ---
+		if (m_FetchingIPv6 && m_IpFutureIPv6.valid())
+		{
+			if (m_IpFutureIPv6.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
+			{
+				m_PublicIPv6 = m_IpFutureIPv6.get();
+				m_FetchingIPv6 = false;
+			}
+		}
+
+		if (net && net->IsHost())
+		{
+			ImGui::Text("Server is running.");
+			ImGui::Separator();
+
+			ImGui::Text("Port: %u", net->GetPort());
+			ImGui::Text("Max clients: %d", m_MaxClients);
+			ImGui::Text("Connected: %zu", net->GetClientCount());
+
+			ImGui::Separator();
+
+			// ── Public IPv4 block ───────────────────────────────────────────────
+			ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.3f, 1.0f), "Public IPv4 (for internet play):");
+			ImGui::SameLine();
+			if (m_FetchingIP)
+			{
+				ImGui::TextDisabled("fetching...");
+			}
+			else if (m_PublicIP.empty())
+			{
+				ImGui::TextDisabled("(not fetched)");
+				ImGui::SameLine();
+				if (ImGui::SmallButton("Fetch##ipv4"))
+				{
+					m_FetchingIP = true;
+					m_IpFuture = std::async(std::launch::async, []() { return FetchPublicIPBlocking(false); });
+				}
+			}
+			else
+			{
+				ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.6f, 1.0f), "%s:%u", m_PublicIP.c_str(), net->GetPort());
+				ImGui::SameLine();
+				if (ImGui::SmallButton("Copy##ipv4"))
+				{
+					std::string full = m_PublicIP + ":" + std::to_string(net->GetPort());
+					ImGui::SetClipboardText(full.c_str());
+					m_StatusMessage = "Copied: " + full;
+					m_StatusIsError = false;
+				}
+				ImGui::SameLine();
+				if (ImGui::SmallButton("Refresh##ipv4"))
+				{
+					m_PublicIP.clear();
+					m_FetchingIP = true;
+					m_IpFuture = std::async(std::launch::async, []() { return FetchPublicIPBlocking(false); });
+				}
+			}
+			ImGui::TextDisabled("Forward UDP port %u on your router to play over the internet.", net->GetPort());
+
+			ImGui::Separator();
+
+			// ── Public IPv6 block ───────────────────────────────────────────────
+			ImGui::TextColored(ImVec4(0.6f, 0.4f, 1.0f, 1.0f), "Public IPv6 (if available):");
+			ImGui::SameLine();
+			if (m_FetchingIPv6)
+			{
+				ImGui::TextDisabled("fetching...");
+			}
+			else if (m_PublicIPv6.empty())
+			{
+				ImGui::TextDisabled("(not fetched)");
+				ImGui::SameLine();
+				if (ImGui::SmallButton("Fetch##ipv6"))
+				{
+					m_FetchingIPv6 = true;
+					m_IpFutureIPv6 = std::async(std::launch::async, []() { return FetchPublicIPBlocking(true); });
+				}
+			}
+			else if (m_PublicIPv6.find("error") != std::string::npos || m_PublicIPv6.find("empty") != std::string::npos)
+			{
+				ImGui::TextDisabled("IPv6 not available (CGNAT or no IPv6 support)");
+			}
+			else
+			{
+				// IPv6 addresses need brackets in URLs
+				ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.6f, 1.0f), "[%s]:%u", m_PublicIPv6.c_str(), net->GetPort());
+				ImGui::SameLine();
+				if (ImGui::SmallButton("Copy##ipv6"))
+				{
+					std::string full = "[" + m_PublicIPv6 + "]:" + std::to_string(net->GetPort());
+					ImGui::SetClipboardText(full.c_str());
+					m_StatusMessage = "Copied IPv6: " + full;
+					m_StatusIsError = false;
+				}
+				ImGui::SameLine();
+				if (ImGui::SmallButton("Refresh##ipv6"))
+				{
+					m_PublicIPv6.clear();
+					m_FetchingIPv6 = true;
+					m_IpFutureIPv6 = std::async(std::launch::async, []() { return FetchPublicIPBlocking(true); });
+				}
+				ImGui::TextDisabled("IPv6 bypasses CGNAT — share this address with friends!");
+			}
+
+			ImGui::Separator();
+
+			if (net->IsUpnpAvailable())
+			{
+				ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "UPnP: Active — port forwarded automatically");
+			}
+			else
+			{
+				ImGui::TextDisabled("UPnP: not available (manual port forwarding needed)");
+			}
+
+			if (net->IsFirewallRuleActive())
+			{
+				ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "Firewall: Rule added for UDP %u", net->GetPort());
+			}
+			else
+			{
+				ImGui::TextDisabled("Firewall: no auto-rule (run as admin to enable)");
+			}
+
+			if (!net->IsUpnpAvailable())
+			{
+				ImGui::Separator();
+				ImGui::TextColored(ImVec4(0.3f, 0.8f, 1.0f, 1.0f), "For internet play:");
+				ImGui::BulletText("Install Radmin VPN, create/join a network");
+				ImGui::BulletText("Share your Radmin IP (e.g. 26.xx.xx.xx:7777) with friends");
+				ImGui::BulletText("Or forward UDP port %u on your router manually", net->GetPort());
+			}
+
+			ImGui::Separator();
+
+			if (ImGui::Button("Stop Server", ImVec2(ImGui::GetContentRegionAvail().x, 0)))
+			{
+				net->Shutdown();
+				m_StatusMessage = "Server stopped.";
+				m_StatusIsError = false;
+				m_PublicIP.clear();
+				m_PublicIPv6.clear();
+				m_FetchingIP = false;
+				m_FetchingIPv6 = false;
+			}
+		}
+		else
+		{
+			ImGui::Text("Start a server to host a game.");
+			ImGui::Separator();
+
+			ImGui::SetNextItemWidth(120);
+			ImGui::InputText("Port", m_HostPort, sizeof(m_HostPort), ImGuiInputTextFlags_CharsDecimal);
+
+			ImGui::SetNextItemWidth(120);
+			ImGui::InputInt("Max Clients", &m_MaxClients, 1, 10);
+			if (m_MaxClients < 1)
+			{
+				m_MaxClients = 1;
+			}
+			if (m_MaxClients > 32)
+			{
+				m_MaxClients = 32;
+			}
+
+			ImGui::Separator();
+
+			ImGui::TextDisabled("Direct IP connection — no NAT traversal.");
+			ImGui::TextDisabled("For internet play, use Radmin VPN or forward UDP port on your router.");
+
+			ImGui::Separator();
+
+			if (ImGui::Button("Start Server", ImVec2(ImGui::GetContentRegionAvail().x, 0)))
+			{
+				uint16_t port = static_cast<uint16_t>(std::atoi(m_HostPort));
+				if (port == 0)
+				{
+					port = 7777;
+				}
+
+				if (net)
+				{
+					NetworkSystem::GetInstance().SetPlayerPrefab("prefab/player.chprefab");
+					net->HostGame(port, m_MaxClients);
+					// Auto-fetch public IP when server starts
+					m_PublicIP.clear();
+					m_PublicIPv6.clear();
+					m_FetchingIP = true;
+					m_FetchingIPv6 = true;
+					m_IpFuture = std::async(std::launch::async, []() { return FetchPublicIPBlocking(false); });
+					m_IpFutureIPv6 = std::async(std::launch::async, []() { return FetchPublicIPBlocking(true); });
+
+					m_StatusMessage = "Server started on port " + std::string(m_HostPort);
+					m_StatusIsError = false;
+				}
+				else
+				{
+					m_StatusMessage = "Network service not available!";
+					m_StatusIsError = true;
+				}
+			}
+		}
+	}
+
+	void NetworkPanel::DrawConnectTab()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+
+		if (net && net->IsClient())
+		{
+			ImGui::Text("Connected to server.");
+			ImGui::Separator();
+
+			ImGui::Text("Server: %s:%s", m_ConnectIP, m_ConnectPort);
+
+			ImGui::Separator();
+
+			if (ImGui::Button("Disconnect", ImVec2(ImGui::GetContentRegionAvail().x, 0)))
+			{
+				net->Disconnect();
+				m_StatusMessage = "Disconnected.";
+				m_StatusIsError = false;
+			}
+		}
+		else
+		{
+			ImGui::Text("Connect to an existing server.");
+			ImGui::Separator();
+
+			ImGui::SetNextItemWidth(200);
+			ImGui::InputText("IP", m_ConnectIP, sizeof(m_ConnectIP));
+
+			ImGui::SetNextItemWidth(120);
+			ImGui::InputText("Port", m_ConnectPort, sizeof(m_ConnectPort), ImGuiInputTextFlags_CharsDecimal);
+
+			ImGui::Separator();
+
+			if (ImGui::Button("Connect", ImVec2(ImGui::GetContentRegionAvail().x, 0)))
+			{
+				uint16_t port = static_cast<uint16_t>(std::atoi(m_ConnectPort));
+				if (port == 0)
+				{
+					port = 7777;
+				}
+
+				if (net)
+				{
+					NetworkSystem::GetInstance().SetPlayerPrefab("prefab/player.chprefab");
+					net->ConnectTo(m_ConnectIP, port);
+					m_StatusMessage =
+						"Connecting to " + std::string(m_ConnectIP) + ":" + std::string(m_ConnectPort) + "...";
+					m_StatusIsError = false;
+				}
+				else
+				{
+					m_StatusMessage = "Network service not available!";
+					m_StatusIsError = true;
+				}
+			}
+		}
+	}
+
+	void NetworkPanel::DrawPlayersTab()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+
+		if (!net || net->GetRole() == Role::Offline)
+		{
+			ImGui::TextDisabled("Not connected.");
+			return;
+		}
+
+		ImGui::Text("Connected players:");
+		ImGui::Separator();
+
+		// Table header
+		ImGui::Columns(3, "##PlayerColumns", true);
+		ImGui::SetColumnWidth(0, 60);
+		ImGui::SetColumnWidth(1, 180);
+		ImGui::SetColumnWidth(2, 100);
+
+		ImGui::Text("ID");
+		ImGui::NextColumn();
+		ImGui::Text("Role");
+		ImGui::NextColumn();
+		ImGui::Text("Status");
+		ImGui::NextColumn();
+		ImGui::Separator();
+
+		// Host entry (self)
+		if (net->IsHost())
+		{
+			ImGui::Text("0");
+			ImGui::NextColumn();
+			ImGui::Text("Host (You)");
+			ImGui::NextColumn();
+			ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "Playing");
+			ImGui::NextColumn();
+		}
+
+		// Client entries
+		size_t clientCount = net->GetClientCount();
+		for (size_t i = 0; i < clientCount; ++i)
+		{
+			ImGui::Text("%zu", i + 1);
+			ImGui::NextColumn();
+			ImGui::Text("Client");
+			ImGui::NextColumn();
+			ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "Connected");
+			ImGui::NextColumn();
+		}
+
+		ImGui::Columns(1);
+
+		if (clientCount == 0 && net->IsHost())
+		{
+			ImGui::TextDisabled("No clients connected yet.");
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/panels/network_panel.h b/editor/panels/network_panel.h
new file mode 100644
index 000000000..f91065e6b
--- /dev/null
+++ b/editor/panels/network_panel.h
@@ -0,0 +1,48 @@
+#ifndef CH_NETWORK_PANEL_H
+#define CH_NETWORK_PANEL_H
+
+#include "panel.h"
+#include <atomic>
+#include <future>
+#include <string>
+
+namespace Chained
+{
+
+	class NetworkPanel : public Panel
+	{
+	public:
+		NetworkPanel();
+		~NetworkPanel() override;
+
+		void OnImGuiRender(bool readOnly = false) override;
+
+	private:
+		void DrawHostTab();
+		void DrawConnectTab();
+		void DrawPlayersTab();
+
+		// Host settings
+		char m_HostPort[16] = "7777";
+		int m_MaxClients = 8;
+
+		// Connect settings
+		char m_ConnectIP[128] = "127.0.0.1";
+		char m_ConnectPort[16] = "7777";
+
+		// Status
+		std::string m_StatusMessage;
+		bool m_StatusIsError = false;
+
+		// Public IP fetch
+		std::string m_PublicIP;	  ///< cached IPv4 result from api.ipify.org
+		std::string m_PublicIPv6; ///< cached IPv6 result from ipv6.api.ipify.org
+		std::future<std::string> m_IpFuture;
+		std::future<std::string> m_IpFutureIPv6;
+		bool m_FetchingIP = false;
+		bool m_FetchingIPv6 = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_NETWORK_PANEL_H
diff --git a/editor/panels/panel.h b/editor/panels/panel.h
index 28d97986d..25839c3ab 100644
--- a/editor/panels/panel.h
+++ b/editor/panels/panel.h
@@ -1,58 +1,62 @@
 #ifndef CH_PANEL_H
 #define CH_PANEL_H
 
-#include "engine/core/base.h"
-#include "engine/core/events.h"
-#include "engine/core/timestep.h"
+#include "engine/common/base.h"
+#include "engine/core/events/events.h"
+#include "engine/common/timestep.h"
 #include "engine/scene/scene.h"
+#include <memory>
+#include <string>
+#include <vector>
 
-namespace CHEngine
+namespace Chained
 {
-// Base class for dockable editor panels with optional scene context.
-class Panel
-{
-public:
-    virtual ~Panel() = default;
-
-    // Draws the panel UI. readOnly is used when the panel should avoid editing.
-    virtual void OnImGuiRender(bool readOnly = false) = 0;
-    // Optional per-frame update hook.
-    virtual void OnUpdate(Timestep ts)
-    {
-    }
-    // Optional event hook.
-    virtual void OnEvent(Event& e)
-    {
-    }
-    // Optional configuration hook used by settings panels.
-    virtual void OnConfiguration()
-    {
-    }
-    // Updates the scene context used by the panel.
-    virtual void SetContext(const std::shared_ptr<Scene>& context)
-    {
-        m_Context = context;
-    }
-
-    bool& IsOpen()
-    {
-        return m_IsOpen;
-    }
-    bool& ShowSettings()
-    {
-        return m_ShowSettings;
-    }
-    const std::string& GetName() const
-    {
-        return m_Name;
-    }
-
-protected:
-    std::string m_Name;
-    std::shared_ptr<Scene> m_Context;
-    bool m_IsOpen = true;
-    bool m_ShowSettings = false;
-};
-} // namespace CHEngine
+	// Base class for dockable editor panels with optional scene context.
+	class Panel
+	{
+	public:
+		Panel() = default;
+		virtual ~Panel() = default;
+
+		virtual void OnImGuiRender(bool readOnly = false)
+		{
+		}
+		virtual void OnUpdate(Timestep ts)
+		{
+		}
+		virtual void OnEvent(Event& e)
+		{
+		}
+
+		virtual void SetContext(const std::shared_ptr<Scene>& context)
+		{
+			m_Context = context;
+		}
+
+		bool& IsOpen()
+		{
+			return m_IsOpen;
+		}
+		const std::string& GetName() const
+		{
+			return m_Name;
+		}
+
+		bool IsPendingKill() const
+		{
+			return m_PendingKill;
+		}
+		void MarkForDelete()
+		{
+			m_PendingKill = true;
+		}
+
+	protected:
+		std::string m_Name;
+		std::shared_ptr<Scene> m_Context;
+		bool m_IsOpen = true;
+		bool m_PendingKill = false;
+	};
+} // namespace Chained
 
 #endif // CH_PANEL_H
diff --git a/editor/panels/profiler_panel.cpp b/editor/panels/profiler_panel.cpp
index 9f78341d7..3c3393e9b 100644
--- a/editor/panels/profiler_panel.cpp
+++ b/editor/panels/profiler_panel.cpp
@@ -1,139 +1,133 @@
 #include "profiler_panel.h"
 #include "engine/core/profiler.h"
+#include "imgui.h"
 #include <format>
 #include <glad/gl.h>
-#include "imgui.h"
-
-namespace CHEngine
-{
-ProfilerPanel::ProfilerPanel()
-{
-    m_Name = "Profiler";
-    m_FrameTimeHistory.reserve(100);
-    for (int i = 0; i < 100; i++)
-    {
-        m_FrameTimeHistory.push_back(0.0f);
-    }
-}
-
-void ProfilerPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
-
-    UpdateHistory();
-
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
-
-    const auto& stats = Profiler::GetStats();
-
-    if (ImGui::CollapsingHeader("Hardware & System", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::Text("GPU: %s", glGetString(GL_RENDERER));
-        ImGui::Text("Driver: %s", glGetString(GL_VERSION));
-    }
-
-    if (ImGui::CollapsingHeader("Scene Statistics", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::Columns(2);
-        ImGui::Text("Entities:");
-        ImGui::NextColumn();
-        ImGui::Text("%u", stats.EntityCount);
-        ImGui::NextColumn();
-        ImGui::Text("Draw Calls:");
-        ImGui::NextColumn();
-        ImGui::Text("%u", stats.DrawCalls);
-        ImGui::NextColumn();
-        ImGui::Text("Meshes:");
-        ImGui::NextColumn();
-        ImGui::Text("%u", stats.MeshCount);
-        ImGui::NextColumn();
-
-        // Format polys (K, M)
-        std::string polyStr;
-        if (stats.PolyCount > 1000000)
-        {
-            polyStr = std::format("{:.2f} M", stats.PolyCount / 1000000.0f);
-        }
-        else if (stats.PolyCount > 1000)
-        {
-            polyStr = std::format("{:.1f} K", stats.PolyCount / 1000.0f);
-        }
-        else
-        {
-            polyStr = std::to_string(stats.PolyCount);
-        }
-
-        ImGui::Text("Polygons:");
-        ImGui::NextColumn();
-        ImGui::Text("%s", polyStr.c_str());
-        ImGui::NextColumn();
-        ImGui::Text("Colliders:");
-        ImGui::NextColumn();
-        ImGui::Text("%u", stats.ColliderCount);
-        ImGui::NextColumn();
-        ImGui::Columns(1);
-    }
-
-    const auto& results = Profiler::GetLastFrameResults();
-    if (ImGui::CollapsingHeader("Execution Timeline", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        if (!m_FrameTimeHistory.empty())
-        {
-            float maxTime = 0.0f;
-            for (float f : m_FrameTimeHistory)
-            {
-                if (f > maxTime)
-                {
-                    maxTime = f;
-                }
-            }
-
-            ImGui::PushStyleColor(ImGuiCol_PlotLines, ImVec4(0.2f, 0.7f, 1.0f, 1.0f));
-            ImGui::PlotLines("##FrameTime", m_FrameTimeHistory.data(), (int)m_FrameTimeHistory.size(), 0,
-                             std::format("Max: {:.2f}ms", maxTime).c_str(), 0.0f, 33.3f, ImVec2(0, 80));
-            ImGui::PopStyleColor();
-        }
-
-        for (const auto& result : results)
-        {
-            DrawProfileResult(result);
-        }
-    }
-
-    ImGui::End();
-}
-
-void ProfilerPanel::DrawProfileResult(const ProfileResult& result)
-{
-    std::string label = std::format("{} - {:.3f}ms", result.Name, result.DurationMS);
-    ImGui::Text("%s", label.c_str());
-}
 
-void ProfilerPanel::UpdateHistory()
+namespace Chained
 {
-    const auto& results = Profiler::GetLastFrameResults();
-    float frameMS = 0.0f;
-
-    for (const auto& res : results)
-    {
-        if (res.Name == "MainThread_Frame")
-        {
-            frameMS = res.DurationMS;
-            break;
-        }
-    }
-
-    if (frameMS > 0)
-    {
-        for (size_t i = 1; i < m_FrameTimeHistory.size(); i++)
-        {
-            m_FrameTimeHistory[i - 1] = m_FrameTimeHistory[i];
-        }
-        m_FrameTimeHistory.back() = frameMS;
-    }
-}
-
-} // namespace CHEngine
+	ProfilerPanel::ProfilerPanel()
+	{
+		m_Name = "Profiler";
+		m_IsOpen = false;
+		m_FrameTimeHistory.reserve(100);
+		for (int i = 0; i < 100; i++)
+		{
+			m_FrameTimeHistory.push_back(0.0f);
+		}
+	}
+
+	void ProfilerPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		UpdateHistory();
+
+		ImGui::Begin(m_Name.c_str(), &m_IsOpen);
+
+		const auto& stats = Instrumentor::Get().GetStats();
+
+		if (ImGui::CollapsingHeader("Hardware & System", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			ImGui::Text("GPU: %s", glGetString(GL_RENDERER));
+			ImGui::Text("Driver: %s", glGetString(GL_VERSION));
+		}
+
+		if (ImGui::CollapsingHeader("Scene Statistics", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			ImGui::Columns(2);
+			ImGui::Text("Entities:");
+			ImGui::NextColumn();
+			ImGui::Text("%u", stats.EntityCount);
+			ImGui::NextColumn();
+			ImGui::Text("Draw Calls:");
+			ImGui::NextColumn();
+			ImGui::Text("%u", stats.DrawCalls);
+			ImGui::NextColumn();
+			ImGui::Text("Meshes:");
+			ImGui::NextColumn();
+			ImGui::Text("%u", stats.MeshCount);
+			ImGui::NextColumn();
+
+			ImGui::Text("Colliders:");
+			ImGui::NextColumn();
+			ImGui::Text("%u", stats.ColliderCount);
+			ImGui::NextColumn();
+			ImGui::Columns(1);
+		}
+
+		const auto& results = Instrumentor::Get().GetLastFrameResults();
+		if (ImGui::CollapsingHeader("Execution Timeline", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			if (!m_FrameTimeHistory.empty())
+			{
+				float maxTime = 0.0f;
+				for (float f : m_FrameTimeHistory)
+				{
+					if (f > maxTime)
+					{
+						maxTime = f;
+					}
+				}
+
+				ImGui::PushStyleColor(ImGuiCol_PlotLines, ImVec4(0.2f, 0.7f, 1.0f, 1.0f));
+				ImGui::PlotLines("##FrameTime", m_FrameTimeHistory.data(), (int)m_FrameTimeHistory.size(), 0,
+								 std::format("Max: {:.2f}ms", maxTime).c_str(), 0.0f, 33.3f, ImVec2(0, 80));
+				ImGui::PopStyleColor();
+			}
+
+			for (const auto& result : results)
+			{
+				DrawProfileResult(result);
+			}
+		}
+
+		ImGui::End();
+	}
+
+	void ProfilerPanel::DrawProfileResult(const ProfileResult& result)
+	{
+		std::string label = std::format("{} - {:.3f}ms", result.Name, result.DurationMS);
+		ImGui::Text("%s", label.c_str());
+	}
+
+	void ProfilerPanel::UpdateHistory()
+	{
+		const auto& results = Instrumentor::Get().GetLastFrameResults();
+		float frameMS = 0.0f;
+
+		for (const auto& res : results)
+		{
+			if (res.Name == "Run")
+			{
+				frameMS = res.DurationMS;
+				break;
+			}
+		}
+
+		if (frameMS <= 0)
+		{
+			for (const auto& res : results)
+			{
+				if (res.Name == "MainThread_Frame")
+				{
+					frameMS = res.DurationMS;
+					break;
+				}
+			}
+		}
+
+		if (frameMS > 0)
+		{
+			for (size_t i = 1; i < m_FrameTimeHistory.size(); i++)
+			{
+				m_FrameTimeHistory[i - 1] = m_FrameTimeHistory[i];
+			}
+			m_FrameTimeHistory.back() = frameMS;
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/panels/profiler_panel.h b/editor/panels/profiler_panel.h
index ed08e7728..e5eec3500 100644
--- a/editor/panels/profiler_panel.h
+++ b/editor/panels/profiler_panel.h
@@ -3,21 +3,21 @@
 
 #include "panel.h"
 
-namespace CHEngine
+namespace Chained
 {
-class ProfilerPanel : public Panel
-{
-public:
-    ProfilerPanel();
-    virtual void OnImGuiRender(bool readOnly = false) override;
+	class ProfilerPanel : public Panel
+	{
+	public:
+		ProfilerPanel();
+		virtual void OnImGuiRender(bool readOnly = false) override;
 
-private:
-    void DrawProfileResult(const struct ProfileResult& result);
-    void UpdateHistory();
+	private:
+		void DrawProfileResult(const struct ProfileResult& result);
+		void UpdateHistory();
 
-private:
-    std::vector<float> m_FrameTimeHistory;
-};
-} // namespace CHEngine
+	private:
+		std::vector<float> m_FrameTimeHistory;
+	};
+} // namespace Chained
 
 #endif // CH_PROFILER_PANEL_H
diff --git a/editor/panels/project_browser_panel.cpp b/editor/panels/project_browser_panel.cpp
deleted file mode 100644
index 248b503be..000000000
--- a/editor/panels/project_browser_panel.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "project_browser_panel.h"
-
-#include "editor_layer.h"
-#include "engine/scene/scene_events.h"
-#include "IconsFontAwesome6.h"
-#include "engine/platform/utils/dialogs.h"
-#include "panel.h"
-#include <filesystem>
-
-namespace CHEngine
-{
-ProjectBrowserPanel::ProjectBrowserPanel()
-{
-    m_Name = "Project Browser";
-    std::string cwd = std::filesystem::current_path().string();
-    memset(m_ProjectLocationBuffer, 0, sizeof(m_ProjectLocationBuffer));
-    cwd.copy(m_ProjectLocationBuffer, sizeof(m_ProjectLocationBuffer) - 1);
-
-    m_NewProjectIconHandle = TextureSystem::Get().LoadTexture("engine/resources/icons/newproject.jpg");
-    m_OpenProjectIconHandle = TextureSystem::Get().LoadTexture("engine/resources/icons/folder.png");
-}
-
-ProjectBrowserPanel::~ProjectBrowserPanel()
-{
-    // Textures are cached globally by the texture system.
-}
-
-void ProjectBrowserPanel::OnImGuiRender(bool readOnly)
-{
-    ImGuiViewport* viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(viewport->WorkPos);
-    ImGui::SetNextWindowSize(viewport->WorkSize);
-    ImGui::SetNextWindowViewport(viewport->ID);
-
-    ImGuiWindowFlags windowFlags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse |
-                                   ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoNavFocus |
-                                   ImGuiWindowFlags_NoScrollbar;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-
-    ImGui::Begin("Project Browser", nullptr, windowFlags);
-
-    if (m_OpenCreatePopupRequest)
-    {
-        ImGui::OpenPopup("Create New Project");
-        m_OpenCreatePopupRequest = false;
-    }
-
-    DrawWelcomeScreen();
-
-    if (m_ShowCreateDialog)
-    {
-        DrawCreateProjectDialog();
-    }
-
-    ImGui::End();
-    ImGui::PopStyleVar(3);
-}
-
-void ProjectBrowserPanel::DrawWelcomeScreen()
-{
-    // 1. Sidebar (Recent Projects)
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.02f, 0.02f, 0.02f, 1.0f));
-    ImGui::BeginChild("Sidebar", ImVec2(300, 0), true);
-
-    ImGui::Spacing();
-    ImGui::SetCursorPosX(20);
-    ImGui::SetWindowFontScale(1.5f);
-    ImGui::TextColored(ImVec4(0.2f, 0.7f, 1.0f, 1.0f), ICON_FA_LINK " Chained");
-    ImGui::SameLine();
-    ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 1.0f), "Engine");
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::Separator();
-
-    ImGui::Spacing();
-    ImGui::TextDisabled("   RECENT PROJECTS");
-    ImGui::Spacing();
-
-    const auto& recentProjects = EditorLayer::Get().GetConfig().RecentProjects;
-    if (recentProjects.empty())
-    {
-        ImGui::TextDisabled("   No recent projects.");
-    }
-    else
-    {
-        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.15f, 0.15f, 0.15f, 1.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.05f, 0.5f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 5.0f);
-
-        for (const auto& projectPath : recentProjects)
-        {
-            std::string fileName = std::filesystem::path(projectPath).filename().string();
-            std::string dirName  = std::filesystem::path(projectPath).parent_path().filename().string();
-
-            std::string label = ICON_FA_FOLDER_OPEN "  " + fileName + "\n      " + dirName;
-            if (ImGui::Button(label.c_str(), ImVec2(-1, 50)))
-            {
-                EditorLayer::Get().GetProjectManager().OpenProject(projectPath);
-            }
-            if (ImGui::IsItemHovered())
-            {
-                ImGui::SetTooltip("%s", projectPath.c_str());
-            }
-            ImGui::Spacing();
-        }
-
-        ImGui::PopStyleVar(2);
-        ImGui::PopStyleColor();
-    }
-
-
-    ImGui::EndChild();
-    ImGui::PopStyleColor();
-
-    ImGui::SameLine();
-
-    // 2. Main Area (Actions)
-    // Darker background for main area to match screenshot
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.08f, 0.08f, 0.08f, 1.0f));
-    ImGui::BeginChild("MainArea", ImVec2(0, 0), false);
-
-    float centerX = ImGui::GetContentRegionAvail().x * 0.5f;
-    float centerY = ImGui::GetContentRegionAvail().y * 0.5f;
-
-    ImGui::SetCursorPos(ImVec2(centerX - 350, centerY - 150));
-
-    // Large Card Style
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(20, 20));
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 12.0f);
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.12f, 0.12f, 0.13f, 1.0f));
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.18f, 0.18f, 0.19f, 1.0f));
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.1f, 0.1f, 0.1f, 1.0f));
-    ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.9f, 0.9f, 0.9f, 1.0f));
-
-    ImGui::BeginGroup();
-    {
-        ImTextureID newProjTex = 0;
-        if (m_NewProjectIconHandle != 0)
-            newProjTex = (ImTextureID)(uintptr_t)TextureSystem::Get().GetRendererID(m_NewProjectIconHandle);
-
-        if (ImGui::ImageButton("##NewProject", newProjTex, {300, 300}, {0, 1}, {1, 0}))
-        {
-            m_OpenCreatePopupRequest = true;
-            m_ShowCreateDialog = true;
-        }
-    }
-    ImGui::SetWindowFontScale(1.3f);
-    ImGui::Text("New Project");
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + 280);
-    ImGui::TextDisabled("Start a fresh journey with a dedicated");
-    ImGui::TextDisabled("project folder and optimized settings.");
-    ImGui::PopTextWrapPos();
-    ImGui::EndGroup();
-
-    ImGui::SameLine(0, 40);
-
-    ImGui::BeginGroup();
-    {
-        ImTextureID openProjTex = 0;
-        if (m_OpenProjectIconHandle != 0)
-            openProjTex = (ImTextureID)(uintptr_t)TextureSystem::Get().GetRendererID(m_OpenProjectIconHandle);
-
-        if (ImGui::ImageButton("##OpenProject", openProjTex, {300, 300}, {0, 1}, {1, 0}))
-        {
-            EditorLayer::Get().GetProjectManager().OpenProject();
-        }
-    }
-    ImGui::SetWindowFontScale(1.3f);
-    ImGui::Text("Open Project");
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + 280);
-    ImGui::TextDisabled("Browse and load an existing Chained");
-    ImGui::TextDisabled("Engine project (.chproject) file.");
-    ImGui::PopTextWrapPos();
-    ImGui::EndGroup();
-
-    ImGui::PopStyleColor(4);
-    ImGui::PopStyleVar(2);
-
-    ImGui::EndChild();
-    ImGui::PopStyleColor(); // ChildBg
-}
-
-void ProjectBrowserPanel::DrawCreateProjectDialog()
-{
-    ImVec2 center = ImGui::GetMainViewport()->GetCenter();
-    ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
-    ImGui::SetNextWindowSize(ImVec2(500, 250));
-
-    if (ImGui::BeginPopupModal("Create New Project", &m_ShowCreateDialog,
-                               ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove))
-    {
-        ImGui::Text("Project Name:");
-        ImGui::InputText("##ProjectName", m_ProjectNameBuffer, sizeof(m_ProjectNameBuffer));
-
-        ImGui::Spacing();
-        ImGui::Text("Location:");
-        ImGui::InputText("##ProjectLocation", m_ProjectLocationBuffer, sizeof(m_ProjectLocationBuffer));
-        ImGui::SameLine();
-        if (ImGui::Button("Browse..."))
-        {
-            auto result = Dialogs::PickFolder();
-            if (result)
-            {
-                memset(m_ProjectLocationBuffer, 0, sizeof(m_ProjectLocationBuffer));
-                std::string path = result->string();
-                path.copy(m_ProjectLocationBuffer, sizeof(m_ProjectLocationBuffer) - 1);
-            }
-        }
-
-        ImGui::Spacing();
-
-        // Path Preview
-        std::filesystem::path root(m_ProjectLocationBuffer);
-        std::filesystem::path finalPath;
-        if (root.filename().string() == m_ProjectNameBuffer)
-        {
-            finalPath = root / (std::string(m_ProjectNameBuffer) + ".chproject");
-        }
-        else
-        {
-            finalPath = root / m_ProjectNameBuffer / (std::string(m_ProjectNameBuffer) + ".chproject");
-        }
-
-        ImGui::TextColored(ImVec4(0.5f, 0.5f, 0.5f, 1.0f), "Resulting Project File:");
-        ImGui::SetWindowFontScale(0.9f);
-        ImGui::TextWrapped("%s", finalPath.string().c_str());
-        ImGui::SetWindowFontScale(1.0f);
-
-        ImGui::Spacing();
-        ImGui::Separator();
-        ImGui::Spacing();
-
-        if (ImGui::Button("Create", ImVec2(120, 0)))
-        {
-            if (strlen(m_ProjectNameBuffer) == 0)
-            {
-                CH_CORE_ERROR("Project Name cannot be empty!");
-            }
-            else if (m_EventCallback)
-            {
-                CH_CORE_INFO("ProjectBrowser: Dispatching ProjectCreatedEvent - Name: {0}, Location: {1}",
-                             m_ProjectNameBuffer, m_ProjectLocationBuffer);
-                ProjectCreatedEvent e(m_ProjectNameBuffer, m_ProjectLocationBuffer);
-                m_EventCallback(e);
-                m_ShowCreateDialog = false;
-                ImGui::CloseCurrentPopup();
-            }
-        }
-
-        ImGui::SameLine();
-        if (ImGui::Button("Cancel", ImVec2(120, 0)))
-        {
-            m_ShowCreateDialog = false;
-            ImGui::CloseCurrentPopup();
-        }
-
-        ImGui::EndPopup();
-    }
-}
-} // namespace CHEngine
diff --git a/editor/panels/project_browser_panel.h b/editor/panels/project_browser_panel.h
deleted file mode 100644
index ae4fa77fc..000000000
--- a/editor/panels/project_browser_panel.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef CH_PROJECT_BROWSER_PANEL_H
-#define CH_PROJECT_BROWSER_PANEL_H
-
-#include "panel.h"
-#include "engine/graphics/texture_system.h"
-#include <filesystem>
-#include <functional>
-#include <string>
-#include <vector>
-
-namespace CHEngine
-{
-class ProjectBrowserPanel : public Panel
-{
-public:
-    ProjectBrowserPanel();
-    ~ProjectBrowserPanel();
-
-    virtual void OnImGuiRender(bool readOnly = false) override;
-
-    using EventCallbackFn = std::function<void(Event&)>;
-    void SetEventCallback(const EventCallbackFn& callback)
-    {
-        m_EventCallback = callback;
-    }
-
-    // Testing accessors
-    bool IsCreateDialogVisible() const
-    {
-        return m_ShowCreateDialog;
-    }
-    void SetCreateDialogVisible(bool visible)
-    {
-        m_ShowCreateDialog = visible;
-    }
-    bool HasPendingCreatePopupRequest() const
-    {
-        return m_OpenCreatePopupRequest;
-    }
-
-private:
-    void DrawWelcomeScreen();
-    void DrawCreateProjectDialog();
-
-    EventCallbackFn m_EventCallback;
-
-    // Simplified state
-    bool m_ShowCreateDialog = false;
-    bool m_OpenCreatePopupRequest = false;
-    char m_ProjectNameBuffer[256] = "MyProject";
-    char m_ProjectLocationBuffer[512] = "";
-
-    TextureHandle m_NewProjectIconHandle = 0;
-    TextureHandle m_OpenProjectIconHandle = 0;
-};
-} // namespace CHEngine
-
-#endif // CH_PROJECT_BROWSER_PANEL_H
diff --git a/editor/panels/project_settings_panel.cpp b/editor/panels/project_settings_panel.cpp
index d1b36c3cb..bae0fdc5f 100644
--- a/editor/panels/project_settings_panel.cpp
+++ b/editor/panels/project_settings_panel.cpp
@@ -1,324 +1,314 @@
 #include "project_settings_panel.h"
-#include "engine/scene/project.h"
-#include "editor_layer.h"
-#include "engine/scene/project_serializer.h"
+#include "engine/core/platform.h"
+#include "engine/platform/dialogs/dialogs.h"
+#include "engine/project/project.h"
 #include "imgui.h"
-#include "engine/platform/utils/dialogs.h"
-#include "IconsFontAwesome6.h"
-#include <format>
+#include "layer.h"
+#include "project/project_serializer.h"
+#include "project_manager.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include <filesystem>
+#include <misc/cpp/imgui_stdlib.h>
 
-namespace CHEngine
+namespace Chained
 {
-ProjectSettingsPanel::ProjectSettingsPanel()
-{
-    m_Name = "Project Settings";
-    m_IsOpen = false;
-}
+	ProjectSettingsPanel::ProjectSettingsPanel()
+	{
+		m_Name = "Project Settings";
+		m_IsOpen = false;
+	}
 
-void ProjectSettingsPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
-
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        m_IsOpen = false;
-        return;
-    }
-
-    if (ImGui::Begin("Project Settings", &m_IsOpen))
-    {
-        auto& config = project->GetConfig();
-
-        static int selectedCategory = 0;
-        const char* categories[] = {
-            ICON_FA_GEARS " General",
-            ICON_FA_CODE " Scripting",
-            ICON_FA_CUBES " Physics",
-            ICON_FA_WINDOW_RESTORE " Window",
-            ICON_FA_PLAY " Runtime",
-            ICON_FA_CAMERA " Editor",
-            ICON_FA_MOUNTAIN_SUN " Rendering",
-            ICON_FA_BOXES_STACKED " Assets"
-        };
-
-        ImGui::Columns(2, "ProjectSettingsColumns", true);
-        ImGui::SetColumnWidth(0, 200.0f);
-
-        // Sidebar
-        for (int i = 0; i < IM_ARRAYSIZE(categories); i++)
-        {
-            if (ImGui::Selectable(categories[i], selectedCategory == i))
-            {
-                selectedCategory = i;
-            }
-        }
-
-        ImGui::NextColumn();
-
-        // Content
-        if (selectedCategory == 0) // General
-        {
-            ImGui::TextDisabled("General Settings");
-            char nameBuf[256];
-            strncpy(nameBuf, config.Name.c_str(), 255);
-            if (ImGui::InputText("Project Name", nameBuf, 255))
-            {
-                config.Name = nameBuf;
-            }
-
-            char iconBuf[512];
-            strncpy(iconBuf, config.IconPath.c_str(), 511);
-            iconBuf[511] = '\0';
-            if (ImGui::InputText("Icon Path", iconBuf, 511))
-            {
-                config.IconPath = iconBuf;
-            }
-            ImGui::SameLine();
-            if (ImGui::Button("...###IconBrowse"))
-            {
-                std::vector<FileDialogFilter> filters = {{"Image Files", "png,jpg,jpeg"}};
-                auto result = Dialogs::OpenFile(filters);
-                if (result)
-                {
-                    config.IconPath = Project::GetRelativePath(result->string());
-                }
-            }
-
-            auto availableScenes = Project::GetAvailableScenes();
-            const char* currentScene = config.StartScene.c_str();
-
-            if (ImGui::BeginCombo("Start Scene", currentScene))
-            {
-                for (const auto& scenePath : availableScenes)
-                {
-                    bool isSelected = (config.StartScene == scenePath);
-                    if (ImGui::Selectable(scenePath.c_str(), isSelected))
-                    {
-                        config.StartScene = scenePath;
-                    }
-                    if (isSelected)
-                    {
-                        ImGui::SetItemDefaultFocus();
-                    }
-                }
-                ImGui::EndCombo();
-            }
-
-            ImGui::Separator();
-            ImGui::Text(ICON_FA_ROCKET " Launch Profiles");
-
-            if (config.LaunchProfiles.empty())
-            {
-                if (ImGui::Button("Add Default Profile"))
-                {
-                    LaunchProfile debug;
-                    debug.Name = "Debug Runtime";
-                    debug.BinaryPath = "${BUILD}/ChainedRuntime.exe";
-                    debug.Arguments = "--project \"${PROJECT_FILE}\"";
-                    config.LaunchProfiles.push_back(debug);
-                }
-            }
-
-            for (int i = 0; i < (int)config.LaunchProfiles.size(); i++)
-            {
-                auto& profile = config.LaunchProfiles[i];
-                ImGui::PushID(i);
-
-                bool isActive = (config.ActiveLaunchProfileIndex == i);
-                if (ImGui::RadioButton("Active", isActive))
-                {
-                    config.ActiveLaunchProfileIndex = i;
-                }
-                ImGui::SameLine();
-
-                if (ImGui::CollapsingHeader(std::format("{}###Header", profile.Name).c_str()))
-                {
-                    char profileNameBuf[128];
-                    strncpy(profileNameBuf, profile.Name.c_str(), 127);
-                    profileNameBuf[127] = '\0';
-                    if (ImGui::InputText("Profile Name", profileNameBuf, 127))
-                    {
-                        profile.Name = profileNameBuf;
-                    }
-
-                    char pathBuf[512];
-                    strncpy(pathBuf, profile.BinaryPath.c_str(), 511);
-                    pathBuf[511] = '\0';
-                    if (ImGui::InputText("Binary Path", pathBuf, 511))
-                    {
-                        profile.BinaryPath = pathBuf;
-                    }
-
-                    ImGui::SameLine();
-                    if (ImGui::Button("..."))
-                    {
-                        std::vector<FileDialogFilter> filters = {{"Runtime Executable", "exe"}};
-                        auto result = Dialogs::OpenFile(filters);
-                        if (result)
-                        {
-                            profile.BinaryPath = result->string();
-                        }
-                    }
-
-                    char argBuf[512];
-                    strncpy(argBuf, profile.Arguments.c_str(), 511);
-                    argBuf[511] = '\0';
-                    if (ImGui::InputText("Arguments", argBuf, 511))
-                    {
-                        profile.Arguments = argBuf;
-                    }
-
-                    ImGui::Checkbox("Use Default Project Args", &profile.UseDefaultArgs);
-
-                    if (ImGui::Button("Remove Profile"))
-                    {
-                        config.LaunchProfiles.erase(config.LaunchProfiles.begin() + i);
-                        if (config.ActiveLaunchProfileIndex >= (int)config.LaunchProfiles.size())
-                        {
-                            config.ActiveLaunchProfileIndex = std::max(0, (int)config.LaunchProfiles.size() - 1);
-                        }
-                        ImGui::PopID();
-                        break;
-                    }
-                }
-                ImGui::PopID();
-            }
-
-            if (ImGui::Button(ICON_FA_PLUS " Add New Profile"))
-            {
-                config.LaunchProfiles.push_back({"New Profile", "", ""});
-                if (config.LaunchProfiles.size() == 1)
-                {
-                    config.ActiveLaunchProfileIndex = 0;
-                }
-            }
-        }
-        else if (selectedCategory == 1) // Scripting
-        {
-            ImGui::TextDisabled("Scripting Settings");
-            char moduleNameBuf[256];
-            strncpy(moduleNameBuf, config.Scripting.ModuleName.c_str(), 255);
-            moduleNameBuf[255] = '\0';
-            if (ImGui::InputText("Module Name", moduleNameBuf, 255))
-            {
-                config.Scripting.ModuleName = moduleNameBuf;
-            }
-
-            char moduleDirBuf[512];
-            strncpy(moduleDirBuf, config.Scripting.ModuleDirectory.string().c_str(), 511);
-            moduleDirBuf[511] = '\0';
-            if (ImGui::InputText("Module Directory", moduleDirBuf, 511))
-            {
-                config.Scripting.ModuleDirectory = moduleDirBuf;
-            }
-            ImGui::SameLine();
-            if (ImGui::Button("...###ModuleDirBrowse"))
-            {
-                auto result = Dialogs::PickFolder();
-                if (result)
-                {
-                    config.Scripting.ModuleDirectory = Project::GetRelativePath(result->string());
-                }
-            }
-
-            ImGui::Checkbox("Auto Load Module", &config.Scripting.AutoLoad);
-        }
-        else if (selectedCategory == 2) // Physics
-        {
-            ImGui::TextDisabled("Physics Settings");
-            ImGui::DragFloat("World Gravity", &config.Physics.Gravity, 0.1f);
-            ImGui::DragFloat("Fixed Timestep", &config.Physics.FixedTimestep, 0.001f, 0.001f, 0.1f, "%.4f");
-        }
-        else if (selectedCategory == 3) // Window
-        {
-            ImGui::TextDisabled("Window Settings");
-            ImGui::DragInt("Width", &config.Window.Width, 1, 800, 3840);
-            ImGui::DragInt("Height", &config.Window.Height, 1, 600, 2160);
-            ImGui::Checkbox("VSync", &config.Window.VSync);
-            ImGui::Checkbox("Resizable", &config.Window.Resizable);
-        }
-        else if (selectedCategory == 4) // Runtime
-        {
-            ImGui::TextDisabled("Runtime Settings");
-            ImGui::Checkbox("Fullscreen", &config.Runtime.Fullscreen);
-            ImGui::Checkbox("Show Stats", &config.Runtime.ShowStats);
-            ImGui::Checkbox("Enable Console", &config.Runtime.EnableConsole);
-        }
-        else if (selectedCategory == 5) // Editor
-        {
-            ImGui::TextDisabled("Editor Settings");
-            ImGui::DragFloat("Camera Speed", &config.Editor.CameraMoveSpeed, 0.1f, 0.1f, 100.0f);
-            ImGui::DragFloat("Rotation Speed", &config.Editor.CameraRotationSpeed, 0.01f, 0.01f, 1.0f);
-            ImGui::DragFloat("Boost Multiplier", &config.Editor.CameraBoostMultiplier, 0.1f, 1.0f, 200.0f);
-
-            ImGui::Separator();
-            ImGui::TextDisabled("Auto-Save Settings");
-            auto& editorConfig = EditorLayer::Get().GetConfig();
-            ImGui::Checkbox("Enable Auto-Save", &editorConfig.AutoSaveEnabled);
-            ImGui::DragFloat("Auto-Save Interval (s)", &editorConfig.AutoSaveInterval, 1.0f, 10.0f, 3600.0f);
-        }
-        else if (selectedCategory == 6) // Rendering
-        {
-            ImGui::TextDisabled("Rendering Settings");
-            ImGui::DragFloat("Ambient Intensity", &config.Render.AmbientIntensity, 0.01f, 0.0f, 1.0f);
-            ImGui::DragFloat("Default Exposure", &config.Render.DefaultExposure, 0.01f, 0.0f, 10.0f);
-
-            ImGui::Separator();
-            ImGui::Text("Texture Quality");
-            ImGui::Checkbox("Generate Mipmaps", &config.Texture.GenerateMipmaps);
-            if (ImGui::IsItemHovered())
-            {
-                ImGui::SetTooltip("Generates mip chain on texture upload.\nReduces aliasing and bandwidth.\nApplied to newly loaded textures.");
-            }
-
-            const char* filterNames[] = {"Point (No Filter)", "Bilinear", "Trilinear", "Anisotropic 4x",
-                                          "Anisotropic 8x", "Anisotropic 16x"};
-            int currentFilter = (int)config.Texture.Filter;
-            if (ImGui::Combo("Texture Filter", &currentFilter, filterNames, 6))
-            {
-                config.Texture.Filter = (TextureFilter)currentFilter;
-            }
-        }
-        else if (selectedCategory == 7) // Assets
-        {
-            ImGui::TextDisabled("Asset Management Settings");
-            
-            ImGui::Separator();
-            ImGui::Text("Mesh Import Settings");
-            ImGui::Checkbox("Import Materials", &config.Mesh.ImportMaterials);
-            if (ImGui::IsItemHovered())
-            {
-                ImGui::SetTooltip("If disabled, .mtl files or embedded materials will be ignored.\nModels will use a default material.");
-            }
-            
-            ImGui::Checkbox("Calculate Tangents", &config.Mesh.CalculateTangents);
-            if (ImGui::IsItemHovered())
-            {
-                ImGui::SetTooltip("Generates tangent and bitangent vectors for normal mapping.");
-            }
-            
-            ImGui::Checkbox("Flip UVs", &config.Mesh.FlipUVs);
-            if (ImGui::IsItemHovered())
-            {
-                ImGui::SetTooltip("Flips the Y-coordinate of texture coordinates.");
-            }
-        }
-
-        ImGui::Columns(1);
-        ImGui::Separator();
-        
-        if (ImGui::Button("Save Project Settings"))
-        {
-            ProjectSerializer serializer(project);
-            std::filesystem::path path = project->GetProjectDirectory() / (project->GetConfig().Name + ".chproject");
-            serializer.Serialize(path);
-        }
-
-    }
-    ImGui::End();
-}
-} // namespace CHEngine
+	void ProjectSettingsPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			m_IsOpen = false;
+			return;
+		}
+
+		if (ImGui::Begin("Project Settings", &m_IsOpen))
+		{
+			auto& config = project->GetConfig();
+
+			const char* categories[] = {ICON_FA_GEARS " General",
+										ICON_FA_CODE " Scripting",
+										ICON_FA_CUBES " Physics",
+										ICON_FA_WINDOW_RESTORE " Window",
+										ICON_FA_MOUNTAIN_SUN " Rendering",
+										ICON_FA_VOLUME_HIGH " Audio",
+										ICON_FA_CUBE " Mesh",
+										ICON_FA_PLAY " Runtime"};
+
+			// Two-column layout: sidebar left, content right
+			ImGui::Columns(2, "ProjectSettingsColumns", true);
+
+			if (!m_WidthSet)
+			{
+				ImGui::SetColumnWidth(0, 200.0f);
+				m_WidthSet = true;
+			}
+
+			// --- Left sidebar ---
+			ImGui::BeginChild("SettingsSidebar", ImVec2(0, 0), ImGuiChildFlags_NavFlattened);
+			for (int i = 0; i < IM_ARRAYSIZE(categories); i++)
+			{
+				if (ImGui::Selectable(categories[i], m_SelectedCategory == i, ImGuiSelectableFlags_DontClosePopups))
+				{
+					m_SelectedCategory = i;
+				}
+			}
+			ImGui::EndChild();
+
+			ImGui::NextColumn();
+
+			// --- Right content panel ---
+			ImGui::BeginChild("SettingsContent", ImVec2(0, -ImGui::GetFrameHeightWithSpacing()),
+							  ImGuiChildFlags_NavFlattened);
+			ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4, 4));
+
+			switch (m_SelectedCategory)
+			{
+			case 0: // General
+			{
+				ImGui::TextDisabled("General Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				char nameBuf[256];
+				snprintf(nameBuf, sizeof(nameBuf), "%s", config.Name.c_str());
+				if (ImGui::InputText("Project Name", nameBuf, sizeof(nameBuf)))
+				{
+					config.Name = nameBuf;
+				}
+
+				char iconBuf[512];
+				snprintf(iconBuf, sizeof(iconBuf), "%s", config.IconPath.c_str());
+				if (ImGui::InputText("Icon Path", iconBuf, sizeof(iconBuf)))
+				{
+					config.IconPath = iconBuf;
+				}
+				ImGui::SameLine();
+				if (ImGui::Button("...###IconBrowse"))
+				{
+					std::vector<DialogFilter> filters = {{"Image Files", "png,jpg,jpeg"}};
+					auto result = Chained::Dialogs::OpenFile(filters);
+					if (result)
+					{
+						config.IconPath = project->GetRelativePath(result->string());
+					}
+				}
+
+				auto availableScenes = project->GetAvailableScenes();
+				const char* currentScene = config.StartScene.c_str();
+
+				if (ImGui::BeginCombo("Start Scene", currentScene))
+				{
+					for (const auto& scenePath : availableScenes)
+					{
+						bool isSelected = (config.StartScene == scenePath);
+						if (ImGui::Selectable(scenePath.c_str(), isSelected))
+						{
+							config.StartScene = scenePath;
+						}
+						if (isSelected)
+						{
+							ImGui::SetItemDefaultFocus();
+						}
+					}
+					ImGui::EndCombo();
+				}
+				break;
+			}
+			case 1: // Scripting
+			{
+				ImGui::TextDisabled("Scripting Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				char moduleNameBuf[256];
+				snprintf(moduleNameBuf, sizeof(moduleNameBuf), "%s", config.Scripting.ModuleName.c_str());
+				if (ImGui::InputText("Module Name", moduleNameBuf, sizeof(moduleNameBuf)))
+				{
+					config.Scripting.ModuleName = moduleNameBuf;
+				}
+
+				char moduleDirBuf[512];
+				snprintf(moduleDirBuf, sizeof(moduleDirBuf), "%s", config.Scripting.ModuleDirectory.string().c_str());
+				if (ImGui::InputText("Module Directory", moduleDirBuf, sizeof(moduleDirBuf)))
+				{
+					config.Scripting.ModuleDirectory = moduleDirBuf;
+				}
+				ImGui::SameLine();
+				if (ImGui::Button("...###ModuleDirBrowse"))
+				{
+					auto result = Chained::Dialogs::PickFolder();
+					if (result)
+					{
+						config.Scripting.ModuleDirectory = project->GetRelativePath(result->string());
+					}
+				}
+
+				ImGui::Checkbox("Auto Load Module", &config.Scripting.AutoLoad);
+				break;
+			}
+			case 2: // Physics
+			{
+				ImGui::TextDisabled("Physics Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::DragFloat("World Gravity", &config.Physics.Gravity, 0.1f);
+				ImGui::DragFloat("Fixed Timestep", &config.Physics.FixedTimestep, 0.001f, 0.001f, 0.1f, "%.4f");
+				break;
+			}
+			case 3: // Window
+			{
+				ImGui::TextDisabled("Window Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::DragInt("Width", &config.Window.Width, 1, 800, 3840);
+				ImGui::DragInt("Height", &config.Window.Height, 1, 600, 2160);
+				ImGui::Checkbox("VSync", &config.Window.VSync);
+				break;
+			}
+			case 4: // Rendering
+			{
+				ImGui::TextDisabled("Rendering Settings");
+				ImGui::Separator();
+				ImGui::TextDisabled("Visual Quality");
+
+				static constexpr int kShadowResValues[] = {512, 1024, 2048, 4096};
+				static constexpr int kShadowResCount = sizeof(kShadowResValues) / sizeof(kShadowResValues[0]);
+				const char* shadowResNames[kShadowResCount] = {"512", "1024", "2048", "4096"};
+				int currentShadowResIdx = 2; // Default 2048
+				for (int i = 0; i < kShadowResCount; i++)
+				{
+					if (config.Render.ShadowResolution == kShadowResValues[i])
+					{
+						currentShadowResIdx = i;
+						break;
+					}
+				}
+
+				if (ImGui::Combo("Shadow Resolution", &currentShadowResIdx, shadowResNames, kShadowResCount))
+				{
+					config.Render.ShadowResolution = kShadowResValues[currentShadowResIdx];
+				}
+
+				static constexpr int kAAValues[] = {0, 2, 4, 8};
+				static constexpr int kAACount = sizeof(kAAValues) / sizeof(kAAValues[0]);
+				const char* aaNames[kAACount] = {"None", "2x MSAA", "4x MSAA", "8x MSAA"};
+				int currentAAIdx = 0;
+				for (int i = 0; i < kAACount; i++)
+				{
+					if (config.Render.AntiAliasingSamples == kAAValues[i])
+					{
+						currentAAIdx = i;
+						break;
+					}
+				}
+
+				if (ImGui::Combo("Anti-Aliasing", &currentAAIdx, aaNames, kAACount))
+				{
+					config.Render.AntiAliasingSamples = kAAValues[currentAAIdx];
+				}
+
+				ImGui::Checkbox("Enable Shadows", &config.Render.EnableShadows);
+				break;
+			}
+			case 5: // Audio
+			{
+				ImGui::TextDisabled("Audio Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::SliderFloat("Master Volume", &config.Audio.MasterVolume, 0.0f, 1.0f);
+				ImGui::SliderFloat("Music Volume", &config.Audio.MusicVolume, 0.0f, 1.0f);
+				ImGui::SliderFloat("SFX Volume", &config.Audio.SFXVolume, 0.0f, 1.0f);
+				break;
+			}
+			case 6: // Mesh
+			{
+				ImGui::TextDisabled("Mesh Import Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::Checkbox("Import Materials", &config.Mesh.ImportMaterials);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Automatically import materials when loading meshes");
+				}
+
+				ImGui::Checkbox("Calculate Tangents", &config.Mesh.CalculateTangents);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Calculate tangent vectors for normal mapping");
+				}
+
+				ImGui::Checkbox("Flip UVs", &config.Mesh.FlipUVs);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Flip texture UV coordinates vertically on import");
+				}
+				break;
+			}
+			case 7: // Runtime
+			{
+				ImGui::TextDisabled("Runtime Settings");
+				ImGui::Separator();
+				ImGui::Spacing();
+
+				ImGui::Checkbox("Fullscreen", &config.Runtime.Fullscreen);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Start the game in fullscreen mode");
+				}
+
+				ImGui::Checkbox("Show Stats Overlay", &config.Runtime.ShowStats);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Display FPS and performance stats in the runtime window");
+				}
+
+				ImGui::Checkbox("Enable Console", &config.Runtime.EnableConsole);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("Enable the in-game developer console");
+				}
+
+				ImGui::DragInt("Target FPS", &config.Runtime.TargetFPS, 1, 0, 240);
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("0 = Uncapped framerate");
+				}
+				break;
+			}
+			}
+
+			ImGui::PopStyleVar();
+			ImGui::EndChild();
+
+			ImGui::Columns(1);
+			ImGui::Separator();
+
+			float buttonWidth =
+				ImGui::CalcTextSize("Save Project Settings").x + ImGui::GetStyle().FramePadding.x * 2.0f;
+			ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - buttonWidth);
+
+			if (ImGui::Button("Save Project Settings"))
+			{
+				std::filesystem::path path =
+					project->GetConfig().ProjectDirectory / (project->GetName() + ".chproject");
+				EditorProjectSerializer::Serialize(project, path);
+			}
+		}
+		ImGui::End();
+	}
+} // namespace Chained
diff --git a/editor/panels/project_settings_panel.h b/editor/panels/project_settings_panel.h
index 582ee2a3a..b4391b22a 100644
--- a/editor/panels/project_settings_panel.h
+++ b/editor/panels/project_settings_panel.h
@@ -3,16 +3,20 @@
 
 #include "panel.h"
 
-namespace CHEngine
+namespace Chained
 {
-class ProjectSettingsPanel : public Panel
-{
-public:
-    ProjectSettingsPanel();
+	class ProjectSettingsPanel : public Panel
+	{
+	public:
+		ProjectSettingsPanel();
+
+	public:
+		virtual void OnImGuiRender(bool readOnly = false) override;
 
-public:
-    virtual void OnImGuiRender(bool readOnly = false) override;
-};
-} // namespace CHEngine
+	private:
+		int m_SelectedCategory = 0;
+		bool m_WidthSet = false;
+	};
+} // namespace Chained
 
 #endif // CH_PROJECT_SETTINGS_PANEL_H
diff --git a/editor/panels/property_editor.cpp b/editor/panels/property_editor.cpp
index ed5ef50ea..75fc2453d 100644
--- a/editor/panels/property_editor.cpp
+++ b/editor/panels/property_editor.cpp
@@ -1,392 +1,1500 @@
 #include "property_editor.h"
-#include "IconsFontAwesome6.h"
-#include "editor/editor_layer.h"
+#include "engine/reflection/reflection_rfl.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "engine/scene/components/render/primitive_component.h"
+#include "engine/scene/component_registry.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "editor/layer.h"
 #include "editor/undo/component_commands.h"
 #include "editor/undo/modify_component_command.h"
-#include "editor_gui.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/graphics/assets/texture_asset.h"
+#include "engine/core/service_locator.h"
+#include "gui.h"
+
 #include "engine/physics/physics.h"
-#include "engine/scene/components.h"
-#include "engine/scene/project.h"
-#include "engine/scene/scene.h"
 #include "engine/scene/scene_settings.h"
 #include "imgui.h"
-#include "panel.h"
+#include "misc/cpp/imgui_stdlib.h"
 #include "ui_properties.h" // Included here to break circular dependency
 #include <memory>
-
-#include "nfd.h"
-#include "scripting/scriptengine.h"
+#include "engine/scripting/scriptengine.h"
 #include <Coral/ManagedObject.hpp>
 
-#include <algorithm>
-#include <iterator>
+#include "engine/app/application.h"
 #include <yaml-cpp/yaml.h>
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/scene/components/animation/animation_component.h"
+#include "engine/assets/loaders/anim_graph_loader.h"
+#include "engine/assets/types/animation_graph_asset.h"
+#include "engine/ui/ui_font_registry.h"
+#include "engine/ui/widget_renderer.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-std::unordered_map<entt::id_type, PropertyEditor::ComponentMetadata> PropertyEditor::s_ComponentRegistry;
+	// --- UI Widget Data Drawers (extracted from UIControlComponent lambda) ---
 
-// --- Template Implementations (Moved from Header) ---
+	static bool DrawButtonData(ButtonData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (ui.Property("Interactable", data.IsInteractable))
+		{
+			changed = true;
+		}
+		if (ui.Property("Auto Size", data.AutoSize))
+		{
+			changed = true;
+		}
+		return changed;
+	}
 
-template <typename T>
-void PropertyEditor::DrawComponentReflection(const std::string& name, const char* icon, Entity entity)
-{
-    static std::unordered_map<entt::entity, T> s_InitialStates;
-    entt::entity e = (entt::entity)entity;
-
-    DrawComponentContainer<T>(name, icon, entity, [&](T& comp, Entity ent) {
-        UIProperties ui;
-        Properties props(ui);
-        comp.Reflect(props);
-
-        if (ui.HasStarted())
-        {
-            s_InitialStates[e] = entity.GetComponent<T>();
-        }
-
-        if (ui.HasFinished())
-        {
-            if (s_InitialStates.contains(e))
-            {
-                auto oldState = s_InitialStates[e];
-                auto newState = comp;
-                EditorLayer::GetCommandHistory().PushCommand(
-                    std::make_unique<ModifyComponentCommand<T>>(entity, oldState, newState, "Modify " + name));
-                s_InitialStates.erase(e);
-            }
-        }
-
-        return props.HasChanged();
-    });
-}
-
-template <typename T>
-void PropertyEditor::DrawComponentContainer(const std::string& name, const char* icon, Entity entity,
-                                            std::function<bool(T&, Entity)> drawer)
-{
-    if (entity.HasComponent<T>())
-    {
-        DrawComponentInternal(
-            entt::type_hash<T>::value(), name, icon, entity,
-            [&]() {
-                auto& component = entity.GetComponent<T>();
-                T componentCopy = component;
-                if (drawer(componentCopy, entity))
-                {
-                    // Live preview / immediate update
-                    entity.GetRegistry().template patch<T>(entity, [&componentCopy](T& comp) { comp = componentCopy; });
-                    return true;
-                }
-                return false;
-            },
-            [&]() {
-                EditorLayer::GetCommandHistory().PushCommand(std::make_unique<RemoveComponentCommand<T>>(entity));
-            });
-    }
-}
-
-template <typename T> void PropertyEditor::Register(const std::string& name, const char* icon)
-{
-    ComponentMetadata metadata;
-    metadata.Name = name;
-    metadata.Icon = icon;
-    metadata.Draw = [name, icon](Entity e) { DrawComponentReflection<T>(name, icon, e); };
-    metadata.Add = [](Entity e) {
-        if (!e.HasComponent<T>())
-        {
-            EditorLayer::GetCommandHistory().PushCommand(std::make_unique<AddComponentCommand<T>>(e));
-            return true;
-        }
-        return false;
-    };
-    RegisterComponent(entt::type_hash<T>::value(), metadata);
-}
-
-template <typename T>
-void PropertyEditor::RegisterCustom(const std::string& name, std::function<bool(T&, Entity)> drawer, const char* icon)
-{
-    ComponentMetadata metadata;
-    metadata.Name = name;
-    metadata.Icon = icon;
-    metadata.Draw = [name, icon, drawer](Entity e) { DrawComponentContainer<T>(name, icon, e, drawer); };
-    metadata.Add = [](Entity e) {
-        if (!e.HasComponent<T>())
-        {
-            EditorLayer::GetCommandHistory().PushCommand(std::make_unique<AddComponentCommand<T>>(e));
-            return true;
-        }
-        return false;
-    };
-    RegisterComponent(entt::type_hash<T>::value(), metadata);
-}
-
-// --- Implementation ---
-
-void PropertyEditor::RegisterComponent(entt::id_type typeId, const ComponentMetadata& metadata)
-{
-    s_ComponentRegistry[typeId] = metadata;
-}
+	static bool DrawLabelData(LabelData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Text", data.Text))
+		{
+			changed = true;
+		}
+		if (ui.Property("Auto Size", data.AutoSize))
+		{
+			changed = true;
+		}
+		return changed;
+	}
 
-void PropertyEditor::Init()
-{
-    // --- Core Components ---
-    Register<TransformComponent>("Transform", ICON_FA_ARROWS_UP_DOWN_LEFT_RIGHT);
-    s_ComponentRegistry[entt::type_hash<TransformComponent>::value()].AllowAdd = false;
-
-    Register<TagComponent>("Tag", ICON_FA_TAG);
-    Register<CameraComponent>("Camera", ICON_FA_VIDEO);
-    Register<LightComponent>("Light", ICON_FA_LIGHTBULB);
-    Register<RigidBodyComponent>("RigidBody", ICON_FA_CUBES);
-    Register<ColliderComponent>("Collider", ICON_FA_SHIELD);
-    Register<ModelComponent>("Model", ICON_FA_CUBE);
-    Register<MaterialComponent>("Materials", ICON_FA_DROPLET);
-    Register<SpriteComponent>("Sprite", ICON_FA_IMAGE);
-    Register<PrimitiveComponent>("Primitive", ICON_FA_SHAPES);
-    Register<ShaderComponent>("Shader", ICON_FA_CODE);
-    Register<AnimationComponent>("Animation", ICON_FA_FILM);
-    Register<AudioComponent>("Audio", ICON_FA_VOLUME_HIGH);
-    Register<SpawnComponent>("SpawnZone", ICON_FA_LOCATION_DOT);
-    Register<PlayerComponent>("Player", ICON_FA_USER);
-    Register<SceneTransitionComponent>("SceneTransition", ICON_FA_DOOR_OPEN);
-
-    // --- Scripting ---
-    Register<ManagedScriptComponent>("Scripts", ICON_FA_FILE_CODE);
-
-    // --- UI Components ---
-
-    Register<ControlComponent>("RectTransform", ICON_FA_VECTOR_SQUARE);
-    Register<NavigationComponent>("Navigation", ICON_FA_ARROWS_TO_DOT);
-    Register<UIActionComponent>("UIAction", ICON_FA_BOLT);
-
-    // --- UI Widgets ---
-    Register<ButtonControl>("Button", ICON_FA_ARROW_POINTER);
-    Register<PanelControl>("Panel", ICON_FA_WINDOW_MAXIMIZE);
-    Register<LabelControl>("Label", ICON_FA_FONT);
-    Register<SliderControl>("Slider", ICON_FA_SLIDERS);
-    Register<CheckboxControl>("Checkbox", ICON_FA_SQUARE_CHECK);
-    Register<InputTextControl>("InputText", ICON_FA_PEN_TO_SQUARE);
-    Register<ComboBoxControl>("ComboBox", ICON_FA_LIST_UL);
-    Register<ProgressBarControl>("ProgressBar", ICON_FA_BARS_PROGRESS);
-    Register<ImageControl>("Image", ICON_FA_IMAGE);
-    Register<ImageButtonControl>("ImageButton", ICON_FA_IMAGE);
-    Register<SeparatorControl>("Separator", ICON_FA_MINUS);
-    Register<RadioButtonControl>("RadioButton", ICON_FA_CIRCLE_DOT);
-    Register<ColorPickerControl>("ColorPicker", ICON_FA_PALETTE);
-    Register<DragFloatControl>("DragFloat", ICON_FA_ARROWS_LEFT_RIGHT);
-    Register<DragIntControl>("DragInt", ICON_FA_ARROWS_LEFT_RIGHT);
-    Register<TabBarControl>("TabBar", ICON_FA_TABLE_COLUMNS);
-    Register<TabItemControl>("TabItem", ICON_FA_FILE);
-    Register<CollapsingHeaderControl>("CollapsingHeader", ICON_FA_ANGLE_DOWN);
-    Register<VerticalLayoutGroup>("VerticalLayoutGroup", ICON_FA_LAYER_GROUP);
-
-    // Mark only real UI widget types as IsWidget (these will be hidden in 3D scenes)
-    auto markWidget = [&](entt::id_type id) {
-        if (s_ComponentRegistry.contains(id))
-        {
-            s_ComponentRegistry[id].IsWidget = true;
-        }
-    };
-    markWidget(entt::type_hash<ControlComponent>::value());
-    markWidget(entt::type_hash<NavigationComponent>::value());
-    markWidget(entt::type_hash<UIActionComponent>::value());
-    markWidget(entt::type_hash<ButtonControl>::value());
-    markWidget(entt::type_hash<PanelControl>::value());
-    markWidget(entt::type_hash<LabelControl>::value());
-    markWidget(entt::type_hash<SliderControl>::value());
-    markWidget(entt::type_hash<CheckboxControl>::value());
-    markWidget(entt::type_hash<InputTextControl>::value());
-    markWidget(entt::type_hash<ComboBoxControl>::value());
-    markWidget(entt::type_hash<ProgressBarControl>::value());
-    markWidget(entt::type_hash<ImageControl>::value());
-    markWidget(entt::type_hash<ImageButtonControl>::value());
-    markWidget(entt::type_hash<SeparatorControl>::value());
-    markWidget(entt::type_hash<RadioButtonControl>::value());
-    markWidget(entt::type_hash<ColorPickerControl>::value());
-    markWidget(entt::type_hash<DragFloatControl>::value());
-    markWidget(entt::type_hash<DragIntControl>::value());
-    markWidget(entt::type_hash<TabBarControl>::value());
-    markWidget(entt::type_hash<TabItemControl>::value());
-    markWidget(entt::type_hash<CollapsingHeaderControl>::value());
-    markWidget(entt::type_hash<VerticalLayoutGroup>::value());
-    markWidget(entt::type_hash<SpriteComponent>::value());
-}
-
-void PropertyEditor::DrawComponentInternal(entt::id_type typeId, const std::string& name, const char* icon,
-                                           Entity entity, std::function<bool()> contentDrawer,
-                                           std::function<void()> remover)
-{
-    const ImGuiTreeNodeFlags treeNodeFlags = ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed |
-                                             ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_AllowOverlap |
-                                             ImGuiTreeNodeFlags_FramePadding;
-
-    ImVec2 contentRegionAvailable = ImGui::GetContentRegionAvail();
-
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{4, 4});
-    float lineHeight = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
-
-    // Header Background Color
-    ImGui::PushStyleColor(ImGuiCol_Header, {0.2f, 0.25f, 0.35f, 0.8f});
-    ImGui::PushStyleColor(ImGuiCol_HeaderActive, {0.3f, 0.4f, 0.6f, 1.0f});
-    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, {0.25f, 0.35f, 0.5f, 1.0f});
-
-    std::string headerName = (icon ? std::string(icon) + " " : "") + name;
-    bool open = ImGui::TreeNodeEx((void*)typeId, treeNodeFlags, headerName.c_str());
-
-    ImGui::PopStyleColor(3);
-    ImGui::PopStyleVar();
-
-    // Right-aligned settings button
-    ImGui::SameLine(contentRegionAvailable.x - lineHeight * 0.7f);
-    ImGui::PushStyleColor(ImGuiCol_Button, {0, 0, 0, 0});
-    if (ImGui::Button(ICON_FA_GEAR, ImVec2{lineHeight, lineHeight}))
-    {
-        ImGui::OpenPopup("ComponentSettings");
-    }
-    ImGui::PopStyleColor();
-
-    bool removed = false;
-    if (ImGui::BeginPopup("ComponentSettings"))
-    {
-        if (ImGui::MenuItem("Remove Component"))
-        {
-            remover();
-            removed = true;
-        }
-
-        ImGui::EndPopup();
-    }
-
-    if (open)
-    {
-        if (!removed)
-        {
-            EditorGUI::BeginPropertyGrid();
-            contentDrawer();
-            EditorGUI::EndPropertyGrid();
-        }
-        ImGui::TreePop();
-        ImGui::Spacing();
-    }
-}
-
-void PropertyEditor::DrawEntityProperties(CHEngine::Entity entity)
-{
-    auto& registry = entity.GetRegistry();
-    bool isUI = entity.HasComponent<ControlComponent>();
-
-    // 1. Check for widgets more efficiently
-    bool hasWidget = false;
-    for (auto [id, storage] : registry.storage())
-    {
-        if (storage.contains(entity) && s_ComponentRegistry.contains(id) && s_ComponentRegistry[id].IsWidget)
-        {
-            hasWidget = true;
-            break;
-        }
-    }
-
-    // 2. Draw components efficiently
-    for (auto [id, storage] : registry.storage())
-    {
-        if (storage.contains(entity) && s_ComponentRegistry.contains(id))
-        {
-            auto& metadata = s_ComponentRegistry[id];
-            if (!metadata.Visible)
-            {
-                continue;
-            }
-
-            // Logic to reduce clutter
-            if (isUI && id == entt::type_hash<TransformComponent>::value())
-            {
-                continue;
-            }
-
-            ImGui::PushID((int)id);
-            metadata.Draw(entity);
-            ImGui::PopID();
-        }
-    }
-}
-
-void PropertyEditor::DrawEntityHeader(CHEngine::Entity entity)
-{
-    if (entity.HasComponent<TagComponent>())
-    {
-        auto& tag = entity.GetComponent<TagComponent>().Tag;
-
-        // Entity Icon and Label
-        ImGui::BeginGroup();
-        ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
-        ImGui::TextColored({0.4f, 0.6f, 0.9f, 1.0f}, ICON_FA_CUBE " Entity");
-        ImGui::PopFont();
-
-        char buffer[256];
-        memset(buffer, 0, sizeof(buffer));
-        strncpy(buffer, tag.c_str(), sizeof(buffer) - 1);
-
-        ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - 120.0f);
-        if (ImGui::InputText("##Tag", buffer, sizeof(buffer)))
-        {
-            tag = std::string(buffer);
-        }
-        ImGui::PopItemWidth();
-
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_PLUS " Add Component", ImVec2(110, 0)))
-        {
-            ImGui::OpenPopup("AddComponent");
-        }
-
-        DrawAddComponentPopup(entity);
-        ImGui::EndGroup();
-
-        ImGui::Spacing();
-    }
-}
-
-void PropertyEditor::DrawAddComponentPopup(CHEngine::Entity entity)
-{
-    if (ImGui::BeginPopup("AddComponent"))
-    {
-        bool isUIEntity = entity.HasComponent<ControlComponent>();
-        auto* scene = entity.GetRegistry().ctx().find<Scene*>();
-        bool is3DScene = scene && (*scene)->GetSettings().Mode == BackgroundMode::Environment3D;
-
-        for (auto& [id, metadata] : s_ComponentRegistry)
-        {
-            if (!metadata.AllowAdd)
-            {
-                continue;
-            }
-            if (metadata.IsWidget && !isUIEntity)
-            {
-                continue;
-            }
-            if (is3DScene && (metadata.IsWidget || id == entt::type_hash<ControlComponent>::value()))
-            {
-                continue;
-            }
-
-            auto& registry = entity.GetRegistry();
-            auto* storage = registry.storage(id);
-            if (storage && storage->contains(entity))
-            {
-                continue;
-            }
-
-            std::string label = (metadata.Icon ? std::string(metadata.Icon) + " " : "") + metadata.Name;
-            if (ImGui::MenuItem(label.c_str()))
-            {
-                metadata.Add(entity);
-                ImGui::CloseCurrentPopup();
-            }
-        }
-        ImGui::EndPopup();
-    }
-}
-} // namespace CHEngine
+	static bool DrawCheckboxData(CheckboxData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (ui.Property("Checked", data.Checked))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawSliderData(SliderData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (ui.Property("Value", data.Value, PropertyMeta(data.Min, data.Max, 0.01f)))
+		{
+			changed = true;
+		}
+		if (ui.Property("Min", data.Min))
+		{
+			changed = true;
+		}
+		if (ui.Property("Max", data.Max))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawProgressBarData(ProgressBarData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Progress", data.Progress, PropertyMeta(0.0f, 1.0f, 0.01f)))
+		{
+			changed = true;
+		}
+		if (ui.Property("Overlay Text", data.OverlayText))
+		{
+			changed = true;
+		}
+		if (ui.Property("Show %", data.ShowPercentage))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawImageData(ImageData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.File("Texture Path", data.TexturePath, ".png,.jpg,.jpeg,.bmp,.tga"))
+		{
+			changed = true;
+		}
+		if (ui.Property("Tint Color", data.TintColor))
+		{
+			changed = true;
+		}
+		if (ui.Property("Border Color", data.BorderColor))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawPanelData(PanelData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.File("Texture Path", data.TexturePath, ".png,.jpg,.jpeg"))
+		{
+			changed = true;
+		}
+		if (ui.Property("Full Screen", data.FullScreen))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawComboBoxData(ComboBoxData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (!data.Items.empty())
+		{
+			if (ui.Property("Selected", data.SelectedIndex, PropertyMeta(0, (int)data.Items.size() - 1, 1)))
+			{
+				changed = true;
+			}
+		}
+
+		ImGui::TableNextRow();
+		ImGui::TableSetColumnIndex(0);
+		ImGui::TextUnformatted("Items");
+		ImGui::TableSetColumnIndex(1);
+		int removeIdx = -1;
+		for (int i = 0; i < (int)data.Items.size(); i++)
+		{
+			ImGui::PushID(i);
+			if (ImGui::InputText("##item", &data.Items[i]))
+			{
+				changed = true;
+			}
+			ImGui::SameLine();
+			if (ImGui::SmallButton(ICON_FA_TRASH))
+			{
+				removeIdx = i;
+				changed = true;
+			}
+			ImGui::PopID();
+		}
+		if (removeIdx >= 0)
+		{
+			data.Items.erase(data.Items.begin() + removeIdx);
+		}
+		if (ImGui::SmallButton(ICON_FA_PLUS " Add Item"))
+		{
+			data.Items.push_back("");
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawInputTextData(InputTextData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Text", data.Text))
+		{
+			data.InputBuffer.clear();
+			changed = true;
+		}
+		if (ui.Property("Placeholder", data.Placeholder))
+		{
+			changed = true;
+		}
+		if (ui.Property("Max Length", data.MaxLength, PropertyMeta(1, 1024, 1)))
+		{
+			changed = true;
+		}
+		if (ui.Property("Multiline", data.Multiline))
+		{
+			changed = true;
+		}
+		if (ui.Property("Read Only", data.ReadOnly))
+		{
+			changed = true;
+		}
+		if (ui.Property("Password", data.Password))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawImageButtonData(ImageButtonData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.File("Texture Path", data.TexturePath, ".png,.jpg,.jpeg"))
+		{
+			changed = true;
+		}
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawRadioButtonData(RadioButtonData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (!data.Options.empty())
+		{
+			if (ui.Property("Selected", data.SelectedIndex, PropertyMeta(0, (int)data.Options.size() - 1, 1)))
+			{
+				changed = true;
+			}
+		}
+		if (ui.Property("Horizontal", data.Horizontal))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawDragFloatData(DragFloatData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (ui.Property("Value", data.Value, PropertyMeta(data.Min, data.Max, data.Speed)))
+		{
+			changed = true;
+		}
+		if (ui.Property("Min", data.Min))
+		{
+			changed = true;
+		}
+		if (ui.Property("Max", data.Max))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	static bool DrawDragIntData(DragIntData& data, UIProperties& ui)
+	{
+		bool changed = false;
+		if (ui.Property("Label", data.Label))
+		{
+			changed = true;
+		}
+		if (ui.Property("Value", data.Value, PropertyMeta(data.Min, data.Max, 1)))
+		{
+			changed = true;
+		}
+		if (ui.Property("Min", data.Min))
+		{
+			changed = true;
+		}
+		if (ui.Property("Max", data.Max))
+		{
+			changed = true;
+		}
+		return changed;
+	}
+
+	// --- Template Implementations (Moved from Header) ---
+
+	template <typename T>
+	void PropertyEditor::DrawComponentReflection(const std::string& name, const char* icon, Entity entity)
+	{
+		static std::unordered_map<entt::entity, T> s_InitialStates;
+		entt::entity e = (entt::entity)entity;
+
+		// Clear stale states when entity is not in the current context
+		// (handles scene changes where entity IDs may be reused)
+		static entt::registry* s_LastRegistry = nullptr;
+		entt::registry* currentRegistry = &entity.GetRegistry();
+		if (s_LastRegistry != currentRegistry)
+		{
+			s_InitialStates.clear();
+			s_LastRegistry = currentRegistry;
+		}
+
+		DrawComponentContainer<T>(name, icon, entity, [&](T& comp, Entity ent) {
+			UIProperties ui;
+			Properties props(ui);
+
+			if constexpr (is_rfl_component<T>::value)
+			{
+				ReflectFromRfl(comp, props);
+			}
+			else
+			{
+				comp.Reflect(props);
+			}
+
+			if (ui.HasStarted())
+			{
+				s_InitialStates[e] = entity.GetComponent<T>();
+			}
+
+			if (ui.HasFinished())
+			{
+				if (s_InitialStates.contains(e))
+				{
+					auto oldState = s_InitialStates[e];
+					auto newState = comp;
+
+					EditorLayer::Get().GetCommandHistory().PushCommand(
+						std::make_unique<ModifyComponentCommand<T>>(entity, oldState, newState, "Modify " + name));
+
+					s_InitialStates.erase(e);
+				}
+			}
+
+			return props.HasChanged();
+		});
+	}
+
+	template <typename T, typename F>
+	void PropertyEditor::DrawComponentContainer(const std::string& name, const char* icon, Entity entity, F&& drawer)
+	{
+		if (entity.HasComponent<T>())
+		{
+			if constexpr (std::is_same_v<T, ModelComponent>)
+			{
+				if (entity.HasComponent<PrimitiveComponent>() &&
+					entity.GetComponent<PrimitiveComponent>().Type != PrimitiveType::None)
+				{
+					return;
+				}
+			}
+
+			DrawComponentInternal(
+				entt::type_hash<T>::value(), name, icon, entity,
+				[&]() {
+					auto& component = entity.GetComponent<T>();
+					T componentCopy = component;
+					if (drawer(componentCopy, entity))
+					{
+						// Live preview / immediate update
+						entity.GetRegistry().template patch<T>(entity,
+															   [&componentCopy](T& comp) { comp = componentCopy; });
+						return true;
+					}
+					return false;
+				},
+				[&]() {
+					EditorLayer::Get().GetCommandHistory().PushCommand(
+						std::make_unique<RemoveComponentCommand<T>>(entity));
+				});
+		}
+	}
+
+	void PropertyEditor::DrawGenericReflection(const ComponentMetadata& metadata, Entity entity)
+	{
+		// Use a stable hash of the component name as the tree node ID
+		// to avoid ImGui ID collisions when multiple generic components are rendered
+		entt::id_type stableId = static_cast<entt::id_type>(std::hash<std::string>{}(metadata.Name));
+
+		DrawComponentInternal(
+			stableId, metadata.Name, metadata.Icon, entity,
+			[&]() {
+				UIProperties ui;
+				metadata.ReflectInternal(entity, ui, ReflectionMode::UI);
+				bool changed = ui.HasChanged();
+				if (changed && metadata.NotifyUpdate)
+				{
+					// Fire registry.patch() so on_update observers (e.g. MarkPrimitiveDirty) run.
+					metadata.NotifyUpdate(entity);
+				}
+				return changed;
+			},
+			[&]() {
+				if (metadata.Remove)
+				{
+					metadata.Remove(entity);
+				}
+			});
+	}
+
+	template <typename T>
+	void PropertyEditor::RegisterComponentImpl(const std::string& name, const char* icon,
+											   std::function<void(Entity)> drawUI)
+	{
+		auto typeId = entt::type_hash<T>::value();
+
+		// Register fresh metadata if the component type doesn't exist yet
+		if (!ComponentRegistry::Exists(typeId))
+		{
+			ComponentMetadata fresh;
+			fresh.Name = name;
+			fresh.Icon = icon;
+			fresh.Category = "Engine";
+			fresh.SerializationKey = name + "Component";
+			ComponentRegistry::Register(typeId, fresh);
+		}
+
+		// Apply editor-specific overrides (undo/redo, custom DrawUI)
+		ComponentMetadata override;
+		override.Name = name;
+		override.Icon = icon;
+		override.DrawUI = drawUI;
+		override.Add = [](Entity e) {
+			if (!e.HasComponent<T>())
+			{
+				EditorLayer::Get().GetCommandHistory().PushCommand(std::make_unique<AddComponentCommand<T>>(e));
+			}
+		};
+		override.Remove = [](Entity e) {
+			EditorLayer::Get().GetCommandHistory().PushCommand(std::make_unique<RemoveComponentCommand<T>>(e));
+		};
+		ComponentRegistry::OverrideMetadata(typeId, override);
+	}
+
+	template <typename T> void PropertyEditor::Register(const std::string& name, const char* icon)
+	{
+		RegisterComponentImpl<T>(name, icon, [name, icon](Entity e) { DrawComponentReflection<T>(name, icon, e); });
+	}
+
+	template <typename T, typename F>
+	void PropertyEditor::RegisterCustom(const std::string& name, F&& drawer, const char* icon)
+	{
+		RegisterComponentImpl<T>(name, icon, [name, icon, drawer = std::forward<F>(drawer)](Entity e) {
+			DrawComponentContainer<T>(name, icon, e, drawer);
+		});
+	}
+
+	// --- Implementation ---
+
+	void PropertyEditor::Init()
+	{
+		// --- Core Components ---
+		ComponentRegistry::SetAllowAdd(entt::type_hash<TransformComponent>::value(), false);
+
+		// Custom drawer for PrimitiveComponent (shown in Inspector)
+		RegisterCustom<PrimitiveComponent>(
+			"Primitive",
+			[](PrimitiveComponent& comp, Entity entity) {
+				bool changed = false;
+				UIProperties ui;
+
+				static const char* primitiveTypes[] = {"None", "Cube",	"Sphere", "Plane",	   "Cylinder",
+													   "Cone", "Torus", "Knot",	  "Hemisphere"};
+				int typeIdx = static_cast<int>(comp.Type);
+				if (ui.Enum("Shape Type", typeIdx, primitiveTypes, 9))
+				{
+					comp.Type = static_cast<PrimitiveType>(typeIdx);
+					changed = true;
+				}
+
+				switch (comp.Type)
+				{
+				case PrimitiveType::Cube: {
+					if (ui.Property("Dimensions", comp.Dimensions, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Sphere: {
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Slices", comp.Slices, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Stacks", comp.Stacks, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Plane: {
+					if (ui.Property("Dimensions", comp.Dimensions, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Cylinder: {
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Height", comp.Height, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Slices", comp.Slices, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Cone: {
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Height", comp.Height, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Slices", comp.Slices, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Torus: {
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Inner Radius", comp.InnerRadius, PropertyMeta(0.01f, 50.0f, 0.01f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Slices", comp.Slices, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Stacks", comp.Stacks, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Knot: {
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Inner Radius", comp.InnerRadius, PropertyMeta(0.01f, 50.0f, 0.01f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Slices", comp.Slices, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Stacks", comp.Stacks, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				case PrimitiveType::Hemisphere: {
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Slices", comp.Slices, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Stacks", comp.Stacks, PropertyMeta(3, 128, 1)))
+					{
+						changed = true;
+					}
+					break;
+				}
+				default:
+					break;
+				}
+
+				if (entity.HasComponent<ModelComponent>())
+				{
+					auto& mc = entity.GetComponent<ModelComponent>();
+					ImGui::Spacing();
+					ImGui::Separator();
+					ImGui::TextDisabled("Material Override");
+
+					if (mc.MaterialPaths.empty())
+					{
+						mc.MaterialPaths.resize(1);
+					}
+
+					std::filesystem::path modelPath(mc.ModelPath);
+					std::string modelName = modelPath.stem().string();
+					std::filesystem::path modelDir = modelPath.parent_path();
+
+					for (size_t matIdx = 0; matIdx < mc.MaterialPaths.size(); ++matIdx)
+					{
+						if (mc.MaterialPaths[matIdx].empty() && !mc.ModelPath.empty())
+						{
+							auto* am = ServiceLocator::TryGet<AssetManager>();
+							std::string autoName = modelName + "_material_" + std::to_string(matIdx) + ".chmat";
+							std::string autoRel = (modelDir / autoName).generic_string();
+							if (am && am->FileExists(autoRel))
+							{
+								mc.MaterialPaths[matIdx] = autoRel;
+							}
+						}
+
+						std::string matLabel = "Material " + std::to_string(matIdx);
+						if (ui.File(matLabel.c_str(), mc.MaterialPaths[matIdx], ".chmat"))
+						{
+							entity.GetRegistry().patch<ModelComponent>(entity, [](ModelComponent&) {});
+							EditorLayer::Get().GetSceneManager().MarkSceneDirty();
+							changed = true;
+						}
+					}
+				}
+
+				return changed;
+			},
+			ICON_FA_SHAPES);
+		RegisterCustom<LightComponent>(
+			"Light",
+			[&](LightComponent& comp, Entity entity) {
+				bool changed = false;
+				UIProperties ui;
+				Properties props(ui);
+
+				int typeIdx = static_cast<int>(comp.Type);
+				static const char* lightTypes[] = {"Point", "Spot", "Directional"};
+				if (ui.Enum("Type", typeIdx, lightTypes, 3))
+				{
+					comp.Type = static_cast<LightType>(typeIdx);
+					changed = true;
+				}
+				if (ui.Property("Color", comp.LightColor))
+				{
+					changed = true;
+				}
+				if (ui.Property("Intensity", comp.Intensity, PropertyMeta(0.0f, 10000.0f, 5.0f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Range", comp.Radius, PropertyMeta(0.0f, 1000.0f, 1.0f)))
+				{
+					changed = true;
+				}
+
+				if (comp.Type == LightType::Spot)
+				{
+					if (ui.Property("Inner Cutoff", comp.InnerCutoff, PropertyMeta(0.0f, 90.0f, 0.5f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Outer Cutoff", comp.OuterCutoff, PropertyMeta(0.0f, 90.0f, 0.5f)))
+					{
+						changed = true;
+					}
+				}
+
+				if (ui.Property("Cast Shadows", comp.Shadows))
+				{
+					changed = true;
+				}
+
+				return changed;
+			},
+			ICON_FA_LIGHTBULB);
+
+		RegisterCustom<ColliderComponent>(
+			"Collider",
+			[&](ColliderComponent& comp, Entity entity) {
+				bool changed = false;
+				UIProperties ui;
+				Properties props(ui);
+
+				int typeIdx = static_cast<int>(comp.Type);
+				static const char* colliderTypes[] = {"Box", "Sphere", "Capsule", "Mesh"};
+				if (ui.Enum("Type", typeIdx, colliderTypes, 4))
+				{
+					comp.Type = static_cast<ColliderType>(typeIdx);
+					changed = true;
+				}
+
+				if (comp.Type == ColliderType::Box)
+				{
+					if (ui.Property("Size", comp.Size, PropertyMeta(0.01f, 100.0f, 0.05f)))
+					{
+						changed = true;
+					}
+				}
+				else if (comp.Type == ColliderType::Sphere || comp.Type == ColliderType::Capsule)
+				{
+					if (ui.Property("Radius", comp.Radius, PropertyMeta(0.0f, 500.0f, 0.05f)))
+					{
+						changed = true;
+					}
+				}
+				if (comp.Type == ColliderType::Capsule)
+				{
+					if (ui.Property("Height", comp.Height, PropertyMeta(0.0f, 500.0f, 0.05f)))
+					{
+						changed = true;
+					}
+				}
+
+				if (ui.Property("Offset", comp.Offset, PropertyMeta(-10.0f, 10.0f, 0.05f)))
+				{
+					changed = true;
+				}
+
+				if (comp.Type == ColliderType::Mesh)
+				{
+					if (ui.Property("Auto Calculate", comp.AutoCalculate))
+					{
+						changed = true;
+					}
+					if (!comp.AutoCalculate)
+					{
+						if (ui.File("Model Path", comp.ModelPath, ".glb,.gltf,.obj"))
+						{
+							changed = true;
+						}
+					}
+				}
+
+				if (ui.Property("Friction", comp.Friction, PropertyMeta(0.0f, 1.0f, 0.01f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Restitution", comp.Restitution, PropertyMeta(0.0f, 1.0f, 0.01f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Is Trigger", comp.IsTrigger))
+				{
+					changed = true;
+				}
+				if (ui.Property("Enabled", comp.Enabled))
+				{
+					changed = true;
+				}
+
+				return changed;
+			},
+			ICON_FA_SHIELD);
+
+		// --- Scripting ---
+		RegisterCustom<ManagedScriptComponent>(
+			"Scripts",
+			[](ManagedScriptComponent& comp, Entity entity) {
+				bool changed = false;
+
+				for (int i = 0; i < (int)comp.Scripts.size(); i++)
+				{
+					auto& script = comp.Scripts[i];
+					ImGui::PushID(i);
+
+					// We are already inside a PropertyGrid table (2 columns).
+					ImGui::TableNextRow();
+					ImGui::TableSetColumnIndex(0);
+
+					ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed |
+											   ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_AllowOverlap |
+											   ImGuiTreeNodeFlags_SpanAllColumns;
+
+					// Extract short class name (after last dot)
+					std::string fullClassName = script.ClassName;
+					size_t lastDot = fullClassName.find_last_of('.');
+					std::string shortName =
+						(lastDot == std::string::npos) ? fullClassName : fullClassName.substr(lastDot + 1);
+					std::string label = shortName.empty() ? "-- Empty Script --" : shortName;
+
+					float lineHeight = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
+					bool open =
+						ImGui::TreeNodeEx((void*)(uintptr_t)i, flags, "%s %s", ICON_FA_FILE_CODE, label.c_str());
+
+					// Tooltip with full name
+					if (ImGui::IsItemHovered() && !fullClassName.empty())
+					{
+						ImGui::SetTooltip("%s", fullClassName.c_str());
+					}
+
+					// Delete button in the header row (right aligned in column 1)
+					ImGui::TableSetColumnIndex(1);
+					ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - lineHeight - 5.0f);
+					if (ImGui::Button(ICON_FA_TRASH, ImVec2{lineHeight, lineHeight}))
+					{
+						comp.Scripts.erase(comp.Scripts.begin() + i);
+						changed = true;
+						if (open)
+						{
+							ImGui::TreePop();
+						}
+						ImGui::PopID();
+						break;
+					}
+
+					if (open)
+					{
+						UIProperties ui;
+						// Manually draw fields from the map, skipping redundancy
+						for (auto& [fieldName, field] : script.Fields)
+						{
+							std::visit(
+								[&](auto&& val) {
+									if (ui.Property(fieldName.c_str(), val))
+									{
+										changed = true;
+									}
+								},
+								field.Value);
+						}
+
+						ImGui::TreePop();
+					}
+
+					ImGui::PopID();
+					ImGui::Spacing();
+				}
+
+				ImGui::TableNextRow();
+				ImGui::TableSetColumnIndex(1);
+				if (EditorGUI::ActionButton(ICON_FA_PLUS, "Add Script"))
+				{
+					ImGui::OpenPopup("AddScriptPopup");
+				}
+
+				if (ImGui::BeginPopup("AddScriptPopup"))
+				{
+					if (auto* se = ServiceLocator::TryGet<ScriptEngine>())
+					{
+						for (const auto& [className, type] : se->GetRegistry().GetScriptClasses())
+						{
+							// Extract short name for menu
+							size_t lastDot = className.find_last_of('.');
+							std::string shortName =
+								(lastDot == std::string::npos) ? className : className.substr(lastDot + 1);
+
+							if (ImGui::MenuItem(shortName.c_str()))
+							{
+								comp.Scripts.emplace_back(className);
+								changed = true;
+							}
+							if (ImGui::IsItemHovered())
+							{
+								ImGui::SetTooltip("%s", className.c_str());
+							}
+						}
+					}
+					ImGui::EndPopup();
+				}
+
+				return changed;
+			},
+			ICON_FA_FILE_CODE);
+
+		RegisterCustom<ModelComponent>(
+			"Model",
+			[&](ModelComponent& comp, Entity entity) {
+				bool changed = false;
+				UIProperties ui;
+				Properties props(ui);
+
+				if (ui.File("Model Path", comp.ModelPath, ".glb,.gltf,.obj"))
+				{
+					comp.ModelHandle = AssetHandle(0);
+					comp.MaterialPaths.clear();
+					changed = true;
+				}
+
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (am && !comp.ModelPath.empty())
+				{
+					auto handle = am->ResolveToHandle(comp.ModelPath);
+					if (handle != AssetHandle(0))
+					{
+						auto asset = am->Get<ModelAsset>(handle);
+						if (asset)
+						{
+							const char* stateStr = "Unknown";
+							ImVec4 stateColor(0.7f, 0.7f, 0.7f, 1.0f);
+							switch (asset->GetState())
+							{
+							case AssetState::Ready:
+								stateStr = "Ready";
+								stateColor = ImVec4(0.3f, 0.8f, 0.3f, 1.0f);
+								break;
+							case AssetState::Loading:
+								stateStr = "Loading";
+								stateColor = ImVec4(0.9f, 0.7f, 0.2f, 1.0f);
+								break;
+							case AssetState::Failed:
+								stateStr = "Failed";
+								stateColor = ImVec4(0.9f, 0.2f, 0.2f, 1.0f);
+								break;
+							default:
+								break;
+							}
+							ImGui::SameLine();
+							ImGui::TextColored(stateColor, "%s", stateStr);
+
+							if (asset->GetState() == AssetState::Ready)
+							{
+								ImGui::SameLine();
+								if (ImGui::SmallButton("Reload"))
+								{
+									am->Invalidate(comp.ModelPath);
+									comp.ModelHandle = AssetHandle(0);
+									comp.MaterialPaths.clear();
+									CH_CORE_INFO("ModelComponent: Invalidated '{}', will reload next frame",
+												 comp.ModelPath);
+								}
+								ImGui::SameLine();
+								if (ImGui::SmallButton("Delete .chasset"))
+								{
+									am->DeleteChasset(comp.ModelPath);
+									am->Invalidate(comp.ModelPath);
+									comp.ModelHandle = AssetHandle(0);
+									comp.MaterialPaths.clear();
+									CH_CORE_INFO("ModelComponent: Deleted .chasset for '{}', will re-import next frame",
+												 comp.ModelPath);
+								}
+								ImGui::SameLine();
+								if (ImGui::SmallButton("Delete .chmat"))
+								{
+									std::filesystem::path modelPath(comp.ModelPath);
+									std::string modelName = modelPath.stem().string();
+									std::filesystem::path modelDir = modelPath.parent_path();
+									for (const auto& mp : comp.MaterialPaths)
+									{
+										if (!mp.empty())
+										{
+											std::string resolved = am->ResolvePath(mp);
+											std::error_code ec;
+											std::filesystem::remove(resolved, ec);
+											std::filesystem::remove(resolved + ".meta", ec);
+											am->Invalidate(mp);
+										}
+									}
+									for (int i = 0; i < 64; ++i)
+									{
+										std::string matFileName =
+											modelName + "_material_" + std::to_string(i) + ".chmat";
+										std::string matRel = (modelDir / matFileName).generic_string();
+										std::string resolved = am->ResolvePath(matRel);
+										if (std::filesystem::exists(resolved))
+										{
+											std::error_code ec;
+											std::filesystem::remove(resolved, ec);
+											std::filesystem::remove(resolved + ".meta", ec);
+											am->Invalidate(matRel);
+										}
+									}
+									comp.MaterialPaths.clear();
+									am->Invalidate(comp.ModelPath);
+									comp.ModelHandle = AssetHandle(0);
+									CH_CORE_INFO(
+										"ModelComponent: Deleted .chmat files for '{}', restored default materials",
+										comp.ModelPath);
+								}
+							}
+						}
+					}
+				}
+
+				return changed;
+			},
+			ICON_FA_SHAPES);
+
+		RegisterCustom<AnimationComponent>(
+			"Animation",
+			[&](AnimationComponent& comp, Entity entity) {
+				bool changed = false;
+				UIProperties ui;
+				Properties props(ui);
+
+				if (ui.File("Graph Path", comp.GraphPath, ".chag"))
+				{
+					comp.GraphAssetHandle = AssetHandle(0);
+					changed = true;
+				}
+
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (ImGui::Button("New Graph"))
+				{
+					std::string baseName = "anim_graph";
+					if (entity.HasComponent<TagComponent>())
+					{
+						std::string tag = entity.GetComponent<TagComponent>().Tag;
+						if (!tag.empty())
+						{
+							std::string cleanTag = tag;
+							std::replace(cleanTag.begin(), cleanTag.end(), ' ', '_');
+							std::replace(cleanTag.begin(), cleanTag.end(), '/', '_');
+							std::replace(cleanTag.begin(), cleanTag.end(), '\\', '_');
+							std::replace(cleanTag.begin(), cleanTag.end(), '#', '_');
+							std::transform(cleanTag.begin(), cleanTag.end(), cleanTag.begin(), ::tolower);
+							baseName = cleanTag + "_graph";
+						}
+					}
+					else if (entity.HasComponent<ModelComponent>())
+					{
+						std::string mPath = entity.GetComponent<ModelComponent>().ModelPath;
+						if (!mPath.empty())
+						{
+							baseName = std::filesystem::path(mPath).stem().string() + "_graph";
+						}
+					}
+
+					std::string cand = "animations/" + baseName + ".chag";
+					if (am)
+					{
+						int counter = 1;
+						while (std::filesystem::exists(am->ResolvePath(cand)))
+						{
+							cand = "animations/" + baseName + "_" + std::to_string(counter++) + ".chag";
+						}
+					}
+					comp.GraphPath = cand;
+					comp.GraphAssetHandle = AssetHandle(0);
+
+					AnimationGraphAsset newGraph;
+					AnimGraphLoader loader;
+					if (am)
+					{
+						loader.Save(newGraph, am->ResolvePath(cand));
+						am->Invalidate(cand);
+					}
+					changed = true;
+				}
+
+				ImGui::SameLine();
+				if (ImGui::Button("Duplicate Graph") && !comp.GraphPath.empty() && am)
+				{
+					std::string srcResolved = am->ResolvePath(comp.GraphPath);
+					if (std::filesystem::exists(srcResolved))
+					{
+						std::filesystem::path p(comp.GraphPath);
+						std::string newPath = (p.parent_path() / (p.stem().string() + "_copy.chag")).generic_string();
+						int counter = 1;
+						while (std::filesystem::exists(am->ResolvePath(newPath)))
+						{
+							newPath =
+								(p.parent_path() / (p.stem().string() + "_copy" + std::to_string(counter++) + ".chag"))
+									.generic_string();
+						}
+						std::error_code ec;
+						std::filesystem::copy_file(srcResolved, am->ResolvePath(newPath), ec);
+						comp.GraphPath = newPath;
+						comp.GraphAssetHandle = AssetHandle(0);
+						am->Invalidate(newPath);
+						changed = true;
+					}
+				}
+
+				if (ui.Property("Blend Duration", comp.BlendDuration, PropertyMeta(0.0f, 10.0f, 0.01f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Default Loop", comp.DefaultIsLooping))
+				{
+					changed = true;
+				}
+				if (ui.Property("Play On Start", comp.PlayOnStart))
+				{
+					changed = true;
+				}
+
+				return changed;
+			},
+			ICON_FA_FILM);
+
+		// --- UI Components ---
+
+		// --- UI Widgets ---
+		RegisterCustom<UIControlComponent>(
+			"Widget",
+			[](UIControlComponent& comp, Entity entity) {
+				bool changed = false;
+				UIProperties ui;
+
+				// Box Style
+				ui.Header("Box Style");
+				if (ui.Property("BG Color", comp.BoxStyle.BackgroundColor))
+				{
+					changed = true;
+				}
+				if (ui.Property("Hover Color", comp.BoxStyle.HoverColor))
+				{
+					changed = true;
+				}
+				if (ui.Property("Pressed Color", comp.BoxStyle.PressedColor))
+				{
+					changed = true;
+				}
+				if (ui.Property("Border Color", comp.BoxStyle.BorderColor))
+				{
+					changed = true;
+				}
+				if (ui.Property("Rounding", comp.BoxStyle.Rounding, PropertyMeta(0.0f, 32.0f, 0.5f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Border Size", comp.BoxStyle.BorderSize, PropertyMeta(0.0f, 10.0f, 0.1f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Padding", comp.BoxStyle.Padding, PropertyMeta(0.0f, 64.0f, 0.5f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Hover Scale", comp.BoxStyle.HoverScale, PropertyMeta(0.5f, 3.0f, 0.01f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Pressed Scale", comp.BoxStyle.PressedScale, PropertyMeta(0.5f, 3.0f, 0.01f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Transition Speed", comp.BoxStyle.TransitionSpeed, PropertyMeta(0.0f, 2.0f, 0.01f)))
+				{
+					changed = true;
+				}
+				if (ui.Property("Gradient", comp.BoxStyle.UseGradient))
+				{
+					changed = true;
+				}
+				if (ui.Property("Gradient Color", comp.BoxStyle.GradientColor))
+				{
+					changed = true;
+				}
+
+				const bool needsTextStyle =
+					std::holds_alternative<ButtonData>(comp.Data) || std::holds_alternative<LabelData>(comp.Data) ||
+					std::holds_alternative<CheckboxData>(comp.Data) ||
+					std::holds_alternative<InputTextData>(comp.Data) ||
+					std::holds_alternative<ComboBoxData>(comp.Data) ||
+					std::holds_alternative<RadioButtonData>(comp.Data) ||
+					std::holds_alternative<ColorPickerData>(comp.Data) ||
+					std::holds_alternative<DragFloatData>(comp.Data) ||
+					std::holds_alternative<DragIntData>(comp.Data) || std::holds_alternative<TabBarData>(comp.Data) ||
+					std::holds_alternative<TabItemData>(comp.Data) ||
+					std::holds_alternative<CollapsingHeaderData>(comp.Data) ||
+					std::holds_alternative<PlotData>(comp.Data) || std::holds_alternative<ProgressBarData>(comp.Data) ||
+					std::holds_alternative<ImageButtonData>(comp.Data);
+
+				if (needsTextStyle)
+				{
+					ui.Separator();
+					// Text Style
+					ui.Header("Text Style");
+					{
+						auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>();
+						auto fontNames = fontRegistry ? fontRegistry->GetKnownFontNames() : std::vector<std::string>{};
+						fontNames.insert(fontNames.begin(), "Default");
+						if (ui.StringEnum("Font Name", comp.TextStyle.FontName, fontNames))
+						{
+							changed = true;
+						}
+					}
+					if (ui.Property("Font Size", comp.TextStyle.FontSize, PropertyMeta(4.0f, 256.0f, 0.5f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Text Color", comp.TextStyle.TextColor))
+					{
+						changed = true;
+					}
+					if (ui.Property("Shadow", comp.TextStyle.Shadow))
+					{
+						changed = true;
+					}
+					if (comp.TextStyle.Shadow)
+					{
+						if (ui.Property("Shadow Offset", comp.TextStyle.ShadowOffset, PropertyMeta(0.0f, 20.0f, 0.5f)))
+						{
+							changed = true;
+						}
+						if (ui.Property("Shadow Color", comp.TextStyle.ShadowColor))
+						{
+							changed = true;
+						}
+					}
+					if (ui.Property("Letter Spacing", comp.TextStyle.LetterSpacing, PropertyMeta(0.0f, 10.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("Line Height", comp.TextStyle.LineHeight, PropertyMeta(0.0f, 5.0f, 0.05f)))
+					{
+						changed = true;
+					}
+					if (ui.Property("H Align", comp.TextStyle.Horizontal))
+					{
+						changed = true;
+					}
+					if (ui.Property("V Align", comp.TextStyle.Vertical))
+					{
+						changed = true;
+					}
+				}
+
+				ui.Separator();
+				// Widget-type specific
+				std::visit(
+					[&](auto&& data) {
+						using T = std::decay_t<decltype(data)>;
+						if constexpr (std::is_same_v<T, ButtonData>)
+						{
+							changed = DrawButtonData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, LabelData>)
+						{
+							changed = DrawLabelData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, CheckboxData>)
+						{
+							changed = DrawCheckboxData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, SliderData>)
+						{
+							changed = DrawSliderData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, ProgressBarData>)
+						{
+							changed = DrawProgressBarData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, ImageData>)
+						{
+							changed = DrawImageData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, PanelData>)
+						{
+							changed = DrawPanelData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, ComboBoxData>)
+						{
+							changed = DrawComboBoxData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, InputTextData>)
+						{
+							changed = DrawInputTextData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, ImageButtonData>)
+						{
+							changed = DrawImageButtonData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, RadioButtonData>)
+						{
+							changed = DrawRadioButtonData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, DragFloatData>)
+						{
+							changed = DrawDragFloatData(data, ui) || changed;
+						}
+						else if constexpr (std::is_same_v<T, DragIntData>)
+						{
+							changed = DrawDragIntData(data, ui) || changed;
+						}
+					},
+					comp.Data);
+
+				return changed;
+			},
+			ICON_FA_SHAPES);
+
+		// Mark only real UI widget types as IsWidget (these will be hidden in 3D scenes)
+		auto markWidget = [&](entt::id_type id) { ComponentRegistry::SetIsWidget(id, true); };
+		markWidget(entt::type_hash<ControlComponent>::value());
+		markWidget(entt::type_hash<UIActionComponent>::value());
+		markWidget(entt::type_hash<UIControlComponent>::value());
+		markWidget(entt::type_hash<SpriteComponent>::value());
+	}
+
+	void PropertyEditor::DrawComponentInternal(entt::id_type typeId, const std::string& name, const char* icon,
+											   Entity entity, std::function<bool()> contentDrawer,
+											   std::function<void()> remover)
+	{
+		const ImGuiTreeNodeFlags treeNodeFlags = ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed |
+												 ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_AllowOverlap |
+												 ImGuiTreeNodeFlags_FramePadding;
+
+		ImVec2 contentRegionAvailable = ImGui::GetContentRegionAvail();
+
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{4, 4});
+		float lineHeight = ImGui::GetFontSize() + ImGui::GetStyle().FramePadding.y * 2.0f;
+
+		// Header Background Color
+		ImGui::PushStyleColor(ImGuiCol_Header, {0.2f, 0.25f, 0.35f, 0.8f});
+		ImGui::PushStyleColor(ImGuiCol_HeaderActive, {0.3f, 0.4f, 0.6f, 1.0f});
+		ImGui::PushStyleColor(ImGuiCol_HeaderHovered, {0.25f, 0.35f, 0.5f, 1.0f});
+
+		std::string headerName = (icon ? std::string(icon) + " " : "") + name;
+		bool open = ImGui::TreeNodeEx((void*)typeId, treeNodeFlags, headerName.c_str());
+
+		ImGui::PopStyleColor(3);
+		ImGui::PopStyleVar();
+
+		// Right-aligned settings button
+		ImGui::SameLine(contentRegionAvailable.x - lineHeight * 0.7f);
+		ImGui::PushStyleColor(ImGuiCol_Button, {0, 0, 0, 0});
+		if (ImGui::Button(ICON_FA_GEAR, ImVec2{lineHeight, lineHeight}))
+		{
+			ImGui::OpenPopup("ComponentSettings");
+		}
+		ImGui::PopStyleColor();
+
+		bool removed = false;
+		if (ImGui::BeginPopup("ComponentSettings"))
+		{
+			if (ImGui::MenuItem("Remove Component"))
+			{
+				remover();
+				removed = true;
+			}
+
+			ImGui::EndPopup();
+		}
+
+		if (open)
+		{
+			if (!removed)
+			{
+				EditorGUI::BeginPropertyGrid();
+				contentDrawer();
+				EditorGUI::EndPropertyGrid();
+			}
+			ImGui::TreePop();
+			ImGui::Spacing();
+		}
+	}
+
+	void PropertyEditor::DrawEntityProperties(Chained::Entity entity)
+	{
+		auto& registry = entity.GetRegistry();
+		bool isUI = entity.HasComponent<ControlComponent>();
+
+		auto& compRegistry = ComponentRegistry::GetRegistry();
+
+		// 2. Draw components efficiently
+		for (auto [id, storage] : registry.storage())
+		{
+			if (storage.contains(entity) && compRegistry.contains(id))
+			{
+				auto& metadata = compRegistry.at(id);
+				if (!metadata.Visible)
+				{
+					continue;
+				}
+
+				// Logic to reduce clutter
+				if (isUI && id == entt::type_hash<TransformComponent>::value())
+				{
+					continue;
+				}
+
+				ImGui::PushID((int)id);
+				if (metadata.DrawUI)
+				{
+					metadata.DrawUI(entity);
+				}
+				else if (metadata.IsReflective && metadata.ReflectInternal)
+				{
+					DrawGenericReflection(metadata, entity);
+				}
+				ImGui::PopID();
+			}
+		}
+	}
+
+	void PropertyEditor::DrawEntityHeader(Chained::Entity entity)
+	{
+		if (entity.HasComponent<TagComponent>())
+		{
+			auto& tag = entity.GetComponent<TagComponent>().Tag;
+
+			// Entity Icon and Label
+			ImGui::BeginGroup();
+			ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
+			ImGui::TextColored({0.4f, 0.6f, 0.9f, 1.0f}, ICON_FA_CUBE " Entity");
+			ImGui::PopFont();
+
+			char buffer[256];
+			memset(buffer, 0, sizeof(buffer));
+			strncpy(buffer, tag.c_str(), sizeof(buffer) - 1);
+
+			ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - 120.0f);
+			if (ImGui::InputText("##Tag", buffer, sizeof(buffer)))
+			{
+				tag = std::string(buffer);
+			}
+			ImGui::PopItemWidth();
+
+			ImGui::SameLine();
+			if (ImGui::Button(ICON_FA_PLUS " Add Component", ImVec2(110, 0)))
+			{
+				ImGui::OpenPopup("AddComponent");
+			}
+
+			DrawAddComponentPopup(entity);
+			ImGui::EndGroup();
+
+			ImGui::Spacing();
+		}
+	}
+
+	void PropertyEditor::DrawAddComponentPopup(Entity entity)
+	{
+		if (ImGui::BeginPopup("AddComponent"))
+		{
+			bool isUIEntity = entity.HasComponent<ControlComponent>();
+			auto* scene = entity.GetRegistry().ctx().find<Scene*>();
+			bool is3DScene = scene && (*scene)->GetSettings().Mode == BackgroundMode::Environment3D;
+
+			// Group components by category
+			std::map<std::string, std::vector<const ComponentMetadata*>> categorized;
+
+			for (auto& [id, metadata] : ComponentRegistry::GetRegistry())
+			{
+				if (!metadata.AllowAdd)
+				{
+					continue;
+				}
+				if (metadata.IsWidget && !isUIEntity)
+				{
+					continue;
+				}
+				if (is3DScene && (metadata.IsWidget || id == entt::type_hash<ControlComponent>::value()))
+				{
+					continue;
+				}
+
+				auto& registry = entity.GetRegistry();
+				auto* storage = registry.storage(id);
+				if (storage && storage->contains(entity))
+				{
+					continue;
+				}
+
+				categorized[metadata.Category].push_back(&metadata);
+			}
+
+			// Render categorized menus
+			for (auto& [category, components] : categorized)
+			{
+				if (ImGui::BeginMenu(category.c_str()))
+				{
+					for (const auto* metadata : components)
+					{
+						std::string label = (metadata->Icon ? std::string(metadata->Icon) + " " : "") + metadata->Name;
+						if (ImGui::MenuItem(label.c_str()))
+						{
+							metadata->Add(entity);
+							ImGui::CloseCurrentPopup();
+						}
+					}
+					ImGui::EndMenu();
+				}
+			}
+
+			ImGui::EndPopup();
+		}
+	}
+} // namespace Chained
diff --git a/editor/panels/property_editor.h b/editor/panels/property_editor.h
index 3cf4e86e8..41682eb4b 100644
--- a/editor/panels/property_editor.h
+++ b/editor/panels/property_editor.h
@@ -3,59 +3,50 @@
 
 #include <functional>
 #include <string>
-#include <unordered_map>
 
+#include "engine/scene/component_registry.h"
 #include "engine/scene/entity.h"
 
-namespace CHEngine
+namespace Chained
 {
-class PropertyEditor
-{
-public:
-    struct ComponentMetadata
-    {
-        std::string Name;
-        const char* Icon = nullptr;
-        std::function<void(Entity)> Draw;
-        std::function<bool(Entity)> Add;
-        bool Visible = true;
-        bool AllowAdd = true;
-        bool IsWidget = false;
-    };
-
-    static void Init();
-
-    // Registry API
-    static void RegisterComponent(entt::id_type typeId, const ComponentMetadata& metadata);
-    static void DrawEntityProperties(Entity entity);
-    static void DrawAddComponentPopup(Entity entity);
-
-    // Automation: Register using Reflection
-    template <typename T> static void Register(const std::string& name, const char* icon = nullptr);
-
-    // Custom Drawer Registration
-    template <typename T>
-    static void RegisterCustom(const std::string& name, std::function<bool(T&, Entity)> drawer,
-                               const char* icon = nullptr);
-
-    static void DrawEntityHeader(CHEngine::Entity entity);
-
-private:
-    // Internal template helpers (Implementations moved to .cpp or a separate _impl.h if needed elsewhere)
-    template <typename T> static void DrawComponentReflection(const std::string& name, const char* icon, Entity entity);
-
-    template <typename T>
-    static void DrawComponentContainer(const std::string& name, const char* icon, Entity entity,
-                                       std::function<bool(T&, Entity)> drawer);
-
-    // Final non-template drawing core
-    static void DrawComponentInternal(entt::id_type typeId, const std::string& name, const char* icon, Entity entity,
-                                      std::function<bool()> contentDrawer, std::function<void()> remover);
-
-private:
-    static std::unordered_map<entt::id_type, ComponentMetadata> s_ComponentRegistry;
-};
-
-} // namespace CHEngine
+	class PropertyEditor
+	{
+	public:
+		static void Init();
+
+		// Registry API
+		static void DrawEntityProperties(Entity entity);
+		static void DrawAddComponentPopup(Entity entity);
+
+		// Automation: Register using Reflection
+		template <typename T> static void Register(const std::string& name, const char* icon = nullptr);
+
+		// Custom Drawer Registration
+		template <typename T, typename F>
+		static void RegisterCustom(const std::string& name, F&& drawer, const char* icon = nullptr);
+
+		static void DrawEntityHeader(Entity entity);
+
+	private:
+		// Shared registration logic
+		template <typename T>
+		static void RegisterComponentImpl(const std::string& name, const char* icon,
+										  std::function<void(Entity)> drawUI);
+
+		// Internal template helpers (Implementations moved to .cpp or a separate _impl.h if needed elsewhere)
+		template <typename T>
+		static void DrawComponentReflection(const std::string& name, const char* icon, Entity entity);
+		static void DrawGenericReflection(const ComponentMetadata& metadata, Entity entity);
+
+		template <typename T, typename F>
+		static void DrawComponentContainer(const std::string& name, const char* icon, Entity entity, F&& drawer);
+
+		// Final non-template drawing core
+		static void DrawComponentInternal(::entt::id_type typeId, const std::string& name, const char* icon,
+										  Entity entity, std::function<bool()> contentDrawer,
+										  std::function<void()> remover);
+	};
+
+} // namespace Chained
 
 #endif // CH_PROPERTY_EDITOR_H
diff --git a/editor/panels/scene_hierarchy_panel.cpp b/editor/panels/scene_hierarchy_panel.cpp
index b08039434..b4c36686a 100644
--- a/editor/panels/scene_hierarchy_panel.cpp
+++ b/editor/panels/scene_hierarchy_panel.cpp
@@ -1,542 +1,550 @@
 #include "scene_hierarchy_panel.h"
-#include "editor_layer.h"
-#include "engine/core/application.h"
+#include "editor/events.h"
+#include "editor/layer.h"
+#include "editor/types.h"
+#include "editor/undo/command_history.h"
+#include "engine/app/application.h"
+#include "engine/platform/dialogs/dialogs.h"
 #include "engine/scene/components.h"
 #include "engine/scene/scene_events.h"
 #include "engine/scene/scene_settings.h"
-#include "IconsFontAwesome6.h"
+#include "thirdparty/IconsFontAwesome6.h"
 
+#include "engine/core/input.h"
+#include "engine/core/platform.h"
+#include "engine/scene/prefab_serializer.h"
+#include "engine/scene/scene_serializer.h"
+#include "events.h"
 #include "imgui.h"
 #include "undo/entity_commands.h"
-#include "editor_events.h"
-#include "engine/core/input.h"
-#include <functional>
 #include <functional>
+#include <queue>
 #include <vector>
 
 namespace
 {
-    bool IsDescendant(CHEngine::Entity child, CHEngine::Entity possibleParent)
-    {
-        if (child == possibleParent) return true;
-        
-        if (!possibleParent.HasComponent<CHEngine::HierarchyComponent>()) return false;
-        
-        for (entt::entity c : possibleParent.GetComponent<CHEngine::HierarchyComponent>().Children)
-        {
-            if (IsDescendant(child, CHEngine::Entity(c, child.GetRegistryPtr()))) return true;
-        }
-        return false;
-    }
-}
-
-namespace CHEngine
-{
-SceneHierarchyPanel::SceneHierarchyPanel()
-{
-    m_Name = "Scene Hierarchy";
-}
-
-SceneHierarchyPanel::SceneHierarchyPanel(const std::shared_ptr<Scene>& context)
-{
-    m_Name = "Scene Hierarchy";
-    SetContext(context);
-}
-
-void SceneHierarchyPanel::OnImGuiRender(bool readOnly)
-{
-    ImGui::Begin("Scene Hierarchy");
-
-    // Search Bar
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{4, 4});
-    ImGui::InputTextWithHint("##Search", ICON_FA_MAGNIFYING_GLASS " Search...", m_SearchBuffer, sizeof(m_SearchBuffer));
-    ImGui::PopStyleVar();
-    ImGui::Separator();
-
-    if (m_Context)
-    {
-        m_DrawnEntities.clear();
-        m_EntitiesToDestroyPending.clear();
-
-        ImGui::BeginDisabled(readOnly);
-
-        std::string filter = m_SearchBuffer;
-        std::transform(filter.begin(), filter.end(), filter.begin(), ::tolower);
-
-        // Draw entities
-        auto view = m_Context->GetRegistry().view<IDComponent>();
-        for (auto entityID : view)
-        {
-            Entity entity(entityID, &m_Context->GetRegistry());
-
-            // Skip child entities, they will be drawn recursively
-            if (entity.HasComponent<HierarchyComponent>() &&
-                entity.GetComponent<HierarchyComponent>().Parent != entt::null)
-            {
-                continue;
-            }
-
-            // Skip hidden UI components
-            if (entity.HasComponent<ControlComponent>() && entity.GetComponent<ControlComponent>().HiddenInHierarchy)
-            {
-                continue;
-            }
-
-            // Apply search filter (if not empty)
-            if (!filter.empty())
-            {
-                std::string tag = entity.GetComponent<TagComponent>().Tag;
-                std::transform(tag.begin(), tag.end(), tag.begin(), ::tolower);
-                if (tag.find(filter) == std::string::npos)
-                {
-                    continue;
-                }
-            }
-
-            DrawEntityNodeRecursive(entity, readOnly);
-        }
-
-        if (ImGui::IsMouseDown(0) && ImGui::IsWindowHovered() && !ImGui::IsAnyItemHovered())
-        {
-            EntitySelectedEvent e(entt::null, m_Context.get());
-            Application::Get().OnEvent(e);
-        }
-
-        // Focus Shortcut
-        if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows) && Input::IsKeyPressed(Key::F))
-
-
-        {
-            Entity selected = EditorContext::GetSelectedEntity();
-            if (selected)
-            {
-                ViewportFocusEntityEvent e(selected);
-                Application::Get().OnEvent(e);
-            }
-        }
-
-        // Duplicate Shortcut
-        if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows) && Input::IsKeyDown(Key::LeftControl) &&
-            Input::IsKeyPressed(Key::D))
-
-
-        {
-            Entity selected = EditorContext::GetSelectedEntity();
-            if (selected)
-            {
-                EditorLayer::GetCommandHistory().PushCommand(std::make_unique<DuplicateEntityCommand>(selected));
-            }
-        }
-
-        // Blank space context menu
-        if (!readOnly && ImGui::BeginPopupContextWindow(0, ImGuiPopupFlags_MouseButtonRight | ImGuiPopupFlags_NoOpenOverItems))
-        {
-            DrawContextMenu();
-            ImGui::EndPopup();
-        }
-
-        // Blank space drop target to unparent
-        ImGui::Dummy(ImGui::GetContentRegionAvail());
-        if (!readOnly && ImGui::BeginDragDropTarget())
-        {
-            if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("ENTITY"))
-            {
-                uint64_t droppedUUID = *(const uint64_t*)payload->Data;
-                Entity sourceEntity = m_Context->GetEntityByUUID(droppedUUID);
-                if (sourceEntity)
-                {
-                    EditorLayer::GetCommandHistory().PushCommand(std::make_unique<ParentEntityCommand>(sourceEntity, Entity{}, m_Context.get()));
-                }
-            }
-            ImGui::EndDragDropTarget();
-        }
-
-        ImGui::EndDisabled();
-    }
-
-    ImGui::End();
-
-    if (!m_EntitiesToDestroyPending.empty())
-    {
-        for (auto ent : m_EntitiesToDestroyPending)
-        {
-            Entity entity(ent, &m_Context->GetRegistry());
-            if (entity.IsValid())
-            {
-                EditorLayer::GetCommandHistory().PushCommand(std::make_unique<DestroyEntityCommand>(entity));
-            }
-        }
-        m_EntitiesToDestroyPending.clear();
-    }
-}
-
-const char* SceneHierarchyPanel::GetEntityIcon(Entity entity)
-{
-    if (entity.HasComponent<ButtonControl>())
-    {
-        return ICON_FA_ARROW_POINTER;
-    }
-    if (entity.HasComponent<LabelControl>())
-    {
-        return ICON_FA_FONT;
-    }
-    if (entity.HasComponent<SliderControl>())
-    {
-        return ICON_FA_SLIDERS;
-    }
-    if (entity.HasComponent<CheckboxControl>())
-    {
-        return ICON_FA_SQUARE_CHECK;
-    }
-    if (entity.HasComponent<ImageControl>() || entity.HasComponent<ImageButtonControl>())
-    {
-        return ICON_FA_IMAGE;
-    }
-    if (entity.HasComponent<ControlComponent>())
-    {
-        return ICON_FA_SHAPES;
-    }
-    if (entity.HasComponent<LightComponent>())
-    {
-        return ICON_FA_LIGHTBULB;
-    }
-    if (entity.HasComponent<CameraComponent>())
-    {
-        return ICON_FA_VIDEO;
-    }
-    if (entity.HasComponent<AudioComponent>())
-    {
-        return ICON_FA_VOLUME_HIGH;
-    }
-    if (entity.HasComponent<ManagedScriptComponent>())
-    {
-        return ICON_FA_CODE;
-    }
-
-    return ICON_FA_CUBE;
-}
-
-void SceneHierarchyPanel::DrawEntityNodeRecursive(Entity entity, bool readOnly)
-{
-    if (!entity || !entity.IsValid() || m_DrawnEntities.contains(entity))
-    {
-        return;
-    }
-
-    m_DrawnEntities.insert(entity);
-
-    auto& tag = entity.GetComponent<TagComponent>().Tag;
-    std::string label = std::string(GetEntityIcon(entity)) + "  " + tag;
-
-    auto selectedEntity = EditorLayer::Get().GetSelectedEntity();
-    ImGuiTreeNodeFlags flags = ((selectedEntity == entity) ? ImGuiTreeNodeFlags_Selected : 0);
-    flags |= ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_SpanAvailWidth;
-
-    if (!entity.HasComponent<HierarchyComponent>() || entity.GetComponent<HierarchyComponent>().Children.empty())
-    {
-        flags |= ImGuiTreeNodeFlags_Leaf;
-    }
-
-    ImGui::PushID((int)(uint32_t)entity);
-
-    bool opened = false;
-    bool renamed = false;
-
-    if (m_Renaming && m_RenamingEntity == entity)
-    {
-        ImGui::SetKeyboardFocusHere();
-        if (ImGui::InputText("##Rename", m_RenameBuffer, sizeof(m_RenameBuffer), ImGuiInputTextFlags_EnterReturnsTrue) ||
-            (ImGui::IsMouseClicked(0) && !ImGui::IsItemHovered()))
-        {
-            tag = m_RenameBuffer;
-            m_Renaming = false;
-            renamed = true;
-        }
-    }
-    else
-    {
-        opened = ImGui::TreeNodeEx(label.c_str(), flags);
-    }
-
-    // Drag & Drop Source
-    if (!readOnly && ImGui::BeginDragDropSource())
-    {
-        uint64_t uuid = entity.GetUUID();
-        ImGui::SetDragDropPayload("ENTITY", &uuid, sizeof(uint64_t));
-        ImGui::Text("%s", label.c_str());
-        ImGui::EndDragDropSource();
-    }
-
-    // Drag & Drop Target
-    if (!readOnly && ImGui::BeginDragDropTarget())
-    {
-        if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("ENTITY"))
-        {
-            uint64_t droppedUUID = *(const uint64_t*)payload->Data;
-            Entity sourceEntity = m_Context->GetEntityByUUID(droppedUUID);
-            if (sourceEntity && sourceEntity != entity && !IsDescendant(entity, sourceEntity))
-            {
-                EditorLayer::GetCommandHistory().PushCommand(std::make_unique<ParentEntityCommand>(sourceEntity, entity, m_Context.get()));
-            }
-        }
-        ImGui::EndDragDropTarget();
-    }
-
-    if (ImGui::IsItemClicked())
-    {
-        EntitySelectedEvent e(entity, m_Context.get());
-        Application::Get().OnEvent(e);
-    }
-
-    // Rename on F2
-    if (selectedEntity == entity && ImGui::IsKeyPressed(ImGuiKey_F2) && !m_Renaming)
-    {
-        m_Renaming = true;
-        m_RenamingEntity = entity;
-        strncpy(m_RenameBuffer, tag.c_str(), sizeof(m_RenameBuffer));
-    }
-
-    if (!readOnly && ImGui::BeginPopupContextItem())
-    {
-        if (ImGui::MenuItem(ICON_FA_PEN " Rename", "F2"))
-        {
-            m_Renaming = true;
-            m_RenamingEntity = entity;
-            strncpy(m_RenameBuffer, tag.c_str(), sizeof(m_RenameBuffer));
-        }
-        if (ImGui::MenuItem(ICON_FA_COPY " Duplicate", "Ctrl+D"))
-        {
-            EditorLayer::GetCommandHistory().PushCommand(std::make_unique<DuplicateEntityCommand>(entity));
-        }
-        ImGui::Separator();
-        if (ImGui::MenuItem(ICON_FA_TRASH " Delete Entity", "Del"))
-        {
-            m_EntitiesToDestroyPending.push_back((entt::entity)entity);
-        }
-
-        ImGui::EndPopup();
-    }
-
-    if (opened)
-    {
-        if (entity.HasComponent<HierarchyComponent>())
-        {
-            auto children = entity.GetComponent<HierarchyComponent>().Children; // Copy to avoid iteration issues
-            for (auto childID : children)
-            {
-                DrawEntityNodeRecursive(Entity(childID, &m_Context->GetRegistry()), readOnly);
-            }
-        }
-        ImGui::TreePop();
-    }
-    ImGui::PopID();
-}
-
-void SceneHierarchyPanel::DrawContextMenu()
+	bool IsDescendant(Chained::Entity child, Chained::Entity possibleParent)
+	{
+		if (child == possibleParent)
+		{
+			return true;
+		}
+
+		if (!possibleParent.HasComponent<Chained::HierarchyComponent>())
+		{
+			return false;
+		}
+
+		std::queue<entt::entity> queue;
+		for (entt::entity c : possibleParent.GetComponent<Chained::HierarchyComponent>().Children)
+		{
+			queue.push(c);
+		}
+
+		while (!queue.empty())
+		{
+			entt::entity current = queue.front();
+			queue.pop();
+
+			Chained::Entity currentEnt(current, child.GetRegistryPtr());
+			if (currentEnt == child)
+			{
+				return true;
+			}
+
+			if (currentEnt.HasComponent<Chained::HierarchyComponent>())
+			{
+				for (entt::entity c : currentEnt.GetComponent<Chained::HierarchyComponent>().Children)
+				{
+					queue.push(c);
+				}
+			}
+		}
+		return false;
+	}
+} // namespace
+
+namespace Chained
 {
-    if (ImGui::MenuItem("Create Empty Entity"))
-    {
-        m_Context->CreateEntity("Empty Entity");
-    }
-
-    if (ImGui::BeginMenu("Create"))
-    {
-        if (ImGui::MenuItem("Static Box Collider"))
-        {
-            auto entity = m_Context->CreateEntity("Static Collider");
-            auto& collider = entity.AddComponent<ColliderComponent>();
-            collider.Type = ColliderType::Box;
-            collider.AutoCalculate = false;
-            collider.Size = {1.0f, 1.0f, 1.0f};
-            collider.Offset = {0.0f, 0.0f, 0.0f};
-        }
-        ImGui::EndMenu();
-    }
-
-    if (ImGui::MenuItem("Camera"))
-    {
-        auto entity = m_Context->CreateEntity("Camera");
-        entity.AddComponent<CameraComponent>();
-    }
-
-    if (ImGui::MenuItem("Point Light"))
-    {
-        auto entity = m_Context->CreateEntity("Point Light");
-        auto& light = entity.AddComponent<LightComponent>();
-        light.Type = LightType::Point;
-    }
-
-    if (ImGui::MenuItem("Spot Light"))
-    {
-        auto entity = m_Context->CreateEntity("Spot Light");
-        auto& light = entity.AddComponent<LightComponent>();
-        light.Type = LightType::Spot;
-    }
-
-    if (ImGui::MenuItem("Directional Light"))
-    {
-        auto entity = m_Context->CreateEntity("Directional Light");
-        auto& light = entity.AddComponent<LightComponent>();
-        light.Type = LightType::Directional;
-    }
-
-    if (ImGui::MenuItem("Spawn Zone"))
-    {
-        m_Context->CreateEntity("Spawn Zone").AddComponent<SpawnComponent>();
-    }
-
-    if (ImGui::BeginMenu("3D Object"))
-    {
-        auto create = [this](const char* name, const char* mesh) {
-            EditorLayer::GetCommandHistory().PushCommand(
-                std::make_unique<CreateEntityCommand>(m_Context.get(), name, mesh));
-        };
-        if (ImGui::MenuItem("Cube"))
-        {
-            create("Cube", ":cube:");
-        }
-        if (ImGui::MenuItem("Sphere"))
-        {
-            create("Sphere", ":sphere:");
-        }
-        if (ImGui::MenuItem("Cylinder"))
-        {
-            create("Cylinder", ":cylinder:");
-        }
-        if (ImGui::MenuItem("Cone"))
-        {
-            create("Cone", ":cone:");
-        }
-        if (ImGui::MenuItem("Torus"))
-        {
-            create("Torus", ":torus:");
-        }
-        if (ImGui::MenuItem("Knot"))
-        {
-            create("Knot", ":knot:");
-        }
-        if (ImGui::MenuItem("Plane"))
-        {
-            create("Plane", ":plane:");
-        }
-        ImGui::EndMenu();
-    }
-
-    if (m_Context->GetSettings().Mode != BackgroundMode::Environment3D)
-    {
-        if (ImGui::BeginMenu("Control"))
-        {
-        if (ImGui::BeginMenu("Basic"))
-        {
-            if (ImGui::MenuItem("Panel"))
-            {
-                m_Context->CreateUIEntity("Panel");
-            }
-            if (ImGui::MenuItem("Button"))
-            {
-                m_Context->CreateUIEntity("Button");
-            }
-            if (ImGui::MenuItem("Label"))
-            {
-                m_Context->CreateUIEntity("Label");
-            }
-            if (ImGui::MenuItem("Slider"))
-            {
-                m_Context->CreateUIEntity("Slider");
-            }
-            if (ImGui::MenuItem("Checkbox"))
-            {
-                m_Context->CreateUIEntity("CheckBox");
-            }
-            if (ImGui::MenuItem("InputText"))
-            {
-                m_Context->CreateUIEntity("InputText");
-            }
-            if (ImGui::MenuItem("ComboBox"))
-            {
-                m_Context->CreateUIEntity("ComboBox");
-            }
-            if (ImGui::MenuItem("ProgressBar"))
-            {
-                m_Context->CreateUIEntity("ProgressBar");
-            }
-            ImGui::EndMenu();
-        }
-
-        if (ImGui::BeginMenu("Visual"))
-        {
-            if (ImGui::MenuItem("Image"))
-            {
-                m_Context->CreateUIEntity("Image");
-            }
-            if (ImGui::MenuItem("Image Button"))
-            {
-                m_Context->CreateUIEntity("ImageButton");
-            }
-            if (ImGui::MenuItem("Separator"))
-            {
-                m_Context->CreateUIEntity("Separator");
-            }
-            ImGui::EndMenu();
-        }
-
-        if (ImGui::BeginMenu("Input"))
-        {
-            if (ImGui::MenuItem("RadioButton"))
-            {
-                m_Context->CreateUIEntity("RadioButton");
-            }
-            if (ImGui::MenuItem("ColorPicker"))
-            {
-                m_Context->CreateUIEntity("ColorPicker");
-            }
-            if (ImGui::MenuItem("Drag Float"))
-            {
-                m_Context->CreateUIEntity("DragFloat");
-            }
-            if (ImGui::MenuItem("Drag Int"))
-            {
-                m_Context->CreateUIEntity("DragInt");
-            }
-            ImGui::EndMenu();
-        }
-
-        if (ImGui::BeginMenu("Structural"))
-        {
-            if (ImGui::MenuItem("Tree Node"))
-            {
-                m_Context->CreateUIEntity("TreeNode");
-            }
-            if (ImGui::MenuItem("Tab Bar"))
-            {
-                m_Context->CreateUIEntity("TabBar");
-            }
-            if (ImGui::MenuItem("Tab Item"))
-            {
-                m_Context->CreateUIEntity("TabItem");
-            }
-            if (ImGui::MenuItem("Collapsing Header"))
-            {
-                m_Context->CreateUIEntity("CollapsingHeader");
-            }
-            ImGui::EndMenu();
-        }
-
-        if (ImGui::BeginMenu("Charts"))
-        {
-            if (ImGui::MenuItem("Plot Lines"))
-            {
-                m_Context->CreateUIEntity("PlotLines");
-            }
-            if (ImGui::MenuItem("Plot Histogram"))
-            {
-                m_Context->CreateUIEntity("PlotHistogram");
-            }
-            ImGui::EndMenu();
-        }
-
-            ImGui::EndMenu();
-        }
-    }
-}
-} // namespace CHEngine
+	SceneHierarchyPanel::SceneHierarchyPanel()
+	{
+		m_Name = "Scene Hierarchy";
+	}
+
+	void SceneHierarchyPanel::OnImGuiRender(bool readOnly)
+	{
+		ImGui::Begin("Scene Hierarchy###SceneHierarchyPanel");
+
+		// Search Bar
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{4, 4});
+		ImGui::InputTextWithHint("##Search", ICON_FA_MAGNIFYING_GLASS " Search...", m_SearchBuffer,
+								 sizeof(m_SearchBuffer));
+		ImGui::PopStyleVar();
+		ImGui::Separator();
+
+		if (m_Context)
+		{
+			m_DrawnEntities.clear();
+			m_EntitiesToDestroyPending.clear();
+
+			bool isTransitioning = EditorLayer::Get().GetSceneManager().IsTransitioning();
+			ImGui::BeginDisabled(readOnly || isTransitioning);
+
+			std::string filter = m_SearchBuffer;
+			std::transform(filter.begin(), filter.end(), filter.begin(), ::tolower);
+
+			// Draw entities
+			auto view = m_Context->GetRegistry().view<IDComponent>();
+			for (auto entityID : view)
+			{
+				Entity entity(entityID, &m_Context->GetRegistry());
+
+				// Skip child entities, they will be drawn recursively
+				if (entity.HasComponent<HierarchyComponent>() &&
+					entity.GetComponent<HierarchyComponent>().Parent != entt::null)
+				{
+					continue;
+				}
+
+				// Skip hidden UI components
+				if (entity.HasComponent<ControlComponent>() &&
+					entity.GetComponent<ControlComponent>().HiddenInHierarchy)
+				{
+					continue;
+				}
+
+				// Apply search filter (if not empty)
+				if (!filter.empty())
+				{
+					std::string tag = entity.GetComponent<TagComponent>().Tag;
+					std::transform(tag.begin(), tag.end(), tag.begin(), ::tolower);
+					if (tag.find(filter) == std::string::npos)
+					{
+						continue;
+					}
+				}
+
+				DrawEntityNodeRecursive(entity, readOnly);
+			}
+
+			if (ImGui::IsMouseDown(0) && ImGui::IsWindowHovered() && !ImGui::IsAnyItemHovered())
+			{
+				DeselectEntity(m_Context.get());
+			}
+
+			// Focus Shortcut
+			if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows) && Core::Input::IsKeyPressed(KeyCode::F))
+			{
+				Entity selected = EditorLayer::Get().GetEditorState().SelectedEntity;
+				if (selected)
+				{
+					ViewportFocusEntityEvent e(selected);
+					Application::Get().OnEvent(e);
+				}
+			}
+
+			// Duplicate Shortcut
+			if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows) &&
+				Core::Input::IsKeyDown(KeyCode::LeftControl) && Core::Input::IsKeyPressed(KeyCode::D))
+			{
+				Entity selected = EditorLayer::Get().GetEditorState().SelectedEntity;
+				if (selected)
+				{
+					EditorLayer::Get().GetCommandHistory().PushCommand(
+						std::make_unique<DuplicateEntityCommand>(selected));
+				}
+			}
+
+			// Blank space context menu
+			if (!readOnly &&
+				ImGui::BeginPopupContextWindow(0, ImGuiPopupFlags_MouseButtonRight | ImGuiPopupFlags_NoOpenOverItems))
+			{
+				DrawContextMenu();
+				ImGui::EndPopup();
+			}
+
+			// Blank space drop target to unparent
+			ImGui::Dummy(ImGui::GetContentRegionAvail());
+			if (!readOnly && ImGui::BeginDragDropTarget())
+			{
+				if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("ENTITY"))
+				{
+					uint64_t droppedUUID = *(const uint64_t*)payload->Data;
+					Entity sourceEntity = m_Context->GetEntityByUUID(droppedUUID);
+					if (sourceEntity)
+					{
+						EditorLayer::Get().GetCommandHistory().PushCommand(
+							std::make_unique<ParentEntityCommand>(sourceEntity, Entity{}, m_Context.get()));
+					}
+				}
+				ImGui::EndDragDropTarget();
+			}
+
+			ImGui::EndDisabled();
+		}
+
+		ImGui::End();
+
+		if (!m_EntitiesToDestroyPending.empty())
+		{
+			for (auto ent : m_EntitiesToDestroyPending)
+			{
+				Entity entity(ent, &m_Context->GetRegistry());
+				if (entity.IsValid())
+				{
+					EditorLayer::Get().GetCommandHistory().PushCommand(std::make_unique<DestroyEntityCommand>(entity));
+				}
+			}
+			m_EntitiesToDestroyPending.clear();
+		}
+	}
+
+	const char* SceneHierarchyPanel::GetEntityIcon(Entity entity)
+	{
+		// Priority 1: UIControlComponent — detect widget subtype
+		if (entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ButtonData>(widget.Data))
+			{
+				return ICON_FA_ARROW_POINTER;
+			}
+			if (std::holds_alternative<LabelData>(widget.Data))
+			{
+				return ICON_FA_FONT;
+			}
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				return ICON_FA_SLIDERS;
+			}
+			if (std::holds_alternative<CheckboxData>(widget.Data))
+			{
+				return ICON_FA_SQUARE_CHECK;
+			}
+			if (std::holds_alternative<ImageData>(widget.Data) || std::holds_alternative<ImageButtonData>(widget.Data))
+			{
+				return ICON_FA_IMAGE;
+			}
+			return ICON_FA_WINDOW_MAXIMIZE;
+		}
+
+		// Priority 2+: Use ComponentRegistry icon lookup
+		auto& registry = entity.GetRegistry();
+		auto& compRegistry = ComponentRegistry::GetRegistry();
+
+		// Check components in a fixed priority order for consistent icon display
+		static const entt::id_type priorityOrder[] = {
+			entt::type_hash<ControlComponent>::value(),		  entt::type_hash<LightComponent>::value(),
+			entt::type_hash<CameraComponent>::value(),		  entt::type_hash<AudioComponent>::value(),
+			entt::type_hash<ManagedScriptComponent>::value(), entt::type_hash<ModelComponent>::value(),
+			entt::type_hash<PrimitiveComponent>::value(),	  entt::type_hash<RigidBodyComponent>::value(),
+			entt::type_hash<ColliderComponent>::value(),	  entt::type_hash<AnimationComponent>::value(),
+		};
+
+		for (auto typeId : priorityOrder)
+		{
+			if (compRegistry.contains(typeId))
+			{
+				auto& meta = compRegistry.at(typeId);
+				if (meta.Icon && meta.Has && meta.Has(entity))
+				{
+					return meta.Icon;
+				}
+			}
+		}
+
+		return ICON_FA_CUBE;
+	}
+
+	void SceneHierarchyPanel::DrawEntityNodeRecursive(Entity entity, bool readOnly)
+	{
+		if (!entity || !entity.IsValid() || m_DrawnEntities.contains(entity))
+		{
+			return;
+		}
+
+		m_DrawnEntities.insert(entity);
+
+		auto& tag = entity.GetComponent<TagComponent>().Tag;
+		std::string label = std::string(GetEntityIcon(entity)) + "  " + tag;
+
+		auto selectedEntity = EditorLayer::Get().GetEditorState().SelectedEntity;
+		ImGuiTreeNodeFlags flags = ((selectedEntity == entity) ? ImGuiTreeNodeFlags_Selected : 0);
+		flags |= ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_SpanAvailWidth;
+
+		if (!entity.HasComponent<HierarchyComponent>() || entity.GetComponent<HierarchyComponent>().Children.empty())
+		{
+			flags |= ImGuiTreeNodeFlags_Leaf;
+		}
+
+		ImGui::PushID((int)(uint32_t)entity);
+
+		bool opened = false;
+		bool renamed = false;
+
+		if (m_Renaming && m_RenamingEntity == entity)
+		{
+			ImGui::SetKeyboardFocusHere();
+			if (ImGui::InputText("##Rename", m_RenameBuffer, sizeof(m_RenameBuffer),
+								 ImGuiInputTextFlags_EnterReturnsTrue) ||
+				(ImGui::IsMouseClicked(0) && !ImGui::IsItemHovered()))
+			{
+				tag = m_RenameBuffer;
+				m_Renaming = false;
+				renamed = true;
+			}
+		}
+		else
+		{
+			opened = ImGui::TreeNodeEx(label.c_str(), flags);
+		}
+
+		// Drag & Drop Source
+		if (!readOnly && ImGui::BeginDragDropSource())
+		{
+			uint64_t uuid = entity.GetUUID();
+			ImGui::SetDragDropPayload("ENTITY", &uuid, sizeof(uint64_t));
+			ImGui::Text("%s", label.c_str());
+			ImGui::EndDragDropSource();
+		}
+
+		// Drag & Drop Target
+		if (!readOnly && ImGui::BeginDragDropTarget())
+		{
+			if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("ENTITY"))
+			{
+				uint64_t droppedUUID = *(const uint64_t*)payload->Data;
+				Entity sourceEntity = m_Context->GetEntityByUUID(droppedUUID);
+				if (sourceEntity && sourceEntity != entity && !IsDescendant(entity, sourceEntity))
+				{
+					EditorLayer::Get().GetCommandHistory().PushCommand(
+						std::make_unique<ParentEntityCommand>(sourceEntity, entity, m_Context.get()));
+				}
+			}
+			ImGui::EndDragDropTarget();
+		}
+
+		if (ImGui::IsItemClicked())
+		{
+			SelectEntity(entity, m_Context.get());
+		}
+
+		// Rename on F2
+		if (selectedEntity == entity && ImGui::IsKeyPressed(ImGuiKey_F2) && !m_Renaming)
+		{
+			StartRename(entity);
+		}
+
+		if (!readOnly && ImGui::BeginPopupContextItem())
+		{
+			if (ImGui::MenuItem(ICON_FA_PEN " Rename", "F2"))
+			{
+				StartRename(entity);
+			}
+			if (ImGui::MenuItem(ICON_FA_COPY " Duplicate", "Ctrl+D"))
+			{
+				EditorLayer::Get().GetCommandHistory().PushCommand(std::make_unique<DuplicateEntityCommand>(entity));
+			}
+			ImGui::Separator();
+			if (ImGui::MenuItem(ICON_FA_TRASH " Delete Entity", "Del"))
+			{
+				m_EntitiesToDestroyPending.push_back((entt::entity)entity);
+			}
+			ImGui::Separator();
+			if (ImGui::MenuItem(ICON_FA_FILE_EXPORT " Save as Prefab..."))
+			{
+				std::vector<DialogFilter> filters = {{"Chained Prefab", "chprefab"}};
+				auto path = Chained::Dialogs::SaveFile(filters);
+				if (path)
+				{
+					if (path->extension().empty())
+					{
+						path->replace_extension(".chprefab");
+					}
+					PrefabSerializer::Serialize(entity, path->string());
+				}
+			}
+
+			ImGui::EndPopup();
+		}
+
+		if (opened)
+		{
+			if (entity.HasComponent<HierarchyComponent>())
+			{
+				auto children = entity.GetComponent<HierarchyComponent>().Children; // Copy to avoid iteration issues
+				for (auto childID : children)
+				{
+					DrawEntityNodeRecursive(Entity(childID, &m_Context->GetRegistry()), readOnly);
+				}
+			}
+			ImGui::TreePop();
+		}
+		ImGui::PopID();
+	}
+
+	void SceneHierarchyPanel::DrawContextMenu()
+	{
+		if (ImGui::MenuItem("Create Empty Entity"))
+		{
+			m_Context->CreateEntity("Empty Entity");
+		}
+
+		if (ImGui::MenuItem(ICON_FA_FILE_IMPORT " Load Prefab..."))
+		{
+			std::vector<DialogFilter> filters = {{"Chained Prefab", "chprefab"}};
+			auto path = Chained::Dialogs::OpenFile(filters);
+			if (path)
+			{
+				PrefabSerializer::Deserialize(m_Context.get(), path->string());
+			}
+		}
+
+		ImGui::Separator();
+
+		// --- Quick Create: Lights & Camera ---
+		if (m_Context->GetSettings().Type != SceneType::UI)
+		{
+			struct QuickCreateEntry
+			{
+				const char* label;
+				const char* icon;
+				std::function<void()> action;
+			};
+			static const QuickCreateEntry quickCreates[] = {
+				{"Camera", ICON_FA_VIDEO,
+				 [this]() {
+					 auto e = m_Context->CreateEntity("Camera");
+					 e.AddComponent<CameraComponent>();
+				 }},
+				{"Point Light", ICON_FA_LIGHTBULB,
+				 [this]() {
+					 auto e = m_Context->CreateEntity("Point Light");
+					 e.AddComponent<LightComponent>().Type = LightType::Point;
+				 }},
+				{"Spot Light", ICON_FA_LIGHTBULB,
+				 [this]() {
+					 auto e = m_Context->CreateEntity("Spot Light");
+					 e.AddComponent<LightComponent>().Type = LightType::Spot;
+				 }},
+				{"Directional Light", ICON_FA_LIGHTBULB,
+				 [this]() {
+					 auto e = m_Context->CreateEntity("Directional Light");
+					 e.AddComponent<LightComponent>().Type = LightType::Directional;
+				 }},
+			};
+			for (auto& entry : quickCreates)
+			{
+				std::string label = entry.icon ? std::string(entry.icon) + " " + entry.label : entry.label;
+				if (ImGui::MenuItem(label.c_str()))
+				{
+					entry.action();
+				}
+			}
+
+			ImGui::Separator();
+
+			// --- 3D Object Submenu ---
+			struct PrimitiveEntry
+			{
+				const char* label;
+				const char* mesh;
+			};
+			static const PrimitiveEntry primitives[] = {
+				{"Cube", ":cube:"},	  {"Sphere", ":sphere:"}, {"Cylinder", ":cylinder:"}, {"Cone", ":cone:"},
+				{"Torus", ":torus:"}, {"Knot", ":knot:"},	  {"Plane", ":plane:"},
+			};
+			if (ImGui::BeginMenu("3D Object"))
+			{
+				for (auto& p : primitives)
+				{
+					if (ImGui::MenuItem(p.label))
+					{
+						EditorLayer::Get().GetCommandHistory().PushCommand(
+							std::make_unique<CreateEntityCommand>(m_Context.get(), p.label, p.mesh));
+					}
+				}
+				ImGui::EndMenu();
+			}
+		}
+
+		// --- UI Widget Submenus ---
+		if (m_Context->GetSettings().Type == SceneType::UI ||
+			m_Context->GetSettings().Mode != BackgroundMode::Environment3D)
+		{
+			struct WidgetEntry
+			{
+				const char* label;
+				WidgetType type;
+			};
+			struct WidgetCategory
+			{
+				const char* label;
+				const WidgetEntry* entries;
+				int count;
+			};
+
+			static const WidgetEntry basicWidgets[] = {
+				{"Panel", WidgetType_Panel},	   {"Button", WidgetType_Button},
+				{"Label", WidgetType_Label},	   {"Slider", WidgetType_Slider},
+				{"Checkbox", WidgetType_Checkbox}, {"InputText", WidgetType_InputText},
+				{"ComboBox", WidgetType_ComboBox}, {"ProgressBar", WidgetType_ProgressBar},
+			};
+			static const WidgetEntry visualWidgets[] = {
+				{"Image", WidgetType_Image},
+				{"Image Button", WidgetType_ImageButton},
+				{"Separator", WidgetType_Separator},
+			};
+			static const WidgetEntry inputWidgets[] = {
+				{"RadioButton", WidgetType_RadioButton},
+				{"ColorPicker", WidgetType_ColorPicker},
+				{"Drag Float", WidgetType_DragFloat},
+				{"Drag Int", WidgetType_DragInt},
+			};
+			static const WidgetEntry structuralWidgets[] = {
+				{"Tree Node", WidgetType_TreeNode},
+				{"Tab Bar", WidgetType_TabBar},
+				{"Tab Item", WidgetType_TabItem},
+				{"Collapsing Header", WidgetType_CollapsingHeader},
+			};
+			static const WidgetEntry chartWidgets[] = {
+				{"Plot Lines", WidgetType_PlotLines},
+				{"Plot Histogram", WidgetType_PlotHistogram},
+			};
+
+			static const WidgetCategory widgetCategories[] = {
+				{"Basic", basicWidgets, (int)std::size(basicWidgets)},
+				{"Visual", visualWidgets, (int)std::size(visualWidgets)},
+				{"Input", inputWidgets, (int)std::size(inputWidgets)},
+				{"Structural", structuralWidgets, (int)std::size(structuralWidgets)},
+				{"Charts", chartWidgets, (int)std::size(chartWidgets)},
+			};
+
+			if (ImGui::BeginMenu("Control"))
+			{
+				for (auto& cat : widgetCategories)
+				{
+					if (ImGui::BeginMenu(cat.label))
+					{
+						for (int i = 0; i < cat.count; ++i)
+						{
+							if (ImGui::MenuItem(cat.entries[i].label))
+							{
+								m_Context->CreateUIEntity(cat.entries[i].type);
+							}
+						}
+						ImGui::EndMenu();
+					}
+				}
+				ImGui::EndMenu();
+			}
+		}
+	}
+	void SceneHierarchyPanel::StartRename(Entity entity)
+	{
+		m_Renaming = true;
+		m_RenamingEntity = entity;
+		snprintf(m_RenameBuffer, sizeof(m_RenameBuffer), "%s", entity.GetComponent<TagComponent>().Tag.c_str());
+	}
+
+} // namespace Chained
diff --git a/editor/panels/scene_hierarchy_panel.h b/editor/panels/scene_hierarchy_panel.h
index 6b18f3f13..ecbc8fd1d 100644
--- a/editor/panels/scene_hierarchy_panel.h
+++ b/editor/panels/scene_hierarchy_panel.h
@@ -4,32 +4,35 @@
 #include "panel.h"
 #include "unordered_set"
 
-namespace CHEngine
+namespace Chained
 {
-class SceneHierarchyPanel : public Panel
-{
-public:
-    SceneHierarchyPanel();
-    SceneHierarchyPanel(const std::shared_ptr<Scene>& context);
 
-    virtual void OnImGuiRender(bool readOnly = false) override;
+	class CommandHistory;
+	struct EditorState;
+
+	class SceneHierarchyPanel : public Panel
+	{
+	public:
+		SceneHierarchyPanel();
+
+		virtual void OnImGuiRender(bool readOnly = false) override;
 
-private:
-    void DrawEntityNodeRecursive(Entity entity, bool readOnly);
-    void DrawComponents(Entity entity);
-    void DrawContextMenu();
-    const char* GetEntityIcon(Entity entity);
+	private:
+		void DrawEntityNodeRecursive(Entity entity, bool readOnly);
+		void DrawContextMenu();
+		const char* GetEntityIcon(Entity entity);
+		void StartRename(Entity entity);
 
-private:
-    std::unordered_set<entt::entity> m_DrawnEntities;
-    std::vector<entt::entity> m_EntitiesToDestroyPending;
+	private:
+		std::unordered_set<entt::entity> m_DrawnEntities;
+		std::vector<entt::entity> m_EntitiesToDestroyPending;
 
-    char m_SearchBuffer[128] = {0};
-    bool m_Renaming = false;
-    char m_RenameBuffer[128] = {0};
-    Entity m_RenamingEntity;
-};
+		char m_SearchBuffer[128] = {0};
+		bool m_Renaming = false;
+		char m_RenameBuffer[128] = {0};
+		Entity m_RenamingEntity;
+	};
 
-} // namespace CHEngine
+} // namespace Chained
 
 #endif // CH_SCENE_HIERARCHY_PANEL_H
diff --git a/editor/panels/viewport_panel.cpp b/editor/panels/viewport_panel.cpp
index 242de8d5a..20a8347d9 100644
--- a/editor/panels/viewport_panel.cpp
+++ b/editor/panels/viewport_panel.cpp
@@ -1,648 +1,1153 @@
 #include "viewport_panel.h"
-
-#include "IconsFontAwesome6.h"
-#include "editor/editor_layer.h"
+#include "editor/asset_types.h"
+#include "editor/editor_colors.h"
+#include "editor/layer.h"
+#include "editor/scene_picking.h"
 #include "editor/viewport/ui_manipulator.h"
-#include "editor_events.h"
-#include "editor_gui.h"
-#include "editor_layer.h"
-#include "editor_layout.h"
-#include "engine/core/application.h"
-#include "engine/core/events.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/events/events.h"
 #include "engine/core/input.h"
-#include "engine/graphics/pipeline/render_command.h"
+#include "engine/core/key_codes.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/api/framebuffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/pipeline/debug_renderer.h"
 #include "engine/graphics/pipeline/renderer.h"
 #include "engine/graphics/pipeline/scene_renderer.h"
-#include "engine/graphics/pipeline/ui_renderer.h"
-#include "engine/scene/components.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/project/project.h"
 #include "engine/scene/prefab_serializer.h"
-#include "engine/scene/project.h"
 #include "engine/scene/scene.h"
 #include "engine/scene/scene_events.h"
-#include "engine/scene/scene_picking.h"
+#include "events.h"
 #include "imgui.h"
 #include "imgui_internal.h"
-#include "scripting/scriptengine.h"
+#include "engine/scripting/scriptengine.h"
+#include "thirdparty/IconsFontAwesome6.h"
 #include "undo/entity_commands.h"
+#include <GLFW/glfw3.h>
+#include <glad/gl.h>
+#include <limits>
 
-namespace CHEngine
-{
-void ViewportPanel::ClearSceneBackground(Scene* scene)
-{
-    auto mode = scene->GetSettings().Mode;
-    if (mode == BackgroundMode::Color)
-    {
-        RenderCommand::Clear(scene->GetSettings().BackgroundColor);
-    }
-    else if (mode == BackgroundMode::Texture)
-    {
-        auto& path = scene->GetSettings().BackgroundTexturePath;
-        if (!path.empty())
-        {
-            // Fallback for now
-            RenderCommand::Clear(scene->GetSettings().BackgroundColor);
-        }
-    }
-    else if (mode == BackgroundMode::Environment3D)
-    {
-        RenderCommand::Clear({0, 0, 0, 255});
-    }
-}
-
-static const GizmoBtn s_GizmoBtns[] = {
-    {GizmoType::NONE, ICON_FA_ARROW_POINTER "##Select", "Select (Q)", Key::Q},
-    {GizmoType::TRANSLATE, ICON_FA_UP_DOWN_LEFT_RIGHT "##Translate", "Translate (W)", Key::W},
-    {GizmoType::ROTATE, ICON_FA_ARROWS_ROTATE "##Rotate", "Rotate (E)", Key::E},
-    {GizmoType::SCALE, ICON_FA_UP_RIGHT_FROM_SQUARE "##Scale", "Scale (R)", Key::R}};
-
-void ViewportPanel::DrawCameraSelector(Scene* scene)
-{
-    if (!scene)
-    {
-        return;
-    }
-
-    ImGui::PushStyleColor(ImGuiCol_Button, {0.1f, 0.1f, 0.12f, 0.0f});
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 4.0f);
-
-    auto view = scene->GetRegistry().view<CameraComponent>();
-    Entity primaryCam = scene->GetPrimaryCameraEntity();
-    std::string currentLabel = primaryCam ? primaryCam.GetComponent<TagComponent>().Tag : "No Camera";
-
-    ImGui::SetNextItemWidth(150);
-    if (ImGui::BeginCombo("##CameraSelector", (ICON_FA_VIDEO "  " + currentLabel).c_str(), ImGuiComboFlags_None))
-    {
-        for (auto entityHandle : view)
-        {
-            Entity entity(entityHandle, &scene->GetRegistry());
-            bool isSelected = (entity == primaryCam);
-            std::string tag = entity.GetComponent<TagComponent>().Tag;
-
-            if (ImGui::Selectable(tag.c_str(), isSelected))
-            {
-                // Unset all and set this one as primary
-                for (auto otherHandle : view)
-                {
-                    scene->GetRegistry().get<CameraComponent>(otherHandle).Primary = false;
-                }
-                entity.GetComponent<CameraComponent>().Primary = true;
-            }
-
-            if (isSelected)
-            {
-                ImGui::SetItemDefaultFocus();
-            }
-        }
-        ImGui::EndCombo();
-    }
-
-    ImGui::PopStyleVar();
-    ImGui::PopStyleColor();
-}
-
-void ViewportPanel::DrawGizmoButtons()
-{
-    ImGui::PushStyleColor(ImGuiCol_Button, {0.1f, 0.1f, 0.1f, 0.0f}); // Transparent buttons in toolbar
-
-    for (const auto& btn : s_GizmoBtns)
-    {
-        bool selected = (m_CurrentTool == btn.type);
-        if (selected)
-        {
-            ImGui::PushStyleColor(ImGuiCol_Button, {0.9f, 0.45f, 0.0f, 1.0f});
-        }
-
-        if (ImGui::Button(btn.icon, {28, 28}))
-        {
-            m_CurrentTool = btn.type;
-        }
-        if (ImGui::IsItemHovered())
-        {
-            ImGui::SetTooltip("%s", btn.tooltip);
-        }
-
-        if (selected)
-        {
-            ImGui::PopStyleColor();
-        }
-        ImGui::SameLine(0, 5);
-    }
-
-    ImGui::PopStyleColor();
-}
-
-ViewportPanel::ViewportPanel()
-{
-    m_Name = "Viewport";
-
-    FramebufferSpecification spec;
-    spec.Width = 1280;
-    spec.Height = 720;
-    spec.ColorFormat = FramebufferColorFormat::RGBA8;
-
-    if (Application::Get().GetWindow().GetNativeWindow())
-    {
-        spec.Width = Application::Get().GetWindow().GetWidth() > 0 ? Application::Get().GetWindow().GetWidth() : 1280;
-        spec.Height = Application::Get().GetWindow().GetHeight() > 0 ? Application::Get().GetWindow().GetHeight() : 720;
-    }
-
-    m_ViewportFramebuffer = Framebuffer::Create(spec);
-
-    FramebufferSpecification hdrSpec = spec;
-    hdrSpec.ColorFormat = FramebufferColorFormat::RGBA16F;
-    m_HDRFramebuffer = Framebuffer::Create(hdrSpec);
-
-    m_SceneRenderer = std::make_unique<SceneRenderer>();
-    m_CameraController = std::make_unique<EditorCameraController>();
-}
-
-ViewportPanel::~ViewportPanel()
+namespace Chained
 {
-}
 
-void ViewportPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen) return;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{0, 0});
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
-
-    ImVec2 viewportSize = ImGui::GetContentRegionAvail();
-    ImVec2 viewportScreenPos = ImGui::GetCursorScreenPos();
-
-    auto activeScene = EditorLayer::Get().GetActiveScene();
-    auto activeScene_raw = activeScene.get();
-
-    // 1. Initial State & Resizing
-    HandleResize(viewportSize, activeScene_raw);
-
-    if (!activeScene || viewportSize.x <= 0 || viewportSize.y <= 0)
-    {
-        ImGui::End();
-        ImGui::PopStyleVar();
-        return;
-    }
-
-    m_Focused = ImGui::IsWindowFocused();
-    m_Hovered = ImGui::IsWindowHovered();
-
-    // 2. Rendering
-    RenderViewportScene(activeScene_raw, viewportSize);
-
-    // 3. UI Image & Interaction
-    uint32_t finalTextureID = m_ViewportFramebuffer->GetColorAttachmentRendererID();
-    ImGui::Image((ImTextureID)(uintptr_t)finalTextureID, viewportSize, {0, 1}, {1, 0});
-
-    // 4. Drag & Drop
-    HandleDragDrop(activeScene_raw);
-
-    // 5. Overlays (Gizmos, UI, Highlights)
-    RenderOverlays(activeScene_raw, viewportSize, viewportScreenPos);
-
-    // 6. Picking
-    HandlePicking(activeScene_raw, viewportSize, viewportScreenPos);
-
-    // 7. Toolbars
-    RenderToolbar(activeScene_raw, viewportSize, viewportScreenPos);
-    RenderLaunchHUD(viewportSize, viewportScreenPos);
-
-    ImGui::End();
-    ImGui::PopStyleVar();
-
-    // Shortcuts & Keyboard Input
-    if (ImGui::IsWindowFocused() || ImGui::IsWindowHovered())
-    {
-        for (const auto& btn : s_GizmoBtns)
-        {
-            if (CHEngine::Input::IsKeyPressed(btn.key))    
-            {
-                m_CurrentTool = btn.type;
-            }
-        }
-
-        if (Input::IsKeyDown(Key::LeftControl) && Input::IsKeyPressed(Key::D))
-        {
-            Entity selected = EditorLayer::Get().GetSelectedEntity();
-            if (selected){
-                EditorLayer::GetCommandHistory().PushCommand(std::make_unique<DuplicateEntityCommand>(selected));
-            }
-        }
-    }
-}
-
-void ViewportPanel::OnUpdate(Timestep ts)
-{
-    // Only update editor camera in Edit mode
-    if (EditorLayer::Get().GetSceneState() == SceneState::Edit)
-    {
-        auto activeScene = EditorLayer::Get().GetActiveScene();
-        // Use m_Focused/m_Hovered that were set in the PREVIOUS frame's ImGuiRender.
-        // Also allow update if right mouse is held (user clicked into viewport from outside).
-        bool mouseInViewport = m_Hovered || m_Focused || Input::IsMouseButtonDown(Mouse::ButtonRight);
-        if (activeScene && mouseInViewport)
-        {
-            Entity primaryCamera = activeScene->GetPrimaryCameraEntity();
-            m_CameraController->OnUpdate(primaryCamera, ts);
-        }
-    }
-}
-
-void ViewportPanel::OnEvent(Event& e)
-{
-    EventDispatcher dispatcher(e);
-    dispatcher.Dispatch<ViewportFocusEntityEvent>([this](ViewportFocusEntityEvent& ev) {
-        Entity entity = ev.GetEntity();
-        if (entity && entity.HasComponent<TransformComponent>())
-        {
-            auto& transform = entity.GetComponent<TransformComponent>();
-            m_CameraController->GetCamera().SetFocalPoint(*reinterpret_cast<const glm::vec3*>(&transform.Translation));
-            return true;
-        }
-        return false;
-    });
-}
-
-void ViewportPanel::HandleResize(const ImVec2& viewportSize, Scene* activeScene)
-{
-    if (viewportSize.x != (float)m_ViewportFramebuffer->GetSpecification().Width ||
-        viewportSize.y != (float)m_ViewportFramebuffer->GetSpecification().Height)
-    {
-        if (viewportSize.x > 0 && viewportSize.y > 0)
-        {
-            m_ViewportFramebuffer->Resize((uint32_t)viewportSize.x, (uint32_t)viewportSize.y);
-            m_HDRFramebuffer->Resize((uint32_t)viewportSize.x, (uint32_t)viewportSize.y);
-
-            EditorLayer::Get().SetViewportSize(viewportSize);
-            m_CameraController->GetCamera().SetViewportSize((uint32_t)viewportSize.x, (uint32_t)viewportSize.y);
-
-            if (activeScene)
-            {
-                EditorLayer::Get().GetSceneManager().OnViewportResize((uint32_t)viewportSize.x, (uint32_t)viewportSize.y);
-            }
-        }
-    }
-}
-
-void ViewportPanel::RenderViewportScene(Scene* activeScene, const ImVec2& viewportSize)
-{
-    m_HDRFramebuffer->Bind();
-    ClearSceneBackground(activeScene);
-
-    auto activeCameraOpt = activeScene->GetActiveCamera();
-    bool cameraFound = activeCameraOpt.has_value();
-    CHEngine::Camera3D camera;
-    float nearClip = 0.01f;
-    float farClip = 10000.0f;
-
-    // Default to Editor Camera
-    auto& edCam = m_CameraController->GetCamera();
-    glm::vec3 pos = edCam.CalculatePosition();
-    camera.Position = {pos.x, pos.y, pos.z};
-
-    glm::vec3 fp = edCam.GetFocalPoint();
-    camera.Target = {fp.x, fp.y, fp.z};
-
-    glm::vec3 up = edCam.GetUpDirection();
-    camera.Up = {up.x, up.y, up.z};
-
-    camera.Fovy = glm::degrees(edCam.GetPerspectiveVerticalFOV()); // Fovy in degrees
-    camera.Projection = 0;                                         // Perspective
-
-    nearClip = edCam.GetPerspectiveNearClip();
-    farClip = edCam.GetPerspectiveFarClip();
-
-    // If an entity camera is active during Play mode, override the viewport perspective
-    if (cameraFound && EditorLayer::Get().GetSceneState() == SceneState::Play)
-    {
-        camera = activeCameraOpt.value();
-        Entity primaryCam = activeScene->GetPrimaryCameraEntity();
-        if (primaryCam && primaryCam.HasComponent<CameraComponent>())
-        {
-            auto& cameraComp = primaryCam.GetComponent<CameraComponent>().Camera;
-            nearClip = cameraComp.GetPerspectiveNearClip();
-            farClip = cameraComp.GetPerspectiveFarClip();
-        }
-    }
-
-    SceneRenderOptions options;
-    auto& currentDebugFlags = activeScene->GetSettings().DebugFlags;
-    options.DrawGrid = currentDebugFlags.DrawGrid;
-    options.ShowDebugColliders = currentDebugFlags.DrawColliders;
-    options.ShowDebugCollisionModelBox = currentDebugFlags.DrawCollisionModelBox;
-    options.ShowDebugSpawnZones = currentDebugFlags.DrawSpawnZones;
-    options.ShowEditorIcons = true;
-
-    m_SceneRenderer->RenderScene(activeScene, camera, nearClip, farClip, options);
-    m_HDRFramebuffer->Unbind();
-
-    // Application of Post-processing
-    m_ViewportFramebuffer->Bind();
-    RenderCommand::Clear({0, 0, 0, 255}); // Clear viewport buffer
-    Renderer::Get().ApplyPostProcessing(m_HDRFramebuffer->GetColorAttachmentRendererID(),
-                                        m_HDRFramebuffer->GetDepthAttachmentRendererID(), camera);
-    m_ViewportFramebuffer->Unbind();
-}
-
-void ViewportPanel::HandleDragDrop(Scene* activeScene)
-{
-    if (ImGui::BeginDragDropTarget())
-    {
-        if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("CONTENT_BROWSER_ITEM"))
-        {
-            const char* path = (const char*)payload->Data;
-            std::filesystem::path filepath = std::filesystem::path(path); // Ensure cross-platform path handling
-            std::string ext = filepath.extension().string();
-            std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
-
-            if (ext == ".chscene")
-            {
-                EditorLayer::Get().GetSceneManager().OpenScene(filepath);
-            }
-            else if (ext == ".chprefab")
-            {
-                PrefabSerializer::Deserialize(activeScene, filepath.string());
-            }
-            else if (ext == ".gltf" || ext == ".glb" || ext == ".obj")
-            {
-                std::string filename = filepath.stem().string();
-                Entity entity = activeScene->CreateEntity(filename);
-                auto& modelcomp = entity.AddComponent<ModelComponent>();
-                // Use relative path if possible to satisfy portability
-                modelcomp.ModelPath = Project::GetRelativePath(filepath);
-
-                // Select the new entity
-                EntitySelectedEvent e((entt::entity)entity, activeScene);
-                EditorLayer::Get().OnEvent(e);
-            }
-        }
-        ImGui::EndDragDropTarget();
-    }
-}
-
-void ViewportPanel::RenderOverlays(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
-{
-    auto selectedEntity = EditorLayer::Get().GetSelectedEntity();
-    bool isUISelected = selectedEntity && selectedEntity.HasComponent<ControlComponent>();
-    auto activeCameraOpt = activeScene->GetActiveCamera();
-    CHEngine::Camera3D camera;
-    if (activeCameraOpt.has_value())
-    {
-        camera = activeCameraOpt.value();
-    }
-    else
-    {
-        // Fallback to editor camera for gizmos even if no scene camera
-        auto& edCam = m_CameraController->GetCamera();
-        glm::vec3 pos = edCam.CalculatePosition();
-        camera.Position = {pos.x, pos.y, pos.z};
-        glm::vec3 fp = edCam.GetFocalPoint();
-        camera.Target = {fp.x, fp.y, fp.z};
-        glm::vec3 up = edCam.GetUpDirection();
-        camera.Up = {up.x, up.y, up.z};
-        camera.Fovy = glm::degrees(edCam.GetPerspectiveVerticalFOV());
-        camera.Projection = 0;
-    }
-
-    ImGui::SetCursorScreenPos(viewportScreenPos);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-
-    if (ImGui::BeginChild("##SceneUI", viewportSize, false,
-                          ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar |
-                              ImGuiWindowFlags_NoScrollWithMouse))
-    {
-        // 1. Gizmo handling (inside child window for input priority)
-        m_Gizmo.RenderAndHandle(!isUISelected ? m_CurrentTool : GizmoType::NONE, viewportScreenPos,
-                                viewportSize, camera);
-
-        // 2. Game UI Overlay
-        ImVec2 canvasOrigin = ImGui::GetCursorScreenPos();
-        UIRenderer::Get().DrawCanvas(activeScene, canvasOrigin, viewportSize,
-                                     EditorLayer::Get().GetSceneState() == SceneState::Edit);
-
-        // 3. Selection Highlight
-        if (isUISelected && selectedEntity && EditorLayer::Get().GetSceneState() == SceneState::Edit)
-        {
-            auto rect = UIRenderer::Get().GetEntityRect(selectedEntity, viewportSize, viewportScreenPos);
-
-            ImVec2 p1 = ImVec2(rect.x, rect.y);
-            ImVec2 p2 = ImVec2(p1.x + rect.width, p1.y + rect.height);
-
-            ImGui::GetWindowDrawList()->AddRect(p1, p2, IM_COL32(255, 255, 0, 255), 0, 0, 2.0f);
-
-            // Use the new UI Manipulator
-            m_UIManipulator.OnImGuiRender(selectedEntity, viewportScreenPos, viewportSize);
-
-            // Debug info
-            if (ImGui::IsMouseHoveringRect(p1, p2))
-            {
-                ImGui::GetWindowDrawList()->AddRect(p1, p2, IM_COL32(0, 255, 0, 255), 0, 0, 1.0f);
-            }
-        }
-    }
-    ImGui::EndChild();
-    ImGui::PopStyleVar();
-}
-
-void ViewportPanel::HandlePicking(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
-{
-    // Object picking logic
-    ImGuiContext& g = *GImGui;
-    bool isUIChildHovered = ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_AllowWhenBlockedByPopup);
-    bool isClicked = ImGui::IsMouseClicked(ImGuiMouseButton_Left);
-    bool isDragging = m_UIManipulator.IsActive();
-    bool isGizmoDragging = m_Gizmo.IsDragging();
-    bool isGizmoHovered = m_Gizmo.IsHovered();
-    SceneState sceneState = EditorLayer::Get().GetSceneState();
-
-    if (sceneState == SceneState::Edit && isUIChildHovered && isClicked && !isGizmoDragging && !isGizmoHovered && !isDragging)
-    {
-        ImVec2 mousePos = ImGui::GetMousePos();
-        ImVec2 localMouseImGui = {mousePos.x - viewportScreenPos.x, mousePos.y - viewportScreenPos.y};
-
-        auto activeCameraOpt = activeScene->GetActiveCamera();
-        CHEngine::Camera3D camera;
-        if (activeCameraOpt.has_value())
-        {
-            camera = activeCameraOpt.value();
-        }
-        else
-        {
-             auto& edCam = m_CameraController->GetCamera();
-             camera.Position = {edCam.CalculatePosition().x, edCam.CalculatePosition().y, edCam.CalculatePosition().z};
-             camera.Target = {edCam.GetFocalPoint().x, edCam.GetFocalPoint().y, edCam.GetFocalPoint().z};
-             camera.Up = {edCam.GetUpDirection().x, edCam.GetUpDirection().y, edCam.GetUpDirection().z};
-             camera.Fovy = glm::degrees(edCam.GetPerspectiveVerticalFOV());
-             camera.Projection = 0;
-        }
-
-        Ray ray = EditorGUI::GetMouseRay(camera, {localMouseImGui.x, localMouseImGui.y}, {viewportSize.x, viewportSize.y});
-
-        Entity bestHit = {};
-
-        // UI Picking
-        auto uiView = activeScene->GetRegistry().view<ControlComponent>();
-        for (auto entityID : uiView)
-        {
-            Entity entity(entityID, &activeScene->GetRegistry());
-            auto& cc = uiView.get<ControlComponent>(entityID);
-            if (!cc.IsActive) continue;
-
-            auto rect = UIRenderer::Get().GetEntityRect(entity, viewportSize, viewportScreenPos);
-            if (mousePos.x >= rect.x && mousePos.x <= rect.x + rect.width && mousePos.y >= rect.y && mousePos.y <= rect.y + rect.height)
-            {
-                bestHit = entity;
-            }
-        }
-
-        // 3D Picking
-        if (!bestHit && activeCameraOpt.has_value())
-        {
-            SceneRaycastResult result = ScenePicker::Raycast(activeScene, ray);
-            if (result.Hit)
-            {
-                bestHit = result.HitEntity;
-            }
-        }
-
-        if (bestHit)
-        {
-            EntitySelectedEvent e((entt::entity)bestHit, activeScene);
-            EditorLayer::Get().OnEvent(e);
-        }
-        else
-        {
-            // Only deselect if the mouse is genuinely inside the viewport area
-            ImVec2 mousePos = ImGui::GetMousePos();
-            bool mouseInViewport = (mousePos.x >= viewportScreenPos.x &&
-                                    mousePos.x <= viewportScreenPos.x + viewportSize.x &&
-                                    mousePos.y >= viewportScreenPos.y &&
-                                    mousePos.y <= viewportScreenPos.y + viewportSize.y);
-            if (mouseInViewport)
-            {
-                EntitySelectedEvent e(entt::null, activeScene);
-                EditorLayer::Get().OnEvent(e);
-            }
-        }
-    }
-}
-
-void ViewportPanel::RenderToolbar(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
-{
-    ImVec2 toolbarPos = {viewportScreenPos.x + 10.0f, viewportScreenPos.y + 10.0f};
-    ImGui::SetNextWindowPos(toolbarPos);
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.1f, 0.1f, 0.12f, 0.8f));
-    ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 6.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(5, 5));
-
-    if (ImGui::BeginChild("##FloatingToolbar", ImVec2(850, 40), true,
-                          ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse))
-    {
-        ImGui::SetCursorPosY(6); // Center align vertically-ish
-        ImGui::Indent(5);
-
-        DrawGizmoButtons();
-        DrawCameraSelector(activeScene);
-
-        ImGui::SameLine(0, 10);
-        ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
-        ImGui::SameLine(0, 10);
-
-        // Snapping toggle
-        bool snapping = m_Gizmo.IsSnappingEnabled();
-        if (snapping) ImGui::PushStyleColor(ImGuiCol_Text, {0.3f, 0.8f, 1.0f, 1.0f});
-        if (ImGui::Button(ICON_FA_MAGNET "##SnapToggle", {28, 28})) m_Gizmo.SetSnapping(!snapping);
-        if (snapping) ImGui::PopStyleColor();
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("Enable Grid Snapping");
-
-        ImGui::SameLine(0, 5);
-        float gridSize = m_Gizmo.GetGridSize();
-        ImGui::SetNextItemWidth(45);
-        if (ImGui::DragFloat("##SnapValue", &gridSize, 0.1f, 0.1f, 10.0f, "%.1f")) m_Gizmo.SetGridSize(gridSize);
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("Grid Snap Size");
-
-        ImGui::SameLine(0, 10);
-
-        // Local/World toggle
-        bool isLocal = m_Gizmo.IsLocalSpace();
-        if (ImGui::Button(isLocal ? (ICON_FA_CUBE " Local") : (ICON_FA_EARTH_AMERICAS " World"), {70, 28})) m_Gizmo.SetLocalSpace(!isLocal);
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("Toggle Local/World Space");
-
-        ImGui::SameLine(0, 15);
-        ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
-        ImGui::SameLine(0, 15);
-
-        // Playback Tools
-        SceneState sceneState = EditorLayer::Get().GetSceneState();
-        bool isPlaying = (sceneState == SceneState::Play);
-        ImGui::SameLine(0, 10);
-
-        if (isPlaying) ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.3f, 1.0f, 0.3f, 1.0f));
-        if (ImGui::Button(isPlaying ? ICON_FA_STOP : ICON_FA_PLAY, ImVec2(28, 28)))
-        {
-            if (isPlaying)
-            {
-                SceneStopEvent e;
-                EditorLayer::Get().OnEvent(e);
-            }
-            else
-            {
-                ScenePlayEvent e;
-                EditorLayer::Get().OnEvent(e);
-            }
-        }
-        if (isPlaying) ImGui::PopStyleColor();
-
-        ImGui::SameLine(0, 5);
-        if (ImGui::Button(ICON_FA_FILE_CODE "##ReloadToolbar", ImVec2(28, 28)))
-        {
-            ScriptEngine::Get().RequestAssemblyReload("ViewportPanel");
-        }
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("Reload Scripts (Ctrl+R)");
-
-        ImGui::SameLine(0, 15);
-        ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
-        ImGui::SameLine(0, 15);
-
-        // Run scene in new window (for play mode testing)
-        if (ImGui::Button(ICON_FA_WINDOW_MAXIMIZE "##RunSceneInNewWindow", ImVec2(28, 28)))
-        {
-            AppLaunchRuntimeEvent e;
-            Application::Get().OnEvent(e);
-        }
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("Run Scene in New Window (Shift+F5)");
-
-        // Camera Info
-        Entity primaryCam = activeScene->GetPrimaryCameraEntity();
-        if (primaryCam) ImGui::TextDisabled(ICON_FA_CAMERA " %s", primaryCam.GetComponent<TagComponent>().Tag.c_str());
-        else ImGui::TextColored({1, 0, 0, 1}, ICON_FA_CIRCLE_EXCLAMATION " No Primary Camera");
-    }
-    ImGui::EndChild();
-    ImGui::PopStyleVar(2);
-    ImGui::PopStyleColor();
-}
-
-void ViewportPanel::RenderLaunchHUD(const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
-{
-    ImGui::SetCursorScreenPos({viewportScreenPos.x + viewportSize.x - 110.0f, viewportScreenPos.y + 10.0f});
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.1f, 0.1f, 0.12f, 0.8f));
-    ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 6.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(5, 5));
-
-    if (ImGui::BeginChild("##LaunchHUD", ImVec2(100, 40), true,
-                          ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse))
-    {
-        ImGui::SetCursorPosY(6);
-        ImGui::Indent(5);
-        if (ImGui::Button(ICON_FA_ROCKET " Launch", ImVec2(90, 28)))
-        {
-            AppLaunchRuntimeEvent e;
-            Application::Get().OnEvent(e);
-        }
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("Build & Run Standalone project (F5)");
-    }
-    ImGui::EndChild();
-    ImGui::PopStyleVar(2);
-    ImGui::PopStyleColor();
-}
-
-} // namespace CHEngine
+	constexpr float kMinIconClickRadius = 14.0f;
+
+	Camera3D ViewportPanel::GetActiveOrEditorCamera(Scene* scene) const
+	{
+		if (!scene)
+		{
+			return {};
+		}
+		auto activeCameraOpt = SceneRenderer::GetActiveCamera(scene->GetRegistry());
+		if (activeCameraOpt.has_value() && EditorLayer::Get().GetSceneManager().GetSceneState() == SceneState::Play)
+		{
+			return activeCameraOpt.value();
+		}
+		return m_CameraController->ToCamera3D();
+	}
+
+	void ViewportPanel::ClearSceneBackground(Scene* scene)
+	{
+		auto mode = scene->GetSettings().Mode;
+		if (mode == BackgroundMode::Color)
+		{
+			GraphicsDevice::Get().Clear(scene->GetSettings().BackgroundColor);
+		}
+		else if (mode == BackgroundMode::Texture)
+		{
+			auto& path = scene->GetSettings().BackgroundTexturePath;
+			if (!path.empty())
+			{
+				// Fallback for now
+				GraphicsDevice::Get().Clear(scene->GetSettings().BackgroundColor);
+			}
+		}
+		else if (mode == BackgroundMode::Environment3D)
+		{
+			GraphicsDevice::Get().Clear({0, 0, 0, 255});
+		}
+	}
+
+	static uint32_t GetIconHandle(const std::shared_ptr<TextureAsset>& icon)
+	{
+		if (icon && icon->IsReady())
+		{
+			auto tex = icon->GetTexture();
+			if (tex)
+			{
+				return tex->GetNativeHandle();
+			}
+		}
+		return 0;
+	}
+
+	static float ComputeIconSize(const glm::vec3& worldPos, const glm::vec3& cameraPos, float minSize, float maxSize,
+								 float scale)
+	{
+		const float distance = glm::distance(worldPos, cameraPos);
+		return std::clamp(distance * scale, minSize, maxSize);
+	}
+
+	static const GizmoBtn s_GizmoBtns[] = {
+		{GizmoType::NONE, ICON_FA_ARROW_POINTER "##Select", "Select (Q)", Chained::KeyCode::Q},
+		{GizmoType::TRANSLATE, ICON_FA_UP_DOWN_LEFT_RIGHT "##Translate", "Translate (W)", Chained::KeyCode::W},
+		{GizmoType::ROTATE, ICON_FA_ARROWS_ROTATE "##Rotate", "Rotate (E)", Chained::KeyCode::E},
+		{GizmoType::SCALE, ICON_FA_UP_RIGHT_FROM_SQUARE "##Scale", "Scale (R)", Chained::KeyCode::R}};
+
+	void ViewportPanel::DrawCameraSelector(Scene* scene)
+	{
+		if (!scene)
+		{
+			return;
+		}
+
+		ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::FloatingToolbarBg);
+		ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 4.0f);
+
+		auto view = scene->GetRegistry().view<CameraComponent>();
+		Entity primaryCam = SceneRenderer::GetPrimaryCameraEntity(scene->GetRegistry(), scene->GetRegistryPtr());
+		std::string currentLabel = primaryCam ? primaryCam.GetComponent<TagComponent>().Tag : "Editor Camera";
+
+		ImGui::SetNextItemWidth(150);
+		if (ImGui::BeginCombo("##CameraSelector", (ICON_FA_VIDEO "  " + currentLabel).c_str(), ImGuiComboFlags_None))
+		{
+			for (auto entityHandle : view)
+			{
+				Entity entity(entityHandle, &scene->GetRegistry());
+				bool isSelected = (entity == primaryCam);
+				std::string tag = entity.GetComponent<TagComponent>().Tag;
+
+				if (ImGui::Selectable(tag.c_str(), isSelected))
+				{
+					// Unset all and set this one as primary
+					for (auto otherHandle : view)
+					{
+						scene->GetRegistry().get<CameraComponent>(otherHandle).Primary = false;
+					}
+					entity.GetComponent<CameraComponent>().Primary = true;
+				}
+
+				if (isSelected)
+				{
+					ImGui::SetItemDefaultFocus();
+				}
+			}
+			ImGui::EndCombo();
+		}
+
+		ImGui::PopStyleVar();
+		ImGui::PopStyleColor();
+	}
+
+	void ViewportPanel::DrawGizmoButtons()
+	{
+		ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::TransparentButton); // Transparent buttons in toolbar
+
+		for (const auto& btn : s_GizmoBtns)
+		{
+			bool selected = (m_CurrentTool == btn.type);
+			if (selected)
+			{
+				ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::ActiveToolOrange);
+			}
+
+			if (ImGui::Button(btn.icon, {28, 28}))
+			{
+				m_CurrentTool = btn.type;
+			}
+			if (ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip("%s", btn.tooltip);
+			}
+
+			if (selected)
+			{
+				ImGui::PopStyleColor();
+			}
+			ImGui::SameLine(0, 5);
+		}
+
+		ImGui::PopStyleColor();
+	}
+
+	// Project's RenderSettings::AntiAliasingSamples is 0/2/4/8 ("0 = off"); Framebuffer's
+	// Samples field uses "1 = off" (matches GL's own multisample vs. non-multisample distinction).
+	static uint32_t GetConfiguredMSAASamples()
+	{
+		auto project = Project::GetActive();
+		int samples = project ? project->GetConfig().Render.AntiAliasingSamples : 4;
+		return samples > 1 ? (uint32_t)samples : 1u;
+	}
+
+	ViewportPanel::ViewportPanel(ImVec2& editorViewportSize)
+		: m_EditorViewportSize(editorViewportSize)
+	{
+		m_Name = "Viewport";
+
+		FramebufferSpecification spec;
+		spec.Width = 1280;
+		spec.Height = 720;
+		spec.ColorFormat = FramebufferColorFormat::RGBA8;
+
+		if (Application::Get().GetWindow().GetNativeWindow())
+		{
+			spec.Width =
+				Application::Get().GetWindow().GetWidth() > 0 ? Application::Get().GetWindow().GetWidth() : 1280;
+			spec.Height =
+				Application::Get().GetWindow().GetHeight() > 0 ? Application::Get().GetWindow().GetHeight() : 720;
+		}
+
+		m_ViewportFramebuffer = Framebuffer::Create(spec);
+
+		FramebufferSpecification hdrSpec = spec;
+		hdrSpec.ColorFormat = FramebufferColorFormat::RGBA16F;
+		hdrSpec.Samples = GetConfiguredMSAASamples();
+		m_MSAAFramebufferSamples = hdrSpec.Samples;
+		m_HDRFramebuffer = Framebuffer::Create(hdrSpec);
+
+		m_SceneRenderer = std::make_unique<SceneRenderer>();
+		m_CameraController = std::make_unique<EditorCameraController>();
+	}
+
+	ViewportPanel::~ViewportPanel()
+	{
+		if (m_CursorLocked && m_LockedWindow)
+		{
+			glfwSetInputMode(m_LockedWindow, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+			m_CursorLocked = false;
+			m_LockedWindow = nullptr;
+		}
+	}
+
+	void ViewportPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		// Track the current platform window (native GLFW window) hosting this panel
+		ImGuiViewport* vp = ImGui::GetWindowViewport();
+		if (vp && vp->PlatformHandle)
+		{
+			m_PlatformWindow = static_cast<GLFWwindow*>(vp->PlatformHandle);
+		}
+		else
+		{
+			m_PlatformWindow = static_cast<GLFWwindow*>(Application::Get().GetWindow().GetNativeWindow());
+		}
+
+		auto activeScene = EditorLayer::Get().GetSceneManager().GetActiveScene();
+
+		std::string sceneName = "None";
+		if (activeScene && !activeScene->GetSettings().Name.empty())
+		{
+			sceneName = activeScene->GetSettings().Name;
+		}
+		std::string title = m_Name + " [" + sceneName + "]###" + m_Name;
+
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{0, 0});
+		ImGui::Begin(title.c_str(), &m_IsOpen);
+
+		ImVec2 viewportSize = ImGui::GetContentRegionAvail();
+		ImVec2 viewportScreenPos = ImGui::GetCursorScreenPos();
+
+		// 1. Initial State & Resizing
+		HandleResize(viewportSize, activeScene.get());
+
+		if (!activeScene || viewportSize.x <= 0 || viewportSize.y <= 0)
+		{
+			ImGui::End();
+			ImGui::PopStyleVar();
+			return;
+		}
+
+		m_Focused = ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows);
+		m_Hovered = ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows);
+
+		// 2. Rendering
+		if (!activeScene->IsStartingUp())
+		{
+			RenderViewportScene(activeScene.get());
+		}
+
+		// 3. UI Image & Interaction
+		if (!m_ViewportFramebuffer || !m_ViewportFramebuffer->IsValid())
+		{
+			ImGui::End();
+			ImGui::PopStyleVar();
+			return;
+		}
+		uint32_t finalTextureID = m_ViewportFramebuffer->GetColorAttachmentRendererID();
+
+		// Capture the EXACT screen position where the image starts to prevent gizmo offset
+		viewportScreenPos = ImGui::GetCursorScreenPos();
+
+		ImGui::Image((ImTextureID)(uintptr_t)finalTextureID, viewportSize, {0, 1}, {1, 0});
+
+		bool isTransitioning = EditorLayer::Get().GetSceneManager().IsTransitioning();
+		if (activeScene->IsStartingUp() || isTransitioning)
+		{
+			ImDrawList* drawList = ImGui::GetWindowDrawList();
+			ImVec2 p0 = ImGui::GetItemRectMin();
+			ImVec2 p1 = ImGui::GetItemRectMax();
+
+			drawList->AddRectFilled(p0, p1, IM_COL32(15, 15, 20, 200));
+
+			std::string status = EditorLayer::Get().GetSceneManager().GetLoadingStatus();
+			if (status.empty())
+			{
+				status = "Loading Scene...";
+			}
+			const char* text = status.c_str();
+			ImVec2 textSize = ImGui::CalcTextSize(text);
+			ImVec2 textPos = ImVec2(p0.x + (p1.x - p0.x - textSize.x) * 0.5f, p0.y + (p1.y - p0.y - textSize.y) * 0.5f);
+			drawList->AddText(textPos, IM_COL32(255, 255, 255, 255), text);
+		}
+
+		// 4. Drag & Drop
+		HandleDragDrop(activeScene.get());
+
+		// 5. Overlays (Gizmos, UI, Highlights)
+		RenderOverlays(activeScene.get(), viewportSize, viewportScreenPos);
+
+		// 6. Picking
+		HandlePicking(activeScene.get(), viewportSize, viewportScreenPos);
+
+		// 7. Toolbars
+		RenderToolbar(activeScene.get(), viewportScreenPos);
+
+		// Shortcuts & Keyboard Input — must be before ImGui::End() so IsWindowFocused works
+		if (m_Focused || m_Hovered)
+		{
+			HandleKeyboardShortcuts();
+		}
+
+		ImGui::End();
+		ImGui::PopStyleVar();
+	}
+
+	void ViewportPanel::OnUpdate(Timestep ts)
+	{
+		bool hasImGui = ImGui::GetCurrentContext() != nullptr;
+		bool rightDown = hasImGui ? ImGui::IsMouseDown(ImGuiMouseButton_Right)
+								  : Chained::Core::Input::IsMouseButtonDown(Chained::MouseCode::ButtonRight);
+
+		// Unlock cursor if right mouse is released while locked
+		if (m_CursorLocked && !rightDown)
+		{
+			GLFWwindow* win = m_LockedWindow ? m_LockedWindow : m_PlatformWindow;
+			if (!win)
+			{
+				win = static_cast<GLFWwindow*>(Application::Get().GetWindow().GetNativeWindow());
+			}
+			if (win)
+			{
+				glfwSetInputMode(win, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+			}
+			m_CursorLocked = false;
+			m_LockedWindow = nullptr;
+		}
+
+		// Auto-switch camera 2D mode based on scene type
+		auto activeScene = EditorLayer::Get().GetSceneManager().GetActiveScene();
+		if (activeScene)
+		{
+			SceneType sceneType = activeScene->GetSettings().Type;
+			if (sceneType != m_LastSceneType)
+			{
+				bool want2D = (sceneType == SceneType::UI);
+				if (m_CameraController->Is2DMode() != want2D)
+				{
+					m_CameraController->Set2DMode(want2D);
+					m_Gizmo.Set2DMode(want2D);
+				}
+				m_LastSceneType = sceneType;
+			}
+		}
+
+		// Cursor lock for camera rotation
+		if ((m_Hovered || m_CursorLocked) && rightDown && !m_CursorLocked)
+		{
+			GLFWwindow* win = m_PlatformWindow
+								  ? m_PlatformWindow
+								  : static_cast<GLFWwindow*>(Application::Get().GetWindow().GetNativeWindow());
+			if (win)
+			{
+				glfwSetInputMode(win, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+				m_CursorLocked = true;
+				m_LockedWindow = win;
+			}
+		}
+
+		// Update editor camera in Edit and Simulate modes (not during Play)
+		SceneState state = EditorLayer::Get().GetSceneManager().GetSceneState();
+		if (state == SceneState::Edit || state == SceneState::Simulate)
+		{
+			auto activeScene = EditorLayer::Get().GetSceneManager().GetActiveScene();
+			// Use m_Hovered that was set in the PREVIOUS frame's ImGuiRender.
+			// Also allow update if right mouse is held (user clicked into viewport from outside).
+			bool mouseInViewport = m_Hovered || rightDown;
+			if (activeScene && mouseInViewport)
+			{
+				const auto& editorCfg = EditorLayer::Get().GetConfig();
+				m_CameraController->SetMoveSpeed(editorCfg.CameraMoveSpeed);
+				m_CameraController->SetBoostMultiplier(editorCfg.CameraBoostMultiplier);
+				m_CameraController->SetDisableZoom(editorCfg.DisableCameraZoom);
+				m_CameraController->SetRotationSpeed(editorCfg.CameraRotationSpeed);
+				m_CameraController->SetZoomSpeedMultiplier(editorCfg.CameraZoomSpeedMultiplier);
+				m_CameraController->SetFovDegrees(editorCfg.CameraFovDegrees);
+				m_CameraController->SetNearClip(editorCfg.CameraNearClip);
+				m_CameraController->SetFarClip(editorCfg.CameraFarClip);
+
+				Entity primaryCamera =
+					SceneRenderer::GetPrimaryCameraEntity(activeScene->GetRegistry(), activeScene->GetRegistryPtr());
+				m_CameraController->OnUpdate(primaryCamera, ts, m_ViewportSize);
+			}
+		}
+	}
+
+	void ViewportPanel::OnEvent(Event& e)
+	{
+		EventDispatcher dispatcher(e);
+		dispatcher.Dispatch<ViewportFocusEntityEvent>([this](ViewportFocusEntityEvent& ev) {
+			Entity entity = ev.GetEntity();
+			if (entity && entity.HasComponent<TransformComponent>())
+			{
+				auto& transform = entity.GetComponent<TransformComponent>();
+				m_CameraController->SetFocalPoint(*reinterpret_cast<const glm::vec3*>(&transform.Translation));
+				return true;
+			}
+			return false;
+		});
+	}
+
+	void ViewportPanel::HandleKeyboardShortcuts()
+	{
+		bool hasImGui = ImGui::GetCurrentContext() != nullptr;
+		bool rightDown = hasImGui ? ImGui::IsMouseDown(ImGuiMouseButton_Right)
+								  : Chained::Core::Input::IsMouseButtonDown(Chained::MouseCode::ButtonRight);
+
+		if (!rightDown)
+		{
+			if (hasImGui)
+			{
+				if (ImGui::IsKeyPressed(ImGuiKey_Q, false))
+				{
+					m_CurrentTool = GizmoType::NONE;
+				}
+				else if (ImGui::IsKeyPressed(ImGuiKey_W, false))
+				{
+					m_CurrentTool = GizmoType::TRANSLATE;
+				}
+				else if (ImGui::IsKeyPressed(ImGuiKey_E, false))
+				{
+					m_CurrentTool = GizmoType::ROTATE;
+				}
+				else if (ImGui::IsKeyPressed(ImGuiKey_R, false))
+				{
+					m_CurrentTool = GizmoType::SCALE;
+				}
+			}
+			else
+			{
+				for (const auto& btn : s_GizmoBtns)
+				{
+					if (Chained::Core::Input::IsKeyPressed(btn.key))
+					{
+						m_CurrentTool = btn.type;
+					}
+				}
+			}
+		}
+
+		bool isCtrl = hasImGui ? (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl))
+							   : (Chained::Core::Input::IsKeyDown(Chained::KeyCode::LeftControl) ||
+								  Chained::Core::Input::IsKeyDown(Chained::KeyCode::RightControl));
+		bool isDPressed =
+			hasImGui ? ImGui::IsKeyPressed(ImGuiKey_D, false) : Chained::Core::Input::IsKeyPressed(Chained::KeyCode::D);
+
+		if (isCtrl && isDPressed)
+		{
+			Entity selected = EditorLayer::Get().GetEditorState().SelectedEntity;
+			if (selected)
+			{
+				EditorLayer::Get().GetCommandHistory().PushCommand(std::make_unique<DuplicateEntityCommand>(selected));
+			}
+		}
+	}
+
+	Ray ViewportPanel::GetMouseRay(const glm::vec2& mousePosition)
+	{
+		auto activeScene = EditorLayer::Get().GetSceneManager().GetActiveScene();
+		if (!activeScene)
+		{
+			return {};
+		}
+		Camera3D camera = GetActiveOrEditorCamera(activeScene.get());
+		return ScenePicker::CreateRayFromViewport(camera, mousePosition, m_ViewportSize);
+	}
+
+	void ViewportPanel::HandleResize(const ImVec2& viewportSize, Scene* activeScene)
+	{
+		if (viewportSize.x != m_ViewportSize.x || viewportSize.y != m_ViewportSize.y)
+		{
+			m_ViewportSize = {viewportSize.x, viewportSize.y};
+			if (m_ViewportSize.x > 0 && m_ViewportSize.y > 0)
+			{
+				if (m_ViewportFramebuffer)
+				{
+					m_ViewportFramebuffer->Resize((uint32_t)m_ViewportSize.x, (uint32_t)m_ViewportSize.y);
+				}
+				if (m_HDRFramebuffer)
+				{
+					m_HDRFramebuffer->Resize((uint32_t)m_ViewportSize.x, (uint32_t)m_ViewportSize.y);
+				}
+
+				// Keep Renderer in sync so frustum & projection use correct aspect ratio
+				if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+				{
+					renderer->SetViewportSize((uint32_t)m_ViewportSize.x, (uint32_t)m_ViewportSize.y);
+				}
+
+				m_EditorViewportSize = {m_ViewportSize.x, m_ViewportSize.y};
+				m_CameraController->SetViewportSize((uint32_t)m_ViewportSize.x, (uint32_t)m_ViewportSize.y);
+
+				if (activeScene)
+				{
+					activeScene->OnViewportResize((uint32_t)m_ViewportSize.x, (uint32_t)m_ViewportSize.y);
+				}
+			}
+		}
+
+		// Recreate FBOs if they became invalid (e.g. after context loss or bad resize),
+		// or if the project's AntiAliasingSamples setting changed since we last (re)created them -
+		// the sample count is baked into the framebuffer at creation and can't change in place.
+		uint32_t configuredSamples = GetConfiguredMSAASamples();
+		if (m_HDRFramebuffer && configuredSamples != m_MSAAFramebufferSamples)
+		{
+			m_HDRFramebuffer.reset();
+		}
+
+		if (m_ViewportSize.x > 0 && m_ViewportSize.y > 0)
+		{
+			if (!m_ViewportFramebuffer || !m_ViewportFramebuffer->IsValid())
+			{
+				FramebufferSpecification spec;
+				spec.Width = (uint32_t)m_ViewportSize.x;
+				spec.Height = (uint32_t)m_ViewportSize.y;
+				spec.ColorFormat = FramebufferColorFormat::RGBA8;
+				m_ViewportFramebuffer = Framebuffer::Create(spec);
+			}
+			if (!m_HDRFramebuffer || !m_HDRFramebuffer->IsValid())
+			{
+				FramebufferSpecification hdrSpec;
+				hdrSpec.Width = (uint32_t)m_ViewportSize.x;
+				hdrSpec.Height = (uint32_t)m_ViewportSize.y;
+				hdrSpec.ColorFormat = FramebufferColorFormat::RGBA16F;
+				hdrSpec.Samples = configuredSamples;
+				m_MSAAFramebufferSamples = configuredSamples;
+				m_HDRFramebuffer = Framebuffer::Create(hdrSpec);
+			}
+		}
+	}
+
+	void ViewportPanel::RenderViewportScene(Scene* activeScene)
+	{
+		if (!m_HDRFramebuffer || !m_HDRFramebuffer->IsValid())
+		{
+			return;
+		}
+
+		m_HDRFramebuffer->Bind();
+		ClearSceneBackground(activeScene);
+
+		if (!activeScene)
+		{
+			m_HDRFramebuffer->Unbind();
+			return;
+		}
+
+		auto camera = GetActiveOrEditorCamera(activeScene);
+
+		if (glm::distance(glm::vec3(camera.Position), glm::vec3(camera.Target)) < 0.001f)
+		{
+			camera.Position.z += 1.0f;
+			camera.ViewMatrix = glm::lookAt(glm::vec3(camera.Position), glm::vec3(camera.Target), glm::vec3(camera.Up));
+		}
+
+		SceneRenderOptions options;
+		auto& currentDebugFlags = activeScene->GetSettings().DebugFlags;
+		options.DrawGrid = currentDebugFlags.DrawGrid;
+		options.ShowDebugColliders = currentDebugFlags.DrawColliders;
+		options.ShowDebugSpawnZones = currentDebugFlags.DrawSpawnZones;
+		options.SetCollisionWireframeMode = currentDebugFlags.SetCollisionWireframeMode;
+		m_SceneRenderer->RenderScene(activeScene->GetRegistry(), activeScene->GetSettings(), camera, options);
+
+		// Render proper editor icons (camera, light, spawn) with loaded textures
+		if (EditorLayer::Get().GetSceneManager().GetSceneState() != SceneState::Play &&
+			EditorLayer::Get().GetConfig().ShowEditorIcons)
+		{
+			RenderEditorIcons(activeScene->GetRegistry(), camera);
+		}
+
+		m_HDRFramebuffer->Unbind();
+		// Multisample attachments aren't directly sampleable - resolve into the single-sample
+		// texture that ApplyPostProcessing()/GetColorAttachmentRendererID() below reads from.
+		m_HDRFramebuffer->Resolve();
+
+		if (!m_ViewportFramebuffer || !m_ViewportFramebuffer->IsValid())
+		{
+			return;
+		}
+
+		m_ViewportFramebuffer->Bind();
+		GraphicsDevice::Get().Clear({0, 0, 0, 255});
+
+		if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+		{
+			renderer->ApplyPostProcessing(m_HDRFramebuffer->GetColorAttachmentRendererID(),
+										  m_HDRFramebuffer->GetDepthAttachmentRendererID(), camera, nullptr, {});
+		}
+
+		m_ViewportFramebuffer->Unbind();
+	}
+
+	void ViewportPanel::HandleDragDrop(Scene* activeScene)
+	{
+		if (ImGui::BeginDragDropTarget())
+		{
+			if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("CONTENT_BROWSER_ITEM"))
+			{
+				const char* path = (const char*)payload->Data;
+				std::filesystem::path filepath = std::filesystem::path(path); // Ensure cross-platform path handling
+				std::string ext = filepath.extension().string();
+				std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+				if (ext == ".chscene")
+				{
+					EditorLayer::Get().GetSceneManager().OpenScene(filepath);
+				}
+				else if (ext == ".chprefab")
+				{
+					PrefabSerializer::Deserialize(activeScene, filepath.string());
+				}
+				else if (ext == ".gltf" || ext == ".glb" || ext == ".obj")
+				{
+					std::string filename = filepath.stem().string();
+					Entity entity = activeScene->CreateEntity(filename);
+					auto& modelcomp = entity.AddComponent<ModelComponent>();
+					// Use relative path if possible to satisfy portability
+					modelcomp.ModelPath = Project::GetActive()->GetRelativePath(filepath);
+
+					SelectEntity(entity, activeScene);
+				}
+			}
+			ImGui::EndDragDropTarget();
+		}
+	}
+
+	void ViewportPanel::RenderOverlays(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
+	{
+		auto selectedEntity = EditorLayer::Get().GetEditorState().SelectedEntity;
+		if (selectedEntity)
+		{
+			if (!activeScene || selectedEntity.GetRegistryPtr() != &activeScene->GetRegistry() ||
+				!selectedEntity.IsValid())
+			{
+				EditorLayer::Get().GetEditorState().SelectedEntity = {};
+				selectedEntity = {};
+			}
+		}
+		bool isUISelected = selectedEntity && selectedEntity.HasComponent<ControlComponent>();
+		auto camera = GetActiveOrEditorCamera(activeScene);
+
+		ImGui::SetCursorScreenPos(viewportScreenPos);
+
+		// 1. Gizmo handling (using absolute screen coordinates)
+		m_Gizmo.RenderAndHandle(!isUISelected ? m_CurrentTool : GizmoType::NONE, viewportScreenPos, viewportSize,
+								camera);
+
+		// 2. Game UI Overlay
+		ImVec2 canvasOrigin = viewportScreenPos;
+		if (auto* widgetRenderer = ServiceLocator::TryGet<WidgetRenderer>())
+		{
+			widgetRenderer->DrawCanvas(activeScene, canvasOrigin, viewportSize,
+									   EditorLayer::Get().GetSceneManager().GetSceneState() == SceneState::Edit);
+		}
+
+		// 2b. Script UI Overlay (OnGUI)
+		SceneState sceneState = EditorLayer::Get().GetSceneManager().GetSceneState();
+		if (activeScene && (sceneState == SceneState::Play || sceneState == SceneState::Simulate))
+		{
+			ImGui::SetCursorScreenPos(ImVec2(viewportScreenPos.x + 10.0f, viewportScreenPos.y + 10.0f));
+			activeScene->OnRenderUI();
+		}
+
+		// 3. Selection Highlight
+		if (isUISelected && selectedEntity && EditorLayer::Get().GetSceneManager().GetSceneState() == SceneState::Edit)
+		{
+			auto* widgetRenderer = ServiceLocator::TryGet<WidgetRenderer>();
+			auto rect = widgetRenderer ? widgetRenderer->GetEntityRect(selectedEntity) : UIRect{0, 0, 0, 0};
+
+			ImVec2 p1 = ImVec2(rect.x, rect.y);
+			ImVec2 p2 = ImVec2(p1.x + rect.width, p1.y + rect.height);
+
+			ImGui::GetWindowDrawList()->AddRect(p1, p2, IM_COL32(255, 255, 0, 255), 0, 0, 2.0f);
+
+			// Use the new UI Manipulator
+			m_UIManipulator.OnImGuiRender(selectedEntity, viewportScreenPos, viewportSize);
+
+			// Debug info
+			if (ImGui::IsMouseHoveringRect(p1, p2))
+			{
+				ImGui::GetWindowDrawList()->AddRect(p1, p2, IM_COL32(0, 255, 0, 255), 0, 0, 1.0f);
+			}
+		}
+	}
+
+	Entity ViewportPanel::HandleIconPicking(Scene* scene, const Camera3D& camera, const ImVec2& mousePos,
+											const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
+	{
+		if (!EditorLayer::Get().GetConfig().ShowEditorIcons)
+		{
+			return {};
+		}
+
+		const auto& editorCfg = EditorLayer::Get().GetConfig();
+		const float iconMin = editorCfg.IconSizeMin;
+		const float iconMax = editorCfg.IconSizeMax;
+		const float iconScale = editorCfg.IconSizeScale;
+
+		const glm::mat4 vp = camera.ProjectionMatrix * camera.ViewMatrix;
+
+		auto worldToScreen = [&](const glm::vec3& wp) -> glm::vec2 {
+			glm::vec4 clip = vp * glm::vec4(wp, 1.0f);
+			if (clip.w <= 0.0f)
+			{
+				return {-1.f, -1.f};
+			}
+			const glm::vec3 ndc = glm::vec3(clip) / clip.w;
+			return {(ndc.x * 0.5f + 0.5f) * viewportSize.x + viewportScreenPos.x,
+					(1.0f - (ndc.y * 0.5f + 0.5f)) * viewportSize.y + viewportScreenPos.y};
+		};
+
+		auto iconPixelRadius = [&](const glm::vec3& wp) -> float {
+			const float dist = glm::distance(wp, camera.Position);
+			const float worldSz = std::clamp(dist * iconScale, iconMin, iconMax);
+			float ppu;
+			if (camera.Projection == ProjectionType::Perspective && dist > 0.001f)
+			{
+				ppu = (viewportSize.y * 0.5f) / (std::tan(glm::radians(camera.FovDegrees) * 0.5f) * dist);
+			}
+			else
+			{
+				ppu = (viewportSize.y * 0.5f) / std::max(camera.OrthographicSize, 0.001f);
+			}
+			return std::max(worldSz * ppu * 0.5f, kMinIconClickRadius);
+		};
+
+		Entity bestHit = {};
+		float bestIconDist = FLT_MAX;
+
+		auto testIcon = [&](entt::entity id, const glm::vec3& wp) {
+			const glm::vec2 sp = worldToScreen(wp);
+			if (sp.x < 0.f)
+			{
+				return;
+			}
+			const float r = iconPixelRadius(wp);
+			const float dx = mousePos.x - sp.x;
+			const float dy = mousePos.y - sp.y;
+			if (dx * dx + dy * dy <= r * r)
+			{
+				const float d = glm::distance(wp, camera.Position);
+				if (d < bestIconDist)
+				{
+					bestIconDist = d;
+					bestHit = Entity(id, &scene->GetRegistry());
+				}
+			}
+		};
+
+		auto& reg = scene->GetRegistry();
+
+		reg.view<TransformComponent, CameraComponent>().each(
+			[&](entt::entity id, TransformComponent& tc, CameraComponent&) {
+				const glm::vec3 wp = glm::vec3(tc.WorldTransform[3]);
+				if (glm::distance(wp, camera.Position) >= 0.25f)
+				{
+					testIcon(id, wp);
+				}
+			});
+
+		reg.view<TransformComponent, LightComponent>().each(
+			[&](entt::entity id, TransformComponent& tc, LightComponent&) {
+				testIcon(id, glm::vec3(tc.WorldTransform[3]));
+			});
+
+		reg.view<TransformComponent, SpawnComponent>().each(
+			[&](entt::entity id, TransformComponent& tc, SpawnComponent&) {
+				testIcon(id, glm::vec3(tc.WorldTransform[3]));
+			});
+
+		reg.view<TransformComponent, AudioComponent>().each(
+			[&](entt::entity id, TransformComponent& tc, AudioComponent&) {
+				testIcon(id, glm::vec3(tc.WorldTransform[3]));
+			});
+
+		return bestHit;
+	}
+
+	void ViewportPanel::HandlePicking(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos)
+	{
+		if (EditorLayer::Get().GetSceneManager().IsTransitioning())
+		{
+			return;
+		}
+
+		// Object picking logic
+		bool isClicked = ImGui::IsMouseClicked(ImGuiMouseButton_Left);
+		bool isDragging = m_UIManipulator.IsActive();
+		bool isGizmoDragging = m_Gizmo.IsDragging();
+		bool isGizmoHovered = m_Gizmo.IsHovered();
+		SceneState sceneState = EditorLayer::Get().GetSceneManager().GetSceneState();
+		ImVec2 mousePos = ImGui::GetMousePos();
+		bool mouseInViewport =
+			(mousePos.x >= viewportScreenPos.x && mousePos.x <= viewportScreenPos.x + viewportSize.x &&
+			 mousePos.y >= viewportScreenPos.y && mousePos.y <= viewportScreenPos.y + viewportSize.y);
+
+		if ((sceneState == SceneState::Edit || sceneState == SceneState::Simulate) && mouseInViewport && isClicked &&
+			!isGizmoDragging && !isGizmoHovered && !isDragging)
+		{
+			ImVec2 localMouseImGui = {mousePos.x - viewportScreenPos.x, mousePos.y - viewportScreenPos.y};
+
+			Ray ray = GetMouseRay({localMouseImGui.x, localMouseImGui.y});
+
+			Entity bestHit = {};
+
+			// UI Picking
+			auto uiView = activeScene->GetRegistry().view<ControlComponent>();
+			int bestZOrder = std::numeric_limits<int>::min();
+			for (auto entityID : uiView)
+			{
+				Entity entity(entityID, &activeScene->GetRegistry());
+				auto& cc = uiView.get<ControlComponent>(entityID);
+				if (!cc.IsActive || cc.HiddenInHierarchy)
+				{
+					continue;
+				}
+
+				auto* widgetRenderer = ServiceLocator::TryGet<WidgetRenderer>();
+				auto rect = widgetRenderer ? widgetRenderer->GetEntityRect(entity) : UIRect{0, 0, 0, 0};
+				if (mousePos.x >= rect.x && mousePos.x <= rect.x + rect.width && mousePos.y >= rect.y &&
+					mousePos.y <= rect.y + rect.height)
+				{
+					if (cc.ZOrder >= bestZOrder)
+					{
+						bestZOrder = cc.ZOrder;
+						bestHit = entity;
+					}
+				}
+			}
+
+			// Icon Picking — screen-space hit test against billboard icons
+			if (!bestHit)
+			{
+				Camera3D cam = m_CameraController->ToCamera3D();
+				bestHit = HandleIconPicking(activeScene, cam, mousePos, viewportSize, viewportScreenPos);
+			}
+
+			// 3D Picking
+			if (!bestHit)
+			{
+				RaycastResult result = ScenePicker::Raycast(activeScene, ray);
+				if (result.Hit)
+				{
+					bestHit = Entity(result.Entity, &activeScene->GetRegistry());
+				}
+			}
+
+			if (bestHit)
+			{
+				SelectEntity(bestHit, activeScene);
+			}
+			else
+			{
+				if (mouseInViewport)
+				{
+					DeselectEntity(activeScene);
+				}
+			}
+		}
+	}
+
+	void ViewportPanel::RenderToolbar(Scene* activeScene, const ImVec2& viewportScreenPos)
+	{
+		SceneState sceneState = EditorLayer::Get().GetSceneManager().GetSceneState();
+		if (sceneState == SceneState::Play || sceneState == SceneState::Simulate)
+		{
+			// In Play/Simulate mode, Playback controls are in the Main Menu Bar at the top.
+			// Viewport canvas stays completely clean for game rendering & HUD scripts.
+			return;
+		}
+
+		ImVec2 toolbarPos = {viewportScreenPos.x + 10.0f, viewportScreenPos.y + 10.0f};
+		ImGui::SetNextWindowPos(toolbarPos);
+		ImGui::PushStyleColor(ImGuiCol_ChildBg, EditorColors::ToolbarBg);
+		ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 6.0f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(5, 5));
+
+		if (ImGui::BeginChild("##FloatingToolbar", ImVec2(750, 40), true,
+							  ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse))
+		{
+			ImGui::SetCursorPosY(6); // Center align vertically-ish
+			ImGui::Indent(5);
+
+			DrawGizmoButtons();
+
+			ImGui::SameLine(0, 10);
+			bool is2D = m_CameraController->Is2DMode();
+			bool isUIScene = activeScene && activeScene->GetSettings().Type == SceneType::UI;
+			if (is2D)
+			{
+				ImGui::PushStyleColor(ImGuiCol_Text, EditorColors::ActiveToolOrange);
+			}
+			if (!isUIScene)
+			{
+				ImGui::BeginDisabled();
+			}
+			if (ImGui::Button(is2D ? (ICON_FA_CAMERA " 2D") : (ICON_FA_CUBE " 3D"), {50, 28}))
+			{
+				m_CameraController->Set2DMode(!is2D);
+				m_Gizmo.Set2DMode(!is2D);
+			}
+			if (!isUIScene)
+			{
+				ImGui::EndDisabled();
+			}
+			if (is2D)
+			{
+				ImGui::PopStyleColor();
+			}
+			if (ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip(isUIScene ? "Toggle 2D/3D Editor Mode" : "2D mode available for UI scenes only");
+			}
+
+			ImGui::SameLine(0, 10);
+			DrawCameraSelector(activeScene);
+
+			ImGui::SameLine(0, 10);
+			ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
+			ImGui::SameLine(0, 10);
+
+			DrawSnapSection();
+			DrawTransformSpaceToggle();
+
+			ImGui::SameLine(0, 15);
+			ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
+			ImGui::SameLine(0, 15);
+
+			DrawScriptReloadButton();
+		}
+		ImGui::EndChild();
+		ImGui::PopStyleVar(2);
+		ImGui::PopStyleColor();
+	}
+
+	void ViewportPanel::DrawSnapSection()
+	{
+		bool snapping = m_Gizmo.IsSnappingEnabled();
+		if (snapping)
+		{
+			ImGui::PushStyleColor(ImGuiCol_Text, EditorColors::ActiveSnapBlue);
+		}
+		if (ImGui::Button(ICON_FA_MAGNET "##SnapToggle", {28, 28}))
+		{
+			m_Gizmo.SetSnapping(!snapping);
+		}
+		if (snapping)
+		{
+			ImGui::PopStyleColor();
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("Enable Grid Snapping");
+		}
+
+		ImGui::SameLine(0, 5);
+		auto scene = EditorLayer::Get().GetActiveScene();
+		float gridSize = scene->GetSettings().Grid.Spacing;
+		ImGui::SetNextItemWidth(60);
+		if (ImGui::DragFloat("##SnapValue", &gridSize, 0.1f, 0.1f, 50.0f, "%.1f"))
+		{
+			scene->GetSettings().Grid.Spacing = gridSize;
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("Grid Snap Size (synced with visual grid)");
+		}
+	}
+
+	void ViewportPanel::DrawTransformSpaceToggle()
+	{
+		ImGui::SameLine(0, 10);
+
+		bool isLocal = m_Gizmo.IsLocalSpace();
+		if (ImGui::Button(isLocal ? (ICON_FA_CUBE " Local") : (ICON_FA_EARTH_AMERICAS " World"), {70, 28}))
+		{
+			m_Gizmo.SetLocalSpace(!isLocal);
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("Toggle Local/World Space");
+		}
+	}
+
+	void ViewportPanel::DrawScriptReloadButton()
+	{
+		ImGui::SameLine(0, 5);
+		if (ImGui::Button(ICON_FA_FILE_CODE "##ReloadToolbar", ImVec2(28, 28)))
+		{
+			auto project = Project::GetActive();
+			if (project)
+			{
+				auto assemblyPath = ScriptEngine::ResolveAssemblyPath(project->GetConfig().Scripting,
+																	  project->GetConfig().ProjectDirectory);
+				if (auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>())
+				{
+					scriptEngine->RequestAssemblyReload(assemblyPath.string(), "ViewportPanel");
+				}
+			}
+		}
+		if (ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("Reload Scripts (Ctrl+R)");
+		}
+	}
+
+	void ViewportPanel::RenderLightIcons(entt::registry& registry, const Camera3D& camera, float iconMin, float iconMax,
+										 float iconScale)
+	{
+		const glm::vec3 activeCameraPos = camera.Position;
+
+		auto lightView = registry.view<TransformComponent, LightComponent>();
+		for (auto entity : lightView)
+		{
+			auto [transform, light] = lightView.get<TransformComponent, LightComponent>(entity);
+			const glm::vec3 iconPos = glm::vec3(transform.WorldTransform[3]);
+			const float iconSize = ComputeIconSize(iconPos, activeCameraPos, iconMin, iconMax, iconScale);
+
+			glm::vec4 lightTint = {light.LightColor.r / 255.0f, light.LightColor.g / 255.0f,
+								   light.LightColor.b / 255.0f, 0.95f};
+
+			uint32_t iconTextureId = GetIconHandle(m_EditorIcons.LightIcon);
+			DrawBillboardIcon(camera, iconTextureId, iconPos, iconSize, lightTint);
+
+			if (iconTextureId != 0 && light.Type == LightType::Directional)
+			{
+				glm::vec3 dir = glm::normalize(glm::vec3(transform.WorldTransform[2])) * 0.45f;
+				if (auto* debugRenderer = ServiceLocator::TryGet<DebugRenderer>())
+				{
+					debugRenderer->DrawLine(iconPos, iconPos + dir, lightTint);
+				}
+			}
+			else if (iconTextureId == 0 && light.Type == LightType::Directional)
+			{
+				glm::vec3 dir = glm::normalize(glm::vec3(transform.WorldTransform[2])) * 0.5f;
+				if (auto* debugRenderer = ServiceLocator::TryGet<DebugRenderer>())
+				{
+					debugRenderer->DrawLine(iconPos, iconPos + dir, lightTint);
+				}
+			}
+		}
+	}
+
+	void ViewportPanel::DrawBillboardIcon(const Camera3D& camera, uint32_t textureId, const glm::vec3& worldPos,
+										  float iconSize, const glm::vec4& tint)
+	{
+		if (textureId != 0)
+		{
+			if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+			{
+				renderer->DrawBillboard(camera, textureId, worldPos, iconSize, tint);
+			}
+		}
+	}
+
+	void ViewportPanel::RenderEditorIcons(entt::registry& registry, const Camera3D& camera)
+	{
+		const glm::vec3 activeCameraPos = camera.Position;
+
+		auto tryLoadIcon = [&](const char* path, std::shared_ptr<TextureAsset>& cachedIcon) {
+			if (cachedIcon)
+			{
+				return;
+			}
+
+			if (auto* assetManager = ServiceLocator::TryGet<AssetManager>())
+			{
+				cachedIcon = assetManager->Load<TextureAsset>(path);
+			}
+		};
+
+		tryLoadIcon("engine/resources/icons/camera_icon.png", m_EditorIcons.CameraIcon);
+		tryLoadIcon("engine/resources/icons/light_bulb.png", m_EditorIcons.LightIcon);
+		tryLoadIcon("engine/resources/icons/leaf_icon.png", m_EditorIcons.SpawnIcon);
+		tryLoadIcon("engine/resources/icons/audio.png", m_EditorIcons.AudioIcon);
+
+		// Gizmo icon sizing comes from the global editor settings (Editor Settings > Appearance).
+		const auto& editorCfg = EditorLayer::Get().GetConfig();
+		const float iconMin = editorCfg.IconSizeMin;
+		const float iconMax = editorCfg.IconSizeMax;
+		const float iconScale = editorCfg.IconSizeScale;
+
+		// Camera icons
+		auto cameraView = registry.view<TransformComponent, CameraComponent>();
+		for (auto entity : cameraView)
+		{
+			auto [transform, cameraComp] = cameraView.get<TransformComponent, CameraComponent>(entity);
+			const glm::vec3 iconPos = glm::vec3(transform.WorldTransform[3]);
+			if (glm::distance(iconPos, activeCameraPos) < 0.25f)
+			{
+				continue;
+			}
+
+			const float iconSize = ComputeIconSize(iconPos, activeCameraPos, iconMin, iconMax, iconScale);
+			const glm::vec4 cameraTint = glm::vec4(0.65f, 0.95f, 1.0f, 0.95f);
+			DrawBillboardIcon(camera, GetIconHandle(m_EditorIcons.CameraIcon), iconPos, iconSize, cameraTint);
+		}
+
+		// Light icons
+		RenderLightIcons(registry, camera, iconMin, iconMax, iconScale);
+
+		// Spawn icons
+		{
+			auto spawnView = registry.view<TransformComponent, SpawnComponent>();
+			for (auto entity : spawnView)
+			{
+				auto [transform, spawn] = spawnView.get<TransformComponent, SpawnComponent>(entity);
+				const glm::vec3 iconPos = glm::vec3(transform.WorldTransform[3]);
+				const float iconSize = ComputeIconSize(iconPos, activeCameraPos, iconMin, iconMax, iconScale);
+				const glm::vec4 spawnTint = {1.0f, 1.0f, 1.0f, 0.95f};
+				DrawBillboardIcon(camera, GetIconHandle(m_EditorIcons.SpawnIcon), iconPos, iconSize, spawnTint);
+			}
+		}
+		{
+			auto audioView = registry.view<TransformComponent, AudioComponent>();
+			for (auto entity : audioView)
+			{
+				auto [transform, audio] = audioView.get<TransformComponent, AudioComponent>(entity);
+				const glm::vec3 iconPos = glm::vec3(transform.WorldTransform[3]);
+				const float iconSize = ComputeIconSize(iconPos, activeCameraPos, iconMin, iconMax, iconScale);
+				const glm::vec4 audioTint = {1.0f, 1.0f, 1.0f, 0.95f};
+				DrawBillboardIcon(camera, GetIconHandle(m_EditorIcons.AudioIcon), iconPos, iconSize, audioTint);
+			}
+		}
+	}
+} // namespace Chained
diff --git a/editor/panels/viewport_panel.h b/editor/panels/viewport_panel.h
index 79f65a5b7..342abf266 100644
--- a/editor/panels/viewport_panel.h
+++ b/editor/panels/viewport_panel.h
@@ -1,93 +1,131 @@
 #ifndef CH_VIEWPORT_PANEL_H
 #define CH_VIEWPORT_PANEL_H
 
-#include "engine/core/timestep.h"
 #include "panel.h"
-#include "imgui.h"
-#include "IconsFontAwesome6.h"
-#include <memory>
-#include "engine/graphics/api/framebuffer.h"
-#include "viewport/editor_camera.h"
-#include "viewport/editor_gizmo.h"
+#include "engine/common/timestep.h"
+#include "engine/physics/raycast_result.h"
+#include "engine/scene/scene_settings.h"
+#include "viewport/camera.h"
+#include "viewport/gizmo.h"
 #include "viewport/ui_manipulator.h"
+#include "icons.h"
 
-namespace CHEngine
-{
-struct GizmoBtn
-{
-    GizmoType type;
-    const char* icon;
-    const char* tooltip;
-    int key;
-};
+#include <memory>
+#include <glm/glm.hpp>
+#include <entt/entt.hpp>
+#include "engine/core/key_codes.h"
 
-class ViewportPanel : public Panel
+struct GLFWwindow;
+
+namespace Chained
 {
-public:
-    ViewportPanel();
-    ~ViewportPanel();
-
-public:
-    virtual void OnImGuiRender(bool readOnly = false) override;
-    virtual void OnUpdate(Timestep ts) override;
-    virtual void OnEvent(Event& e) override;
-
-public:
-    bool IsFocused() const
-    {
-        return m_Focused;
-    }
-    bool IsHovered() const
-    {
-        return m_Hovered;
-    }
-    glm::vec2 GetSize() const
-    {
-        return m_ViewportSize;
-    }
-
-    GizmoType& GetCurrentTool()
-    {
-        return m_CurrentTool;
-    }
-
-public:
-    void DrawGizmoButtons();
-    void DrawCameraSelector(class Scene* scene);
-
-private:
-    std::shared_ptr<Framebuffer> m_ViewportFramebuffer;
-    std::shared_ptr<Framebuffer> m_HDRFramebuffer;
-    glm::vec2 m_ViewportSize = {0, 0};
-    bool m_Focused = false;
-    bool m_Hovered = false;
-
-    std::unique_ptr<EditorCameraController> m_CameraController;
-    EditorGizmo m_Gizmo;
-    EditorUIManipulator m_UIManipulator;
-    GizmoType m_CurrentTool = GizmoType::TRANSLATE;
-    Entity m_SelectedEntity;
-    std::unique_ptr<class SceneRenderer> m_SceneRenderer;
-
-    // UI Interaction state
-    ImVec2 m_UIDragOffset = {0, 0};
-
-    // Viewport Camera State
-    uint64_t m_ViewportCameraEntityUUID = 0; // 0 = Editor Camera
-
-private:
-    void HandleResize(const ImVec2& viewportSize, class Scene* activeScene);
-    void RenderViewportScene(class Scene* activeScene, const ImVec2& viewportSize);
-    void HandleDragDrop(class Scene* activeScene);
-    void RenderOverlays(class Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
-    void HandlePicking(class Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
-    void RenderToolbar(class Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
-    void RenderLaunchHUD(const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
-
-private:
-    void ClearSceneBackground(Scene* scene);
-};
-
-} // namespace CHEngine
-
-#endif // CH_VIEWPORT_PANEL_H
+
+	class Framebuffer;
+	class Scene;
+	class SceneRenderer;
+	class Renderer;
+	struct SceneSettings;
+	struct Camera3D;
+	class Event;
+
+	struct GizmoBtn
+	{
+		GizmoType type;
+		const char* icon;
+		const char* tooltip;
+		KeyCode key;
+	};
+
+	class ViewportPanel : public Panel
+	{
+	public:
+		ViewportPanel(ImVec2& editorViewportSize);
+		~ViewportPanel() override;
+
+		void OnImGuiRender(bool readOnly = false) override;
+		void OnUpdate(Timestep ts) override;
+		void OnEvent(Event& e) override;
+
+		bool IsFocused() const
+		{
+			return m_Focused;
+		}
+		bool IsHovered() const
+		{
+			return m_Hovered;
+		}
+		glm::vec2 GetSize() const
+		{
+			return m_ViewportSize;
+		}
+		GizmoType& GetCurrentTool()
+		{
+			return m_CurrentTool;
+		}
+
+		void DrawGizmoButtons();
+		void DrawCameraSelector(Scene* scene);
+		Ray GetMouseRay(const glm::vec2& mousePosition);
+
+		std::shared_ptr<Framebuffer> GetViewportFramebuffer() const
+		{
+			return m_ViewportFramebuffer;
+		}
+
+	private:
+		glm::vec2 m_ViewportSize = {0, 0};
+		bool m_Focused = false;
+		bool m_Hovered = false;
+		bool m_CursorLocked = false;
+		GLFWwindow* m_PlatformWindow = nullptr;
+		GLFWwindow* m_LockedWindow = nullptr;
+		GizmoType m_CurrentTool = GizmoType::TRANSLATE;
+
+		std::unique_ptr<EditorCameraController> m_CameraController;
+		EditorGizmo m_Gizmo;
+		EditorUIManipulator m_UIManipulator;
+		EditorIcons m_EditorIcons;
+
+		SceneType m_LastSceneType = SceneType::Default;
+
+		std::shared_ptr<Framebuffer> m_ViewportFramebuffer;
+		std::shared_ptr<Framebuffer> m_HDRFramebuffer;
+		uint32_t m_MSAAFramebufferSamples = 1; // MSAA sample count m_HDRFramebuffer was last (re)created with
+
+		// Engine subsystem pointers are now accessed via static APIs (Renderer::Get(), etc.)
+		std::unique_ptr<SceneRenderer> m_SceneRenderer;
+
+		ImVec2& m_EditorViewportSize;
+
+	private:
+		void HandleResize(const ImVec2& viewportSize, Scene* activeScene);
+		void RenderViewportScene(Scene* activeScene);
+		void HandleDragDrop(Scene* activeScene);
+		void RenderOverlays(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
+		void HandlePicking(Scene* activeScene, const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
+		void RenderToolbar(Scene* activeScene, const ImVec2& viewportScreenPos);
+		void HandleKeyboardShortcuts();
+
+		// Toolbar sub-sections
+		void DrawSnapSection();
+		void DrawTransformSpaceToggle();
+		void DrawScriptReloadButton();
+
+		// Picking helpers
+		Entity HandleIconPicking(Scene* scene, const Camera3D& camera, const ImVec2& mousePos,
+								 const ImVec2& viewportSize, const ImVec2& viewportScreenPos);
+
+		// Icon rendering helpers
+		void DrawBillboardIcon(const Camera3D& camera, uint32_t textureId, const glm::vec3& worldPos, float iconSize,
+							   const glm::vec4& tint);
+		void RenderEditorIcons(entt::registry& registry, const Camera3D& camera);
+		void RenderLightIcons(entt::registry& registry, const Camera3D& camera, float iconMin, float iconMax,
+							  float iconScale);
+		void ClearSceneBackground(Scene* scene);
+
+		Camera3D GetActiveOrEditorCamera(Scene* scene) const;
+	};
+
+} // namespace Chained
+
+#endif // CH_VIEWPORT_PANEL_H
\ No newline at end of file
diff --git a/editor/panels/world_panel.cpp b/editor/panels/world_panel.cpp
index fb1e6d3e7..04d9d0473 100644
--- a/editor/panels/world_panel.cpp
+++ b/editor/panels/world_panel.cpp
@@ -1,450 +1,590 @@
 #include "world_panel.h"
-#include "IconsFontAwesome6.h"
-#include "editor/editor_layer.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/environment.h"
-#include "engine/platform/utils/dialogs.h"
-#include "engine/scene/project.h"
+#include "editor/layer.h"
+#include "editor/project/project_serializer.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/environment_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/imgui/imgui_layer.h"
+#include "engine/physics/physics.h"
+#include "engine/platform/dialogs/dialogs.h"
+#include "engine/project/project.h"
 #include "scene/scene.h"
+#include "thirdparty/IconsFontAwesome6.h"
 #include <filesystem>
+#include <fstream>
 
-
-namespace CHEngine
-{
-
-WorldPanel::WorldPanel()
+namespace Chained
 {
-    m_Name = "World Settings";
-}
 
-void WorldPanel::OnImGuiRender(bool readOnly)
-{
-    if (!m_IsOpen)
-    {
-        return;
-    }
-
-    ImGui::Begin(m_Name.c_str(), &m_IsOpen);
-
-    if (!m_Context)
-    {
-        ImGui::Text("No active scene.");
-        ImGui::End();
-        return;
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_GLOBE "  Scene Background", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::Indent(10.0f);
-        if (readOnly)
-        {
-            ImGui::BeginDisabled();
-        }
-
-        const char* bgModes[] = {"Solid Color", "Texture", "3D Environment"};
-        int currentMode = (int)m_Context->GetSettings().Mode;
-
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Mode");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(-1);
-        if (ImGui::Combo("##BGMode", &currentMode, bgModes, 3))
-        {
-            m_Context->GetSettings().Mode = (BackgroundMode)currentMode;
-        }
-
-        if (m_Context->GetSettings().Mode == BackgroundMode::Color)
-        {
-            Color bgColor = m_Context->GetSettings().BackgroundColor;
-            float c[4] = {bgColor.r / 255.f, bgColor.g / 255.f, bgColor.b / 255.f, bgColor.a / 255.f};
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("Color");
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(-1);
-            if (ImGui::ColorEdit4("##BGColor", c))
-            {
-                m_Context->GetSettings().BackgroundColor = {(uint8_t)(c[0] * 255), (uint8_t)(c[1] * 255),
-                                                            (uint8_t)(c[2] * 255), (uint8_t)(c[3] * 255)};
-            }
-        }
-        else if (m_Context->GetSettings().Mode == BackgroundMode::Texture)
-        {
-            char buffer[256];
-            memset(buffer, 0, sizeof(buffer));
-            strncpy(buffer, m_Context->GetSettings().BackgroundTexturePath.c_str(), sizeof(buffer) - 1);
-
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("Texture");
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 35);
-            if (ImGui::InputText("##BGPath", buffer, sizeof(buffer)))
-            {
-                m_Context->GetSettings().BackgroundTexturePath = buffer;
-            }
-
-            ImGui::SameLine();
-            if (ImGui::Button(ICON_FA_FOLDER_OPEN "##BGSelect"))
-            {
-                std::vector<FileDialogFilter> filters = {{"Textures", "png,jpg,tga,bmp"}};
-                auto result = Dialogs::OpenFile(filters);
-                if (result)
-                {
-                    std::filesystem::path p = *result;
-                    if (Project::GetActive())
-                    {
-                        m_Context->GetSettings().BackgroundTexturePath =
-                            std::filesystem::relative(p, Project::GetAssetDirectory()).string();
-                    }
-                    else
-                    {
-                        m_Context->GetSettings().BackgroundTexturePath = p.filename().string();
-                    }
-                }
-            }
-        }
-
-        if (readOnly)
-        {
-            ImGui::EndDisabled();
-        }
-        ImGui::Unindent(10.0f);
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_MICROCHIP "  Physics", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::Indent(10.0f);
-        if (readOnly)
-        {
-            ImGui::BeginDisabled();
-        }
-
-        if (auto project = Project::GetActive())
-        {
-            auto& settings = project->GetConfig().Physics;
-
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("Gravity");
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(-1);
-            ImGui::DragFloat("##Gravity", &settings.Gravity, 0.1f);
-
-            float fps = 1.0f / settings.FixedTimestep;
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("Fixed FPS");
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(-1);
-            if (ImGui::DragFloat("##FixedFPS", &fps, 1.0f, 10.0f, 240.0f))
-            {
-                settings.FixedTimestep = 1.0f / fps;
-            }
-        }
-        else
-        {
-            ImGui::TextDisabled("No active project.");
-        }
-
-        if (readOnly)
-        {
-            ImGui::EndDisabled();
-        }
-        ImGui::Unindent(10.0f);
-    }
-
-    ImGui::Spacing();
-    ImGui::Separator();
-    ImGui::Spacing();
-
-    auto env = m_Context->GetSettings().Environment;
-
-    if (!readOnly)
-    {
-        if (ImGui::Button(ICON_FA_FILE_IMPORT " Load Environment"))
-        {
-            std::vector<FileDialogFilter> filters = {{"Environment", "chenv"}};
-            auto result = Dialogs::OpenFile(filters);
-            if (result)
-            {
-                if (auto project = Project::GetActive())
-                {
-                    m_Context->GetSettings().Environment = AssetManager::Get().Get<EnvironmentAsset>(result->string());
-                }
-            }
-        }
-
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_FILE_CIRCLE_PLUS " New"))
-        {
-            std::vector<FileDialogFilter> filters = {{"Environment", "chenv"}};
-            auto result = Dialogs::SaveFile(filters);
-            if (result)
-            {
-                auto newEnv = std::make_shared<EnvironmentAsset>();
-                newEnv->SetPath(result->string());
-                m_Context->GetSettings().Environment = newEnv;
-            }
-        }
-    }
-
-    if (env)
-    {
-        if (!readOnly)
-        {
-            ImGui::TextDisabled(ICON_FA_FILE_SIGNATURE " %s",
-                                std::filesystem::path(env->GetPath()).filename().string().c_str());
-            ImGui::SameLine(ImGui::GetContentRegionAvail().x - 60);
-
-            if (ImGui::Button(ICON_FA_FLOPPY_DISK " Save"))
-            {
-                const auto& settings = env->GetSettings();
-
-                YAML::Emitter out;
-                out << YAML::BeginMap;
-                out << YAML::Key << "Environment" << YAML::BeginMap;
-                out << YAML::Key << "Lighting" << YAML::BeginMap;
-                out << YAML::Key << "Direction" << YAML::BeginMap;
-                out << YAML::Key << "X" << YAML::Value << settings.Lighting.Direction.x;
-                out << YAML::Key << "Y" << YAML::Value << settings.Lighting.Direction.y;
-                out << YAML::Key << "Z" << YAML::Value << settings.Lighting.Direction.z;
-                out << YAML::EndMap;
-
-                out << YAML::Key << "LightColor" << YAML::BeginMap;
-                out << YAML::Key << "R" << YAML::Value << (int)settings.Lighting.LightColor.r;
-                out << YAML::Key << "G" << YAML::Value << (int)settings.Lighting.LightColor.g;
-                out << YAML::Key << "B" << YAML::Value << (int)settings.Lighting.LightColor.b;
-                out << YAML::Key << "A" << YAML::Value << (int)settings.Lighting.LightColor.a;
-                out << YAML::EndMap;
-                out << YAML::Key << "Ambient" << YAML::Value << settings.Lighting.Ambient;
-                out << YAML::Key << "Exposure" << YAML::Value << settings.Lighting.Exposure;
-                out << YAML::Key << "Gamma" << YAML::Value << settings.Lighting.Gamma;
-                out << YAML::EndMap;
-
-                out << YAML::Key << "Skybox" << YAML::BeginMap;
-                out << YAML::Key << "TexturePath" << YAML::Value << settings.Skybox.TexturePath;
-                out << YAML::Key << "Exposure" << YAML::Value << settings.Skybox.Exposure;
-                out << YAML::Key << "Brightness" << YAML::Value << settings.Skybox.Brightness;
-                out << YAML::Key << "Contrast" << YAML::Value << settings.Skybox.Contrast;
-                out << YAML::EndMap;
-
-                out << YAML::Key << "Fog" << YAML::BeginMap;
-                out << YAML::Key << "Enabled" << YAML::Value << settings.Fog.Enabled;
-                out << YAML::Key << "Color" << YAML::BeginMap;
-                out << YAML::Key << "R" << YAML::Value << (int)settings.Fog.FogColor.r;
-                out << YAML::Key << "G" << YAML::Value << (int)settings.Fog.FogColor.g;
-                out << YAML::Key << "B" << YAML::Value << (int)settings.Fog.FogColor.b;
-                out << YAML::Key << "A" << YAML::Value << (int)settings.Fog.FogColor.a;
-                out << YAML::EndMap;
-                out << YAML::Key << "Density" << YAML::Value << settings.Fog.Density;
-                out << YAML::Key << "Start" << YAML::Value << settings.Fog.Start;
-                out << YAML::Key << "End" << YAML::Value << settings.Fog.End;
-                out << YAML::EndMap;
-
-                out << YAML::EndMap;
-
-                out << YAML::EndMap;
-                out << YAML::EndMap;
-
-                std::string path = env->GetPath();
-                std::filesystem::path fullPath(path);
-                std::filesystem::create_directories(fullPath.parent_path());
-                std::ofstream fout(fullPath);
-                if (fout.is_open())
-                {
-                    fout << out.c_str();
-                }
-            }
-        }
-
-        DrawEnvironmentSettings(env, readOnly);
-    }
-
-    ImGui::End();
-}
-
-void WorldPanel::DrawEnvironmentSettings(std::shared_ptr<EnvironmentAsset> env, bool readOnly)
-{
-    auto& settings = env->GetSettings();
-
-    if (ImGui::CollapsingHeader(ICON_FA_SUN "  Global Lighting", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::PushID("GlobalLighting");
-        ImGui::Indent(10.0f);
-        if (readOnly)
-        {
-            ImGui::BeginDisabled();
-        }
-
-        auto drawDragFloat = [&](const char* label, float* value, float speed, float min, float max,
-                                 const char* format = "%.3f") {
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("%s", label);
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(-1);
-            std::string id = "##";
-            id += label;
-            return ImGui::DragFloat(id.c_str(), value, speed, min, max, format);
-        };
-
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Direction");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(-1);
-        ImGui::DragFloat3("##Direction", &settings.Lighting.Direction.x, 0.01f, -1.0f, 1.0f);
-
-        float color[4] = {settings.Lighting.LightColor.r / 255.f, settings.Lighting.LightColor.g / 255.f,
-                          settings.Lighting.LightColor.b / 255.f, settings.Lighting.LightColor.a / 255.f};
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Color");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(-1);
-        if (ImGui::ColorEdit4("##LightColor", color))
-        {
-            settings.Lighting.LightColor = {(uint8_t)(color[0] * 255), (uint8_t)(color[1] * 255),
-                                            (uint8_t)(color[2] * 255), (uint8_t)(color[3] * 255)};
-        }
-
-        drawDragFloat("Ambient", &settings.Lighting.Ambient, 0.005f, 0.0f, 2.0f);
-        drawDragFloat("Exposure", &settings.Lighting.Exposure, 0.01f, 0.0f, 10.0f);
-        drawDragFloat("Gamma", &settings.Lighting.Gamma, 0.01f, 1.0f, 4.0f);
-
-        if (readOnly)
-        {
-            ImGui::EndDisabled();
-        }
-        ImGui::Unindent(10.0f);
-        ImGui::PopID();
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_CLOUD "  Skybox", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::PushID("Skybox");
-        ImGui::Indent(10.0f);
-        if (readOnly)
-        {
-            ImGui::BeginDisabled();
-        }
-
-        auto drawDragFloat = [&](const char* label, float* value, float speed, float min, float max,
-                                 const char* format = "%.3f") {
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("%s", label);
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(-1);
-            std::string id = "##";
-            id += label;
-            return ImGui::DragFloat(id.c_str(), value, speed, min, max, format);
-        };
-
-        char buffer[256];
-        memset(buffer, 0, sizeof(buffer));
-        strncpy(buffer, settings.Skybox.TexturePath.c_str(), sizeof(buffer) - 1);
-
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Texture");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 35);
-        if (ImGui::InputText("##SkyPath", buffer, sizeof(buffer)))
-        {
-            settings.Skybox.TexturePath = buffer;
-        }
-
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_FOLDER_OPEN "##SkySelect"))
-        {
-            std::vector<FileDialogFilter> filters = {{"Textures/HDR", "png,jpg,hdr"}};
-            auto result = Dialogs::OpenFile(filters);
-            if (result)
-            {
-                std::filesystem::path p = *result;
-                if (Project::GetActive())
-                {
-                    settings.Skybox.TexturePath = std::filesystem::relative(p, Project::GetAssetDirectory()).string();
-                }
-                else
-                {
-                    settings.Skybox.TexturePath = p.filename().string();
-                }
-            }
-        }
-
-        const char* mapModes[] = {"Sphere", "Cross", "Cubemap"};
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Mapping");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(-1);
-        ImGui::Combo("##MapMode", &settings.Skybox.Mode, mapModes, 3);
-        if (ImGui::IsItemHovered())
-        {
-            ImGui::SetTooltip("Sphere: Equirectangular\nCross: Horizontal Cross\nCubemap: GPU Generated");
-        }
-
-        drawDragFloat("Exposure", &settings.Skybox.Exposure, 0.01f, 0.0f, 10.0f);
-        drawDragFloat("Brightness", &settings.Skybox.Brightness, 0.01f, -2.0f, 2.0f);
-        drawDragFloat("Contrast", &settings.Skybox.Contrast, 0.01f, 0.0f, 5.0f);
-
-        if (readOnly)
-        {
-            ImGui::EndDisabled();
-        }
-        ImGui::Unindent(10.0f);
-        ImGui::PopID();
-    }
-
-    if (ImGui::CollapsingHeader(ICON_FA_SMOG "  Fog Visibility", ImGuiTreeNodeFlags_DefaultOpen))
-    {
-        ImGui::PushID("FogVisibility");
-        ImGui::Indent(10.0f);
-        if (readOnly)
-        {
-            ImGui::BeginDisabled();
-        }
-
-        auto drawDragFloat = [&](const char* label, float* value, float speed, float min, float max,
-                                 const char* format = "%.3f") {
-            ImGui::AlignTextToFramePadding();
-            ImGui::Text("%s", label);
-            ImGui::SameLine(100);
-            ImGui::SetNextItemWidth(-1);
-            std::string id = "##";
-            id += label;
-            return ImGui::DragFloat(id.c_str(), value, speed, min, max, format);
-        };
-
-        auto& fog = settings.Fog;
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Enabled");
-        ImGui::SameLine(100);
-        ImGui::Checkbox("##FogEnabled", &fog.Enabled);
-
-        float fogColor[4] = {fog.FogColor.r / 255.f, fog.FogColor.g / 255.f, fog.FogColor.b / 255.f,
-                             fog.FogColor.a / 255.f};
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Color");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(-1);
-        if (ImGui::ColorEdit4("##FogColor", fogColor))
-        {
-            fog.FogColor = {(uint8_t)(fogColor[0] * 255), (uint8_t)(fogColor[1] * 255), (uint8_t)(fogColor[2] * 255),
-                            (uint8_t)(fogColor[3] * 255)};
-        }
-
-        const char* fogModes[] = {"Linear", "Exponential", "Exponential Squared"};
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("Mode");
-        ImGui::SameLine(100);
-        ImGui::SetNextItemWidth(-1);
-        ImGui::Combo("##FogMode", &fog.Mode, fogModes, 3);
-
-        drawDragFloat("Density", &fog.Density, 0.0001f, 0.0f, 0.1f, "%.4f");
-        drawDragFloat("Start", &fog.Start, 1.0f, 0.0f, 10000.0f);
-        drawDragFloat("End", &fog.End, 1.0f, 0.0f, 10000.0f);
-
-        if (readOnly)
-        {
-            ImGui::EndDisabled();
-        }
-        ImGui::Unindent(10.0f);
-        ImGui::PopID();
-    }
-}
-
-} // namespace CHEngine
+	static void ColorToFloat4(const Color& c, float out[4])
+	{
+		out[0] = c.r / 255.f;
+		out[1] = c.g / 255.f;
+		out[2] = c.b / 255.f;
+		out[3] = c.a / 255.f;
+	}
+
+	static Color Float4ToColor(const float c[4])
+	{
+		return {(uint8_t)(c[0] * 255), (uint8_t)(c[1] * 255), (uint8_t)(c[2] * 255), (uint8_t)(c[3] * 255)};
+	}
+
+	static bool DrawDragFloat(const char* label, float* value, float speed = 0.1f, float min = 0.0f, float max = 0.0f,
+							  const char* format = "%.3f")
+	{
+		ImGui::AlignTextToFramePadding();
+		ImGui::Text("%s", label);
+		ImGui::SameLine(100);
+		ImGui::SetNextItemWidth(-1);
+		ImGui::PushID(label);
+		bool changed = ImGui::DragFloat("##v", value, speed, min, max, format);
+		ImGui::PopID();
+		return changed;
+	}
+
+	static void SaveProjectConfig()
+	{
+		if (auto project = Project::GetActive())
+		{
+			std::filesystem::path path = project->GetConfig().ProjectDirectory / (project->GetName() + ".chproject");
+			EditorProjectSerializer::Serialize(project, path);
+		}
+	}
+
+	WorldPanel::WorldPanel()
+	{
+		m_Name = "World Settings";
+	}
+
+	void WorldPanel::OnImGuiRender(bool readOnly)
+	{
+		if (!m_IsOpen)
+		{
+			return;
+		}
+
+		ImGui::Begin(m_Name.c_str(), &m_IsOpen);
+
+		if (!m_Context)
+		{
+			ImGui::Text("No active scene.");
+			ImGui::End();
+			return;
+		}
+
+		DrawSceneGeneral(readOnly);
+		DrawSceneBackground(readOnly);
+
+		if (m_Context->GetSettings().Mode == BackgroundMode::Environment3D)
+		{
+			DrawPhysicsSettings(readOnly);
+			DrawEnvironmentSection(readOnly);
+		}
+
+		ImGui::End();
+	}
+
+	void WorldPanel::DrawSceneGeneral(bool readOnly)
+	{
+		if (!ImGui::CollapsingHeader(ICON_FA_SLIDERS "  Scene General", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			return;
+		}
+
+		ImGui::Indent(10.0f);
+		if (readOnly)
+		{
+			ImGui::BeginDisabled();
+		}
+
+		auto& settings = m_Context->GetSettings();
+		const char* typeModes[] = {"Default (3D)", "UI"};
+		int currentType = (int)settings.Type;
+
+		ImGui::AlignTextToFramePadding();
+		ImGui::Text("Type");
+		ImGui::SameLine(100);
+		ImGui::SetNextItemWidth(-1);
+		if (ImGui::Combo("##SceneType", &currentType, typeModes, 2))
+		{
+			settings.Type = (SceneType)currentType;
+		}
+
+		if (readOnly)
+		{
+			ImGui::EndDisabled();
+		}
+		ImGui::Unindent(10.0f);
+	}
+
+	void WorldPanel::DrawSceneBackground(bool readOnly)
+	{
+		if (!ImGui::CollapsingHeader(ICON_FA_GLOBE "  Scene Background", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			return;
+		}
+
+		ImGui::Indent(10.0f);
+		if (readOnly)
+		{
+			ImGui::BeginDisabled();
+		}
+
+		auto& settings = m_Context->GetSettings();
+		const char* bgModes[] = {"Solid Color", "Texture", "3D Environment"};
+		int currentMode = (int)settings.Mode;
+
+		ImGui::AlignTextToFramePadding();
+		ImGui::Text("Mode");
+		ImGui::SameLine(100);
+		ImGui::SetNextItemWidth(-1);
+		if (ImGui::Combo("##BGMode", &currentMode, bgModes, 3))
+		{
+			settings.Mode = (BackgroundMode)currentMode;
+		}
+
+		if (settings.Mode == BackgroundMode::Color)
+		{
+			float c[4];
+			ColorToFloat4(settings.BackgroundColor, c);
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Color");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			if (ImGui::ColorEdit4("##BGColor", c))
+			{
+				settings.BackgroundColor = Float4ToColor(c);
+			}
+		}
+		else if (settings.Mode == BackgroundMode::Texture)
+		{
+			char buffer[256];
+			snprintf(buffer, sizeof(buffer), "%s", settings.BackgroundTexturePath.c_str());
+
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Texture");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 35);
+			if (ImGui::InputText("##BGPath", buffer, sizeof(buffer)))
+			{
+				settings.BackgroundTexturePath = buffer;
+			}
+
+			ImGui::SameLine();
+			if (ImGui::Button(ICON_FA_FOLDER_OPEN "##BGSelect"))
+			{
+				std::vector<DialogFilter> filters = {{"Textures", "png,jpg,tga,bmp"}};
+				auto result = Chained::Dialogs::OpenFile(filters);
+				if (result)
+				{
+					std::filesystem::path p = *result;
+					if (Project::GetActive())
+					{
+						settings.BackgroundTexturePath =
+							std::filesystem::relative(p, Project::GetActive()->GetAssetDirectory()).string();
+					}
+					else
+					{
+						settings.BackgroundTexturePath = p.filename().string();
+					}
+				}
+			}
+		}
+
+		if (readOnly)
+		{
+			ImGui::EndDisabled();
+		}
+		ImGui::Unindent(10.0f);
+	}
+
+	void WorldPanel::DrawPhysicsSettings(bool readOnly)
+	{
+		if (!ImGui::CollapsingHeader(ICON_FA_MICROCHIP "  Physics", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			return;
+		}
+
+		ImGui::Indent(10.0f);
+		if (readOnly)
+		{
+			ImGui::BeginDisabled();
+		}
+
+		if (auto project = Project::GetActive())
+		{
+			auto& physicsSettings = project->GetConfig().Physics;
+
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Gravity");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			ImGui::DragFloat("##Gravity", &physicsSettings.Gravity, 0.1f);
+
+			if (ImGui::IsItemDeactivatedAfterEdit())
+			{
+				SceneState state = EditorLayer::Get().GetSceneState();
+				if (state == SceneState::Play || state == SceneState::Simulate)
+				{
+					if (auto* physics = ServiceLocator::TryGet<Physics>())
+					{
+						if (auto* world = physics->GetWorld())
+						{
+							world->SetGravity(physicsSettings.Gravity);
+						}
+					}
+				}
+				SaveProjectConfig();
+			}
+
+			float fps = 1.0f / physicsSettings.FixedTimestep;
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Fixed FPS");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			if (ImGui::DragFloat("##FixedFPS", &fps, 1.0f, 10.0f, 240.0f))
+			{
+				physicsSettings.FixedTimestep = 1.0f / fps;
+			}
+
+			if (ImGui::IsItemDeactivatedAfterEdit())
+			{
+				SaveProjectConfig();
+			}
+		}
+		else
+		{
+			ImGui::TextDisabled("No active project.");
+		}
+
+		if (readOnly)
+		{
+			ImGui::EndDisabled();
+		}
+		ImGui::Unindent(10.0f);
+
+		ImGui::Spacing();
+		ImGui::Separator();
+		ImGui::Spacing();
+	}
+
+	void WorldPanel::DrawEnvironmentSection(bool readOnly)
+	{
+		auto env = m_Context->GetSettings().Environment;
+
+		if (!readOnly)
+		{
+			if (ImGui::Button(ICON_FA_FILE_IMPORT " Load Environment"))
+			{
+				std::vector<DialogFilter> filters = {{"Environment", "chenv"}};
+				auto result = Chained::Dialogs::OpenFile(filters);
+				if (result)
+				{
+					if (auto project = Project::GetActive())
+					{
+						if (auto* am = ServiceLocator::TryGet<AssetManager>())
+						{
+							auto handle = am->ResolveToHandle(result->string());
+							m_Context->GetSettings().Environment = am->Get<EnvironmentAsset>(result->string());
+						}
+					}
+				}
+			}
+
+			ImGui::SameLine();
+			if (ImGui::Button(ICON_FA_FILE_CIRCLE_PLUS " New"))
+			{
+				std::vector<DialogFilter> filters = {{"Environment", "chenv"}};
+				auto result = Chained::Dialogs::SaveFile(filters);
+				if (result)
+				{
+					if (result->extension().empty())
+					{
+						result->replace_extension(".chenv");
+					}
+
+					auto newEnv = std::make_shared<EnvironmentAsset>();
+					newEnv->SetPath(result->string());
+					m_Context->GetSettings().Environment = newEnv;
+				}
+			}
+		}
+
+		if (env)
+		{
+			if (!readOnly)
+			{
+				ImGui::TextDisabled(ICON_FA_FILE_SIGNATURE " %s",
+									std::filesystem::path(env->GetPath()).filename().string().c_str());
+				ImGui::SameLine(ImGui::GetContentRegionAvail().x - 60);
+
+				if (ImGui::Button(ICON_FA_FLOPPY_DISK " Save"))
+				{
+					const auto& s = env->GetSettings();
+
+					YAML::Emitter out;
+					out << YAML::BeginMap;
+					out << YAML::Key << "Environment" << YAML::BeginMap;
+
+					out << YAML::Key << "Lighting" << YAML::BeginMap;
+					out << YAML::Key << "Direction" << YAML::BeginMap;
+					out << YAML::Key << "X" << YAML::Value << s.Lighting.Direction.x;
+					out << YAML::Key << "Y" << YAML::Value << s.Lighting.Direction.y;
+					out << YAML::Key << "Z" << YAML::Value << s.Lighting.Direction.z;
+					out << YAML::EndMap;
+					out << YAML::Key << "LightColor" << YAML::BeginMap;
+					out << YAML::Key << "R" << YAML::Value << (int)s.Lighting.LightColor.r;
+					out << YAML::Key << "G" << YAML::Value << (int)s.Lighting.LightColor.g;
+					out << YAML::Key << "B" << YAML::Value << (int)s.Lighting.LightColor.b;
+					out << YAML::Key << "A" << YAML::Value << (int)s.Lighting.LightColor.a;
+					out << YAML::EndMap;
+					out << YAML::Key << "Ambient" << YAML::Value << s.Lighting.Ambient;
+					out << YAML::Key << "Exposure" << YAML::Value << s.Lighting.Exposure;
+					out << YAML::Key << "Gamma" << YAML::Value << s.Lighting.Gamma;
+					out << YAML::EndMap;
+
+					out << YAML::Key << "Skybox" << YAML::BeginMap;
+					out << YAML::Key << "TexturePath" << YAML::Value << s.Skybox.TexturePath;
+					out << YAML::Key << "Mode" << YAML::Value << s.Skybox.Mode;
+					for (int i = 0; i < 6; ++i)
+					{
+						out << YAML::Key << ("CubeFace" + std::to_string(i)) << YAML::Value << s.Skybox.CubeFaces[i];
+					}
+					out << YAML::Key << "Exposure" << YAML::Value << s.Skybox.Exposure;
+					out << YAML::Key << "Brightness" << YAML::Value << s.Skybox.Brightness;
+					out << YAML::Key << "Contrast" << YAML::Value << s.Skybox.Contrast;
+					out << YAML::EndMap;
+
+					out << YAML::Key << "Fog" << YAML::BeginMap;
+					out << YAML::Key << "Enabled" << YAML::Value << s.Fog.Enabled;
+					out << YAML::Key << "Color" << YAML::BeginMap;
+					out << YAML::Key << "R" << YAML::Value << (int)s.Fog.FogColor.r;
+					out << YAML::Key << "G" << YAML::Value << (int)s.Fog.FogColor.g;
+					out << YAML::Key << "B" << YAML::Value << (int)s.Fog.FogColor.b;
+					out << YAML::Key << "A" << YAML::Value << (int)s.Fog.FogColor.a;
+					out << YAML::EndMap;
+					out << YAML::Key << "Density" << YAML::Value << s.Fog.Density;
+					out << YAML::Key << "Start" << YAML::Value << s.Fog.Start;
+					out << YAML::Key << "End" << YAML::Value << s.Fog.End;
+					out << YAML::Key << "HeightFalloff" << YAML::Value << s.Fog.HeightFalloff;
+					out << YAML::EndMap;
+
+					out << YAML::EndMap;
+					out << YAML::EndMap;
+					out << YAML::EndMap;
+
+					std::string path = env->GetPath();
+					std::filesystem::path fullPath(path);
+					std::filesystem::create_directories(fullPath.parent_path());
+					std::ofstream fout(fullPath);
+					if (fout.is_open())
+					{
+						fout << out.c_str();
+					}
+				}
+			}
+
+			DrawEnvironmentSettings(env, readOnly);
+		}
+	}
+
+	void WorldPanel::DrawEnvironmentSettings(std::shared_ptr<EnvironmentAsset> env, bool readOnly)
+	{
+		auto& settings = env->GetSettings();
+
+		if (ImGui::CollapsingHeader(ICON_FA_SUN "  Global Lighting", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			ImGui::PushID("GlobalLighting");
+			ImGui::Indent(10.0f);
+			if (readOnly)
+			{
+				ImGui::BeginDisabled();
+			}
+
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Direction");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			ImGui::DragFloat3("##Direction", &settings.Lighting.Direction.x, 0.01f, -1.0f, 1.0f);
+
+			float color[4];
+			ColorToFloat4(settings.Lighting.LightColor, color);
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Color");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			if (ImGui::ColorEdit4("##LightColor", color))
+			{
+				settings.Lighting.LightColor = Float4ToColor(color);
+			}
+
+			DrawDragFloat("Ambient", &settings.Lighting.Ambient, 0.005f, 0.0f, 2.0f);
+			DrawDragFloat("Exposure", &settings.Lighting.Exposure, 0.01f, 0.0f, 10.0f);
+			DrawDragFloat("Gamma", &settings.Lighting.Gamma, 0.01f, 1.0f, 4.0f);
+
+			if (readOnly)
+			{
+				ImGui::EndDisabled();
+			}
+			ImGui::Unindent(10.0f);
+			ImGui::PopID();
+		}
+
+		if (ImGui::CollapsingHeader(ICON_FA_CLOUD "  Skybox", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			ImGui::PushID("Skybox");
+			ImGui::Indent(10.0f);
+			if (readOnly)
+			{
+				ImGui::BeginDisabled();
+			}
+
+			const char* mapModes[] = {"Sphere", "Cross", "Cubemap", "Six Faces"};
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Mapping");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			ImGui::Combo("##MapMode", &settings.Skybox.Mode, mapModes, 4);
+			if (ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip("Sphere: Equirectangular\nCross: Horizontal Cross\nCubemap: GPU Generated\nSix "
+								  "Faces: 6 Separate Images");
+			}
+
+			if (settings.Skybox.Mode == 3)
+			{
+				const char* faceLabels[] = {"Right (+X)", "Left (-X)",	"Up (+Y)",
+											"Down (-Y)",  "Front (+Z)", "Back (-Z)"};
+				for (int i = 0; i < 6; ++i)
+				{
+					char buffer[256];
+					snprintf(buffer, sizeof(buffer), "%s", settings.Skybox.CubeFaces[i].c_str());
+
+					ImGui::AlignTextToFramePadding();
+					ImGui::Text("%s", faceLabels[i]);
+					ImGui::SameLine(100);
+					ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 35);
+					std::string inputId = "##SkyFace" + std::to_string(i);
+					if (ImGui::InputText(inputId.c_str(), buffer, sizeof(buffer)))
+					{
+						settings.Skybox.CubeFaces[i] = buffer;
+					}
+
+					ImGui::SameLine();
+					std::string btnId = ICON_FA_FOLDER_OPEN "##SkyFaceBtn" + std::to_string(i);
+					if (ImGui::Button(btnId.c_str()))
+					{
+						std::vector<DialogFilter> filters = {{"Textures", "png,jpg,tga,bmp"}};
+						auto result = Chained::Dialogs::OpenFile(filters);
+						if (result)
+						{
+							std::filesystem::path p = *result;
+							if (Project::GetActive())
+							{
+								settings.Skybox.CubeFaces[i] =
+									std::filesystem::relative(p, Project::GetActive()->GetAssetDirectory()).string();
+							}
+							else
+							{
+								settings.Skybox.CubeFaces[i] = p.filename().string();
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				char buffer[256];
+				snprintf(buffer, sizeof(buffer), "%s", settings.Skybox.TexturePath.c_str());
+
+				ImGui::AlignTextToFramePadding();
+				ImGui::Text("Texture");
+				ImGui::SameLine(100);
+				ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 35);
+				if (ImGui::InputText("##SkyPath", buffer, sizeof(buffer)))
+				{
+					settings.Skybox.TexturePath = buffer;
+				}
+
+				ImGui::SameLine();
+				if (ImGui::Button(ICON_FA_FOLDER_OPEN "##SkySelect"))
+				{
+					std::vector<DialogFilter> filters = {{"Textures/HDR", "png,jpg,hdr"}};
+					auto result = Chained::Dialogs::OpenFile(filters);
+					if (result)
+					{
+						std::filesystem::path p = *result;
+						if (Project::GetActive())
+						{
+							settings.Skybox.TexturePath =
+								std::filesystem::relative(p, Project::GetActive()->GetAssetDirectory()).string();
+						}
+						else
+						{
+							settings.Skybox.TexturePath = p.filename().string();
+						}
+					}
+				}
+			}
+
+			DrawDragFloat("Exposure", &settings.Skybox.Exposure, 0.01f, 0.0f, 10.0f);
+			DrawDragFloat("Brightness", &settings.Skybox.Brightness, 0.01f, -2.0f, 2.0f);
+			DrawDragFloat("Contrast", &settings.Skybox.Contrast, 0.01f, 0.0f, 5.0f);
+
+			if (readOnly)
+			{
+				ImGui::EndDisabled();
+			}
+			ImGui::Unindent(10.0f);
+			ImGui::PopID();
+		}
+
+		if (ImGui::CollapsingHeader(ICON_FA_SMOG "  Fog Visibility", ImGuiTreeNodeFlags_DefaultOpen))
+		{
+			ImGui::PushID("FogVisibility");
+			ImGui::Indent(10.0f);
+			if (readOnly)
+			{
+				ImGui::BeginDisabled();
+			}
+
+			auto& fog = settings.Fog;
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Enabled");
+			ImGui::SameLine(100);
+			ImGui::Checkbox("##FogEnabled", &fog.Enabled);
+
+			float fogColor[4];
+			ColorToFloat4(fog.FogColor, fogColor);
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Color");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			if (ImGui::ColorEdit4("##FogColor", fogColor))
+			{
+				fog.FogColor = Float4ToColor(fogColor);
+			}
+
+			const char* fogModes[] = {"Linear", "Exponential", "Exponential Squared"};
+			ImGui::AlignTextToFramePadding();
+			ImGui::Text("Mode");
+			ImGui::SameLine(100);
+			ImGui::SetNextItemWidth(-1);
+			ImGui::Combo("##FogMode", &fog.Mode, fogModes, 3);
+
+			DrawDragFloat("Density", &fog.Density, 0.0001f, 0.0f, 10.f, "%.4f");
+			DrawDragFloat("Start", &fog.Start, 1.0f, 0.0f, 10000.0f);
+			DrawDragFloat("End", &fog.End, 1.0f, 0.0f, 10000.0f);
+			DrawDragFloat("Height Falloff", &fog.HeightFalloff, 0.01f, 0.0f, 1.0f, "%.2f");
+
+			if (readOnly)
+			{
+				ImGui::EndDisabled();
+			}
+			ImGui::Unindent(10.0f);
+			ImGui::PopID();
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/panels/world_panel.h b/editor/panels/world_panel.h
index 892f4be1e..b9de53071 100644
--- a/editor/panels/world_panel.h
+++ b/editor/panels/world_panel.h
@@ -3,19 +3,23 @@
 
 #include "panel.h"
 
-namespace CHEngine
+namespace Chained
 {
-class WorldPanel : public Panel
-{
-public:
-    WorldPanel();
+	class WorldPanel : public Panel
+	{
+	public:
+		WorldPanel();
 
-public:
-    virtual void OnImGuiRender(bool readOnly = false) override;
+	public:
+		virtual void OnImGuiRender(bool readOnly = false) override;
 
-private:
-    void DrawEnvironmentSettings(std::shared_ptr<EnvironmentAsset> env, bool readOnly);
-};
-} // namespace CHEngine
+	private:
+		void DrawSceneGeneral(bool readOnly);
+		void DrawSceneBackground(bool readOnly);
+		void DrawPhysicsSettings(bool readOnly);
+		void DrawEnvironmentSection(bool readOnly);
+		void DrawEnvironmentSettings(std::shared_ptr<EnvironmentAsset> env, bool readOnly);
+	};
+} // namespace Chained
 
 #endif // CH_WORLD_PANEL_H
diff --git a/editor/project/editor_settings.h b/editor/project/editor_settings.h
new file mode 100644
index 000000000..dd605883a
--- /dev/null
+++ b/editor/project/editor_settings.h
@@ -0,0 +1,55 @@
+#ifndef CH_EDITOR_SETTINGS_H
+#define CH_EDITOR_SETTINGS_H
+
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+	struct EditorConfig
+	{
+		std::string LastProjectPath;
+		std::string LastScenePath;
+		bool LoadLastProjectOnStartup = false;
+		bool AutoSaveEnabled = true;
+		float AutoSaveInterval = 300.0f;
+		std::vector<std::string> RecentProjects;
+
+		// --- Appearance: editor UI font (rebuilt live via EditorLayer::ReloadEditorFonts) ---
+		// FontPath is relative to the engine resources root, prefixed with "engine/"
+		// (e.g. "engine/resources/font/lato/lato-bold.ttf"). Empty means "use the built-in default".
+		std::string FontPath = "engine/resources/font/lato/lato-bold.ttf";
+		float FontSize = 16.0f;
+
+		// --- Viewport gizmo icons (camera/light/spawn/audio billboards) ---
+		// Screen-constant sizing: size = clamp(distanceToCamera * IconSizeScale, IconSizeMin, IconSizeMax).
+		float IconSizeScale = 0.12f;
+		float IconSizeMin = 1.2f;
+		float IconSizeMax = 8.0f;
+
+		// --- Editor camera (edit mode). Global, not per-project. ---
+		float CameraMoveSpeed = 10.0f;
+		float CameraBoostMultiplier = 5.0f;
+		bool DisableCameraZoom = false;
+		float CameraRotationSpeed = 1.0f;
+		float CameraZoomSpeedMultiplier = 1.0f;
+		float CameraFovDegrees = 45.0f;
+		float CameraNearClip = 0.1f;
+		float CameraFarClip = 10000.0f;
+
+		// --- Viewport ---
+		bool ShowEditorIcons = true;
+		float GizmoScale = 1.0f;
+
+		// --- Content Browser ---
+		float DefaultThumbnailSize = 96.0f;
+		int DefaultSortOrder = 0;
+		bool ShowFileExtensions = true;
+
+		// --- General ---
+		bool ConfirmOnSceneClose = true;
+		int MaxRecentProjects = 10;
+	};
+} // namespace Chained
+
+#endif // CH_EDITOR_SETTINGS_H
diff --git a/editor/project/project_exporter.cpp b/editor/project/project_exporter.cpp
new file mode 100644
index 000000000..c572ac6a0
--- /dev/null
+++ b/editor/project/project_exporter.cpp
@@ -0,0 +1,698 @@
+#include "project_exporter.h"
+
+#include "engine/core/log.h"
+#include "engine/core/platform.h"
+#include "engine/project/project.h"
+
+#include <algorithm>
+#include <atomic>
+#include <future>
+#include <filesystem>
+#include <stdexcept>
+#include <string>
+#include <system_error>
+#include <vector>
+#include <pack/reader.hpp>
+#include <pack/writer.hpp>
+
+namespace fs = std::filesystem;
+
+namespace Chained
+{
+
+	struct ExportCancelledException : public std::exception
+	{
+		const char* what() const noexcept override
+		{
+			return "Export cancelled by user.";
+		}
+	};
+
+	void ProjectExporter::CollectFiles(const fs::path& dir, std::vector<fs::path>& out)
+	{
+		std::error_code ec;
+		fs::recursive_directory_iterator it(dir, fs::directory_options::skip_permission_denied, ec);
+		if (ec)
+		{
+			CH_CORE_ERROR("ProjectExporter: Cannot iterate '{}': {}", dir.string(), ec.message());
+			return;
+		}
+		for (const auto& entry : it)
+		{
+			if (!entry.is_regular_file())
+			{
+				continue;
+			}
+
+			// Skip 0-byte files (pack reader rejects dataSize == 0)
+			std::error_code szEc;
+			if (entry.file_size(szEc) == 0)
+			{
+				continue;
+			}
+
+			// Skip build artifacts that shouldn't be packed
+			const std::string filename = entry.path().filename().string();
+			const std::string ext = entry.path().extension().string();
+
+			// Skip .Up2Date marker files, .pdb, .ilk, .obj, .tlog, .log build intermediates
+			if (ext == ".pdb" || ext == ".ilk" || ext == ".obj" || ext == ".tlog" || ext == ".log" ||
+				ext == ".Up2Date" || ext == ".FileListAbsolute.txt" || ext == ".lastbuildstate" || ext == ".cache" ||
+				ext == ".nupkg" || ext == ".nuget.g.props" || ext == ".nuget.g.targets")
+			{
+				continue;
+			}
+
+			// Skip obj/ and Debug/ and Release/ build output directories
+			const auto rel = fs::relative(entry.path(), dir, ec);
+			if (!ec)
+			{
+				std::string relStr = rel.string();
+				// Normalize path separators to forward slash for comparison
+				std::replace(relStr.begin(), relStr.end(), '\\', '/');
+				if (relStr.find("/obj/") != std::string::npos || relStr.find("/Debug/") != std::string::npos ||
+					relStr.find("/Release/") != std::string::npos || relStr.find("/x64/") != std::string::npos)
+				{
+					continue;
+				}
+				out.push_back(rel);
+			}
+		}
+	}
+
+	bool ProjectExporter::CopyFile(const fs::path& src, const fs::path& dst, std::string& outError)
+	{
+		std::error_code ec;
+		fs::create_directories(dst.parent_path(), ec);
+		if (ec)
+		{
+			outError = "Failed to create directory '" + dst.parent_path().string() + "': " + ec.message();
+			return false;
+		}
+		fs::copy_file(src, dst, fs::copy_options::update_existing, ec);
+		if (ec)
+		{
+			outError = "Failed to copy '" + src.string() + "': " + ec.message();
+			return false;
+		}
+		return true;
+	}
+
+	bool ProjectExporter::IsPackStale(const fs::path& packPath, const std::vector<std::string>& fileItemPaths,
+									  uint64_t expectedItemCount)
+	{
+		std::error_code ec;
+		if (!fs::exists(packPath, ec))
+		{
+			return true;
+		}
+
+		// A differing item count means files were added or removed, which mtime alone cannot detect.
+		try
+		{
+			pack::Reader reader(packPath);
+			if (reader.getItemCount() != expectedItemCount)
+			{
+				return true;
+			}
+		} catch (...)
+		{
+			return true;
+		}
+
+		const auto packTime = fs::last_write_time(packPath, ec);
+		if (ec)
+		{
+			return true;
+		}
+
+		for (size_t i = 0; i < fileItemPaths.size(); i += 2)
+		{
+			std::error_code srcEc;
+			const auto srcTime = fs::last_write_time(fs::path(fileItemPaths[i]), srcEc);
+			if (srcEc || srcTime > packTime)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	ExportResult ProjectExporter::ExportTo(const fs::path& outputDir, ExportProgressCallback onProgress,
+										   const std::atomic<bool>* cancelFlag, bool forceRepack)
+	{
+		ExportResult result;
+		result.OutDir = outputDir;
+
+		const bool outputExisted = fs::exists(outputDir);
+		// packPath is resolved once we've read the project config (after project is loaded)
+		// For CleanupAndCancel we just wipe all .pack files in outputDir
+		fs::path packPath; // set after project config is read
+
+		// Only remove the output directory when this run created it — otherwise a cancel
+		// would destroy a previous working export, including the pack we tried to preserve.
+		auto CleanupAndCancel = [&](const std::string& phaseLog) -> ExportResult {
+			if (!outputExisted)
+			{
+				std::error_code cleanEc;
+				fs::remove_all(outputDir, cleanEc);
+			}
+			else
+			{
+				// Remove potentially incomplete/corrupted pack files so next export succeeds
+				std::error_code cleanEc;
+				for (const auto& entry : fs::directory_iterator(outputDir, cleanEc))
+				{
+					if (entry.is_regular_file() && entry.path().extension() == ".pack")
+					{
+						fs::remove(entry.path(), cleanEc);
+					}
+				}
+			}
+			result.Cancelled = true;
+			CH_CORE_INFO("ProjectExporter: Cancelled {}. {}", phaseLog,
+						 outputExisted ? "Kept existing output directory." : "Cleaned output directory.");
+			return result;
+		};
+
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			result.Error = "No active project. Please open a project before exporting.";
+			CH_CORE_ERROR("ProjectExporter: {}", result.Error);
+			return result;
+		}
+
+		const auto& cfg = project->GetConfig();
+		const fs::path projectDir = project->GetConfig().ProjectDirectory;
+		const fs::path assetDir = project->GetConfig().ProjectDirectory / project->GetConfig().AssetDirectory;
+		const fs::path exeDir = Platform::GetExecutableDirectory();
+#ifdef CH_BUILD_PRESET
+		const std::string buildPreset = CH_BUILD_PRESET;
+#else
+		const std::string buildPreset = "";
+#endif
+#ifdef CH_BUILD_CONFIG
+		const std::string buildConfig = CH_BUILD_CONFIG;
+#else
+		const std::string buildConfig = exeDir.string().find("Debug") != std::string::npos ? "Debug" : "Release";
+#endif
+		const bool isDebugExport = (buildConfig == "Debug");
+		CH_CORE_INFO("ProjectExporter: Build preset='{}', config='{}', exeDir='{}'", buildPreset, buildConfig,
+					 exeDir.string());
+
+		// ── 0. Prepare output directory ──────────────────────────────────────────
+		std::error_code ec;
+		fs::create_directories(outputDir, ec);
+		if (ec)
+		{
+			result.Error = "Could not create output directory: " + ec.message();
+			CH_CORE_ERROR("ProjectExporter: {}", result.Error);
+			return result;
+		}
+
+		// ── 1. Find .chproject file ──────────────────────────────────────────────
+		fs::path chprojectFile;
+		for (const auto& entry : fs::directory_iterator(projectDir, ec))
+		{
+			if (entry.is_regular_file() && entry.path().extension() == ".chproject")
+			{
+				chprojectFile = entry.path();
+				break;
+			}
+		}
+		if (chprojectFile.empty())
+		{
+			result.Error = "No .chproject file found in '" + projectDir.string() + "'";
+			CH_CORE_ERROR("ProjectExporter: {}", result.Error);
+			return result;
+		}
+
+		// ── 2. Collect files to pack ─────────────────────────────────────────────
+		std::vector<std::string> fileItemPaths;
+
+		// .chproject → "project.chproject"
+		fileItemPaths.push_back(chprojectFile.generic_string());
+		fileItemPaths.push_back("project.chproject");
+
+		// assets/ → "assets/..."
+		if (fs::exists(assetDir))
+		{
+			std::vector<fs::path> assetFiles;
+			CollectFiles(assetDir, assetFiles);
+			for (const auto& rel : assetFiles)
+			{
+				fileItemPaths.push_back((assetDir / rel).generic_string());
+				fileItemPaths.push_back((fs::path("assets") / rel).generic_string());
+			}
+		}
+
+		// resources/ → "resources/..."
+		fs::path resourcesDir = exeDir / "resources";
+		if (fs::exists(resourcesDir))
+		{
+			std::vector<fs::path> resFiles;
+			CollectFiles(resourcesDir, resFiles);
+			for (const auto& rel : resFiles)
+			{
+				fileItemPaths.push_back((resourcesDir / rel).generic_string());
+				fileItemPaths.push_back((fs::path("resources") / rel).generic_string());
+			}
+		}
+		else
+		{
+			CH_CORE_WARN("ProjectExporter: resources/ not found at '{}' — shaders/fonts may be missing from pack.",
+						 resourcesDir.string());
+		}
+
+		const auto& exp = project->GetConfig().Export;
+		const bool isRawMode = (exp.Mode == PackMode::Raw);
+
+		// Resolve pack base path from PackName setting (default: "resources")
+		const std::string packBaseName = exp.PackName.empty() ? "resources" : exp.PackName;
+		packPath = outputDir / (packBaseName + ".pack");
+
+		if (fileItemPaths.size() <= 2)
+		{
+			result.Error = isRawMode ? "No files to copy (no assets or resources found)."
+									 : "No files to pack (no assets or resources found).";
+			CH_CORE_ERROR("ProjectExporter: {}", result.Error);
+			return result;
+		}
+
+		if (cancelFlag && cancelFlag->load(std::memory_order_relaxed))
+		{
+			return CleanupAndCancel("before start");
+		}
+
+		uint64_t fileCount = fileItemPaths.size() / 2;
+		result.PackedFileCount = fileCount;
+
+		// ── 3. Calculate uncompressed size ───────────────────────────────────────
+		result.TotalUncompressedSize = 0;
+		for (size_t i = 0; i < fileItemPaths.size(); i += 2)
+		{
+			std::error_code sizeEc;
+			auto sz = fs::file_size(fs::path(fileItemPaths[i]), sizeEc);
+			if (!sizeEc)
+			{
+				result.TotalUncompressedSize += sz;
+			}
+		}
+
+		// ── 4. PARALLEL EXECUTION: Task A (Packing) & Task B (Copying Binaries) ─
+
+		// --- TASK B: Копіювання EXE, DLL та додаткових папок у фоновому потоці ---
+		auto copyBinariesTask = std::async(std::launch::async, [&]() -> bool {
+			// 1. Copy Executable
+			std::vector<fs::path> exeCandidates;
+			std::error_code dirEc;
+			for (const auto& f : fs::directory_iterator(exeDir, dirEc))
+			{
+				if (cancelFlag && cancelFlag->load(std::memory_order_relaxed))
+				{
+					return false;
+				}
+				if (!f.is_regular_file())
+				{
+					continue;
+				}
+
+				std::string fname = f.path().filename().string();
+				if (fname.find("Editor") != std::string::npos || fname.find("editor") != std::string::npos ||
+					fname.find("test") != std::string::npos)
+				{
+					continue;
+				}
+				if (fname.ends_with(".exe") || (fname.find('.') == std::string::npos && !fname.empty()))
+				{
+					exeCandidates.push_back(f.path());
+				}
+			}
+
+			if (!exeCandidates.empty())
+			{
+				const fs::path& srcExe = exeCandidates[0];
+				std::string exeName = cfg.Name + srcExe.extension().string();
+				fs::path dstExe = outputDir / exeName;
+				std::string copyErr;
+				if (!CopyFile(srcExe, dstExe, copyErr))
+				{
+					CH_CORE_ERROR("ProjectExporter: Failed to copy executable: {}", copyErr);
+					return false;
+				}
+			}
+
+			// 2. Copy DLLs — only from the current build config
+			// Always skip MSVC CRT DLLs (wrong toolchain) and build-time tools.
+			// In Debug: skip release DLLs (no 'd' suffix). In Release: skip debug DLLs ('d' suffix).
+			for (const auto& f : fs::directory_iterator(exeDir, dirEc))
+			{
+				if (cancelFlag && cancelFlag->load(std::memory_order_relaxed))
+				{
+					return false;
+				}
+				if (!f.is_regular_file())
+				{
+					continue;
+				}
+
+				const std::string ext = f.path().extension().string();
+				if (ext != ".dll" && ext != ".so" && ext != ".dylib")
+				{
+					continue;
+				}
+
+				const std::string fname = f.path().filename().string();
+
+				// Always skip MSVC CRT DLLs (e.g. assimp-vc145-mtd.dll) — wrong toolchain
+				if (fname.find("-vc") != std::string::npos)
+				{
+					continue;
+				}
+
+				// Skip build-time generator (not needed at runtime)
+				if (fname.find("Generator") != std::string::npos)
+				{
+					continue;
+				}
+
+				// Check if this DLL has a debug suffix (e.g. "assimpd.dll" → 'd' before ".dll")
+				bool isDebugDll = fname.size() > 4 && fname[fname.size() - 5] == 'd' && fname[fname.size() - 4] == '.';
+
+				// In Debug, skip release DLLs. In Release, skip debug DLLs.
+				if (isDebugExport && !isDebugDll)
+				{
+					continue; // Debug build — skip release DLLs
+				}
+				if (!isDebugExport && isDebugDll)
+				{
+					continue; // Release build — skip debug DLLs
+				}
+
+				std::string copyErr;
+				CopyFile(f.path(), outputDir / f.path().filename(), copyErr);
+			}
+
+			// 3. Copy Subdirectories (skip Generator DLLs in scripts/)
+			for (const std::string& subDirName : {"nethost", "dotnet", "scripts"})
+			{
+				if (cancelFlag && cancelFlag->load(std::memory_order_relaxed))
+				{
+					return false;
+				}
+
+				fs::path subSrc = exeDir / subDirName;
+				if (fs::exists(subSrc))
+				{
+					fs::path subDst = outputDir / subDirName;
+					std::error_code subEc;
+					fs::copy(subSrc, subDst, fs::copy_options::update_existing | fs::copy_options::recursive, subEc);
+
+					// Remove Generator DLLs that were copied recursively
+					for (const auto& entry : fs::recursive_directory_iterator(subDst, subEc))
+					{
+						if (entry.is_regular_file())
+						{
+							const std::string fname = entry.path().filename().string();
+							if (fname.find("Generator") != std::string::npos)
+							{
+								fs::remove(entry.path(), subEc);
+							}
+						}
+					}
+				}
+			}
+
+			// 4. Copy Coral runtime config files to root (needed by ScriptEngine)
+			// Coral files are at exeDir/ (next to the exe), not in scripts/{Name}/
+			fs::path coralManagedDir = exeDir;
+			const char* coralConfigs[] = {"Coral.Managed.runtimeconfig.json", "Coral.Managed.deps.json",
+										  "Coral.Managed.pdb"};
+			for (const auto& name : coralConfigs)
+			{
+				fs::path src = coralManagedDir / name;
+				if (fs::exists(src))
+				{
+					std::string copyErr;
+					if (!CopyFile(src, outputDir / name, copyErr))
+					{
+						CH_CORE_ERROR("ProjectExporter: Failed to copy Coral file '{}': {}", name, copyErr);
+					}
+				}
+				else
+				{
+					CH_CORE_WARN("ProjectExporter: Coral file '{}' not found in '{}'", name, coralManagedDir.string());
+				}
+			}
+
+			return true;
+		});
+
+		// --- TASK A: Пакування або копіювання ресурсів у головному потоці ---
+		bool packSuccess = false;
+
+		if (isRawMode)
+		{
+			// Raw mode: copy files directly into outputDir, preserving assets/ and resources/ structure.
+			// resources.pack is not created; the runtime falls back to the filesystem automatically.
+			CH_CORE_INFO("ProjectExporter: Raw mode — copying {} files to '{}'.", fileCount, outputDir.string());
+
+			// Copy .chproject with original name so runtime can discover it by {AppName}.chproject
+			auto chProjFile = project->GetConfig().ProjectDirectory / (cfg.Name + ".chproject");
+			if (!fs::exists(chProjFile))
+			{
+				for (const auto& entry : fs::directory_iterator(project->GetConfig().ProjectDirectory))
+				{
+					if (entry.is_regular_file() && entry.path().extension() == ".chproject")
+					{
+						chProjFile = entry.path();
+						break;
+					}
+				}
+			}
+			if (fs::exists(chProjFile))
+			{
+				std::string copyErr;
+				if (!CopyFile(chProjFile, outputDir / (cfg.Name + ".chproject"), copyErr))
+				{
+					CH_CORE_ERROR("ProjectExporter: Failed to copy .chproject: {}", copyErr);
+				}
+			}
+
+			for (size_t i = 0; i < fileItemPaths.size(); i += 2)
+			{
+				if (cancelFlag && cancelFlag->load(std::memory_order_relaxed))
+				{
+					copyBinariesTask.wait();
+					return CleanupAndCancel("during raw copy");
+				}
+
+				const fs::path srcFile(fileItemPaths[i]);
+				const fs::path dstFile = outputDir / fileItemPaths[i + 1];
+				std::string copyErr;
+				if (!CopyFile(srcFile, dstFile, copyErr))
+				{
+					CH_CORE_ERROR("ProjectExporter: Raw copy failed: {}", copyErr);
+					copyBinariesTask.wait();
+					CleanupAndCancel("due to raw copy error");
+					result.Error = copyErr;
+					return result;
+				}
+
+				if (onProgress)
+				{
+					onProgress((i / 2) + 1, fileCount, fileItemPaths[i + 1]);
+				}
+			}
+			result.PackSkipped = true; // no .pack file produced
+			result.PackFileSize = 0;
+			packSuccess = true;
+		}
+		else if (!forceRepack && !IsPackStale(packPath, fileItemPaths, fileCount))
+		{
+			CH_CORE_INFO("ProjectExporter: {}.pack is up to date ({} items) — skipping repack.", packBaseName,
+						 fileCount);
+			result.PackSkipped = true;
+			packSuccess = true;
+		}
+		else
+		{
+			bool preferSpeed = (exp.Mode == PackMode::Fast);
+			float threshold = (exp.Mode == PackMode::Max) ? 0.0f : exp.ZipThreshold;
+
+			// --- Build chunks -------------------------------------------------------
+			// Each entry in fileItemPaths is: [srcPath, packKey, srcPath, packKey, ...]
+			// We split by uncompressed (on-disk) file size per chunk.
+			// SplitSizeMB == 0 → one chunk containing all files.
+			struct Chunk
+			{
+				std::vector<std::string> items; // flat [srcPath, packKey, ...]
+				uint64_t itemCount = 0;
+			};
+
+			std::vector<Chunk> chunks;
+			{
+				const uint64_t limitBytes =
+					exp.SplitSizeMB > 0 ? static_cast<uint64_t>(exp.SplitSizeMB) * 1024 * 1024 : UINT64_MAX;
+
+				chunks.emplace_back();
+				uint64_t chunkBytes = 0;
+
+				for (size_t i = 0; i < fileItemPaths.size(); i += 2)
+				{
+					const std::string& srcPath = fileItemPaths[i];
+					std::error_code sizeEc;
+					uint64_t fileBytes = static_cast<uint64_t>(fs::file_size(srcPath, sizeEc));
+					if (sizeEc)
+					{
+						fileBytes = 0;
+					}
+
+					// Start a new chunk if this file would push the current chunk over the limit
+					// (always put at least one file per chunk to avoid infinite loops)
+					if (chunkBytes > 0 && chunkBytes + fileBytes > limitBytes)
+					{
+						chunks.emplace_back();
+						chunkBytes = 0;
+					}
+
+					chunks.back().items.push_back(fileItemPaths[i]);
+					chunks.back().items.push_back(fileItemPaths[i + 1]);
+					++chunks.back().itemCount;
+					chunkBytes += fileBytes;
+				}
+			}
+
+			// Track the global item offset for progress reporting across all chunks
+			uint64_t globalItemOffset = 0;
+
+			struct PackCtx
+			{
+				const std::vector<std::string>& chunkItems; // items for this chunk
+				uint64_t chunkOffset;						// first item index in global list
+				uint64_t totalItems;						// total items across all chunks
+				ExportProgressCallback& cb;
+				const std::atomic<bool>* cancelFlag;
+			};
+
+			try
+			{
+				for (size_t chunkIdx = 0; chunkIdx < chunks.size(); ++chunkIdx)
+				{
+					const Chunk& chunk = chunks[chunkIdx];
+					if (chunk.itemCount == 0)
+					{
+						continue;
+					}
+
+					// Build pack path: {name}.pack, {name}_1.pack, {name}_2.pack ...
+					fs::path chunkPackPath;
+					if (chunkIdx == 0)
+					{
+						chunkPackPath = packPath; // == outputDir / "{packBaseName}.pack"
+					}
+					else
+					{
+						chunkPackPath = outputDir / (packBaseName + "_" + std::to_string(chunkIdx) + ".pack");
+					}
+
+					std::vector<const char*> rawPaths;
+					rawPaths.reserve(chunk.items.size());
+					for (const auto& s : chunk.items)
+					{
+						rawPaths.push_back(s.c_str());
+					}
+
+					PackCtx ctx{chunk.items, globalItemOffset, fileCount, onProgress, cancelFlag};
+
+					OnPackFile cCallback = [](uint64_t itemIndex, void* arg) {
+						auto* ctx = static_cast<PackCtx*>(arg);
+
+						if (ctx->cancelFlag && ctx->cancelFlag->load(std::memory_order_relaxed))
+						{
+							throw ExportCancelledException();
+						}
+
+						if (ctx->cb)
+						{
+							uint64_t globalPacked = ctx->chunkOffset + itemIndex + 1;
+							const std::string& itemPath = ctx->chunkItems[itemIndex * 2 + 1];
+							ctx->cb(globalPacked, ctx->totalItems, itemPath);
+						}
+					};
+
+					CH_CORE_INFO("ProjectExporter: Packing chunk {}/{} → '{}' ({} items)", chunkIdx + 1, chunks.size(),
+								 chunkPackPath.filename().string(), chunk.itemCount);
+
+					pack::Writer::pack(chunkPackPath, chunk.itemCount, rawPaths.data(), exp.DataVersion, threshold,
+									   preferSpeed, false, cCallback, &ctx);
+
+					globalItemOffset += chunk.itemCount;
+				}
+
+				packSuccess = true;
+
+				if (chunks.size() > 1)
+				{
+					CH_CORE_INFO("ProjectExporter: Created {} pack chunks.", chunks.size());
+				}
+			} catch (const ExportCancelledException&)
+			{
+				copyBinariesTask.wait();
+				return CleanupAndCancel("during packing process");
+			} catch (const pack::Error& err)
+			{
+				copyBinariesTask.wait();
+				CleanupAndCancel("due to pack error");
+				result.Error = "Pack failed: " + std::string(err.what());
+				CH_CORE_ERROR("ProjectExporter: {}", result.Error);
+				return result;
+			}
+		}
+
+		// Чекаємо завершення копіювання файлів
+		bool copySuccess = copyBinariesTask.get();
+
+		// Перевірка на скасування після обох завдань
+		if (cancelFlag && cancelFlag->load(std::memory_order_relaxed))
+		{
+			return CleanupAndCancel("after execution tasks");
+		}
+
+		if (!copySuccess || !packSuccess)
+		{
+			return CleanupAndCancel("due to task failure");
+		}
+
+		// ── 5. Get Pack File Size ────────────────────────────────────────────────
+		if (!isRawMode)
+		{
+			// Sum up all .pack files in outputDir
+			std::error_code sizeEc;
+			for (const auto& entry : fs::directory_iterator(outputDir, sizeEc))
+			{
+				if (entry.is_regular_file() && entry.path().extension() == ".pack")
+				{
+					result.PackFileSize += static_cast<uint64_t>(fs::file_size(entry.path(), sizeEc));
+				}
+			}
+		}
+
+		result.Success = true;
+		if (isRawMode)
+		{
+			CH_CORE_INFO("ProjectExporter: Export complete (Raw) → '{}' ({} files copied)", outputDir.string(),
+						 result.PackedFileCount);
+		}
+		else
+		{
+			CH_CORE_INFO("ProjectExporter: Export complete → '{}' ({} {}, {} MB pack)", outputDir.string(),
+						 result.PackedFileCount, result.PackSkipped ? "reused" : "packed",
+						 result.PackFileSize / (1024 * 1024));
+		}
+		return result;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/editor/project/project_exporter.h b/editor/project/project_exporter.h
new file mode 100644
index 000000000..4839c7e06
--- /dev/null
+++ b/editor/project/project_exporter.h
@@ -0,0 +1,58 @@
+#ifndef CH_PROJECT_EXPORTER_H
+#define CH_PROJECT_EXPORTER_H
+
+#include <atomic>
+#include <cstdint>
+#include <filesystem>
+#include <functional>
+#include <string>
+
+namespace Chained
+{
+
+	struct ExportResult
+	{
+		bool Success = false;
+		bool Cancelled = false;
+		std::string Error;
+		std::filesystem::path OutDir;
+		std::string File;
+		uint64_t PackedFileCount = 0;
+		uint64_t TotalUncompressedSize = 0;
+		uint64_t PackFileSize = 0;
+		bool PackSkipped = false;
+	};
+
+	/// @brief Callback invoked after each file is packed.
+	/// @param packed  Number of files packed so far (1-based).
+	/// @param total   Total number of files to pack.
+	/// @param file    Virtual item path of the just-packed file.
+	using ExportProgressCallback = std::function<void(uint64_t packed, uint64_t total, const std::string& file)>;
+
+	class ProjectExporter
+	{
+	public:
+		/// @brief Export the active project to @p outputDir.
+		/// @param outputDir Path to the target folder (will be created if missing).
+		/// @param onProgress Optional callback invoked after each file is packed.
+		/// @param cancelFlag If non-null, export is aborted between phases when set to true.
+		/// @param forceRepack Repack resources.pack even if it is up to date.
+		/// @return ExportResult with success flag and optional error message.
+		static ExportResult ExportTo(const std::filesystem::path& outputDir,
+									 ExportProgressCallback onProgress = nullptr,
+									 const std::atomic<bool>* cancelFlag = nullptr, bool forceRepack = false);
+
+	private:
+		/// @brief Recursively collect files in @p dir, appending relative paths to @p out.
+		static void CollectFiles(const std::filesystem::path& dir, std::vector<std::filesystem::path>& out);
+
+		/// @brief True when @p packPath predates any source file, or covers a different file count.
+		static bool IsPackStale(const std::filesystem::path& packPath, const std::vector<std::string>& fileItemPaths,
+								uint64_t expectedItemCount);
+
+		/// @brief Copy a single file from @p src to @p dst.
+		static bool CopyFile(const std::filesystem::path& src, const std::filesystem::path& dst, std::string& outError);
+	};
+
+} // namespace Chained
+#endif // CH_PROJECT_EXPORTER_H
\ No newline at end of file
diff --git a/editor/project/project_serializer.cpp b/editor/project/project_serializer.cpp
new file mode 100644
index 000000000..83e218ba4
--- /dev/null
+++ b/editor/project/project_serializer.cpp
@@ -0,0 +1,233 @@
+#include "project_serializer.h"
+#include "engine/core/log.h"
+#include "engine/scene/serialization.h"
+#include <fstream>
+#include <yaml-cpp/yaml.h>
+
+namespace Chained
+{
+	using namespace Serialization;
+
+	bool EditorProjectSerializer::Serialize(const std::shared_ptr<Project>& project,
+											const std::filesystem::path& filepath)
+	{
+		const auto& config = project->GetConfig();
+
+		YAML::Emitter out;
+		out << YAML::BeginMap;
+		out << YAML::Key << "Project" << YAML::Value;
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << "Name" << YAML::Value << config.Name;
+			out << YAML::Key << "IconPath" << YAML::Value << config.IconPath;
+			out << YAML::Key << "StartScene" << YAML::Value << config.StartScene;
+			out << YAML::Key << "AssetDirectory" << YAML::Value << config.AssetDirectory.string();
+
+			SerializePath(out, "ActiveScene", config.ActiveScenePath.string());
+
+			out << YAML::Key << "Physics" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Gravity" << YAML::Value << config.Physics.Gravity;
+			out << YAML::Key << "FixedTimestep" << YAML::Value << config.Physics.FixedTimestep;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Animation" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "TargetFPS" << YAML::Value << config.Animation.TargetFPS;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Render" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "ShadowResolution" << YAML::Value << config.Render.ShadowResolution;
+			out << YAML::Key << "EnableShadows" << YAML::Value << config.Render.EnableShadows;
+			out << YAML::Key << "AntiAliasingSamples" << YAML::Value << config.Render.AntiAliasingSamples;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Mesh" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "ImportMaterials" << YAML::Value << config.Mesh.ImportMaterials;
+			out << YAML::Key << "CalculateTangents" << YAML::Value << config.Mesh.CalculateTangents;
+			out << YAML::Key << "FlipUVs" << YAML::Value << config.Mesh.FlipUVs;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Window" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Width" << YAML::Value << config.Window.Width;
+			out << YAML::Key << "Height" << YAML::Value << config.Window.Height;
+			out << YAML::Key << "VSync" << YAML::Value << config.Window.VSync;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Audio" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "MasterVolume" << YAML::Value << config.Audio.MasterVolume;
+			out << YAML::Key << "MusicVolume" << YAML::Value << config.Audio.MusicVolume;
+			out << YAML::Key << "SFXVolume" << YAML::Value << config.Audio.SFXVolume;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Runtime" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Fullscreen" << YAML::Value << config.Runtime.Fullscreen;
+			out << YAML::Key << "ShowStats" << YAML::Value << config.Runtime.ShowStats;
+			out << YAML::Key << "EnableConsole" << YAML::Value << config.Runtime.EnableConsole;
+			out << YAML::Key << "TargetFPS" << YAML::Value << config.Runtime.TargetFPS;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Scripting" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "ModuleName" << YAML::Value << config.Scripting.ModuleName;
+			out << YAML::Key << "ModuleDirectory" << YAML::Value << config.Scripting.ModuleDirectory.string();
+			out << YAML::Key << "AutoLoad" << YAML::Value << config.Scripting.AutoLoad;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Export" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Mode" << YAML::Value << static_cast<int>(config.Export.Mode);
+			out << YAML::Key << "ZipThreshold" << YAML::Value << config.Export.ZipThreshold;
+			out << YAML::Key << "DataVersion" << YAML::Value << config.Export.DataVersion;
+			out << YAML::Key << "SplitSizeMB" << YAML::Value << config.Export.SplitSizeMB;
+			out << YAML::Key << "PackName" << YAML::Value << config.Export.PackName;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "BuildConfig" << YAML::Value << static_cast<int>(config.BuildConfig);
+
+			out << YAML::EndMap;
+		}
+		out << YAML::EndMap;
+
+		std::ofstream fout(filepath);
+		if (!fout.is_open())
+		{
+			CH_CORE_ERROR("Failed to save project file: {}", filepath.string());
+			return false;
+		}
+
+		fout << out.c_str();
+		if (fout.fail())
+		{
+			CH_CORE_ERROR("Failed to write project file: {}", filepath.string());
+			return false;
+		}
+
+		return true;
+	}
+
+	bool EditorProjectSerializer::Deserialize(const std::shared_ptr<Project>& project,
+											  const std::filesystem::path& filepath)
+	{
+		std::ifstream stream(filepath);
+		if (!stream.is_open())
+		{
+			CH_CORE_ERROR("Failed to open project file: {}", filepath.string());
+			return false;
+		}
+
+		YAML::Node data;
+		try
+		{
+			data = YAML::Load(stream);
+		} catch (const YAML::Exception& e)
+		{
+			CH_CORE_ERROR("Failed to parse project file: {} ({})", filepath.string(), e.what());
+			return false;
+		}
+
+		auto projectNode = data["Project"];
+		if (!projectNode)
+		{
+			CH_CORE_ERROR("Missing 'Project' root node in: {}", filepath.string());
+			return false;
+		}
+
+		auto& config = project->GetConfig();
+
+		DeserializeProperty(projectNode, "Name", config.Name);
+		DeserializeProperty(projectNode, "IconPath", config.IconPath);
+		DeserializeProperty(projectNode, "StartScene", config.StartScene);
+		DeserializePath(projectNode, "AssetDirectory", config.AssetDirectory);
+
+		DeserializePath(projectNode, "ActiveScene", config.ActiveScenePath);
+
+		if (auto physics = projectNode["Physics"])
+		{
+			DeserializeProperty(physics, "Gravity", config.Physics.Gravity);
+			DeserializeProperty(physics, "FixedTimestep", config.Physics.FixedTimestep);
+		}
+
+		if (auto anim = projectNode["Animation"])
+		{
+			DeserializeProperty(anim, "TargetFPS", config.Animation.TargetFPS);
+		}
+
+		if (auto render = projectNode["Render"])
+		{
+			DeserializeProperty(render, "ShadowResolution", config.Render.ShadowResolution);
+			DeserializeProperty(render, "EnableShadows", config.Render.EnableShadows);
+			DeserializeProperty(render, "AntiAliasingSamples", config.Render.AntiAliasingSamples);
+		}
+
+		if (auto mesh = projectNode["Mesh"])
+		{
+			DeserializeProperty(mesh, "ImportMaterials", config.Mesh.ImportMaterials);
+			DeserializeProperty(mesh, "CalculateTangents", config.Mesh.CalculateTangents);
+			DeserializeProperty(mesh, "FlipUVs", config.Mesh.FlipUVs);
+		}
+
+		if (auto window = projectNode["Window"])
+		{
+			DeserializeProperty(window, "Width", config.Window.Width);
+			DeserializeProperty(window, "Height", config.Window.Height);
+			DeserializeProperty(window, "VSync", config.Window.VSync);
+		}
+
+		if (auto audio = projectNode["Audio"])
+		{
+			DeserializeProperty(audio, "MasterVolume", config.Audio.MasterVolume);
+			DeserializeProperty(audio, "MusicVolume", config.Audio.MusicVolume);
+			DeserializeProperty(audio, "SFXVolume", config.Audio.SFXVolume);
+		}
+
+		if (auto runtime = projectNode["Runtime"])
+		{
+			DeserializeProperty(runtime, "Fullscreen", config.Runtime.Fullscreen);
+			DeserializeProperty(runtime, "ShowStats", config.Runtime.ShowStats);
+			DeserializeProperty(runtime, "EnableConsole", config.Runtime.EnableConsole);
+			DeserializeProperty(runtime, "TargetFPS", config.Runtime.TargetFPS);
+		}
+
+		if (auto scripting = projectNode["Scripting"])
+		{
+			DeserializeProperty(scripting, "ModuleName", config.Scripting.ModuleName);
+			DeserializeProperty(scripting, "AutoLoad", config.Scripting.AutoLoad);
+
+			std::string moduleDir;
+			DeserializeProperty(scripting, "ModuleDirectory", moduleDir);
+			if (!moduleDir.empty())
+			{
+				config.Scripting.ModuleDirectory = moduleDir;
+			}
+		}
+
+		if (auto exportNode = projectNode["Export"])
+		{
+			if (exportNode["Mode"])
+			{
+				int mode = 0;
+				DeserializeProperty(exportNode, "Mode", mode);
+				config.Export.Mode = static_cast<PackMode>(mode);
+			}
+			else if (exportNode["PreferSpeed"])
+			{
+				bool preferSpeed = false;
+				DeserializeProperty(exportNode, "PreferSpeed", preferSpeed);
+				config.Export.Mode = preferSpeed ? PackMode::Fast : PackMode::Balanced;
+			}
+			DeserializeProperty(exportNode, "ZipThreshold", config.Export.ZipThreshold);
+			DeserializeProperty(exportNode, "DataVersion", config.Export.DataVersion);
+			DeserializeProperty(exportNode, "SplitSizeMB", config.Export.SplitSizeMB);
+			DeserializeProperty(exportNode, "PackName", config.Export.PackName);
+			if (config.Export.PackName.empty())
+			{
+				config.Export.PackName = "resources";
+			}
+		}
+
+		int buildConfig = static_cast<int>(config.BuildConfig);
+		DeserializeProperty(projectNode, "BuildConfig", buildConfig);
+		config.BuildConfig = static_cast<Configuration>(buildConfig);
+
+		config.ProjectDirectory = filepath.parent_path();
+
+		return true;
+	}
+} // namespace Chained
diff --git a/editor/project/project_serializer.h b/editor/project/project_serializer.h
new file mode 100644
index 000000000..dee614715
--- /dev/null
+++ b/editor/project/project_serializer.h
@@ -0,0 +1,18 @@
+#ifndef CH_PROJECT_SERIALIZER_H
+#define CH_PROJECT_SERIALIZER_H
+
+#include "engine/project/project.h"
+#include <filesystem>
+#include <memory>
+
+namespace Chained
+{
+	class EditorProjectSerializer
+	{
+	public:
+		static bool Serialize(const std::shared_ptr<Project>& project, const std::filesystem::path& filepath);
+		static bool Deserialize(const std::shared_ptr<Project>& project, const std::filesystem::path& filepath);
+	};
+} // namespace Chained
+
+#endif // CH_PROJECT_SERIALIZER_H
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
new file mode 100644
index 000000000..419446e0e
--- /dev/null
+++ b/editor/project_manager.cpp
@@ -0,0 +1,695 @@
+#include "engine/platform/dialogs/dialogs.h"
+#include "engine/core/service_locator.h"
+#include "project_manager.h"
+#include "layer.h"
+#include "engine/project/project.h"
+#include "project/project_serializer.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/ui/ui_font_registry.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/scene/scene_events.h"
+#include "engine/scripting/scriptengine.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/imgui/imgui_layer.h"
+#include <algorithm>
+#include <fstream>
+#include <string>
+#include <utility>
+#include <format>
+#include "engine/scene/scene_serializer.h"
+#include "engine/core/profiler.h"
+
+#if CH_PLATFORM_WINDOWS
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <shellapi.h>
+#endif
+
+namespace Chained
+{
+
+	static std::filesystem::path FindProjectRoot()
+	{
+		std::filesystem::path root;
+#ifdef PROJECT_ROOT_DIR
+		root = PROJECT_ROOT_DIR;
+#else
+		root = std::filesystem::current_path();
+		while (root.has_parent_path() && !std::filesystem::exists(root / "CMakeLists.txt"))
+		{
+			root = root.parent_path();
+		}
+#endif
+		return root;
+	}
+
+	static const std::vector<std::string>& GetSearchSubdirs()
+	{
+		static const std::vector<std::string> subdirs = {"build/bin", "bin", "out/bin", "cmake-build-debug/bin",
+														 "cmake-build-release/bin"};
+		return subdirs;
+	}
+
+	static std::filesystem::path FindRuntimeExecutable(const std::string& projectName, const std::string& configStr)
+	{
+		CH_PROFILE_FUNCTION();
+
+		std::filesystem::path root = FindProjectRoot();
+
+		if (!std::filesystem::exists(root))
+		{
+			CH_CORE_ERROR("FindRuntimeExecutable: Root path not found: {}", root.string());
+			return {};
+		}
+
+#if CH_PLATFORM_WINDOWS
+		const std::string perGameName = projectName + ".exe";
+		const std::string fallbackName = "ChainedRuntime.exe";
+#else
+		const std::string perGameName = projectName;
+		const std::string fallbackName = "ChainedRuntime";
+#endif
+
+		auto searchFor = [&](const std::string& targetName) -> std::filesystem::path {
+			std::filesystem::path currentBin = std::filesystem::current_path() / targetName;
+			if (std::filesystem::exists(currentBin))
+			{
+				return currentBin;
+			}
+
+			auto searchSubdirs = GetSearchSubdirs();
+
+			if (std::filesystem::exists(root / "build"))
+			{
+				for (const auto& entry : std::filesystem::directory_iterator(root / "build"))
+				{
+					if (entry.is_directory())
+					{
+						if (std::filesystem::exists(entry.path() / "bin" / targetName))
+						{
+							searchSubdirs.push_back("build/" + entry.path().filename().string() + "/bin");
+						}
+					}
+				}
+			}
+
+			for (const auto& sub : searchSubdirs)
+			{
+				std::filesystem::path p = root / sub / targetName;
+				if (std::filesystem::exists(p))
+				{
+					CH_CORE_INFO("FindRuntimeExecutable: Found '{}' at: {}", targetName, p.string());
+					return p;
+				}
+			}
+			return {};
+		};
+
+		auto result = searchFor(perGameName);
+		if (!result.empty())
+		{
+			return result;
+		}
+
+		result = searchFor(fallbackName);
+		if (!result.empty())
+		{
+			return result;
+		}
+
+		CH_CORE_INFO("FindRuntimeExecutable: Fast path failed, starting scoped recursive search...");
+		try
+		{
+			for (auto it = std::filesystem::recursive_directory_iterator(root);
+				 it != std::filesystem::recursive_directory_iterator(); ++it)
+			{
+				const auto& entry = *it;
+				auto filename = entry.path().filename().string();
+
+				if (entry.is_directory())
+				{
+					if (filename == ".git" || filename == ".cache" || filename == ".idea" || filename == "include" ||
+						filename == "engine")
+					{
+						it.disable_recursion_pending();
+						continue;
+					}
+				}
+
+				if (entry.is_regular_file() && (filename == perGameName || filename == fallbackName))
+				{
+					CH_CORE_INFO("FindRuntimeExecutable: Deep search found at: {}", entry.path().string());
+					return entry.path();
+				}
+			}
+		} catch (const std::exception& e)
+		{
+			CH_CORE_WARN("FindRuntimeExecutable: Deep search error: {}", e.what());
+		}
+
+		return {};
+	}
+
+	static std::string ResolveLaunchVariables(std::string str, std::shared_ptr<Project> project)
+	{
+		CH_PROFILE_FUNCTION();
+		if (!project)
+		{
+			return str;
+		}
+
+		std::filesystem::path root = FindProjectRoot();
+
+		std::filesystem::path projectFile = project->GetConfig().ProjectDirectory / (project->GetName() + ".chproject");
+		std::string projectPathStr = std::filesystem::absolute(projectFile).string();
+
+		auto replaceAll = [&](const std::string& from, const std::string& to) {
+			size_t pos = 0;
+			while ((pos = str.find(from, pos)) != std::string::npos)
+			{
+				str.replace(pos, from.length(), to);
+				pos += to.length();
+			}
+		};
+
+		replaceAll("${ROOT}", std::filesystem::absolute(root).string());
+		replaceAll("${PROJECT_FILE}", projectPathStr);
+
+		if (str.find("${BUILD}") != std::string::npos)
+		{
+			std::string configStr = (project->GetBuildConfig() == Configuration::Release) ? "Release" : "Debug";
+			std::filesystem::path exePath = FindRuntimeExecutable(project->GetName(), configStr);
+			std::filesystem::path buildPath = exePath.parent_path();
+
+			if (buildPath.empty())
+			{
+				for (const auto& sub : GetSearchSubdirs())
+				{
+					if (std::filesystem::exists(root / sub))
+					{
+						buildPath = root / sub;
+						break;
+					}
+				}
+			}
+			replaceAll("${BUILD}", std::filesystem::absolute(buildPath).string());
+		}
+
+		return str;
+	}
+
+	EditorProjectManager::EditorProjectManager()
+	{
+	}
+
+	void EditorProjectManager::NewProject()
+	{
+		// Simple default: close active project to show Project Browser
+		Project::SetActive(nullptr);
+	}
+
+	void EditorProjectManager::NewProject(const std::string& name, const std::string& path)
+	{
+		auto project = std::make_shared<Project>();
+		project->GetConfig().Name = name;
+		project->GetConfig().ProjectDirectory = path;
+
+		auto projectDir = std::filesystem::path(path);
+		auto assetsDir = projectDir / "assets";
+
+		// Create standard directory structure
+		std::filesystem::create_directories(assetsDir / "scenes");
+		std::filesystem::create_directories(assetsDir / "materials");
+		std::filesystem::create_directories(assetsDir / "models");
+		std::filesystem::create_directories(assetsDir / "audio");
+		std::filesystem::create_directories(assetsDir / "animations");
+		std::filesystem::create_directories(assetsDir / "shaders");
+		std::filesystem::create_directories(assetsDir / "skyboxes");
+		std::filesystem::create_directories(assetsDir / "prefab");
+		std::filesystem::create_directories(assetsDir / "environments");
+		std::filesystem::create_directories(assetsDir / "scripts" / "src");
+
+		// Generate .csproj
+		{
+			auto scriptsDir = assetsDir / "scripts";
+			auto engineRoot = std::filesystem::path(PROJECT_ROOT_DIR);
+			auto managedCsproj = engineRoot / "scripting" / "managed" / "Chained.Managed.csproj";
+			auto relativeManaged = std::filesystem::relative(managedCsproj, scriptsDir);
+
+			std::string csprojContent =
+				"<Project Sdk=\"Microsoft.NET.Sdk\">\n"
+				"\n"
+				"  <PropertyGroup>\n"
+				"    <TargetFramework>net9.0</TargetFramework>\n"
+				"    <AssemblyName>" +
+				name +
+				".Scripts</AssemblyName>\n"
+				"    <RootNamespace>" +
+				name +
+				".Scripts</RootNamespace>\n"
+				"    <ImplicitUsings>disable</ImplicitUsings>\n"
+				"    <Nullable>enable</Nullable>\n"
+				"    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\n"
+				"    <OutputPath>../bin</OutputPath>\n"
+				"    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>\n"
+				"    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>\n"
+				"    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>\n"
+				"  </PropertyGroup>\n"
+				"\n"
+				"  <ItemGroup>\n"
+				"    <Compile Include=\"src/**/*.cs\" />\n"
+				"  </ItemGroup>\n"
+				"\n"
+				"  <ItemGroup>\n"
+				"    <ProjectReference Include=\"" +
+				relativeManaged.string() +
+				"\" />\n"
+				"  </ItemGroup>\n"
+				"\n"
+				"</Project>\n";
+
+			std::ofstream csprojOut(scriptsDir / (name + ".Scripts.csproj"));
+			if (csprojOut.is_open())
+			{
+				csprojOut << csprojContent;
+			}
+			else
+			{
+				CH_CORE_ERROR("NewProject: Failed to create .csproj file '{}'",
+							  (scriptsDir / (name + ".Scripts.csproj")).string());
+			}
+		}
+
+		// ── CMake scaffolding ──────────────────────────────────────────────
+		// Create CMakeLists.txt at project root (enables standalone builds;
+		// place the project folder under `game/` for auto-discovery by the
+		// root CMakeLists.txt).
+		{
+			std::filesystem::path cmakeListsPath = projectDir / "CMakeLists.txt";
+			std::ofstream cmakeOut(cmakeListsPath);
+			if (cmakeOut.is_open())
+			{
+				std::string gameDir = std::filesystem::path(path).filename().string();
+				cmakeOut << "chained_add_game(" + name + "\n"
+						 << "    PROJECT_GAME " << gameDir << "\n"
+						 << "    CSHARP_PROJECT \"assets/scripts/" << name << ".Scripts.csproj\"\n"
+						 << ")\n";
+				cmakeOut.close();
+			}
+			else
+			{
+				CH_CORE_ERROR("NewProject: Failed to create CMakeLists.txt '{}'", cmakeListsPath.string());
+			}
+		}
+
+		// Create src/main.cpp entry point
+		{
+			std::filesystem::path srcDir = projectDir / "src";
+			std::filesystem::create_directories(srcDir);
+			std::filesystem::path mainPath = srcDir / "main.cpp";
+			std::ofstream mainOut(mainPath);
+			if (mainOut.is_open())
+			{
+				mainOut << "#include \"engine/app/entry_point.h\"\n"
+						<< "#include \"engine/core/platform.h\"\n"
+						<< "#include \"engine/runtime/runtime_layer.h\"\n"
+						<< "\n"
+						<< "namespace Chained\n"
+						<< "{\n"
+						<< "Application* CreateApplication(ApplicationCommandLineArgs args)\n"
+						<< "{\n"
+						<< "    ApplicationSpecification spec;\n"
+						<< "    spec.Name = \"" << name << "\";\n"
+						<< "    spec.CommandLineArgs = args;\n"
+						<< "    spec.EnableScripting = true;\n"
+						<< "    spec.EngineRoot = Platform::GetExecutableDirectory();\n"
+						<< "    spec.WorkingDirectory = Platform::GetExecutableDirectory().string();\n"
+						<< "\n"
+						<< "    // Resolve project path: first CLI arg or default\n"
+						<< "    std::filesystem::path projectPath;\n"
+						<< "    for (int i = 0; i < args.Count; ++i)\n"
+						<< "    {\n"
+						<< "        std::string arg = args.Args[i];\n"
+						<< "        if (arg.ends_with(\".chproject\"))\n"
+						<< "        {\n"
+						<< "            projectPath = arg;\n"
+						<< "            break;\n"
+						<< "        }\n"
+						<< "    }\n"
+						<< "\n"
+						<< "    if (projectPath.empty() || !std::filesystem::exists(projectPath))\n"
+						<< "    {\n"
+						<< "        projectPath = std::filesystem::path(spec.WorkingDirectory) / (spec.Name + "
+						   "\".chproject\");\n"
+						<< "    }\n"
+						<< "\n"
+						<< "    auto* app = new Application(spec);\n"
+						<< "    app->PushLayer(std::make_unique<RuntimeLayer>(projectPath.string()));\n"
+						<< "    return app;\n"
+						<< "}\n"
+						<< "} // namespace Chained\n";
+				mainOut.close();
+			}
+		}
+
+		// Generate starter script
+		{
+			auto scriptsDir = assetsDir / "scripts";
+			std::string scriptContent = "using Chained;\n"
+										"\n"
+										"namespace " +
+										name +
+										".Scripts\n"
+										"{\n"
+										"    public class Starter : Script\n"
+										"    {\n"
+										"        public override void OnCreate()\n"
+										"        {\n"
+										"        }\n"
+										"\n"
+										"        public override void OnUpdate(float dt)\n"
+										"        {\n"
+										"        }\n"
+										"    }\n"
+										"}\n";
+
+			std::ofstream scriptOut(scriptsDir / "src" / "Starter.cs");
+			if (scriptOut.is_open())
+			{
+				scriptOut << scriptContent;
+			}
+			else
+			{
+				CH_CORE_ERROR("NewProject: Failed to create Starter.cs file '{}'",
+							  (scriptsDir / "src" / "Starter.cs").string());
+			}
+		}
+
+		// Create starter scene
+		{
+			auto scenePath = assetsDir / "scenes" / "untitled.chscene";
+			std::ofstream sceneOut(scenePath);
+			if (sceneOut.is_open())
+			{
+				sceneOut << "Scene: Untitled\n"
+						 << "Settings:\n"
+						 << "  Name: Untitled\n"
+						 << "  Type: 0\n"
+						 << "  Background:\n"
+						 << "    Mode: 2\n"
+						 << "Entities: []\n";
+			}
+		}
+
+		// Create .gitignore
+		{
+			auto gitignorePath = projectDir / ".gitignore";
+			std::ofstream gitignoreOut(gitignorePath);
+			if (gitignoreOut.is_open())
+			{
+				gitignoreOut << "build/\n"
+							 << "*.exe\n"
+							 << "*.dll\n"
+							 << "*.pdb\n"
+							 << "*.obj\n"
+							 << "assets/bin/\n"
+							 << "assets/scripts/bin/\n"
+							 << "assets/scripts/obj/\n";
+			}
+		}
+
+		// Configure scripting settings
+		project->SetScripting(name + ".Scripts.dll", "assets/bin");
+
+		EditorProjectSerializer::Serialize(project, (std::filesystem::path(path) / (name + ".chproject")));
+
+		Project::SetActive(project);
+
+		ProjectOpenedEvent e((std::filesystem::path(path) / (name + ".chproject")).string());
+		Application::Get().OnEvent(e);
+	}
+
+	void EditorProjectManager::OpenProject()
+	{
+		std::vector<DialogFilter> filters = {{"Chained Project", "chproject"}};
+		auto result = Chained::Dialogs::OpenFile(filters);
+		if (result)
+		{
+			OpenProject(*result);
+		}
+	}
+
+	void EditorProjectManager::OpenProject(const std::filesystem::path& path)
+	{
+		auto project = std::make_shared<Project>();
+		if (EditorProjectSerializer::Deserialize(project, path))
+		{
+			m_LastProjectPath = path.string();
+			Project::SetActive(project);
+
+			ProjectOpenedEvent e(path.string());
+			Application::Get().OnEvent(e);
+		}
+	}
+
+	void EditorProjectManager::SaveProject()
+	{
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			return;
+		}
+
+		EditorProjectSerializer::Serialize(
+			project, (project->GetConfig().ProjectDirectory / (project->GetName() + ".chproject")));
+	}
+
+	bool EditorProjectManager::OnProjectOpened(ProjectOpenedEvent& e)
+	{
+		if (!Project::GetActive())
+		{
+			return false;
+		}
+
+		// This event usually fires mid-ImGui-frame (a button click in the Project
+		// Selector). Mutating the font atlas while its fonts are in use crashes
+		// (stbtt_InitFont on freed FontData), so defer the heavy work to the next
+		// EditorLayer::OnUpdate(), which runs before ImGui::NewFrame().
+		m_PendingOpenedProjectPath = e.GetPath();
+		return true;
+	}
+
+	void EditorProjectManager::ProcessPendingProjectOpen()
+	{
+		const std::string openedPath = ConsumePendingProjectPath();
+		if (openedPath.empty())
+		{
+			return;
+		}
+
+		auto project = Project::GetActive();
+		if (project)
+		{
+			std::filesystem::path resolvedPath = openedPath;
+			std::filesystem::path projDir =
+				resolvedPath.extension() == ".chproject" ? resolvedPath.parent_path() : resolvedPath;
+
+			auto* assetMgr = ServiceLocator::TryGet<AssetManager>();
+			auto* renderer = ServiceLocator::TryGet<Renderer>();
+			auto* widgetRenderer = ServiceLocator::TryGet<WidgetRenderer>();
+
+			if (!assetMgr || !renderer)
+			{
+				CH_CORE_ERROR("ProjectManager: AssetManager or Renderer not available");
+				return;
+			}
+
+			assetMgr->SetProjectDirectory(project->GetConfig().ProjectDirectory);
+			assetMgr->SetAssetDirectory(project->GetConfig().ProjectDirectory / project->GetConfig().AssetDirectory);
+
+			// Load engine shaders and resources
+			renderer->LoadEngineResources();
+			// Rebuild font atlas with both editor fonts and project fonts.
+			// Must be done in one pass: Clear → add editor fonts → add project fonts → Build().
+			// Calling Build() twice (once per font group) crashes because ImGui frees
+			// font file data after the first Build(), making a second Build() invalid.
+			EditorLayer::Get().ReloadEditorFonts();
+
+			m_LastProjectPath = openedPath;
+
+			// Track in recent projects list (move to front, cap at 10)
+			auto& config = EditorLayer::Get().GetConfig();
+			auto& recents = config.RecentProjects;
+			recents.erase(std::remove(recents.begin(), recents.end(), m_LastProjectPath), recents.end());
+			recents.insert(recents.begin(), m_LastProjectPath);
+			if (recents.size() > 10)
+			{
+				recents.resize(10);
+			}
+
+			EditorLayer::Get().SaveConfig();
+
+			// Auto-load script assembly if configured
+			if (auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>())
+			{
+				scriptEngine->TryAutoLoad(project->GetConfig());
+			}
+
+			// Auto-load scene if available
+			std::filesystem::path sceneToLoad;
+
+			// 1. Try loading ActiveScene
+			if (!project->GetActiveScenePath().empty())
+			{
+				sceneToLoad = project->GetConfig().ProjectDirectory / project->GetActiveScenePath();
+			}
+
+			// 2. Fallback to StartScene
+			if (sceneToLoad.empty() || !std::filesystem::exists(sceneToLoad))
+			{
+				if (!project->GetStartScene().empty())
+				{
+					sceneToLoad = project->GetConfig().ProjectDirectory / project->GetConfig().AssetDirectory /
+								  project->GetStartScene();
+				}
+			}
+
+			// 3. Load the scene if found
+			if (!sceneToLoad.empty() && std::filesystem::exists(sceneToLoad))
+			{
+				CH_CORE_INFO("EditorProjectManager: Auto-loading scene: {}", sceneToLoad.string());
+				EditorLayer::Get().GetSceneManager().OpenScene(sceneToLoad);
+			}
+		}
+	}
+
+	const std::string& EditorProjectManager::GetLastProjectPath() const
+	{
+		return m_LastProjectPath;
+	}
+
+	void EditorProjectManager::RestoreLastProjectPath(const std::string& path)
+	{
+		m_LastProjectPath = path;
+	}
+
+	std::string EditorProjectManager::ConsumePendingProjectPath()
+	{
+		return std::exchange(m_PendingOpenedProjectPath, {});
+	}
+
+	void EditorProjectManager::LaunchStandalone(std::shared_ptr<Scene> editorScene)
+	{
+		CH_PROFILE_FUNCTION();
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			CH_CORE_ERROR("LaunchStandalone: No active project to launch!");
+			return;
+		}
+
+		auto& config = project->GetConfig();
+		std::string sceneArgument;
+
+		if (editorScene)
+		{
+			std::filesystem::path scenePath = editorScene->GetSettings().ScenePath;
+			if (scenePath.empty())
+			{
+				scenePath = config.ActiveScenePath;
+			}
+
+			if (!scenePath.empty())
+			{
+				if (!editorScene->GetSettings().ScenePath.empty())
+				{
+					SceneSerializer serializer(editorScene.get());
+					if (!serializer.Serialize(editorScene->GetSettings().ScenePath))
+					{
+						CH_CORE_ERROR("LaunchStandalone: Failed to save current editor scene before launching.");
+						return;
+					}
+				}
+
+				if (scenePath.is_relative())
+				{
+					scenePath = project->GetAssetPath(scenePath);
+				}
+
+				scenePath = std::filesystem::absolute(scenePath);
+				project->SetActiveScenePath(project->GetRelativePath(scenePath));
+				sceneArgument = std::format(" --scene \"{}\"", scenePath.string());
+			}
+		}
+
+		std::string configStr = (config.BuildConfig == Configuration::Release) ? "Release" : "Debug";
+		std::string runtimePath = FindRuntimeExecutable(config.Name, configStr).string();
+
+		std::filesystem::path projectFile = project->GetConfig().ProjectDirectory / (project->GetName() + ".chproject");
+		std::string arguments = std::format("\"{}\"", std::filesystem::absolute(projectFile).string());
+
+		if (!sceneArgument.empty())
+		{
+			arguments += sceneArgument;
+		}
+
+		if (runtimePath.empty() || !std::filesystem::exists(runtimePath))
+		{
+			CH_CORE_WARN("LaunchStandalone: Runtime binary not found at '{}'. Searching heuristic...", runtimePath);
+			runtimePath = FindRuntimeExecutable(config.Name, configStr).string();
+
+			if (runtimePath.empty() || !std::filesystem::exists(runtimePath))
+			{
+				CH_CORE_ERROR(
+					"LaunchStandalone: Runtime executable not found! Searched for '{}.exe' and 'ChainedRuntime.exe'.",
+					config.Name);
+				return;
+			}
+		}
+
+		if (!std::filesystem::exists(projectFile))
+		{
+			CH_CORE_ERROR("LaunchStandalone: Project file not found: {}",
+						  std::filesystem::absolute(projectFile).string());
+			return;
+		}
+
+#if CH_PLATFORM_WINDOWS
+		std::string normalizedRuntime = runtimePath;
+		std::replace(normalizedRuntime.begin(), normalizedRuntime.end(), '/', '\\');
+
+		std::string normalizedArgs = arguments;
+		std::replace(normalizedArgs.begin(), normalizedArgs.end(), '/', '\\');
+
+		CH_CORE_INFO("LaunchStandalone: Executing via ShellExecute: {} {}", normalizedRuntime, normalizedArgs);
+
+		// Provide the executable's directory as the working directory so it doesn't inherit the editor's CWD
+		std::string exeDir = std::filesystem::path(normalizedRuntime).parent_path().string();
+
+		std::wstring wExeDir(exeDir.begin(), exeDir.end());
+		HINSTANCE result =
+			ShellExecuteW(NULL, L"open", std::wstring(normalizedRuntime.begin(), normalizedRuntime.end()).c_str(),
+						  std::wstring(normalizedArgs.begin(), normalizedArgs.end()).c_str(), wExeDir.c_str(), SW_SHOW);
+		if ((uintptr_t)result <= 32)
+		{
+			DWORD err = GetLastError();
+			CH_CORE_ERROR("LaunchStandalone: ShellExecute failed with code {} (Win32 error: {})", (uintptr_t)result,
+						  err);
+		}
+#else
+		pid_t pid = fork();
+		if (pid == 0)
+		{
+			execl(runtimePath.c_str(), runtimePath.c_str(), arguments.c_str(), nullptr);
+			_exit(127);
+		}
+		else if (pid < 0)
+		{
+			CH_CORE_ERROR("LaunchStandalone: fork() failed");
+		}
+#endif
+	}
+
+} // namespace Chained
diff --git a/editor/project_manager.h b/editor/project_manager.h
new file mode 100644
index 000000000..700fc7d07
--- /dev/null
+++ b/editor/project_manager.h
@@ -0,0 +1,43 @@
+#ifndef CH_EDITOR_PROJECT_MANAGER_H
+#define CH_EDITOR_PROJECT_MANAGER_H
+
+#include "editor/project/editor_settings.h"
+#include "engine/scene/scene_events.h"
+#include <filesystem>
+#include <string>
+
+namespace Chained
+{
+	class EditorProjectManager
+	{
+	public:
+		EditorProjectManager();
+		~EditorProjectManager() = default;
+
+		void NewProject();
+		void NewProject(const std::string& name, const std::string& path);
+		void OpenProject();
+		void OpenProject(const std::filesystem::path& path);
+		void SaveProject();
+		void LaunchStandalone(std::shared_ptr<Scene> editorScene);
+
+		bool OnProjectOpened(ProjectOpenedEvent& e);
+
+		// Runs the deferred part of project opening (font atlas rebuild, scene load).
+		// Must be called outside the ImGui frame — see EditorLayer::OnUpdate().
+		void ProcessPendingProjectOpen();
+
+		const std::string& GetLastProjectPath() const;
+		void RestoreLastProjectPath(const std::string& path);
+
+		// Returns the pending project path and clears it (consume-once).
+		std::string ConsumePendingProjectPath();
+
+	private:
+		std::string m_LastProjectPath;
+		std::string m_PendingOpenedProjectPath;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_PROJECT_MANAGER_H
diff --git a/editor/scene_manager.cpp b/editor/scene_manager.cpp
new file mode 100644
index 000000000..65779982c
--- /dev/null
+++ b/editor/scene_manager.cpp
@@ -0,0 +1,552 @@
+#include "scene_manager.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/common/thread_pool.h"
+#include "engine/core/service_locator.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/platform/dialogs/dialogs.h"
+#include "engine/project/project.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/scene_events.h"
+#include "engine/scene/scene_serializer.h"
+#include "layer.h"
+
+namespace Chained
+{
+
+	void EditorSceneManager::NewScene()
+	{
+		auto& cfg = EditorLayer::Get().GetConfig();
+		if (cfg.ConfirmOnSceneClose && m_SceneDirty)
+		{
+			m_PendingNewScene = true;
+			return;
+		}
+		SetScene(Scene::CreateDefault());
+	}
+
+	void EditorSceneManager::OpenScene()
+	{
+		std::vector<DialogFilter> filters = {{"Chained Scene", "chscene"}};
+		auto result = Chained::Dialogs::OpenFile(filters);
+		if (result)
+		{
+			OpenScene(*result);
+		}
+	}
+
+	void EditorSceneManager::OpenScene(const std::filesystem::path& path)
+	{
+		auto& cfg = EditorLayer::Get().GetConfig();
+		if (cfg.ConfirmOnSceneClose && m_SceneDirty)
+		{
+			m_PendingOpenScene = true;
+			m_PendingOpenPath = path;
+			return;
+		}
+
+		if (m_Transition.state != TransitionState::None)
+		{
+			CH_CORE_WARN("EditorSceneManager: Transition to '{}' ignored - already in progress", path.string());
+			return;
+		}
+
+		bool forPlayMode = GetSceneState() == SceneState::Play;
+		StartSceneLoad(path, forPlayMode);
+	}
+
+	void EditorSceneManager::SaveScene()
+	{
+		auto scene = GetActiveScene();
+		if (!scene)
+		{
+			return;
+		}
+
+		if (scene->GetSettings().ScenePath.empty())
+		{
+			SaveSceneAs();
+			return;
+		}
+
+		SceneSerializer serializer(scene.get());
+		serializer.Serialize(scene->GetSettings().ScenePath);
+		m_SceneDirty = false;
+		CH_INFO("Scene saved to {0}", scene->GetSettings().ScenePath);
+	}
+
+	void EditorSceneManager::SaveSceneAs()
+	{
+		std::vector<DialogFilter> filters = {{"Chained Scene", "chscene"}};
+		auto result = Chained::Dialogs::SaveFile(filters);
+		if (result)
+		{
+			auto scene = GetActiveScene();
+			if (!scene)
+			{
+				return;
+			}
+
+			if (result->extension().empty())
+			{
+				result->replace_extension(".chscene");
+			}
+
+			scene->GetSettings().ScenePath = result->string();
+			SceneSerializer serializer(scene.get());
+			serializer.Serialize(result->string());
+		}
+	}
+
+	void EditorSceneManager::AutoSave(float interval, float ts)
+	{
+		auto scene = GetActiveScene();
+		if (!scene || scene->GetSettings().ScenePath.empty())
+		{
+			return;
+		}
+
+		m_AutoSaveTimer += ts;
+		if (m_AutoSaveTimer < interval)
+		{
+			return;
+		}
+
+		m_AutoSaveTimer = 0.0f;
+		SceneSerializer serializer(scene.get());
+		serializer.Serialize(scene->GetSettings().ScenePath);
+		CH_TRACE("Scene auto-saved to {0}", scene->GetSettings().ScenePath);
+	}
+
+	void EditorSceneManager::SetScene(const std::shared_ptr<Scene>& scene)
+	{
+		CancelTransition();
+
+		EditorLayer::Get().GetEditorState().SelectedEntity = {};
+
+		m_EditorScene = scene;
+		if (m_EditorScene)
+		{
+			m_EditorScene->TransitionToState(SceneState::Edit);
+		}
+	}
+
+	SceneState EditorSceneManager::GetSceneState() const
+	{
+		auto activeScene = GetActiveScene();
+		return activeScene ? activeScene->GetSceneState() : SceneState::Edit;
+	}
+
+	std::shared_ptr<Scene> EditorSceneManager::GetActiveScene() const
+	{
+		if (m_RuntimeScene)
+		{
+			return m_RuntimeScene;
+		}
+		return m_EditorScene;
+	}
+
+	void EditorSceneManager::SetSceneState(SceneState state)
+	{
+		SceneState current = GetSceneState();
+
+		if (state == SceneState::Play || state == SceneState::Simulate)
+		{
+			if (m_Transition.state != TransitionState::None || current == SceneState::Play ||
+				current == SceneState::Simulate)
+			{
+				return;
+			}
+
+			if (!m_EditorScene)
+			{
+				CH_CORE_WARN("EditorSceneManager::SetSceneState - No editor scene available.");
+				return;
+			}
+
+			CH_CORE_INFO("Editor: {} mode requested.", state == SceneState::Play ? "Play" : "Simulate");
+
+			CancelTransition();
+
+			m_Transition = {};
+			m_Transition.state = TransitionState::PlayStarting;
+			m_Transition.targetState = state;
+			m_Transition.forPlayMode = true;
+			m_Transition.targetPath = m_EditorScene->GetSettings().ScenePath;
+			m_LoadingStatus = (state == SceneState::Play) ? "Preparing Play Mode..." : "Preparing Simulation...";
+
+			auto editorScene = m_EditorScene;
+			if (auto* tp = ServiceLocator::TryGet<ThreadPool>())
+			{
+				m_Transition.future = tp->Enqueue([editorScene]() -> SceneLoadResult {
+					try
+					{
+						auto runtimeScene = Scene::Copy(editorScene);
+						if (!runtimeScene)
+						{
+							return SceneLoadResult{nullptr, "Failed to copy scene for play mode."};
+						}
+						return SceneLoadResult{runtimeScene, {}};
+					} catch (const std::exception& e)
+					{
+						return SceneLoadResult{nullptr, e.what()};
+					}
+				});
+			}
+			else
+			{
+				try
+				{
+					auto runtimeScene = Scene::Copy(editorScene);
+					m_RuntimeScene = runtimeScene;
+					m_Transition.state = TransitionState::Finalizing;
+					m_Transition.sceneReady = true;
+				} catch (const std::exception& e)
+				{
+					CH_CORE_ERROR("Editor: Exception copying scene: {}", e.what());
+					CancelTransition();
+				}
+			}
+		}
+		else
+		{
+			if (m_Transition.state != TransitionState::None)
+			{
+				CancelTransition();
+			}
+
+			if (current == SceneState::Edit)
+			{
+				return;
+			}
+
+			// Map SelectedEntity back to the editor scene
+			auto& editorState = EditorLayer::Get().GetEditorState();
+			if (editorState.SelectedEntity)
+			{
+				UUID uuid = editorState.SelectedEntity.GetUUID();
+				Entity editorEntity = m_EditorScene ? m_EditorScene->GetEntityByUUID(uuid) : Entity{};
+				editorState.SelectedEntity = editorEntity;
+			}
+
+			CH_CORE_INFO("Editor: Play Mode Stopped");
+			if (m_RuntimeScene)
+			{
+				CH_CORE_INFO("Editor: Cleaning up runtime scene...");
+				m_RuntimeScene->OnRuntimeStop();
+				m_RuntimeScene.reset();
+			}
+
+			if (m_EditorScene)
+			{
+				m_EditorScene->TransitionToState(SceneState::Edit);
+			}
+		}
+	}
+
+	void EditorSceneManager::OnUpdate(Timestep ts)
+	{
+		switch (m_Transition.state)
+		{
+		case TransitionState::None:
+			break;
+		case TransitionState::PlayStarting:
+		case TransitionState::SceneLoading:
+			UpdateSceneLoading();
+			break;
+		case TransitionState::Finalizing:
+			UpdateFinalizing();
+			break;
+		}
+	}
+
+	void EditorSceneManager::OnViewportResize(uint32_t width, uint32_t height)
+	{
+		if (m_EditorScene)
+		{
+			m_EditorScene->OnViewportResize(width, height);
+		}
+
+		if (m_RuntimeScene)
+		{
+			m_RuntimeScene->OnViewportResize(width, height);
+		}
+	}
+
+	// --- Transition helpers ---
+
+	void EditorSceneManager::StartSceneLoad(const std::filesystem::path& path, bool forPlayMode)
+	{
+		if (path.empty() || m_Transition.state != TransitionState::None)
+		{
+			return;
+		}
+
+		if (forPlayMode)
+		{
+			CancelTransition();
+		}
+
+		std::filesystem::path scenePath = path;
+		if (scenePath.is_relative())
+		{
+			if (Project::GetActive())
+			{
+				scenePath = Project::GetActive()->GetAssetPath(scenePath);
+			}
+		}
+
+		m_Transition = {};
+		m_Transition.state = TransitionState::SceneLoading;
+		m_Transition.targetPath = scenePath;
+		m_Transition.forPlayMode = forPlayMode;
+		m_Transition.targetState = forPlayMode ? SceneState::Play : SceneState::Edit;
+		m_LoadingStatus = "Loading scene...";
+
+		try
+		{
+			auto* threadPool = ServiceLocator::TryGet<ThreadPool>();
+			if (!threadPool)
+			{
+				CH_CORE_ERROR("Editor: ThreadPool not available, cannot load scene");
+				Dialogs::ShowError("Scene loading failed", "ThreadPool not available");
+				CancelTransition();
+				return;
+			}
+			m_Transition.future = threadPool->Enqueue([scenePath]() -> SceneLoadResult {
+				auto newScene = std::make_shared<Scene>();
+				SceneSerializer serializer(newScene.get());
+				if (!serializer.Deserialize(scenePath.string()))
+				{
+					return SceneLoadResult{nullptr, serializer.GetLastError()};
+				}
+				return SceneLoadResult{newScene, {}};
+			});
+
+			CH_CORE_INFO("Editor: Loading scene '{}' on a worker thread.", scenePath.string());
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("Editor: Failed to start scene load: {}", e.what());
+			Dialogs::ShowError("Scene loading failed",
+							   "Could not start loading '" + scenePath.string() + "':\n\n" + e.what());
+			CancelTransition();
+		}
+	}
+
+	void EditorSceneManager::UpdateSceneLoading()
+	{
+		if (!m_Transition.future.valid() ||
+			m_Transition.future.wait_for(std::chrono::seconds(0)) != std::future_status::ready)
+		{
+			return;
+		}
+
+		SceneLoadResult loadResult;
+		try
+		{
+			loadResult = m_Transition.future.get();
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("Editor: Scene load failed with exception: {}", e.what());
+			Dialogs::ShowError("Scene loading failed",
+							   "Failed to load scene:\n" + m_Transition.targetPath.string() + "\n\n" + e.what());
+			CancelTransition();
+			return;
+		} catch (...)
+		{
+			CH_CORE_ERROR("Editor: Scene load failed with unknown exception.");
+			Dialogs::ShowError("Scene loading failed", "Failed to load scene:\n" + m_Transition.targetPath.string() +
+														   "\n\nAn unknown error occurred.");
+			CancelTransition();
+			return;
+		}
+
+		if (!loadResult.scene)
+		{
+			std::string reason = loadResult.error.empty() ? "The scene file is corrupt or is not a valid Chained scene."
+														  : loadResult.error;
+			CH_CORE_ERROR("Editor: Scene load failed for '{}': {}", m_Transition.targetPath.string(), reason);
+			Dialogs::ShowError("Scene loading failed",
+							   "Failed to load scene:\n" + m_Transition.targetPath.string() + "\n\n" + reason);
+			CancelTransition();
+			return;
+		}
+
+		if (m_Transition.forPlayMode)
+		{
+			if (m_RuntimeScene)
+			{
+				CH_CORE_INFO("Editor: Stopping current runtime scene to load '{}'.", m_Transition.targetPath.string());
+				m_RuntimeScene->OnRuntimeStop();
+			}
+			m_RuntimeScene = loadResult.scene;
+
+			if (auto* uiRenderer = ServiceLocator::TryGet<WidgetRenderer>())
+			{
+				uiRenderer->ResetButtonStates(m_RuntimeScene.get());
+			}
+
+			// Map SelectedEntity to the play/simulate scene so the Inspector shows and modifies running state!
+			auto& editorState = EditorLayer::Get().GetEditorState();
+			if (editorState.SelectedEntity)
+			{
+				UUID uuid = editorState.SelectedEntity.GetUUID();
+				Entity playEntity = m_RuntimeScene->GetEntityByUUID(uuid);
+				if (playEntity)
+				{
+					editorState.SelectedEntity = playEntity;
+				}
+			}
+		}
+		else
+		{
+			EditorLayer::Get().GetEditorState().SelectedEntity = {};
+			m_EditorScene = loadResult.scene;
+		}
+
+		m_Transition.state = TransitionState::Finalizing;
+		m_Transition.sceneReady = false;
+		m_AssetWaitLogTimer = 0.0f;
+	}
+
+	void EditorSceneManager::UpdateFinalizing()
+	{
+		if (!m_Transition.sceneReady)
+		{
+			auto* assetMgr = ServiceLocator::TryGet<AssetManager>();
+			if (assetMgr)
+			{
+				assetMgr->Update(0.016f);
+
+				if (assetMgr->HasBackgroundWork())
+				{
+					m_AssetWaitLogTimer += 0.016f;
+					if (m_AssetWaitLogTimer > 1.0f)
+					{
+						uint32_t pendingCount = assetMgr->GetPendingFinalizeCount();
+						if (pendingCount > 0)
+						{
+							CH_CORE_INFO("Editor: Waiting for {} assets...", pendingCount);
+						}
+						m_AssetWaitLogTimer = 0.0f;
+					}
+					return;
+				}
+			}
+			m_Transition.sceneReady = true;
+		}
+
+		FinalizeTransition();
+	}
+
+	void EditorSceneManager::FinalizeTransition()
+	{
+		auto targetScene = m_Transition.forPlayMode ? m_RuntimeScene : m_EditorScene;
+		if (!targetScene)
+		{
+			CancelTransition();
+			return;
+		}
+
+		auto& layer = EditorLayer::Get();
+
+		if (auto project = Project::GetActive(); project && project->GetEnvironment())
+		{
+			bool hasEnvironment = targetScene->GetSettings().Environment &&
+								  (!targetScene->GetSettings().Environment->GetPath().empty() ||
+								   !targetScene->GetSettings().Environment->GetSettings().Skybox.TexturePath.empty());
+
+			if (!hasEnvironment)
+			{
+				CH_CORE_INFO("Editor: Applying project environment to scene '{}'.",
+							 targetScene->GetSettings().ScenePath);
+				targetScene->GetSettings().Environment = project->GetEnvironment();
+			}
+		}
+
+		targetScene->GetSettings().ScenePath = m_Transition.targetPath.string();
+
+		if (m_Transition.forPlayMode)
+		{
+			m_RuntimeScene->TransitionToState(m_Transition.targetState);
+			CH_CORE_INFO("Editor: Play Mode Started Successfully");
+		}
+		else
+		{
+			m_EditorScene->TransitionToState(SceneState::Edit);
+
+			SceneOpenedEvent e(m_Transition.targetPath.string());
+			OnSceneOpened(e);
+		}
+
+		layer.GetEditorState().SelectedEntity = {};
+		m_LoadingStatus = "";
+		m_Transition = {};
+		CH_CORE_INFO("Editor: Scene transition complete.");
+	}
+
+	void EditorSceneManager::CancelTransition()
+	{
+		if (m_RuntimeScene && m_Transition.forPlayMode && m_Transition.state != TransitionState::None)
+		{
+			CH_CORE_INFO("Editor: Stopping runtime scene during transition...");
+			m_RuntimeScene->OnRuntimeStop();
+			m_RuntimeScene.reset();
+		}
+
+		m_Transition = {};
+		m_LoadingStatus = "";
+	}
+
+	// --- Events ---
+
+	bool EditorSceneManager::OnSceneOpened(SceneOpenedEvent& e)
+	{
+		auto project = Project::GetActive();
+		if (project && !e.GetPath().empty())
+		{
+			project->SetActiveScenePath(std::filesystem::relative(e.GetPath(), project->GetConfig().ProjectDirectory));
+
+			auto& layer = EditorLayer::Get();
+			layer.GetProjectManager().SaveProject();
+
+			layer.GetConfig().LastScenePath = e.GetPath();
+			layer.SaveConfig();
+			return true;
+		}
+		return false;
+	}
+
+	// --- Confirm dialogs ---
+
+	void EditorSceneManager::ConfirmPendingAction()
+	{
+		if (m_PendingNewScene)
+		{
+			m_PendingNewScene = false;
+			m_SceneDirty = false;
+			SetScene(Scene::CreateDefault());
+		}
+		else if (m_PendingOpenScene)
+		{
+			m_PendingOpenScene = false;
+			m_SceneDirty = false;
+			std::filesystem::path path = m_PendingOpenPath;
+			m_PendingOpenPath.clear();
+
+			CH_CORE_INFO("EditorSceneManager: Transition requested to '{}'", path.string());
+			if (m_Transition.state == TransitionState::None)
+			{
+				bool forPlayMode = GetSceneState() == SceneState::Play;
+				StartSceneLoad(path, forPlayMode);
+			}
+		}
+	}
+
+	void EditorSceneManager::CancelPendingAction()
+	{
+		m_PendingNewScene = false;
+		m_PendingOpenScene = false;
+		m_PendingOpenPath.clear();
+	}
+
+} // namespace Chained
diff --git a/editor/scene_manager.h b/editor/scene_manager.h
new file mode 100644
index 000000000..2b56f8619
--- /dev/null
+++ b/editor/scene_manager.h
@@ -0,0 +1,129 @@
+#ifndef CH_EDITOR_SCENE_MANAGER_H
+#define CH_EDITOR_SCENE_MANAGER_H
+
+#include "engine/scene/scene.h"
+#include "engine/scene/scene_events.h"
+#include "editor/project/editor_settings.h"
+#include <filesystem>
+#include <future>
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+
+	class EditorSceneManager
+	{
+	public:
+		EditorSceneManager() = default;
+		~EditorSceneManager() = default;
+
+		void NewScene();
+		void OpenScene();
+		void OpenScene(const std::filesystem::path& path);
+		void OpenSceneInPlayMode(const std::filesystem::path& path);
+		void SaveScene();
+		void SaveSceneAs();
+		void AutoSave(float interval, float ts);
+
+		void SetScene(const std::shared_ptr<Scene>& scene);
+		void SetSceneState(SceneState state);
+		SceneState GetSceneState() const;
+		std::shared_ptr<Scene> GetActiveScene() const;
+		std::shared_ptr<Scene> GetRuntimeScene() const
+		{
+			return m_RuntimeScene;
+		}
+		std::shared_ptr<Scene> GetEditorScene() const
+		{
+			return m_EditorScene;
+		}
+
+		bool IsSceneDirty() const
+		{
+			return m_SceneDirty;
+		}
+		void MarkSceneDirty()
+		{
+			m_SceneDirty = true;
+		}
+		void ClearSceneDirty()
+		{
+			m_SceneDirty = false;
+		}
+
+		bool IsConfirmPending() const
+		{
+			return m_PendingNewScene || m_PendingOpenScene;
+		}
+		void ConfirmPendingAction();
+		void CancelPendingAction();
+
+		void OnUpdate(Timestep ts);
+		void OnViewportResize(uint32_t width, uint32_t height);
+
+		bool IsLoading() const
+		{
+			return m_Transition.state != TransitionState::None;
+		}
+		bool IsTransitioning() const
+		{
+			return IsLoading();
+		}
+		const std::string& GetLoadingStatus() const
+		{
+			return m_LoadingStatus;
+		}
+
+		bool OnSceneOpened(SceneOpenedEvent& e);
+
+	private:
+		enum class TransitionState
+		{
+			None,
+			PlayStarting,
+			SceneLoading,
+			Finalizing
+		};
+
+		struct SceneLoadResult
+		{
+			std::shared_ptr<Scene> scene;
+			std::string error;
+		};
+
+		struct TransitionData
+		{
+			TransitionState state = TransitionState::None;
+			SceneState targetState = SceneState::Edit;
+			bool forPlayMode = false;
+
+			std::future<SceneLoadResult> future;
+			std::filesystem::path targetPath;
+			bool sceneReady = false;
+		};
+
+		void StartSceneLoad(const std::filesystem::path& path, bool forPlayMode);
+		void UpdateSceneLoading();
+		void UpdateFinalizing();
+		void FinalizeTransition();
+		void CancelTransition();
+
+		std::shared_ptr<Scene> m_EditorScene;
+		std::shared_ptr<Scene> m_RuntimeScene;
+
+		TransitionData m_Transition;
+		std::string m_LoadingStatus;
+		float m_AutoSaveTimer = 0.0f;
+		float m_AssetWaitLogTimer = 0.0f;
+
+		bool m_SceneDirty = false;
+
+		bool m_PendingNewScene = false;
+		bool m_PendingOpenScene = false;
+		std::filesystem::path m_PendingOpenPath;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_SCENE_MANAGER_H
diff --git a/editor/scene_picking.cpp b/editor/scene_picking.cpp
new file mode 100644
index 000000000..dc8056220
--- /dev/null
+++ b/editor/scene_picking.cpp
@@ -0,0 +1,291 @@
+#include "scene_picking.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/components.h"
+#include "engine/scene/systems/transform_system.h"
+#include "engine/scene/scene.h"
+#include <algorithm>
+#include <cmath>
+#include <float.h>
+#include <limits>
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+
+namespace Chained
+{
+
+	static bool RayAABBInternal(const glm::vec3& origin, const glm::vec3& dir, const glm::vec3& min,
+								const glm::vec3& max, float& t)
+	{
+		auto SafeInv = [](float d) -> float {
+			return (std::abs(d) < std::numeric_limits<float>::epsilon())
+					   ? std::copysign(std::numeric_limits<float>::infinity(), d)
+					   : 1.0f / d;
+		};
+		glm::vec3 invDir(SafeInv(dir.x), SafeInv(dir.y), SafeInv(dir.z));
+		glm::vec3 t0 = (min - origin) * invDir;
+		glm::vec3 t1 = (max - origin) * invDir;
+
+		glm::vec3 tMin = glm::min(t0, t1);
+		glm::vec3 tMax = glm::max(t0, t1);
+
+		float nearT = std::max({tMin.x, tMin.y, tMin.z});
+		float farT = std::min({tMax.x, tMax.y, tMax.z});
+
+		if (farT < std::max(0.0f, nearT))
+		{
+			return false;
+		}
+		t = nearT;
+		return true;
+	}
+
+	RaycastResult ScenePicker::Raycast(Scene* scene, const Ray& ray)
+	{
+		RaycastResult finalResult;
+		finalResult.Hit = false;
+		finalResult.Distance = FLT_MAX;
+
+		if (!scene)
+		{
+			return finalResult;
+		}
+
+		if (auto* physics = ServiceLocator::TryGet<Physics>())
+		{
+			RaycastResult physResult = physics->Raycast(ray);
+			if (physResult.Hit)
+			{
+				finalResult = physResult;
+			}
+		}
+
+		// Primitive Component picking
+		auto primitiveView = scene->GetRegistry().view<TransformComponent, PrimitiveComponent>();
+		primitiveView.each([&](entt::entity entityID, TransformComponent& tc, PrimitiveComponent& primComp) {
+			if (finalResult.Hit && finalResult.Entity == entityID)
+			{
+				return;
+			}
+			if (primComp.Type == PrimitiveType::None)
+			{
+				return;
+			}
+
+			glm::mat4 modelTransform = TransformSystem::ComputeLocalMatrix(tc);
+			glm::mat4 invTransform = glm::inverse(modelTransform);
+
+			Ray localRay;
+			localRay.position = glm::vec3(invTransform * glm::vec4(ray.position, 1.0f));
+			glm::vec3 localTarget = glm::vec3(invTransform * glm::vec4(ray.position + ray.direction, 1.0f));
+			localRay.direction = glm::normalize(localTarget - localRay.position);
+
+			glm::vec3 halfSize = primComp.Dimensions * 0.5f;
+			if (primComp.Type == PrimitiveType::Sphere)
+			{
+				halfSize = glm::vec3(primComp.Radius);
+			}
+
+			float t = 0.0f;
+			if (RayAABBInternal(localRay.position, localRay.direction, -halfSize, halfSize, t))
+			{
+				glm::vec3 hitPosLocal = localRay.position + localRay.direction * t;
+				glm::vec3 hitPosWorld = glm::vec3(modelTransform * glm::vec4(hitPosLocal, 1.0f));
+				float distWorld = glm::distance(ray.position, hitPosWorld);
+
+				if (distWorld < finalResult.Distance)
+				{
+					finalResult.Distance = distWorld;
+					finalResult.Hit = true;
+					finalResult.Entity = entityID;
+					finalResult.Position = hitPosWorld;
+				}
+			}
+		});
+
+		auto modelView = scene->GetRegistry().view<TransformComponent, ModelComponent>();
+		modelView.each([&](entt::entity entityID, TransformComponent& tc, ModelComponent& modelComp) {
+			if (finalResult.Hit && finalResult.Entity == entityID)
+			{
+				return;
+			}
+
+			if (modelComp.ModelPath.empty())
+			{
+				return;
+			}
+
+			AssetManager* assetManager = ServiceLocator::TryGet<AssetManager>();
+			if (!assetManager)
+			{
+				return;
+			}
+			auto modelAsset = assetManager->Get<ModelAsset>(modelComp.ModelPath);
+			if (!modelAsset || !modelAsset->IsReady())
+			{
+				return;
+			}
+
+			glm::mat4 modelTransform = TransformSystem::ComputeLocalMatrix(tc);
+			glm::mat4 invTransform = glm::inverse(modelTransform);
+
+			Ray localRay;
+			localRay.position = glm::vec3(invTransform * glm::vec4(ray.position, 1.0f));
+			glm::vec3 localTarget = glm::vec3(invTransform * glm::vec4(ray.position + ray.direction, 1.0f));
+			localRay.direction = glm::normalize(localTarget - localRay.position);
+
+			float aabbT = 0.0f;
+			glm::vec3 modelMin = modelAsset->GetBoundingBox().Min;
+			glm::vec3 modelMax = modelAsset->GetBoundingBox().Max;
+
+			if (modelMin != modelMax)
+			{
+				if (!RayAABBInternal(localRay.position, localRay.direction, modelMin, modelMax, aabbT))
+				{
+					return;
+				}
+			}
+
+			float t_local = FLT_MAX;
+			glm::vec3 localNormal = {0, 0, 0};
+			bool hit = false;
+
+			const auto& instances = modelAsset->GetInstances();
+			const auto& rawMeshes = modelAsset->GetMeshes();
+
+			for (const auto& inst : instances)
+			{
+				if (inst.meshIndex < 0 || inst.meshIndex >= (int)rawMeshes.size())
+				{
+					continue;
+				}
+
+				const MeshData& raw = rawMeshes[inst.meshIndex];
+				if (raw.indices.size() < 3)
+				{
+					continue;
+				}
+
+				glm::mat4 invLocalInst = glm::inverse(inst.localTransform);
+				glm::vec3 meshSpaceOrigin = glm::vec3(invLocalInst * glm::vec4(localRay.position, 1.0f));
+				glm::vec3 meshSpaceDir = glm::normalize(glm::vec3(invLocalInst * glm::vec4(localRay.direction, 0.0f)));
+
+				for (size_t i = 0; i + 2 < raw.indices.size(); i += 3)
+				{
+					uint32_t i0 = raw.indices[i];
+					uint32_t i1 = raw.indices[i + 1];
+					uint32_t i2 = raw.indices[i + 2];
+
+					size_t v0Idx = (size_t)i0 * 3;
+					size_t v1Idx = (size_t)i1 * 3;
+					size_t v2Idx = (size_t)i2 * 3;
+
+					if (v0Idx + 2 >= raw.vertices.size() || v1Idx + 2 >= raw.vertices.size() ||
+						v2Idx + 2 >= raw.vertices.size())
+					{
+						continue;
+					}
+
+					glm::vec3 v0 = {raw.vertices[v0Idx], raw.vertices[v0Idx + 1], raw.vertices[v0Idx + 2]};
+					glm::vec3 v1 = {raw.vertices[v1Idx], raw.vertices[v1Idx + 1], raw.vertices[v1Idx + 2]};
+					glm::vec3 v2 = {raw.vertices[v2Idx], raw.vertices[v2Idx + 1], raw.vertices[v2Idx + 2]};
+
+					glm::vec3 e1 = v1 - v0, e2 = v2 - v0;
+					glm::vec3 h = glm::cross(meshSpaceDir, e2);
+					float a = glm::dot(e1, h);
+					if (std::abs(a) < 1e-7f)
+					{
+						continue;
+					}
+					float f = 1.0f / a;
+					glm::vec3 s = meshSpaceOrigin - v0;
+					float u = f * glm::dot(s, h);
+					if (u < 0.0f || u > 1.0f)
+					{
+						continue;
+					}
+					glm::vec3 q = glm::cross(s, e1);
+					float v = f * glm::dot(meshSpaceDir, q);
+					if (v < 0.0f || u + v > 1.0f)
+					{
+						continue;
+					}
+
+					float triT = f * glm::dot(e2, q);
+					if (triT > 0.0f)
+					{
+
+						glm::vec3 hitMeshSpace = meshSpaceOrigin + meshSpaceDir * triT;
+						glm::vec3 hitLocalSpace = glm::vec3(inst.localTransform * glm::vec4(hitMeshSpace, 1.0f));
+
+						float currentLocalT = glm::distance(localRay.position, hitLocalSpace);
+
+						if (currentLocalT < t_local)
+						{
+							t_local = currentLocalT;
+							hit = true;
+
+							glm::vec3 meshNormal = glm::normalize(glm::cross(e1, e2));
+							localNormal =
+								glm::normalize(glm::vec3(glm::transpose(invLocalInst) * glm::vec4(meshNormal, 0.0f)));
+						}
+					}
+				}
+			}
+
+			if (hit)
+			{
+				glm::vec3 hitPosLocal = localRay.position + localRay.direction * t_local;
+				glm::vec3 hitPosWorld = glm::vec3(modelTransform * glm::vec4(hitPosLocal, 1.0f));
+				float distWorld = glm::distance(ray.position, hitPosWorld);
+
+				if (distWorld < finalResult.Distance)
+				{
+					finalResult.Distance = distWorld;
+					finalResult.Hit = true;
+					finalResult.Entity = entityID;
+					finalResult.Position = hitPosWorld;
+				}
+			}
+		});
+
+		return finalResult;
+	}
+
+	Ray ScenePicker::CreateRayFromViewport(const Chained::Camera3D& camera, const glm::vec2& mousePosition,
+										   const glm::vec2& viewportSize)
+	{
+		float ndc_x = (2.0f * mousePosition.x) / viewportSize.x - 1.0f;
+		float ndc_y = 1.0f - (2.0f * mousePosition.y) / viewportSize.y;
+
+		glm::mat4 invVP = glm::inverse(camera.ProjectionMatrix * camera.ViewMatrix);
+
+		auto Unproject = [&](float x, float y, float z) -> glm::vec3 {
+			glm::vec4 ndc(x, y, z, 1.0f);
+			glm::vec4 world = invVP * ndc;
+			if (std::abs(world.w) > 1e-6f)
+			{
+				return glm::vec3(world) / world.w;
+			}
+			return glm::vec3(0.0f);
+		};
+
+#ifdef GLM_FORCE_DEPTH_ZERO_TO_ONE
+		float nearZ = 0.0f;
+#else
+		float nearZ = -1.0f;
+#endif
+		glm::vec3 nearPoint = Unproject(ndc_x, ndc_y, nearZ);
+		glm::vec3 farPoint = Unproject(ndc_x, ndc_y, 1.0f);
+
+		Ray ray;
+		ray.position = nearPoint;
+		ray.direction = glm::normalize(farPoint - nearPoint);
+
+		return ray;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/editor/scene_picking.h b/editor/scene_picking.h
new file mode 100644
index 000000000..c36aaaf2a
--- /dev/null
+++ b/editor/scene_picking.h
@@ -0,0 +1,22 @@
+#ifndef CH_SCENE_PICKING_H
+#define CH_SCENE_PICKING_H
+
+#include "engine/graphics/camera_types.h"
+#include "engine/physics/raycast_result.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+	class Scene;
+
+	class ScenePicker
+	{
+	public:
+		static RaycastResult Raycast(Scene* scene, const Ray& ray);
+		static Ray CreateRayFromViewport(const Chained::Camera3D& camera, const glm::vec2& mousePosition,
+										 const glm::vec2& viewportSize);
+	};
+
+} // namespace Chained
+
+#endif // CH_SCENE_PICKING_H
diff --git a/editor/types.h b/editor/types.h
new file mode 100644
index 000000000..c8ab84441
--- /dev/null
+++ b/editor/types.h
@@ -0,0 +1,22 @@
+#ifndef CH_EDITOR_TYPES_H
+#define CH_EDITOR_TYPES_H
+
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/scene/scene.h"
+#include <cstdint>
+#include <string>
+
+namespace Chained
+{
+	struct EditorState
+	{
+		Entity SelectedEntity;
+		bool FullscreenGame = false;
+		bool NeedsLayoutReset = false;
+		int LastHitMeshIndex = -1;
+		DebugRenderFlags DebugRenderFlags;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_TYPES_H
diff --git a/editor/ui/project_selector_ui.cpp b/editor/ui/project_selector_ui.cpp
new file mode 100644
index 000000000..99e2636d1
--- /dev/null
+++ b/editor/ui/project_selector_ui.cpp
@@ -0,0 +1,355 @@
+#include "project_selector_ui.h"
+#include "editor/editor_colors.h"
+#include "editor/layer.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/platform/dialogs/dialogs.h"
+#include "imgui.h"
+#include "imgui_internal.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include <cstring>
+#include <filesystem>
+#include <string>
+
+namespace Chained
+{
+
+	namespace
+	{
+		void SafeCopy(char* dst, size_t dstSize, const char* src)
+		{
+			strncpy(dst, src, dstSize - 1);
+			dst[dstSize - 1] = '\0';
+		}
+
+		constexpr float kSidebarWidth = 320.0f;
+		constexpr float kCardWidth = 300.0f;
+		constexpr float kCardHeight = 300.0f;
+		constexpr float kCardGap = 40.0f;
+		constexpr float kCardTextWrap = 280.0f;
+		constexpr float kPopupWidth = 480.0f;
+		constexpr float kInputWidth = 432.0f;
+		constexpr float kBtnWidth = 110.0f;
+		constexpr float kBtnHeight = 28.0f;
+		constexpr size_t kNameBufSize = 128;
+		constexpr size_t kLocationBufSize = 256;
+	} // namespace
+
+	ProjectSelectorUI::ProjectSelectorUI(EditorProjectManager& projectManager)
+		: m_ProjectManager(projectManager)
+	{
+	}
+
+	void ProjectSelectorUI::LoadEditorIcons()
+	{
+		if (m_IconsLoaded)
+		{
+			return;
+		}
+
+		auto assetManager = ServiceLocator::TryGet<AssetManager>();
+		if (assetManager)
+		{
+			assetManager->LoadAsset("engine/resources/icons/newproject.jpg", TextureAsset::GetStaticType());
+			assetManager->LoadAsset("engine/resources/icons/folder.png", TextureAsset::GetStaticType());
+
+			m_NewProjectIcon = assetManager->Get<TextureAsset>("engine/resources/icons/newproject.jpg");
+			m_OpenProjectIcon = assetManager->Get<TextureAsset>("engine/resources/icons/folder.png");
+			m_IconsLoaded = true;
+		}
+	}
+
+	void ProjectSelectorUI::OnImGuiRender()
+	{
+		LoadEditorIcons();
+
+		if (!m_Initialized)
+		{
+			std::string cwd = std::filesystem::current_path().string();
+			SafeCopy(m_ProjectLocationBuffer, kLocationBufSize, cwd.c_str());
+			m_Initialized = true;
+		}
+
+		ImGuiViewport* viewport = ImGui::GetMainViewport();
+		ImGui::SetNextWindowPos(viewport->WorkPos);
+		ImGui::SetNextWindowSize(viewport->WorkSize);
+		ImGui::SetNextWindowViewport(viewport->ID);
+
+		ImGuiWindowFlags windowFlags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse |
+									   ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
+									   ImGuiWindowFlags_NoNavFocus | ImGuiWindowFlags_NoScrollbar |
+									   ImGuiWindowFlags_NoBringToFrontOnFocus;
+
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
+
+		ImGui::Begin("Project Selector", nullptr, windowFlags);
+
+		// Sidebar
+		ImGui::PushStyleColor(ImGuiCol_ChildBg, EditorColors::DarkPanelBg);
+		ImGui::BeginChild("Sidebar", ImVec2(kSidebarWidth, 0), false);
+
+		// Banner / Logo Area
+		ImGui::Dummy(ImVec2(0, 15));
+		ImGui::SetCursorPosX(20.0f);
+		ImGui::SetWindowFontScale(1.5f);
+		ImGui::TextColored(ImVec4(0.2f, 0.7f, 1.0f, 1.0f), ICON_FA_LINK " Chained");
+		ImGui::SameLine();
+		ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 1.0f), "Engine");
+		ImGui::SetWindowFontScale(1.0f);
+		ImGui::Separator();
+
+		ImGui::Dummy(ImVec2(0, 15));
+		ImGui::TextDisabled("   RECENT PROJECTS");
+		ImGui::Dummy(ImVec2(0, 10));
+
+		const auto& config = EditorLayer::Get().GetConfig();
+		if (config.RecentProjects.empty())
+		{
+			ImGui::TextDisabled("   No recent projects.");
+		}
+		else
+		{
+			ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::SidebarBg);
+			ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.05f, 0.5f));
+			ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 5.0f);
+
+			for (const auto& projectPath : config.RecentProjects)
+			{
+				std::string fileName = std::filesystem::path(projectPath).filename().string();
+				std::string dirName = std::filesystem::path(projectPath).parent_path().filename().string();
+
+				std::string label = ICON_FA_FOLDER_OPEN "  " + fileName + "\n      " + dirName;
+
+				ImGui::SetCursorPosX(10.0f);
+				if (ImGui::Button(label.c_str(), ImVec2(kSidebarWidth - 20, 50)))
+				{
+					m_ProjectManager.OpenProject(projectPath);
+					break;
+				}
+				if (ImGui::IsItemHovered())
+				{
+					ImGui::SetTooltip("%s", projectPath.c_str());
+				}
+				ImGui::Dummy(ImVec2(0, 5));
+			}
+
+			ImGui::PopStyleVar(2);
+			ImGui::PopStyleColor();
+		}
+
+		ImGui::EndChild();
+		ImGui::PopStyleColor(); // ChildBg Sidebar
+
+		ImGui::SameLine();
+
+		// Main Area
+		ImGui::PushStyleColor(ImGuiCol_ChildBg, EditorColors::SubCardBg);
+		ImGui::BeginChild("MainArea");
+
+		float centerX = ImGui::GetContentRegionAvail().x * 0.5f;
+		float centerY = ImGui::GetContentRegionAvail().y * 0.5f;
+
+		ImGui::SetCursorPos(ImVec2(centerX - kCardWidth / 2.0f - kCardGap / 2.0f, centerY - kCardHeight / 2.0f));
+
+		ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(20, 20));
+		ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 12.0f);
+		ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::ProjectCardBg);
+		ImGui::PushStyleColor(ImGuiCol_ButtonHovered, EditorColors::ProjectCardHover);
+		ImGui::PushStyleColor(ImGuiCol_ButtonActive, EditorColors::ProjectCardActive);
+		ImGui::PushStyleColor(ImGuiCol_Text, EditorColors::BrightText);
+
+		ImGui::BeginGroup();
+		{
+			ImTextureID newProjTex = 0;
+			if (m_NewProjectIcon)
+			{
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (am)
+				{
+					auto texAsset = am->Get<TextureAsset>("engine/resources/icons/newproject.jpg");
+					if (texAsset && texAsset->IsReady())
+					{
+						auto gpuTex = texAsset->GetTexture();
+						if (gpuTex)
+						{
+							newProjTex = (ImTextureID)(uintptr_t)gpuTex->GetNativeHandle();
+						}
+					}
+				}
+			}
+
+			if (ImGui::ImageButton("##NewProject", newProjTex, {kCardWidth, kCardHeight}, {0, 0}, {1, 1}))
+			{
+				m_ShowCreateDialog = true;
+			}
+		}
+		ImGui::SetWindowFontScale(1.3f);
+		ImGui::Text("New Project");
+		ImGui::SetWindowFontScale(1.0f);
+		ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + kCardTextWrap);
+		ImGui::TextDisabled("Start a fresh journey with a dedicated");
+		ImGui::TextDisabled("project folder and optimized settings.");
+		ImGui::PopTextWrapPos();
+		ImGui::EndGroup();
+
+		ImGui::SameLine(0, kCardGap);
+
+		ImGui::BeginGroup();
+		{
+			ImTextureID openProjTex = 0;
+			if (m_OpenProjectIcon)
+			{
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (am)
+				{
+					auto texAsset = am->Get<TextureAsset>("engine/resources/icons/folder.png");
+					if (texAsset && texAsset->IsReady())
+					{
+						auto gpuTex = texAsset->GetTexture();
+						if (gpuTex)
+						{
+							openProjTex = (ImTextureID)(uintptr_t)gpuTex->GetNativeHandle();
+						}
+					}
+				}
+			}
+
+			if (ImGui::ImageButton("##OpenProject", openProjTex, {kCardWidth, kCardHeight}, {0, 0}, {1, 1}))
+			{
+				m_ProjectManager.OpenProject();
+			}
+		}
+		ImGui::SetWindowFontScale(1.3f);
+		ImGui::Text("Open Project");
+		ImGui::SetWindowFontScale(1.0f);
+		ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + kCardTextWrap);
+		ImGui::TextDisabled("Browse and load an existing Chained");
+		ImGui::TextDisabled("Engine project (.chproject) file.");
+		ImGui::PopTextWrapPos();
+		ImGui::EndGroup();
+
+		ImGui::PopStyleColor(4);
+		ImGui::PopStyleVar(2);
+
+		ImGui::EndChild();
+		ImGui::PopStyleColor(); // ChildBg MainArea
+
+		if (m_ShowCreateDialog)
+		{
+			ImGui::OpenPopup("Create New Project");
+
+			ImVec2 mainAreaCenter =
+				ImVec2(kSidebarWidth + (viewport->WorkSize.x - kSidebarWidth) * 0.5f, viewport->WorkSize.y * 0.5f);
+			ImGui::SetNextWindowPos(mainAreaCenter, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
+			ImGui::SetNextWindowSize(ImVec2(kPopupWidth, 0), ImGuiCond_Appearing);
+
+			ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(24, 20));
+			if (ImGui::BeginPopupModal("Create New Project", &m_ShowCreateDialog,
+									   ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar))
+			{
+				// --- Header ---
+				ImGui::SetWindowFontScale(1.2f);
+				ImGui::TextColored(ImVec4(0.2f, 0.7f, 1.0f, 1.0f), ICON_FA_FILE "  New Project");
+				ImGui::SetWindowFontScale(1.0f);
+				ImGui::Dummy(ImVec2(0, 4));
+				ImGui::Separator();
+				ImGui::Dummy(ImVec2(0, 8));
+
+				// --- Project Name ---
+				ImGui::TextDisabled("PROJECT NAME");
+				ImGui::SetNextItemWidth(kInputWidth);
+				ImGui::InputText("##ProjectName", m_ProjectNameBuffer, kNameBufSize);
+
+				bool nameEmpty = (m_ProjectNameBuffer[0] == '\0');
+				if (nameEmpty)
+				{
+					ImGui::TextColored(ImVec4(1.0f, 0.45f, 0.45f, 1.0f),
+									   ICON_FA_CIRCLE_EXCLAMATION "  Name cannot be empty");
+				}
+				else
+				{
+					ImGui::Dummy(ImVec2(0, ImGui::GetTextLineHeight()));
+				}
+
+				ImGui::Dummy(ImVec2(0, 6));
+
+				// --- Location ---
+				ImGui::TextDisabled("LOCATION");
+				ImGui::SetNextItemWidth(360);
+				ImGui::InputText("##ProjectLocation", m_ProjectLocationBuffer, kLocationBufSize);
+				ImGui::SameLine(0, 8);
+				ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::ProjectCardBorder);
+				ImGui::PushStyleColor(ImGuiCol_ButtonHovered, EditorColors::ProjectCardBorderHover);
+				ImGui::PushStyleColor(ImGuiCol_ButtonActive, EditorColors::ProjectCardBorderActive);
+				if (ImGui::Button(ICON_FA_FOLDER_OPEN "  Browse", ImVec2(64, 0)))
+				{
+					auto picked = Dialogs::PickFolder();
+					if (picked)
+					{
+						SafeCopy(m_ProjectLocationBuffer, kLocationBufSize, picked->string().c_str());
+					}
+				}
+				ImGui::PopStyleColor(3);
+
+				// --- Path preview box ---
+				ImGui::Dummy(ImVec2(0, 10));
+				std::filesystem::path previewPath =
+					std::filesystem::path(m_ProjectLocationBuffer) / m_ProjectNameBuffer;
+
+				ImGui::PushStyleColor(ImGuiCol_ChildBg, EditorColors::SubCardBg);
+				ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 4.0f);
+				ImGui::BeginChild("##preview", ImVec2(kInputWidth, 36), false);
+				ImGui::SetCursorPos(ImVec2(10, 10));
+				ImGui::TextColored(EditorColors::MutedText, ICON_FA_CIRCLE_INFO "  ");
+				ImGui::SameLine(0, 0);
+				ImGui::TextDisabled("%s", previewPath.string().c_str());
+				ImGui::EndChild();
+				ImGui::PopStyleVar();
+				ImGui::PopStyleColor();
+
+				// --- Buttons ---
+				ImGui::Dummy(ImVec2(0, 12));
+				ImGui::Separator();
+				ImGui::Dummy(ImVec2(0, 8));
+
+				ImGui::SetCursorPosX(kInputWidth + 24 - kBtnWidth * 2 - 8);
+
+				ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::SubCardBorder);
+				ImGui::PushStyleColor(ImGuiCol_ButtonHovered, EditorColors::SubCardBorderHover);
+				ImGui::PushStyleColor(ImGuiCol_ButtonActive, EditorColors::SubCardBorderActive);
+				if (ImGui::Button("Cancel", ImVec2(kBtnWidth, kBtnHeight)))
+				{
+					m_ShowCreateDialog = false;
+					ImGui::CloseCurrentPopup();
+				}
+				ImGui::PopStyleColor(3);
+
+				ImGui::SameLine(0, 8);
+
+				ImGui::BeginDisabled(nameEmpty);
+				ImGui::PushStyleColor(ImGuiCol_Button, EditorColors::PrimaryButton);
+				ImGui::PushStyleColor(ImGuiCol_ButtonHovered, EditorColors::PrimaryButtonHover);
+				ImGui::PushStyleColor(ImGuiCol_ButtonActive, EditorColors::PrimaryButtonActive);
+				ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+				if (ImGui::Button(ICON_FA_FOLDER "  Create", ImVec2(kBtnWidth, kBtnHeight)))
+				{
+					m_ProjectManager.NewProject(m_ProjectNameBuffer, previewPath.string());
+					m_ShowCreateDialog = false;
+					ImGui::CloseCurrentPopup();
+				}
+				ImGui::PopStyleColor(4);
+				ImGui::EndDisabled();
+
+				ImGui::EndPopup();
+			}
+			ImGui::PopStyleVar();
+		}
+
+		ImGui::End();
+		ImGui::PopStyleVar(3);
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/editor/ui/project_selector_ui.h b/editor/ui/project_selector_ui.h
new file mode 100644
index 000000000..bb37ae15d
--- /dev/null
+++ b/editor/ui/project_selector_ui.h
@@ -0,0 +1,37 @@
+#ifndef CH_PROJECT_SELECTOR_UI_H
+#define CH_PROJECT_SELECTOR_UI_H
+
+#include "editor/project_manager.h"
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+namespace Chained
+{
+	class TextureAsset;
+
+	class ProjectSelectorUI
+	{
+	public:
+		ProjectSelectorUI(EditorProjectManager& projectManager);
+
+		void OnImGuiRender();
+
+	private:
+		EditorProjectManager& m_ProjectManager;
+
+		std::shared_ptr<TextureAsset> m_NewProjectIcon = nullptr;
+		std::shared_ptr<TextureAsset> m_OpenProjectIcon = nullptr;
+		bool m_IconsLoaded = false;
+
+		bool m_ShowCreateDialog = false;
+		char m_ProjectNameBuffer[128] = "NewProject";
+		char m_ProjectLocationBuffer[256] = "";
+		bool m_Initialized = false;
+
+		void LoadEditorIcons();
+	};
+
+} // namespace Chained
+
+#endif // CH_PROJECT_SELECTOR_UI_H
\ No newline at end of file
diff --git a/editor/ui_properties.cpp b/editor/ui_properties.cpp
new file mode 100644
index 000000000..0b5faa58e
--- /dev/null
+++ b/editor/ui_properties.cpp
@@ -0,0 +1,100 @@
+#include "ui_properties.h"
+#include <algorithm>
+#include <cstring>
+
+namespace Chained
+{
+
+	bool UIProperties::EnumPropertyInternal(const char* name, int& value, const char** names, int count,
+											const PropertyMeta& meta)
+	{
+		ImGui::BeginDisabled(meta.ReadOnly);
+		bool changed = EditorGUI::Property(name, value, names, count);
+		ImGui::EndDisabled();
+		if (!meta.Tooltip.empty() && ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("%s", meta.Tooltip.c_str());
+		}
+		UpdateState(changed);
+		return changed;
+	}
+
+	bool UIProperties::StringEnumInternal(const char* name, std::string& value, const std::vector<std::string>& options,
+										  const PropertyMeta& meta)
+	{
+		int currentIndex = 0;
+		for (size_t i = 0; i < options.size(); ++i)
+		{
+			if (options[i] == value)
+			{
+				currentIndex = (int)i;
+				break;
+			}
+		}
+
+		std::vector<const char*> optionNames;
+		for (const auto& option : options)
+		{
+			optionNames.push_back(option.c_str());
+		}
+
+		bool changed = false;
+		EditorGUI::DrawPropertyLabel(name);
+		ImGui::PushID(name);
+		ImGui::BeginDisabled(meta.ReadOnly);
+		ImGui::SetNextItemWidth(-1);
+		if (ImGui::Combo("##prop", &currentIndex, optionNames.data(), (int)optionNames.size()))
+		{
+			value = (currentIndex >= 0 && currentIndex < (int)options.size()) ? options[currentIndex] : std::string();
+			changed = true;
+		}
+		ImGui::EndDisabled();
+		ImGui::PopID();
+
+		if (!meta.Tooltip.empty() && ImGui::IsItemHovered())
+		{
+			ImGui::SetTooltip("%s", meta.Tooltip.c_str());
+		}
+		UpdateState(changed);
+		return changed;
+	}
+
+	void UIProperties::HeaderInternal(const char* label)
+	{
+		if (ImGui::GetCurrentTable() != nullptr)
+		{
+			ImGui::TableNextRow();
+			ImGui::TableSetColumnIndex(0);
+			ImGui::AlignTextToFramePadding();
+		}
+		ImGui::Spacing();
+		ImGui::TextColored({0.2f, 0.7f, 0.9f, 1.0f}, "%s", label);
+		if (ImGui::GetCurrentTable() != nullptr)
+		{
+			ImGui::TableNextRow();
+			ImGui::TableSetColumnIndex(0);
+		}
+	}
+
+	void UIProperties::SeparatorInternal()
+	{
+		ImGui::Separator();
+	}
+
+	void UIProperties::UpdateState(bool changed)
+	{
+		if (changed)
+		{
+			m_Changed = true;
+		}
+		if (ImGui::IsItemActivated())
+		{
+			m_Started = true;
+		}
+		if (ImGui::IsItemDeactivatedAfterEdit())
+		{
+			m_Finished = true;
+		}
+	}
+
+} // namespace Chained
diff --git a/editor/ui_properties.h b/editor/ui_properties.h
index 75ddfe812..b5fbeb3c0 100644
--- a/editor/ui_properties.h
+++ b/editor/ui_properties.h
@@ -1,372 +1,357 @@
 #ifndef CH_UI_PROPERTIES_H
 #define CH_UI_PROPERTIES_H
 
-#include "editor_gui.h"
-#include "engine/core/reflection.h"
-#include "scripting/scriptengine.h"
-#include "IconsFontAwesome6.h"
+#include "thirdparty/IconsFontAwesome6.h"
+#include "gui.h"
+#include "engine/reflection/reflection.h"
 #include "imgui.h"
 #include "imgui_internal.h"
 
 #include <algorithm>
+#include <cstring>
+#include <functional>
 #include <string_view>
+#include <unordered_map>
+#include <vector>
 
-namespace CHEngine
+namespace Chained
 {
-// Implementation of the Archive concept for ImGui UI
-class UIProperties
-{
-public:
-    UIProperties() = default;
-
-    template <typename T> bool Property(const char* name, T& value)
-    {
-        bool changed = false;
-        if constexpr (is_variant_v<T>)
-        {
-            changed = std::visit([&](auto&& v) { return EditorGUI::Property(name, v); }, value);
-        }
-        else if constexpr (std::is_same_v<T, float[4]>)
-        {
-            changed = EditorGUI::Property(name, *(glm::vec4*)&value);
-        }
-        else
-        {
-            changed = EditorGUI::Property(name, value);
-        }
-
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        
-        return changed;
-    }
-
-    // Overload for enums
-    bool Property(const char* name, int& value, const char** names, int count)
-    {
-        bool changed = EditorGUI::Property(name, value, names, count);
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        return changed;
-    }
-
-    // --- Property methods with metadata ---
-    template <typename T> bool Property(const char* name, T& value, const PropertyMeta& meta)
-    {
-        bool changed = false;
-        
-        // Use metadata hint to select widget
-        if constexpr (std::is_same_v<T, float>)
-        {
-            if (meta.Hint == PropertyMeta::WidgetHint::Slider && meta.MaxValue > meta.MinValue)
-            {
-                changed = ImGui::SliderFloat(name, &value, meta.MinValue, meta.MaxValue);
-            }
-            else if (meta.Hint == PropertyMeta::WidgetHint::Default)
-            {
-                changed = ImGui::DragFloat(name, &value, meta.Speed);
-            }
-            else
-            {
-                changed = ImGui::InputFloat(name, &value);
-            }
-        }
-        else if constexpr (std::is_same_v<T, int>)
-        {
-            if (meta.Hint == PropertyMeta::WidgetHint::Slider && meta.MaxValue > meta.MinValue)
-            {
-                changed = ImGui::SliderInt(name, &value, (int)meta.MinValue, (int)meta.MaxValue);
-            }
-            else
-            {
-                changed = EditorGUI::Property(name, value);
-            }
-        }
-        else if constexpr (std::is_same_v<T, std::string>)
-        {
-            if (meta.Hint == PropertyMeta::WidgetHint::Enum && std::string_view(name) == "ClassName")
-            {
-                std::vector<std::string> options;
-                options.emplace_back("-- Select script --");
-
-                for (const auto& [scriptName, scriptType] : ScriptEngine::Get().GetScriptClasses())
-                {
-                    (void)scriptType;
-                    options.emplace_back(scriptName);
-                }
-
-                if (options.size() > 2)
-                {
-                    std::sort(options.begin() + 1, options.end());
-                }
-
-                int currentIndex = 0;
-                for (size_t i = 1; i < options.size(); ++i)
-                {
-                    if (options[i] == value)
-                    {
-                        currentIndex = (int)i;
-                        break;
-                    }
-                }
-
-                std::vector<const char*> optionNames;
-                optionNames.reserve(options.size());
-                for (const auto& option : options)
-                {
-                    optionNames.push_back(option.c_str());
-                }
-
-                if (ImGui::Combo(name, &currentIndex, optionNames.data(), (int)optionNames.size()))
-                {
-                    value = (currentIndex > 0 && currentIndex < (int)options.size()) ? options[currentIndex] : std::string();
-                    changed = true;
-                }
-            }
-            else
-            {
-                changed = EditorGUI::Property(name, value);
-            }
-        }
-        else
-        {
-            // Fall back to default for other types
-            changed = EditorGUI::Property(name, value);
-        }
-
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        return changed;
-    }
-
-    // Enum with metadata
-    bool Property(const char* name, int& value, const char** names, int count, const PropertyMeta& meta)
-    {
-        bool changed = EditorGUI::Property(name, value, names, count);
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        return changed;
-    }
-
-    // File with metadata
-    bool File(const char* name, std::string& path, const char* extensions, const PropertyMeta& meta)
-    {
-        bool changed = EditorGUI::FileProperty(name, path, extensions);
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        return changed;
-    }
-
-    bool Handle(const char* name, uint64_t& value)
-    {
-        bool changed = EditorGUI::Property(name, value);
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        return changed;
-    }
-
-    bool File(const char* name, std::string& path, const char* extensions = nullptr)
-    {
-        bool changed = EditorGUI::FileProperty(name, path, extensions);
-        if (changed) m_Changed = true;
-        if (ImGui::IsItemActivated()) m_Started = true;
-        if (ImGui::IsItemDeactivatedAfterEdit()) m_Finished = true;
-        return changed;
-    }
-
-    void Action(const char* label, std::function<void()> func)
-    {
-        if (EditorGUI::ActionButton(nullptr, label))
-        {
-            func();
-        }
-    }
-
-    template <typename T> bool Sequence(const char* name, std::vector<T>& values)
-    {
-        if (ImGui::GetCurrentTable() != nullptr)
-        {
-            ImGui::TableNextRow();
-            ImGui::TableSetColumnIndex(0);
-            ImGui::AlignTextToFramePadding();
-        }
-
-        bool localChanged = false;
-        ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_SpanAvailWidth;
-        if (ImGui::GetCurrentTable() != nullptr) flags |= ImGuiTreeNodeFlags_SpanAllColumns;
-
-        if (ImGui::TreeNodeEx(name, flags))
-        {
-            for (size_t i = 0; i < (int)values.size(); i++)
-            {
-                ImGui::PushID((int)i);
-
-                if (ImGui::GetCurrentTable() != nullptr)
-                {
-                    ImGui::TableNextRow();
-                    ImGui::TableSetColumnIndex(1);
-                }
-
-                if (ImGui::Button(ICON_FA_TRASH))
-                {
-                    values.erase(values.begin() + i);
-                    m_Changed = true;
-                    localChanged = true;
-                    ImGui::PopID();
-                    break;
-                }
-                
-                ImGui::SameLine();
-                
-                if constexpr (requires(T t, Properties<UIProperties>& p) { t.Reflect(p); })
-                {
-                    char label[32];
-                    sprintf(label, "Item %d", (int)i);
-                    // Use a nested tree node for complex items
-                    if (ImGui::TreeNodeEx(label, ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_SpanAvailWidth))
-                    {
-                        Properties<UIProperties> itemProps(*this);
-                        values[i].Reflect(itemProps);
-                        ImGui::TreePop();
-                    }
-                }
-                else if constexpr (std::is_same_v<T, std::string>)
-                {
-                    char buf[256];
-                    strncpy(buf, values[i].c_str(), sizeof(buf) - 1);
-                    ImGui::SetNextItemWidth(-1);
-                    if (ImGui::InputText("##val", buf, sizeof(buf)))
-                    {
-                        values[i] = buf;
-                        m_Changed = true;
-                        localChanged = true;
-                    }
-                }
-                else
-                {
-                    ImGui::Text("Item %d", (int)i);
-                }
-
-                ImGui::PopID();
-                if constexpr (!requires(T t, Properties<UIProperties>& p) { t.Reflect(p); }) 
-                    ImGui::Separator();
-            }
-
-            ImGui::Spacing();
-            if (ImGui::GetCurrentTable() != nullptr)
-            {
-                ImGui::TableNextRow();
-                ImGui::TableSetColumnIndex(1);
-            }
-
-            if (ImGui::Button(ICON_FA_PLUS " Add New Item", ImVec2(-1, 0)))
-            {
-                values.push_back({});
-                m_Changed = true;
-                localChanged = true;
-            }
-
-            ImGui::TreePop();
-        }
-        return localChanged;
-    }
-
-    template <typename T> bool Nested(const char* name, T& value)
-    {
-        bool localChanged = false;
-        if (ImGui::TreeNodeEx(name, ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_DefaultOpen))
-        {
-            Properties<UIProperties> itemProps(*this);
-            value.Reflect(itemProps);
-            ImGui::TreePop();
-        }
-        return localChanged;
-    }
-
-    void Header(const char* label)
-    {
-        if (ImGui::GetCurrentTable() != nullptr)
-        {
-            ImGui::TableNextRow();
-            ImGui::TableSetColumnIndex(0);
-            ImGui::AlignTextToFramePadding();
-        }
-        ImGui::Spacing();
-        ImGui::TextColored({0.2f, 0.7f, 0.9f, 1.0f}, "%s", label);
-        ImGui::Separator();
-        if (ImGui::GetCurrentTable() != nullptr)
-        {
-            ImGui::TableNextRow();
-            ImGui::TableSetColumnIndex(0);
-        }
-    }
-
-    void Separator()
-    {
-        ImGui::Separator();
-    }
-
-    bool BeginGroup(const char* label, bool defaultOpen = true)
-    {
-        if (ImGui::GetCurrentTable() != nullptr)
-        {
-            ImGui::TableNextRow();
-            ImGui::TableSetColumnIndex(0);
-            ImGui::AlignTextToFramePadding();
-        }
-
-        ImGuiTreeNodeFlags flags =
-            ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_AllowOverlap | ImGuiTreeNodeFlags_FramePadding | 
-            ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_SpanAllColumns;
-        if (defaultOpen)
-        {
-            flags |= ImGuiTreeNodeFlags_DefaultOpen;
-        }
-
-        bool opened = ImGui::TreeNodeEx(label, flags);
-        
-        if (ImGui::GetCurrentTable() != nullptr)
-        {
-            // Move to the next column to ensure the header row context is technically "complete"
-            // although the next property will start a fresh row with TableNextRow().
-            ImGui::TableSetColumnIndex(1);
-        }
-
-        return opened;
-    }
-
-    void EndGroup()
-    {
-        ImGui::TreePop();
-    }
-
-    bool HasFinished() const { return m_Started && m_Finished; }
-    bool HasStarted() const { return m_Started; }
-
-    bool HasChanged() const
-    {
-        return m_Changed;
-    }
-    void SetChanged(bool changed)
-    {
-        m_Changed = changed;
-    }
-    ReflectionMode GetReflectionMode() const
-    {
-        return ReflectionMode::UI;
-    }
-
-private:
-    bool m_Changed = false;
-    bool m_Started = false;
-    bool m_Finished = false;
-};
-} // namespace CHEngine
+	// Implementation of the Archive concept for ImGui UI
+	class UIProperties : public IPropertyArchive
+	{
+	public:
+		UIProperties() = default;
+
+		virtual ReflectionMode GetReflectionMode() const override
+		{
+			return ReflectionMode::UI;
+		}
+		virtual bool HasChanged() const override
+		{
+			return m_Changed;
+		}
+		virtual void SetChanged(bool changed) override
+		{
+			m_Changed = changed;
+		}
+
+		// IPropertyArchive overrides
+		virtual bool Property(const char* name, int& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, float& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, bool& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, std::string& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, glm::vec2& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, glm::vec3& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, glm::vec4& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Property(const char* name, Color& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		virtual bool Enum(const char* name, int& value, const char** names, int count,
+						  const PropertyMeta& meta = {}) override
+		{
+			return EnumPropertyInternal(name, value, names, count, meta);
+		}
+
+		virtual bool StringEnum(const char* name, std::string& value, const std::vector<std::string>& options,
+								const PropertyMeta& meta = {}) override
+		{
+			return StringEnumInternal(name, value, options, meta);
+		}
+
+		virtual bool Property(const char* name, uint64_t& value, const PropertyMeta& meta = {}) override
+		{
+			return Handle(name, value, meta);
+		}
+		virtual bool Handle(const char* name, uint64_t& value, const PropertyMeta& meta = {}) override
+		{
+			bool changed = EditorGUI::Property(name, value);
+			UpdateState(changed);
+			return changed;
+		}
+		virtual bool File(const char* name, std::string& value, const char* extensions = nullptr,
+						  const PropertyMeta& meta = {}) override
+		{
+			ImGui::BeginDisabled(meta.ReadOnly);
+			bool changed = EditorGUI::FileProperty(name, value, extensions);
+			ImGui::EndDisabled();
+			if (!meta.Tooltip.empty() && ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip("%s", meta.Tooltip.c_str());
+			}
+			UpdateState(changed);
+			return changed;
+		}
+		virtual void Header(const char* label) override
+		{
+			HeaderInternal(label);
+		}
+		virtual void Separator() override
+		{
+			SeparatorInternal();
+		}
+		bool HasFinished() const
+		{
+			return m_Started && m_Finished;
+		}
+		bool HasStarted() const
+		{
+			return m_Started;
+		}
+
+		// Template methods for non-virtual calls (still used by Properties<UIProperties>)
+		template <typename T> bool Property(const char* name, T& value)
+		{
+			return PropertyInternal(name, value, {});
+		}
+		template <typename T_Enum> bool Property(const char* name, T_Enum& value, const char** names, int count)
+		{
+			return EnumPropertyInternal(name, (int&)value, names, count, {});
+		}
+		template <typename T> bool Property(const char* name, T& value, const PropertyMeta& meta)
+		{
+			return PropertyInternal(name, value, meta);
+		}
+		template <typename T_Enum>
+		bool Property(const char* name, T_Enum& value, const char** names, int count, const PropertyMeta& meta)
+		{
+			return EnumPropertyInternal(name, (int&)value, names, count, meta);
+		}
+
+		virtual void BeginSequence(const char* name, size_t& size) override
+		{
+			if (ImGui::GetCurrentTable() != nullptr)
+			{
+				ImGui::TableNextRow();
+				ImGui::TableSetColumnIndex(0);
+				ImGui::AlignTextToFramePadding();
+			}
+
+			ImGuiTreeNodeFlags flags =
+				ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_SpanAvailWidth;
+			if (ImGui::GetCurrentTable() != nullptr)
+			{
+				flags |= ImGuiTreeNodeFlags_SpanAllColumns;
+			}
+
+			m_InSequence = ImGui::TreeNodeEx(name, flags);
+			if (m_InSequence && ImGui::GetCurrentTable() != nullptr)
+			{
+				ImGui::TableSetColumnIndex(1);
+			}
+		}
+
+		virtual void EndSequence() override
+		{
+			if (m_InSequence)
+			{
+				ImGui::TreePop();
+				m_InSequence = false;
+			}
+		}
+
+		virtual bool Nested(const char* name, std::function<void(IPropertyArchiveBase&)> callback) override
+		{
+			if (ImGui::TreeNodeEx(name, ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_DefaultOpen))
+			{
+				callback(*this);
+				ImGui::TreePop();
+				return true; // Simplified: assume changed if we opened and called callback
+			}
+			return false;
+		}
+
+		virtual void BeginMap(const char* name, size_t& size) override
+		{
+			// Not used directly in UI mode — Map() template handles rendering
+		}
+
+		virtual void EndMap() override
+		{
+		}
+
+		virtual bool MapNextKey(std::string& key) override
+		{
+			return false;
+		}
+
+		template <typename V> bool Map(const char* name, std::unordered_map<std::string, V>& map)
+		{
+			if (ImGui::GetCurrentTable() != nullptr)
+			{
+				ImGui::TableNextRow();
+				ImGui::TableSetColumnIndex(0);
+				ImGui::AlignTextToFramePadding();
+			}
+
+			bool localChanged = false;
+			ImGuiTreeNodeFlags flags =
+				ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_SpanAvailWidth;
+			if (ImGui::GetCurrentTable() != nullptr)
+			{
+				flags |= ImGuiTreeNodeFlags_SpanAllColumns;
+			}
+
+			if (ImGui::TreeNodeEx(name, flags))
+			{
+				auto it = map.begin();
+				while (it != map.end())
+				{
+					ImGui::PushID(it->first.c_str());
+
+					if (ImGui::GetCurrentTable() != nullptr)
+					{
+						ImGui::TableNextRow();
+						ImGui::TableSetColumnIndex(1);
+					}
+
+					if (ImGui::Button(ICON_FA_TRASH))
+					{
+						it = map.erase(it);
+						m_Changed = localChanged = true;
+						ImGui::PopID();
+						continue;
+					}
+
+					ImGui::SameLine();
+
+					// Key input
+					char keyBuf[128];
+					strncpy(keyBuf, it->first.c_str(), sizeof(keyBuf));
+					keyBuf[sizeof(keyBuf) - 1] = '\0';
+					ImGui::SetNextItemWidth(120);
+					if (ImGui::InputText("##key", keyBuf, sizeof(keyBuf)))
+					{
+						std::string newKey = keyBuf;
+						if (newKey != it->first && map.find(newKey) == map.end())
+						{
+							float val = it->second;
+							auto next = map.erase(it);
+							it = map.insert_or_assign(next, newKey, val).first;
+							m_Changed = localChanged = true;
+						}
+						ImGui::PopID();
+						continue;
+					}
+
+					ImGui::SameLine();
+					ImGui::Text("=");
+					ImGui::SameLine();
+
+					// Value input
+					float val = it->second;
+					ImGui::SetNextItemWidth(-1);
+					if (ImGui::DragFloat("##val", &val, 0.01f))
+					{
+						it->second = val;
+						m_Changed = localChanged = true;
+					}
+
+					++it;
+					ImGui::PopID();
+					ImGui::Separator();
+				}
+
+				ImGui::Spacing();
+				if (ImGui::GetCurrentTable() != nullptr)
+				{
+					ImGui::TableNextRow();
+					ImGui::TableSetColumnIndex(1);
+				}
+
+				if (EditorGUI::ActionButton(ICON_FA_PLUS, "Add Variable"))
+				{
+					std::string newKey = "var_" + std::to_string(map.size());
+					map[newKey] = 0.0f;
+					m_Changed = localChanged = true;
+				}
+				ImGui::TreePop();
+			}
+			return localChanged;
+		}
+
+	private:
+		bool m_InSequence = false;
+
+	public:
+		// --- Legacy types or internal helpers if needed ---
+		// Note: Most templates are now handled by the base class Properties<T_Archive>.
+
+	private:
+		template <typename T> bool PropertyInternal(const char* name, T& value, const PropertyMeta& meta)
+		{
+			bool changed = false;
+			ImGui::BeginDisabled(meta.ReadOnly);
+			if constexpr (std::is_same_v<T, float>)
+			{
+				changed = EditorGUI::Property(name, value, meta.Speed, meta.MinValue, meta.MaxValue);
+			}
+			else if constexpr (std::is_same_v<T, int>)
+			{
+				changed = EditorGUI::Property(name, value, (int)meta.MinValue, (int)meta.MaxValue);
+			}
+			else if constexpr (std::is_same_v<T, std::string>)
+			{
+				changed = EditorGUI::Property(name, value);
+			}
+			else if constexpr (is_variant_v<T>)
+			{
+				changed = std::visit([&](auto&& v) { return EditorGUI::Property(name, v); }, value);
+			}
+			else if constexpr (std::is_same_v<T, float[4]>)
+			{
+				changed = EditorGUI::Property(name, *(glm::vec4*)&value);
+			}
+			else
+			{
+				if constexpr (requires { EditorGUI::Property(name, value); })
+				{
+					changed = EditorGUI::Property(name, value);
+				}
+			}
+			ImGui::EndDisabled();
+
+			if (!meta.Tooltip.empty() && ImGui::IsItemHovered())
+			{
+				ImGui::SetTooltip("%s", meta.Tooltip.c_str());
+			}
+			UpdateState(changed);
+			return changed;
+		}
+
+		bool EnumPropertyInternal(const char* name, int& value, const char** names, int count,
+								  const PropertyMeta& meta);
+		bool StringEnumInternal(const char* name, std::string& value, const std::vector<std::string>& options,
+								const PropertyMeta& meta);
+		void HeaderInternal(const char* label);
+		void SeparatorInternal();
+		void UpdateState(bool changed);
+
+		bool m_Changed = false;
+		bool m_Started = false;
+		bool m_Finished = false;
+	};
+} // namespace Chained
 
 #endif // CH_UI_PROPERTIES_H
diff --git a/editor/undo/command.h b/editor/undo/command.h
new file mode 100644
index 000000000..9cc36afab
--- /dev/null
+++ b/editor/undo/command.h
@@ -0,0 +1,22 @@
+#ifndef CH_EDITOR_COMMAND_H
+#define CH_EDITOR_COMMAND_H
+
+#include <string>
+
+namespace Chained
+{
+
+	class IEditorCommand
+	{
+	public:
+		virtual ~IEditorCommand() = default;
+
+		virtual void Execute() = 0;
+
+		virtual void Undo() = 0;
+
+		virtual std::string GetName() const = 0;
+	};
+} // namespace Chained
+
+#endif // CH_EDITOR_COMMAND_H
diff --git a/editor/undo/command_history.cpp b/editor/undo/command_history.cpp
index c441c6767..13c1905dc 100644
--- a/editor/undo/command_history.cpp
+++ b/editor/undo/command_history.cpp
@@ -1,92 +1,62 @@
 #include "command_history.h"
 #include "engine/core/log.h"
 
-namespace CHEngine
+namespace Chained
 {
-CommandHistory::CommandHistory(size_t maxHistory)
-    : m_MaxHistory(maxHistory)
-{
-}
-
-void CommandHistory::PushCommand(std::unique_ptr<IEditorCommand> command)
-{
-    if (!command)
-    {
-        return;
-    }
-
-    command->Execute();
-    m_RedoStack.clear();
-    m_UndoStack.push_back(std::move(command));
-
-    if (m_UndoStack.size() > m_MaxHistory)
-    {
-        m_UndoStack.pop_front();
-    }
-
-    CH_CORE_INFO("Command pushed: {} (Undo stack size: {})", m_UndoStack.back()->GetName(), m_UndoStack.size());
-
-    Notify();
-}
+	CommandHistory::CommandHistory(size_t maxHistory)
+		: m_MaxHistory(maxHistory)
+	{
+	}
 
-void CommandHistory::Undo()
-{
-    if (m_UndoStack.empty())
-    {
-        return;
-    }
+	void CommandHistory::PushCommand(std::unique_ptr<IEditorCommand> command)
+	{
+		if (!command)
+		{
+			return;
+		}
 
-    std::unique_ptr<IEditorCommand> command = std::move(m_UndoStack.back());
-    m_UndoStack.pop_back();
+		command->Execute();
+		m_RedoStack.clear();
+		m_UndoStack.push_back(std::move(command));
 
-    CH_CORE_INFO("Undoing command: {}", command->GetName());
-    command->Undo();
+		if (m_UndoStack.size() > m_MaxHistory)
+		{
+			m_UndoStack.pop_front();
+		}
 
-    m_RedoStack.push_back(std::move(command));
+		CH_CORE_INFO("Command pushed: {} (Undo stack size: {})", m_UndoStack.back()->GetName(), m_UndoStack.size());
+	}
 
-    Notify();
-}
+	void CommandHistory::Undo()
+	{
+		if (m_UndoStack.empty())
+		{
+			return;
+		}
 
-void CommandHistory::Redo()
-{
-    if (m_RedoStack.empty())
-    {
-        return;
-    }
+		std::unique_ptr<IEditorCommand> command = std::move(m_UndoStack.back());
+		m_UndoStack.pop_back();
 
-    std::unique_ptr<IEditorCommand> command = std::move(m_RedoStack.back());
-    m_RedoStack.pop_back();
+		CH_CORE_INFO("Undoing command: {}", command->GetName());
+		command->Undo();
 
-    CH_CORE_INFO("Redoing command: {}", command->GetName());
-    command->Execute();
+		m_RedoStack.push_back(std::move(command));
+	}
 
-    m_UndoStack.push_back(std::move(command));
+	void CommandHistory::Redo()
+	{
+		if (m_RedoStack.empty())
+		{
+			return;
+		}
 
-    Notify();
-}
+		std::unique_ptr<IEditorCommand> command = std::move(m_RedoStack.back());
+		m_RedoStack.pop_back();
 
-void CommandHistory::Clear()
-{
-    m_UndoStack.clear();
-    m_RedoStack.clear();
-    Notify();
-}
+		CH_CORE_INFO("Redoing command: {}", command->GetName());
+		command->Execute();
 
-std::string CommandHistory::GetUndoName() const
-{
-    return m_UndoStack.empty() ? "" : m_UndoStack.back()->GetName();
-}
+		m_UndoStack.push_back(std::move(command));
+	}
 
-std::string CommandHistory::GetRedoName() const
-{
-    return m_RedoStack.empty() ? "" : m_RedoStack.back()->GetName();
-}
-
-void CommandHistory::Notify()
-{
-    if (m_NotifyCallback)
-    {
-        m_NotifyCallback();
-    }
-}
-} // namespace CHEngine
+} // namespace Chained
diff --git a/editor/undo/command_history.h b/editor/undo/command_history.h
index 498d19ea4..28790ec25 100644
--- a/editor/undo/command_history.h
+++ b/editor/undo/command_history.h
@@ -2,52 +2,28 @@
 #define CH_COMMAND_HISTORY_H
 
 #include "deque"
-#include "editor_command.h"
+#include "command.h"
 #include <functional>
 #include <memory>
 #include <string>
 
-namespace CHEngine
+namespace Chained
 {
-class CommandHistory
-{
-public:
-    using CommandEventCallback = std::function<void()>;
-
-    CommandHistory(size_t maxHistory = 50);
-    ~CommandHistory() = default;
-
-    void PushCommand(std::unique_ptr<IEditorCommand> command);
-    void Undo();
-    void Redo();
-    void Clear();
-
-    bool CanUndo() const
-    {
-        return !m_UndoStack.empty();
-    }
-    bool CanRedo() const
-    {
-        return !m_RedoStack.empty();
-    }
-
-    std::string GetUndoName() const;
-    std::string GetRedoName() const;
-
-    void SetNotifyCallback(CommandEventCallback callback)
-    {
-        m_NotifyCallback = callback;
-    }
-
-private:
-    void Notify();
-
-private:
-    size_t m_MaxHistory;
-    std::deque<std::unique_ptr<IEditorCommand>> m_UndoStack;
-    std::deque<std::unique_ptr<IEditorCommand>> m_RedoStack;
-    CommandEventCallback m_NotifyCallback;
-};
-} // namespace CHEngine
+	class CommandHistory
+	{
+	public:
+		CommandHistory(size_t maxHistory = 50);
+		~CommandHistory() = default;
+
+		void PushCommand(std::unique_ptr<IEditorCommand> command);
+		void Undo();
+		void Redo();
+
+	private:
+		size_t m_MaxHistory;
+		std::deque<std::unique_ptr<IEditorCommand>> m_UndoStack;
+		std::deque<std::unique_ptr<IEditorCommand>> m_RedoStack;
+	};
+} // namespace Chained
 
 #endif // CH_COMMAND_HISTORY_H
diff --git a/editor/undo/component_commands.h b/editor/undo/component_commands.h
index 440efaa8f..53f5a1950 100644
--- a/editor/undo/component_commands.h
+++ b/editor/undo/component_commands.h
@@ -1,96 +1,82 @@
 #ifndef CH_COMPONENT_COMMANDS_H
 #define CH_COMPONENT_COMMANDS_H
 
-#include "editor_command.h"
+#include "command.h"
+
 #include "engine/scene/scene.h"
 #include <string>
 
-namespace CHEngine
-{
-
-template <typename T> 
-class AddComponentCommand : public IEditorCommand
+namespace Chained
 {
-public:
-    AddComponentCommand(Entity entity) 
-        : m_Entity(entity) 
-    {
-    }
-
-    void Execute() override
-    {
-        if (Validate() && !m_Entity.HasComponent<T>())
-        {
-            m_Entity.AddComponent<T>();
-        }
-    }
-
-    void Undo() override
-    {
-        if (Validate() && m_Entity.HasComponent<T>())
-        {
-            m_Entity.RemoveComponent<T>();
-        }
-    }
-
-    std::string GetName() const override
-    {
-        return "Add Component";
-    }
-
-private:
-    bool Validate()
-    {
-        if (!m_Entity) return false;
-        auto* registry = &m_Entity.GetRegistry();
-        return registry->valid(static_cast<entt::entity>(m_Entity));
-    }
-
-    Entity m_Entity;
-};
-
-template <typename T> 
-class RemoveComponentCommand : public IEditorCommand
-{
-public:
-    RemoveComponentCommand(Entity entity) 
-        : m_Entity(entity), m_ComponentState(entity.GetComponent<T>())
-    {
-    }
-
-    void Execute() override
-    {
-        if (Validate() && m_Entity.HasComponent<T>())
-        {
-            m_Entity.RemoveComponent<T>();
-        }
-    }
-
-    void Undo() override
-    {
-        if (Validate() && !m_Entity.HasComponent<T>())
-        {
-            m_Entity.AddComponent<T>(m_ComponentState);
-        }
-    }
-
-    std::string GetName() const override
-    {
-        return "Remove Component";
-    }
-
-private:
-    bool Validate()
-    {
-        if (!m_Entity) return false;
-        auto* registry = &m_Entity.GetRegistry();
-        return registry->valid(static_cast<entt::entity>(m_Entity));
-    }
-
-    Entity m_Entity;
-    T m_ComponentState;
-};
 
-} // namespace CHEngine
+	template <typename T> class AddComponentCommand : public IEditorCommand
+	{
+	public:
+		AddComponentCommand(Entity entity)
+			: m_Entity(entity)
+		{
+		}
+
+		void Execute() override
+		{
+			if (m_Entity.IsValid() && !m_Entity.HasComponent<T>())
+			{
+				m_Entity.AddComponent<T>();
+			}
+		}
+
+		void Undo() override
+		{
+			if (m_Entity.IsValid() && m_Entity.HasComponent<T>())
+			{
+				m_Entity.RemoveComponent<T>();
+			}
+		}
+
+		std::string GetName() const override
+		{
+			return "Add Component";
+		}
+
+	private:
+		Entity m_Entity;
+	};
+
+	template <typename T> class RemoveComponentCommand : public IEditorCommand
+	{
+	public:
+		RemoveComponentCommand(Entity entity)
+			: m_Entity(entity),
+			  m_ComponentState(entity.GetComponent<T>())
+		{
+		}
+
+		void Execute() override
+		{
+			if (m_Entity.IsValid() && m_Entity.HasComponent<T>())
+			{
+				m_Entity.RemoveComponent<T>();
+			}
+		}
+
+		void Undo() override
+		{
+			if (m_Entity.IsValid() && !m_Entity.HasComponent<T>())
+			{
+				m_Entity.AddComponent<T>(m_ComponentState);
+			}
+		}
+
+		std::string GetName() const override
+		{
+			return "Remove Component";
+		}
+
+	private:
+		Entity m_Entity;
+		T m_ComponentState;
+	};
+
+} // namespace Chained
 
 #endif // CH_COMPONENT_COMMANDS_H
diff --git a/editor/undo/editor_command.h b/editor/undo/editor_command.h
deleted file mode 100644
index 67d4ab516..000000000
--- a/editor/undo/editor_command.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CH_EDITOR_COMMAND_H
-#define CH_EDITOR_COMMAND_H
-
-#include <string>
-
-namespace CHEngine
-{
-class IEditorCommand
-{
-public:
-    virtual ~IEditorCommand() = default;
-
-    virtual void Execute() = 0;
-
-    virtual void Undo() = 0;
-
-    virtual std::string GetName() const = 0;
-};
-} // namespace CHEngine
-
-#endif // CH_EDITOR_COMMAND_H
diff --git a/editor/undo/entity_commands.h b/editor/undo/entity_commands.h
index a801248ca..8c987c747 100644
--- a/editor/undo/entity_commands.h
+++ b/editor/undo/entity_commands.h
@@ -1,216 +1,278 @@
 #ifndef CH_ENTITY_COMMANDS_H
 #define CH_ENTITY_COMMANDS_H
 
-#include "editor_command.h"
+#include "command.h"
+#include "editor/layer.h"
 #include "engine/scene/components.h"
 #include "engine/scene/scene.h"
 #include "engine/scene/component_serializer.h"
 #include <yaml-cpp/yaml.h>
 
-namespace CHEngine
+namespace Chained
 {
-class DestroyEntityCommand : public IEditorCommand
-{
-public:
-    DestroyEntityCommand(Entity entity)
-        : m_Entity(entity),
-          m_Scene(entity.GetRegistry().ctx().get<Scene*>())
-    {
-    }
-
-    void Execute() override
-    {
-        CH_CORE_INFO("Destroying entity via command: {}", m_Entity.GetComponent<TagComponent>().Tag);
-        
-        m_UUID = m_Entity.GetUUID();
-
-        // Serialize the entity before destroying
-        YAML::Emitter out;
-        out << YAML::BeginMap;
-        ComponentSerializer::Get().SerializeID(out, m_Entity);
-        ComponentSerializer::Get().SerializeAll(out, m_Entity);
-        out << YAML::EndMap;
-        m_SerializedData = out.c_str();
-
-        m_Scene->DestroyEntity(m_Entity);
-    }
-
-    void Undo() override
-    {
-        CH_CORE_INFO("Undoing DestroyEntity, restoring UUID: {}", m_UUID);
-        YAML::Node node = YAML::Load(m_SerializedData);
-        
-        std::string name = "Restored Entity";
-        auto tagComponent = node["TagComponent"];
-        if (tagComponent && tagComponent["Tag"] && tagComponent["Tag"].IsScalar()) {
-            name = tagComponent["Tag"].as<std::string>();
-        }
-
-        m_Entity = m_Scene->CreateEntityWithUUID(m_UUID, name);
-        ComponentSerializer::Get().DeserializeAll(m_Entity, node);
-    }
-
-    std::string GetName() const override
-    {
-        return "Destroy Entity";
-    }
-
-private:
-    Entity m_Entity;
-    Scene* m_Scene;
-    uint64_t m_UUID;
-    std::string m_SerializedData;
-};
-
-class CreateEntityCommand : public IEditorCommand
-{
-public:
-    CreateEntityCommand(Scene* scene, const std::string& name, const std::string& modelPath = "")
-        : m_Scene(scene),
-          m_Name(name),
-          m_ModelPath(modelPath)
-    {
-    }
-
-    void Execute() override
-    {
-        m_Entity = m_Scene->CreateEntity(m_Name);
-        if (!m_ModelPath.empty())
-        {
-            auto& mc = m_Entity.AddComponent<ModelComponent>();
-            mc.ModelPath = m_ModelPath;
-        }
-    }
-
-    void Undo() override
-    {
-        if (m_Entity)
-        {
-            m_Scene->DestroyEntity(m_Entity);
-        }
-    }
-
-    std::string GetName() const override
-    {
-        return "Create Entity";
-    }
-
-private:
-    Scene* m_Scene;
-    std::string m_Name;
-    std::string m_ModelPath;
-    Entity m_Entity;
-};
-
-class DuplicateEntityCommand : public IEditorCommand
-{
-public:
-    DuplicateEntityCommand(Entity entity)
-        : m_SourceEntity(entity),
-          m_Scene(entity.GetRegistry().ctx().get<Scene*>())
-    {
-    }
-
-    void Execute() override
-    {
-        m_DuplicateEntity = m_Scene->CopyEntity(m_SourceEntity);
-    }
-
-    void Undo() override
-    {
-        if (m_DuplicateEntity)
-        {
-            m_Scene->DestroyEntity(m_DuplicateEntity);
-        }
-    }
-
-    std::string GetName() const override
-    {
-        return "Duplicate Entity";
-    }
-
-private:
-    Entity m_SourceEntity;
-    Entity m_DuplicateEntity;
-    Scene* m_Scene;
-};
-
-class ParentEntityCommand : public IEditorCommand
-{
-public:
-    ParentEntityCommand(Entity entity, Entity newParent, Scene* scene)
-        : m_Entity(entity), m_NewParent(newParent), m_Scene(scene)
-    {
-        if (m_Entity && m_Entity.HasComponent<HierarchyComponent>())
-        {
-            auto parentID = m_Entity.GetComponent<HierarchyComponent>().Parent;
-            if (parentID != entt::null)
-                m_OldParent = Entity(parentID, m_Entity.GetRegistryPtr());
-        }
-    }
-
-    void Execute() override
-    {
-        SetParent(m_Entity, m_NewParent);
-    }
-
-    void Undo() override
-    {
-        SetParent(m_Entity, m_OldParent);
-    }
-
-    std::string GetName() const override
-    {
-        return "Parent Entity";
-    }
-
-private:
-    void SetParent(Entity child, Entity parent)
-    {
-        if (!child) return;
-        
-        if (!child.HasComponent<HierarchyComponent>())
-            child.AddComponent<HierarchyComponent>();
-        
-        auto& hc = child.GetComponent<HierarchyComponent>();
-        
-        // Remove from old parent
-        if (hc.Parent != entt::null && m_Scene->GetRegistryPtr()->valid(hc.Parent))
-        {
-            Entity oldParent(hc.Parent, m_Scene->GetRegistryPtr());
-            if (oldParent && oldParent.HasComponent<HierarchyComponent>())
-            {
-                auto& oldPhc = oldParent.GetComponent<HierarchyComponent>();
-                auto it = std::find(oldPhc.Children.begin(), oldPhc.Children.end(), (entt::entity)child);
-                if (it != oldPhc.Children.end())
-                {
-                    oldPhc.Children.erase(it);
-                }
-            }
-        }
-
-        // Set new parent
-        if (parent)
-        {
-            hc.Parent = (entt::entity)parent;
-            if (!parent.HasComponent<HierarchyComponent>())
-            {
-                parent.AddComponent<HierarchyComponent>();
-            }
-            parent.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
-        }
-        else
-        {
-            hc.Parent = entt::null;
-        }
-    }
-
-    Entity m_Entity;
-    Entity m_NewParent;
-    Entity m_OldParent;
-    Scene* m_Scene;
-};
-
-} // namespace CHEngine
+	class DestroyEntityCommand : public IEditorCommand
+	{
+	public:
+		DestroyEntityCommand(Entity entity)
+			: m_Entity(entity),
+			  m_Scene(entity.GetRegistry().ctx().get<Scene*>())
+		{
+		}
+
+		void Execute() override
+		{
+			CH_CORE_INFO("Destroying entity via command: {}", m_Entity.GetComponent<TagComponent>().Tag);
+
+			m_UUID = m_Entity.GetUUID();
+
+			// Serialize the entity before destroying
+			YAML::Emitter out;
+			out << YAML::BeginMap;
+			ComponentSerializer::SerializeID(out, m_Entity);
+			ComponentSerializer::SerializeAll(out, m_Entity);
+			out << YAML::EndMap;
+			m_SerializedData = out.c_str();
+
+			if (EditorLayer::Get().GetSelectedEntity() == m_Entity)
+			{
+				EditorLayer::Get().SetSelectedEntity({});
+			}
+
+			m_Scene->DestroyEntity(m_Entity);
+		}
+
+		void Undo() override
+		{
+			CH_CORE_INFO("Undoing DestroyEntity, restoring UUID: {}", m_UUID);
+			YAML::Node node = YAML::Load(m_SerializedData);
+
+			std::string name = "Restored Entity";
+			auto tagComponent = node["TagComponent"];
+			if (tagComponent && tagComponent["Tag"] && tagComponent["Tag"].IsScalar())
+			{
+				name = tagComponent["Tag"].as<std::string>();
+			}
+
+			m_Entity = m_Scene->CreateEntityWithUUID(m_UUID, name);
+			ComponentSerializer::DeserializeAll(m_Entity, node);
+		}
+
+		std::string GetName() const override
+		{
+			return "Destroy Entity";
+		}
+
+	private:
+		Entity m_Entity;
+		Scene* m_Scene;
+		uint64_t m_UUID;
+		std::string m_SerializedData;
+	};
+
+	class CreateEntityCommand : public IEditorCommand
+	{
+	public:
+		CreateEntityCommand(Scene* scene, const std::string& name, const std::string& modelPath = "")
+			: m_Scene(scene),
+			  m_Name(name),
+			  m_ModelPath(modelPath)
+		{
+		}
+
+		void Execute() override
+		{
+			m_Entity = m_Scene->CreateEntity(m_Name);
+			if (!m_ModelPath.empty())
+			{
+				// Procedural primitive markers start with ':' — use PrimitiveComponent.
+				if (m_ModelPath.size() > 1 && m_ModelPath.front() == ':' && m_ModelPath.back() == ':')
+				{
+					PrimitiveComponent prim;
+					if (m_ModelPath == ":cube:")
+					{
+						prim.Type = PrimitiveType::Cube;
+					}
+					else if (m_ModelPath == ":sphere:")
+					{
+						prim.Type = PrimitiveType::Sphere;
+					}
+					else if (m_ModelPath == ":plane:")
+					{
+						prim.Type = PrimitiveType::Plane;
+					}
+					else if (m_ModelPath == ":cylinder:")
+					{
+						prim.Type = PrimitiveType::Cylinder;
+					}
+					else if (m_ModelPath == ":cone:")
+					{
+						prim.Type = PrimitiveType::Cone;
+					}
+					else if (m_ModelPath == ":torus:")
+					{
+						prim.Type = PrimitiveType::Torus;
+					}
+					else if (m_ModelPath == ":knot:")
+					{
+						prim.Type = PrimitiveType::Knot;
+					}
+					else if (m_ModelPath == ":hemisphere:")
+					{
+						prim.Type = PrimitiveType::Hemisphere;
+					}
+					else
+					{
+						prim.Type = PrimitiveType::Sphere; // fallback
+					}
+					m_Entity.AddComponent<PrimitiveComponent>(prim);
+				}
+				else
+				{
+					// Real file path — use ModelComponent.
+					auto& mc = m_Entity.AddComponent<ModelComponent>();
+					mc.ModelPath = m_ModelPath;
+				}
+			}
+		}
+
+		void Undo() override
+		{
+			if (m_Entity)
+			{
+				m_Scene->DestroyEntity(m_Entity);
+			}
+		}
+
+		std::string GetName() const override
+		{
+			return "Create Entity";
+		}
+
+	private:
+		Scene* m_Scene;
+		std::string m_Name;
+		std::string m_ModelPath;
+		Entity m_Entity;
+	};
+
+	class DuplicateEntityCommand : public IEditorCommand
+	{
+	public:
+		DuplicateEntityCommand(Entity entity)
+			: m_SourceEntity(entity),
+			  m_Scene(entity.GetRegistry().ctx().get<Scene*>())
+		{
+		}
+
+		void Execute() override
+		{
+			m_DuplicateEntity = Entity(m_Scene->CopyEntity(m_SourceEntity), m_Scene->GetRegistryPtr());
+		}
+
+		void Undo() override
+		{
+			if (m_DuplicateEntity)
+			{
+				m_Scene->DestroyEntity(m_DuplicateEntity);
+			}
+		}
+
+		std::string GetName() const override
+		{
+			return "Duplicate Entity";
+		}
+
+	private:
+		Entity m_SourceEntity;
+		Entity m_DuplicateEntity;
+		Scene* m_Scene;
+	};
+
+	class ParentEntityCommand : public IEditorCommand
+	{
+	public:
+		ParentEntityCommand(Entity entity, Entity newParent, Scene* scene)
+			: m_Entity(entity),
+			  m_NewParent(newParent),
+			  m_Scene(scene)
+		{
+			if (m_Entity && m_Entity.HasComponent<HierarchyComponent>())
+			{
+				auto parentID = m_Entity.GetComponent<HierarchyComponent>().Parent;
+				if (parentID != entt::null)
+				{
+					m_OldParent = Entity(parentID, m_Entity.GetRegistryPtr());
+				}
+			}
+		}
+
+		void Execute() override
+		{
+			SetParent(m_Entity, m_NewParent);
+		}
+
+		void Undo() override
+		{
+			SetParent(m_Entity, m_OldParent);
+		}
+
+		std::string GetName() const override
+		{
+			return "Parent Entity";
+		}
+
+	private:
+		void SetParent(Entity child, Entity parent)
+		{
+			if (!child)
+			{
+				return;
+			}
+
+			if (!child.HasComponent<HierarchyComponent>())
+			{
+				child.AddComponent<HierarchyComponent>();
+			}
+
+			auto& hc = child.GetComponent<HierarchyComponent>();
+
+			// Remove from old parent
+			if (hc.Parent != entt::null && m_Scene->GetRegistryPtr()->valid(hc.Parent))
+			{
+				Entity oldParent(hc.Parent, m_Scene->GetRegistryPtr());
+				if (oldParent && oldParent.HasComponent<HierarchyComponent>())
+				{
+					auto& oldPhc = oldParent.GetComponent<HierarchyComponent>();
+					auto it = std::find(oldPhc.Children.begin(), oldPhc.Children.end(), (entt::entity)child);
+					if (it != oldPhc.Children.end())
+					{
+						oldPhc.Children.erase(it);
+					}
+				}
+			}
+
+			// Set new parent
+			if (parent)
+			{
+				hc.Parent = (entt::entity)parent;
+				if (!parent.HasComponent<HierarchyComponent>())
+				{
+					parent.AddComponent<HierarchyComponent>();
+				}
+				parent.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
+			}
+			else
+			{
+				hc.Parent = entt::null;
+			}
+		}
+
+		Entity m_Entity;
+		Entity m_NewParent;
+		Entity m_OldParent;
+		Scene* m_Scene;
+	};
+
+} // namespace Chained
 
 #endif // CH_ENTITY_COMMANDS_H
diff --git a/editor/undo/lambda_command.h b/editor/undo/lambda_command.h
deleted file mode 100644
index bce935969..000000000
--- a/editor/undo/lambda_command.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef CH_LAMBDA_COMMAND_H
-#define CH_LAMBDA_COMMAND_H
-
-#include "editor_command.h"
-#include <functional>
-#include <string>
-
-namespace CHEngine
-{
-
-class LambdaCommand : public IEditorCommand
-{
-public:
-    using ActionFn = std::function<void()>;
-
-    LambdaCommand(const std::string& name, ActionFn execute, ActionFn undo)
-        : m_Name(name),
-          m_Execute(execute),
-          m_Undo(undo)
-    {
-    }
-
-    void Execute() override
-    {
-        if (m_Execute)
-        {
-            m_Execute();
-        }
-    }
-    void Undo() override
-    {
-        if (m_Undo)
-        {
-            m_Undo();
-        }
-    }
-    std::string GetName() const override
-    {
-        return m_Name;
-    }
-
-private:
-    std::string m_Name;
-    ActionFn m_Execute;
-    ActionFn m_Undo;
-};
-
-} // namespace CHEngine
-
-#endif // CH_LAMBDA_COMMAND_H
diff --git a/editor/undo/modify_component_command.h b/editor/undo/modify_component_command.h
index 12ada35a9..cebb92a37 100644
--- a/editor/undo/modify_component_command.h
+++ b/editor/undo/modify_component_command.h
@@ -1,63 +1,53 @@
 #ifndef CH_MODIFY_COMPONENT_COMMAND_H
 #define CH_MODIFY_COMPONENT_COMMAND_H
 
-#include "editor_command.h"
+#include "command.h"
+
 #include "engine/scene/scene.h"
 #include <string>
 
-namespace CHEngine
+namespace Chained
 {
 
-template <typename T> class ModifyComponentCommand : public IEditorCommand
-{
-public:
-    ModifyComponentCommand(Entity entity, const T& oldState, const T& newState, const std::string& name = "")
-        : m_Entity(entity),
-          m_OldState(oldState),
-          m_NewState(newState),
-          m_Name(name)
-    {
-    }
-
-    void Execute() override
-    {
-        if (Validate())
-        {
-            m_Entity.GetComponent<T>() = m_NewState;
-        }
-    }
-
-    void Undo() override
-    {
-        if (Validate())
-        {
-            m_Entity.GetComponent<T>() = m_OldState;
-        }
-    }
-
-    std::string GetName() const override
-    {
-        return m_Name.empty() ? "Modify Component" : m_Name;
-    }
-
-private:
-    bool Validate()
-    {
-        if (!m_Entity)
-        {
-            return false;
-        }
-        auto* registry = &m_Entity.GetRegistry();
-        return registry->valid(static_cast<entt::entity>(m_Entity)) && m_Entity.HasComponent<T>();
-    }
-
-private:
-    Entity m_Entity;
-    T m_OldState;
-    T m_NewState;
-    std::string m_Name;
-};
-
-} // namespace CHEngine
+	template <typename T> class ModifyComponentCommand : public IEditorCommand
+	{
+	public:
+		ModifyComponentCommand(Entity entity, const T& oldState, const T& newState, const std::string& name = "")
+			: m_Entity(entity),
+			  m_OldState(oldState),
+			  m_NewState(newState),
+			  m_Name(name)
+		{
+		}
+
+		void Execute() override
+		{
+			if (m_Entity.IsValid() && m_Entity.HasComponent<T>())
+			{
+				m_Entity.GetComponent<T>() = m_NewState;
+			}
+		}
+
+		void Undo() override
+		{
+			if (m_Entity.IsValid() && m_Entity.HasComponent<T>())
+			{
+				m_Entity.GetComponent<T>() = m_OldState;
+			}
+		}
+
+		std::string GetName() const override
+		{
+			return m_Name.empty() ? "Modify Component" : m_Name;
+		}
+
+	private:
+		Entity m_Entity;
+		T m_OldState;
+		T m_NewState;
+		std::string m_Name;
+	};
+
+} // namespace Chained
 
 #endif // CH_MODIFY_COMPONENT_COMMAND_H
diff --git a/editor/viewport/camera.cpp b/editor/viewport/camera.cpp
new file mode 100644
index 000000000..a8f20b342
--- /dev/null
+++ b/editor/viewport/camera.cpp
@@ -0,0 +1,307 @@
+#include "camera.h"
+#include "editor/layer.h"
+#include "engine/app/application.h"
+#include "engine/core/input.h"
+#include "engine/scene/components/render/camera_component.h"
+#include "engine/scene/systems/transform_system.h"
+#include "engine/scene/components/core/transform_component.h"
+#include "imgui.h"
+
+#include <algorithm>
+#include <glm/gtx/quaternion.hpp>
+
+namespace Chained
+{
+	static constexpr float kMouseSensitivity = 0.003f;
+
+	// Pan speed: viewport-independent polynomial curve (empirically tuned)
+	static constexpr float kPanSpeedDivisor = 1000.0f;
+	static constexpr float kPanSpeedCap = 2.4f;
+	static constexpr float kPanSpeedA = 0.0366f;
+	static constexpr float kPanSpeedB = -0.1778f;
+	static constexpr float kPanSpeedC = 0.3021f;
+
+	// Zoom speed: quadratic distance-based curve
+	static constexpr float kZoomDistanceScale = 0.2f;
+	static constexpr float kZoomSpeedMin = 0.1f;
+	static constexpr float kZoomSpeedMax = 100.0f;
+
+	EditorCameraController::EditorCameraController()
+	{
+		SetPerspective(glm::radians(45.0f), 0.1f, 10000.0f);
+		UpdateView();
+	}
+
+	Camera3D EditorCameraController::ToCamera3D() const
+	{
+		Camera3D camera;
+		glm::vec3 pos = CalculatePosition();
+		glm::vec3 fp = m_FocalPoint;
+		glm::vec3 up = GetUpDirection();
+		camera.Position = {pos.x, pos.y, pos.z};
+		camera.Target = {fp.x, fp.y, fp.z};
+		camera.Up = {up.x, up.y, up.z};
+		camera.Projection = GetProjectionType();
+		camera.FovDegrees = m_FovDegrees;
+		camera.OrthographicSize = GetOrthographicSize();
+		camera.NearClip = m_NearClip;
+		camera.FarClip = m_FarClip;
+		camera.ViewMatrix = m_ViewMatrix;
+		camera.ProjectionMatrix = GetProjection();
+		return camera;
+	}
+
+	void EditorCameraController::Set2DMode(bool enabled)
+	{
+		if (m_Is2DMode == enabled)
+		{
+			return;
+		}
+
+		m_Is2DMode = enabled;
+
+		if (m_Is2DMode)
+		{
+			m_SavedPitch = m_Pitch;
+			m_SavedYaw = m_Yaw;
+			m_SavedProjectionType = GetProjectionType();
+
+			m_Pitch = 0.0f;
+			m_Yaw = 0.0f;
+			SetProjectionType(ProjectionType::Orthographic);
+		}
+		else
+		{
+			m_Pitch = m_SavedPitch;
+			m_Yaw = m_SavedYaw;
+			SetProjectionType(m_SavedProjectionType);
+		}
+		UpdateView();
+	}
+
+	void EditorCameraController::OnUpdate(Entity cameraEntity, Timestep ts, const glm::vec2& viewportSize)
+	{
+		m_ViewportWidth = (uint32_t)viewportSize.x;
+		m_ViewportHeight = (uint32_t)viewportSize.y;
+
+		float deltaTime = ts;
+		float moveSpeed = m_MoveSpeed;
+		float boostMultiplier = m_BoostMultiplier;
+
+		bool hasImGui = ImGui::GetCurrentContext() != nullptr;
+
+		bool rightDown = hasImGui ? ImGui::IsMouseDown(ImGuiMouseButton_Right)
+								  : Core::Input::IsMouseButtonDown(MouseCode::ButtonRight);
+		bool middleDown = hasImGui ? ImGui::IsMouseDown(ImGuiMouseButton_Middle)
+								   : Core::Input::IsMouseButtonDown(MouseCode::ButtonMiddle);
+		bool leftDown = hasImGui ? ImGui::IsMouseDown(ImGuiMouseButton_Left)
+								 : Core::Input::IsMouseButtonDown(MouseCode::ButtonLeft);
+
+		bool shiftDown =
+			hasImGui ? (ImGui::IsKeyDown(ImGuiKey_LeftShift) || ImGui::IsKeyDown(ImGuiKey_RightShift))
+					 : (Core::Input::IsKeyDown(KeyCode::LeftShift) || Core::Input::IsKeyDown(KeyCode::RightShift));
+		bool altDown = hasImGui
+						   ? (ImGui::IsKeyDown(ImGuiKey_LeftAlt) || ImGui::IsKeyDown(ImGuiKey_RightAlt))
+						   : (Core::Input::IsKeyDown(KeyCode::LeftAlt) || Core::Input::IsKeyDown(KeyCode::RightAlt));
+
+		auto isKeyDown = [hasImGui](KeyCode coreKey, ImGuiKey imguiKey) -> bool {
+			if (hasImGui)
+			{
+				return ImGui::IsKeyDown(imguiKey);
+			}
+			return Core::Input::IsKeyDown(coreKey);
+		};
+
+		bool hasEntity = cameraEntity && cameraEntity.HasComponent<TransformComponent>() &&
+						 cameraEntity.HasComponent<CameraComponent>();
+
+		// In Play mode: sync editor camera FROM TransformComponent (e.g. scripts or inspector changes).
+		// In Edit mode: skip — the editor camera is authoritative, TransformComponent write-back happens below.
+		if (hasEntity && EditorLayer::Get().GetSceneState() == SceneState::Play && !rightDown && !middleDown)
+		{
+			auto& tc = cameraEntity.GetComponent<TransformComponent>();
+			if (std::isfinite(tc.Rotation.x) && std::isfinite(tc.Rotation.y))
+			{
+				if (fabsf(tc.Rotation.x - m_Pitch) > 0.01f || fabsf(tc.Rotation.y - m_Yaw) > 0.01f)
+				{
+					m_Pitch = tc.Rotation.x;
+					m_Yaw = tc.Rotation.y;
+					UpdateView();
+				}
+			}
+		}
+
+		glm::vec2 delta = {0.0f, 0.0f};
+		if (hasImGui)
+		{
+			ImVec2 imguiDelta = ImGui::GetIO().MouseDelta;
+			delta = {imguiDelta.x * kMouseSensitivity, imguiDelta.y * kMouseSensitivity};
+		}
+		else
+		{
+			delta = Core::Input::GetMouseDelta() * kMouseSensitivity;
+		}
+
+		if (rightDown)
+		{
+			MouseRotate(delta);
+
+			float speed = moveSpeed * deltaTime;
+			if (shiftDown)
+			{
+				speed *= boostMultiplier;
+			}
+
+			glm::vec3 fwd = GetForwardDirection();
+			glm::vec3 rgt = GetRightDirection();
+			glm::vec3 upg = {0, 1, 0};
+
+			glm::vec3 currentPos = CalculatePosition();
+
+			if (isKeyDown(KeyCode::W, ImGuiKey_W))
+			{
+				currentPos += (m_Is2DMode ? upg : fwd) * speed;
+			}
+			if (isKeyDown(KeyCode::S, ImGuiKey_S))
+			{
+				currentPos -= (m_Is2DMode ? upg : fwd) * speed;
+			}
+			if (isKeyDown(KeyCode::D, ImGuiKey_D))
+			{
+				currentPos += rgt * speed;
+			}
+			if (isKeyDown(KeyCode::A, ImGuiKey_A))
+			{
+				currentPos -= rgt * speed;
+			}
+			if (isKeyDown(KeyCode::E, ImGuiKey_E))
+			{
+				currentPos += upg * speed;
+			}
+			if (isKeyDown(KeyCode::Q, ImGuiKey_Q))
+			{
+				currentPos -= upg * speed;
+			}
+
+			m_FocalPoint = currentPos + (fwd * m_Distance);
+			UpdateView();
+		}
+
+		if (middleDown)
+		{
+			if (shiftDown)
+			{
+				MousePan(delta);
+			}
+			else
+			{
+				MouseRotate(delta);
+			}
+		}
+
+		if (altDown && leftDown)
+		{
+			MouseRotate(delta);
+		}
+
+		float wheel = hasImGui ? ImGui::GetIO().MouseWheel : Core::Input::GetMouseWheelMove();
+		if (wheel != 0.0f && !m_DisableZoom)
+		{
+			MouseZoom(wheel);
+		}
+
+		// Write back rotation and position to the entity's TransformComponent in both
+		// Play and Edit modes so the inspector stays in sync with the editor camera.
+		if (hasEntity)
+		{
+			auto& tc = cameraEntity.GetComponent<TransformComponent>();
+			TransformSystem::SetRotation(tc, glm::vec3(m_Pitch, m_Yaw, 0.0f));
+			TransformSystem::SetTranslation(tc, CalculatePosition());
+		}
+	}
+
+	void EditorCameraController::UpdateView()
+	{
+		glm::vec3 position = CalculatePosition();
+		glm::quat orientation = GetOrientation();
+		m_ViewMatrix = glm::translate(glm::mat4(1.0f), position) * glm::toMat4(orientation);
+		m_ViewMatrix = glm::inverse(m_ViewMatrix);
+	}
+
+	void EditorCameraController::MousePan(const glm::vec2& delta)
+	{
+		auto [xSpeed, ySpeed] = PanSpeed();
+		m_FocalPoint += -GetRightDirection() * delta.x * xSpeed * m_Distance;
+		m_FocalPoint += GetUpDirection() * delta.y * ySpeed * m_Distance;
+		UpdateView();
+	}
+
+	void EditorCameraController::MouseRotate(const glm::vec2& delta)
+	{
+		if (m_Is2DMode)
+		{
+			return;
+		}
+
+		float yawSign = GetUpDirection().y < 0 ? -1.0f : 1.0f;
+		m_Yaw += yawSign * delta.x * RotationSpeed();
+		m_Pitch += delta.y * RotationSpeed();
+		UpdateView();
+	}
+
+	void EditorCameraController::MouseZoom(float delta)
+	{
+		m_Distance -= delta * ZoomSpeed();
+		if (m_Distance < 0.1f)
+		{
+			m_FocalPoint += GetForwardDirection();
+			m_Distance = 0.1f;
+		}
+		UpdateView();
+	}
+
+	glm::vec3 EditorCameraController::GetUpDirection() const
+	{
+		return glm::rotate(GetOrientation(), glm::vec3(0.0f, 1.0f, 0.0f));
+	}
+	glm::vec3 EditorCameraController::GetRightDirection() const
+	{
+		return glm::rotate(GetOrientation(), glm::vec3(1.0f, 0.0f, 0.0f));
+	}
+	glm::vec3 EditorCameraController::GetForwardDirection() const
+	{
+		return glm::rotate(GetOrientation(), glm::vec3(0.0f, 0.0f, -1.0f));
+	}
+	glm::vec3 EditorCameraController::CalculatePosition() const
+	{
+		return m_FocalPoint - GetForwardDirection() * m_Distance;
+	}
+	glm::quat EditorCameraController::GetOrientation() const
+	{
+		return glm::quat(glm::vec3(-m_Pitch, -m_Yaw, 0.0f));
+	}
+
+	std::pair<float, float> EditorCameraController::PanSpeed() const
+	{
+		float x = std::min((float)m_ViewportWidth / kPanSpeedDivisor, kPanSpeedCap);
+		float xFactor = kPanSpeedA * (x * x) + kPanSpeedB * x + kPanSpeedC;
+		float y = std::min((float)m_ViewportHeight / kPanSpeedDivisor, kPanSpeedCap);
+		float yFactor = kPanSpeedA * (y * y) + kPanSpeedB * y + kPanSpeedC;
+		return {xFactor, yFactor};
+	}
+
+	float EditorCameraController::RotationSpeed() const
+	{
+		return m_RotationSpeed;
+	}
+
+	float EditorCameraController::ZoomSpeed() const
+	{
+		float distance = m_Distance * kZoomDistanceScale;
+		distance = std::max(distance, 0.0f);
+		float speed = distance * distance;
+
+		return std::clamp(speed * m_ZoomSpeedMultiplier, kZoomSpeedMin, kZoomSpeedMax);
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/editor/viewport/camera.h b/editor/viewport/camera.h
new file mode 100644
index 000000000..b3808265d
--- /dev/null
+++ b/editor/viewport/camera.h
@@ -0,0 +1,194 @@
+#ifndef CH_EDITOR_CAMERA_H
+#define CH_EDITOR_CAMERA_H
+
+#include "engine/common/timestep.h"
+#include "engine/scene/camera.h"
+#include "engine/scene/entity.h"
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+namespace Chained
+{
+
+	class EditorCameraController : public Camera
+	{
+	public:
+		EditorCameraController();
+		~EditorCameraController() = default;
+
+		void OnUpdate(Entity cameraEntity, Timestep ts, const glm::vec2& viewportSize);
+
+		// Native Projection is provided by Camera parent class.
+
+		const glm::mat4& GetViewMatrix() const
+		{
+			return m_ViewMatrix;
+		}
+		glm::mat4 GetViewProjection() const
+		{
+			return GetProjection() * m_ViewMatrix;
+		}
+
+		void SetViewportSize(uint32_t width, uint32_t height)
+		{
+			m_ViewportWidth = width;
+			m_ViewportHeight = height;
+			Camera::SetViewportSize(width, height);
+			UpdateView();
+		}
+
+		glm::vec3 GetUpDirection() const;
+		glm::vec3 GetRightDirection() const;
+		glm::vec3 GetForwardDirection() const;
+		glm::vec3 CalculatePosition() const;
+		glm::quat GetOrientation() const;
+
+		float GetPitch() const
+		{
+			return m_Pitch;
+		}
+		float GetYaw() const
+		{
+			return m_Yaw;
+		}
+		void SetPitch(float pitch)
+		{
+			m_Pitch = pitch;
+			UpdateView();
+		}
+		void SetYaw(float yaw)
+		{
+			m_Yaw = yaw;
+			UpdateView();
+		}
+
+		glm::vec3 GetFocalPoint() const
+		{
+			return m_FocalPoint;
+		}
+		void SetFocalPoint(const glm::vec3& focalPoint)
+		{
+			m_FocalPoint = focalPoint;
+			UpdateView();
+		}
+
+		float GetDistance() const
+		{
+			return m_Distance;
+		}
+		void SetDistance(float distance)
+		{
+			m_Distance = distance;
+			UpdateView();
+		}
+
+		void SetMoveSpeed(float speed)
+		{
+			m_MoveSpeed = speed;
+		}
+		void SetBoostMultiplier(float multiplier)
+		{
+			m_BoostMultiplier = multiplier;
+		}
+		void SetDisableZoom(bool disable)
+		{
+			m_DisableZoom = disable;
+		}
+		void SetRotationSpeed(float speed)
+		{
+			m_RotationSpeed = speed;
+		}
+		void SetZoomSpeedMultiplier(float multiplier)
+		{
+			m_ZoomSpeedMultiplier = multiplier;
+		}
+		void SetFovDegrees(float fov)
+		{
+			m_FovDegrees = fov;
+		}
+		void SetNearClip(float near)
+		{
+			m_NearClip = near;
+		}
+		void SetFarClip(float far)
+		{
+			m_FarClip = far;
+		}
+
+		float GetBoostMultiplier() const
+		{
+			return m_BoostMultiplier;
+		}
+		float GetMoveSpeed() const
+		{
+			return m_MoveSpeed;
+		}
+		bool GetDisableZoom() const
+		{
+			return m_DisableZoom;
+		}
+		float GetRotationSpeed() const
+		{
+			return m_RotationSpeed;
+		}
+		float GetZoomSpeedMultiplier() const
+		{
+			return m_ZoomSpeedMultiplier;
+		}
+		float GetFovDegrees() const
+		{
+			return m_FovDegrees;
+		}
+		float GetNearClip() const
+		{
+			return m_NearClip;
+		}
+		float GetFarClip() const
+		{
+			return m_FarClip;
+		}
+
+		Camera3D ToCamera3D() const;
+
+		void Set2DMode(bool enabled);
+		bool Is2DMode() const
+		{
+			return m_Is2DMode;
+		}
+
+		void MousePan(const glm::vec2& delta);
+		void MouseRotate(const glm::vec2& delta);
+		void MouseZoom(float delta);
+
+	private:
+		void UpdateView();
+
+		std::pair<float, float> PanSpeed() const;
+		float RotationSpeed() const;
+		float ZoomSpeed() const;
+
+	private:
+		glm::mat4 m_ViewMatrix = glm::mat4(1.0f);
+		glm::vec3 m_FocalPoint = {0.0f, 0.0f, 0.0f};
+		float m_Distance = 10.0f;
+		float m_Pitch = 0.0f, m_Yaw = 0.0f;
+
+		uint32_t m_ViewportWidth = 1280, m_ViewportHeight = 720;
+		float m_MoveSpeed = 10.0f;
+		float m_BoostMultiplier = 5.0f;
+		bool m_DisableZoom = false;
+		float m_RotationSpeed = 1.0f;
+		float m_ZoomSpeedMultiplier = 1.0f;
+		float m_FovDegrees = 45.0f;
+		float m_NearClip = 0.1f;
+		float m_FarClip = 10000.0f;
+
+		bool m_Is2DMode = false;
+		float m_SavedPitch = 0.0f;
+		float m_SavedYaw = 0.0f;
+		ProjectionType m_SavedProjectionType = ProjectionType::Perspective;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_CAMERA_H
diff --git a/editor/viewport/editor_camera.cpp b/editor/viewport/editor_camera.cpp
deleted file mode 100644
index 97e588b9b..000000000
--- a/editor/viewport/editor_camera.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "editor_camera.h"
-#include "editor/editor_layer.h"
-#include "engine/core/input.h"
-#include "engine/scene/components.h"
-#include "engine/scene/project.h"
-
-namespace CHEngine
-{
-
-EditorCameraController::EditorCameraController()
-{
-}
-
-void EditorCameraController::OnUpdate(Entity cameraEntity, Timestep ts)
-{
-    float deltaTime = ts;
-
-    // Viewport dimensions for calculations
-    m_Camera.SetViewportSize((uint32_t)EditorLayer::Get().GetViewportSize().x,
-                             (uint32_t)EditorLayer::Get().GetViewportSize().y);
-
-    // Load settings from project
-    float moveSpeed = m_MoveSpeed;
-    float boostMultiplier = m_BoostMultiplier;
-    float sensitivity = 1.0f;
-
-    if (auto project = Project::GetActive())
-    {
-        const auto& editorSettings = project->GetConfig().Editor;
-        moveSpeed = editorSettings.CameraMoveSpeed;
-        boostMultiplier = editorSettings.CameraBoostMultiplier;
-        sensitivity = editorSettings.CameraRotationSpeed;
-    }
-
-    bool hasEntity =
-        cameraEntity && cameraEntity.HasComponent<TransformComponent>() && cameraEntity.HasComponent<CameraComponent>();
-
-    // 1. Sync from entity transform if changed externally (e.g. Inspector)
-    if (hasEntity)
-    {
-        auto& tc = cameraEntity.GetComponent<TransformComponent>();
-        if (fabsf(tc.Rotation.x - m_Camera.GetPitch()) > 0.01f || fabsf(tc.Rotation.y - m_Camera.GetYaw()) > 0.01f)
-        {
-            m_Camera.SetPitch(tc.Rotation.x);
-            m_Camera.SetYaw(tc.Rotation.y);
-        }
-        glm::vec3 tcTranslation = *reinterpret_cast<const glm::vec3*>(&tc.Translation);
-        m_Camera.SetFocalPoint(tcTranslation + (m_Camera.GetForwardDirection() * m_Camera.GetDistance()));
-    }
-
-    const glm::vec2& mouse = Input::GetMousePosition();
-    glm::vec2 delta = Input::GetMouseDelta();
-    m_InitialMousePosition = mouse;
-
-    // === Right Mouse Button: Rotate + Fly (FPS-style) ===
-    if (Input::IsMouseButtonDown(Mouse::ButtonRight))
-    {
-        m_Camera.MouseRotate({delta.x * sensitivity, delta.y * sensitivity});
-
-        float speed = moveSpeed * deltaTime;
-        if (Input::IsKeyDown(Key::LeftShift))
-        {
-            speed *= boostMultiplier;
-        }
-
-        glm::vec3 fwd = m_Camera.GetForwardDirection();
-        glm::vec3 rgt = m_Camera.GetRightDirection();
-        glm::vec3 upg = {0, 1, 0};
-
-        glm::vec3 currentPos =
-            hasEntity ? cameraEntity.GetComponent<TransformComponent>().Translation : m_Camera.CalculatePosition();
-
-        if (Input::IsKeyDown(Key::W)) currentPos += fwd * speed;
-        if (Input::IsKeyDown(Key::S)) currentPos -= fwd * speed;
-        if (Input::IsKeyDown(Key::D)) currentPos += rgt * speed;
-        if (Input::IsKeyDown(Key::A)) currentPos -= rgt * speed;
-        if (Input::IsKeyDown(Key::E)) currentPos += upg * speed;
-        if (Input::IsKeyDown(Key::Q)) currentPos -= upg * speed;
-
-        if (hasEntity)
-        {
-            cameraEntity.GetComponent<TransformComponent>().SetTranslation(currentPos);
-        }
-
-        m_Camera.SetFocalPoint(currentPos + (fwd * m_Camera.GetDistance()));
-    }
-
-    // === Middle Mouse: Orbit or Alt+Middle Pan ===
-    if (Input::IsMouseButtonDown(Mouse::ButtonMiddle))
-    {
-        if (Input::IsKeyDown(Key::LeftShift))
-        {
-            m_Camera.MousePan(delta);
-        }
-        else
-        {
-            m_Camera.MouseRotate({delta.x * sensitivity, delta.y * sensitivity});
-        }
-    }
-
-    // === Alt + Left Mouse: Classic orbit (Maya/Unity style) ===
-    if (Input::IsKeyDown(Key::LeftAlt) && Input::IsMouseButtonDown(Mouse::ButtonLeft))
-    {
-        m_Camera.MouseRotate({delta.x * sensitivity, delta.y * sensitivity});
-    }
-
-    // === Scroll wheel: Zoom ===
-    float wheel = Input::GetMouseWheelMove();
-    if (wheel != 0)
-    {
-        m_Camera.MouseZoom(wheel);
-    }
-
-    // 2. Sync camera state back to entity transform
-    if (hasEntity)
-    {
-        auto& tc = cameraEntity.GetComponent<TransformComponent>();
-        tc.SetRotation(glm::vec3(m_Camera.GetPitch(), m_Camera.GetYaw(), 0.0f));
-
-        if (!Input::IsMouseButtonDown(Mouse::ButtonRight))
-        {
-            glm::vec3 pos = m_Camera.CalculatePosition();
-            tc.SetTranslation(pos);
-        }
-    }
-}
-
-} // namespace CHEngine
diff --git a/editor/viewport/editor_camera.h b/editor/viewport/editor_camera.h
deleted file mode 100644
index e611248a1..000000000
--- a/editor/viewport/editor_camera.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CH_EDITOR_CAMERA_H
-#define CH_EDITOR_CAMERA_H
-
-#include "engine/core/timestep.h"
-#include "engine/scene/entity.h"
-#include "engine/scene/editor_camera.h"
-
-namespace CHEngine
-{
-
-class EditorCameraController
-{
-public:
-    EditorCameraController();
-    ~EditorCameraController() = default;
-
-    // Drives the transform and camera component of the given entity
-    void OnUpdate(Entity cameraEntity, Timestep ts);
-
-    EditorCamera& GetCamera() { return m_Camera; }
-    float GetYaw() const { return m_Camera.GetYaw(); }
-    float GetPitch() const { return m_Camera.GetPitch(); }
-
-private:
-    float m_MoveSpeed = 10.0f;
-    float m_BoostMultiplier = 5.0f;
-
-    EditorCamera m_Camera;
-    glm::vec2 m_InitialMousePosition = {0.0f, 0.0f};
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_CAMERA_H
-
diff --git a/editor/viewport/editor_gizmo.cpp b/editor/viewport/editor_gizmo.cpp
deleted file mode 100644
index 950d22121..000000000
--- a/editor/viewport/editor_gizmo.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include "editor_gizmo.h"
-
-#include "editor_gui.h"
-#include "editor_layer.h"
-#include "engine/scene/components.h"
-#include "undo/modify_component_command.h"
-#include <cmath>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-
-namespace CHEngine
-{
-
-bool EditorGizmo::RenderAndHandle(GizmoType type, ImVec2 viewportPos, ImVec2 viewportSize, const CHEngine::Camera3D& camera)
-{
-    auto& layer = EditorLayer::Get();
-    Scene* scene = layer.GetActiveScene().get();
-    Entity entity = layer.GetSelectedEntity();
-
-    if (!scene || !entity || !entity.HasComponent<TransformComponent>() || type == GizmoType::NONE ||
-        layer.GetSceneState() == SceneState::Play)
-    {
-        return false;
-    }
-
-    if (viewportSize.x <= 1.0f || viewportSize.y <= 1.0f)
-    {
-        return false;
-    }
-
-    auto& transform = entity.GetComponent<TransformComponent>();
-
-    // 1. Setup ImGuizmo
-    ImGuizmo::SetOrthographic(camera.Projection != 0);
-    ImGuizmo::SetDrawlist();
-    ImGuizmo::SetRect(viewportPos.x, viewportPos.y, viewportSize.x, viewportSize.y);
-
-    // 2. Prepare View/Projection matrices
-    glm::vec3 up = camera.Up;
-    if (glm::dot(up, up) <= 0.000001f)
-    {
-        up = {0.0f, 1.0f, 0.0f};
-    }
-
-    glm::vec3 forward = camera.Target - camera.Position;
-    if (glm::dot(forward, forward) <= 0.000001f)
-    {
-        forward = {0.0f, 0.0f, -1.0f};
-    }
-    else
-    {
-        forward = glm::normalize(forward);
-    }
-
-    glm::mat4 view = glm::lookAt(camera.Position, camera.Position + forward, up);
-    glm::mat4 projection;
-
-    const float aspect = viewportSize.x / viewportSize.y;
-    constexpr float kNearClip = 0.01f;
-    constexpr float kFarClip = 100000.0f;
-    if (camera.Projection == 0) // Perspective
-    {
-        projection = glm::perspective(glm::radians(camera.Fovy), aspect, kNearClip, kFarClip);
-    }
-    else // Orthographic
-    {
-        float top = camera.Fovy * 0.5f;
-        float right = top * aspect;
-        projection = glm::ortho(-right, right, -top, top, kNearClip, kFarClip);
-    }
-
-    // 3. Prepare Model matrix
-    glm::mat4 modelMat = transform.GetTransform();
-
-    // 4. Handle Snapping
-    float* snap = m_SnappingEnabled ? m_SnapValues : nullptr;
-
-    // 5. Manipulation
-    ImGuizmo::MODE mode = m_IsLocalSpace ? ImGuizmo::LOCAL : ImGuizmo::WORLD;
-
-    const bool wasUsing = m_WasUsing;
-    const bool manipulated = ImGuizmo::Manipulate(
-        glm::value_ptr(view),
-        glm::value_ptr(projection),
-        static_cast<ImGuizmo::OPERATION>(type),
-        mode,
-        glm::value_ptr(modelMat),
-        nullptr,
-        snap);
-
-    const bool isUsingNow = ImGuizmo::IsUsing();
-    if (isUsingNow && !wasUsing)
-    {
-        m_WasUsing = true;
-        m_OldTransform = transform;
-    }
-
-    if (manipulated || isUsingNow)
-    {
-        glm::vec3 translation, rotation, scale;
-        ImGuizmo::DecomposeMatrixToComponents(
-            glm::value_ptr(modelMat),
-            glm::value_ptr(translation),
-            glm::value_ptr(rotation),
-            glm::value_ptr(scale));
-
-        transform.SetTranslation(translation);
-        transform.SetRotation(glm::radians(rotation));
-        transform.SetScale(scale);
-    }
-    else if (m_WasUsing && !isUsingNow)
-    {
-        m_WasUsing = false;
-
-        const bool changed =
-            glm::length(transform.Translation - m_OldTransform.Translation) > 0.0001f ||
-            glm::length(transform.Rotation - m_OldTransform.Rotation) > 0.0001f ||
-            glm::length(transform.Scale - m_OldTransform.Scale) > 0.0001f;
-
-        if (changed)
-        {
-            EditorLayer::GetCommandHistory().PushCommand(std::make_unique<ModifyComponentCommand<TransformComponent>>(
-                entity, m_OldTransform, transform, "Transform Entity"));
-        }
-    }
-
-    return ImGuizmo::IsOver() || isUsingNow;
-}
-
-} // namespace CHEngine
diff --git a/editor/viewport/editor_gizmo.h b/editor/viewport/editor_gizmo.h
deleted file mode 100644
index 7611b00f2..000000000
--- a/editor/viewport/editor_gizmo.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef CH_EDITOR_GIZMO_H
-#define CH_EDITOR_GIZMO_H
-
-#include "engine/scene/scene.h"
-#define IMGUI_DEFINE_MATH_OPERATORS
-#include "imgui.h"
-#include "ImGuizmo.h"
-
-namespace CHEngine
-{
-
-enum class GizmoType
-{
-    NONE = -1,
-    TRANSLATE = ImGuizmo::OPERATION::TRANSLATE,
-    ROTATE = ImGuizmo::OPERATION::ROTATE,
-    SCALE = ImGuizmo::OPERATION::SCALE,
-    BOUNDS = ImGuizmo::OPERATION::BOUNDS
-};
-
-class EditorGizmo
-{
-public:
-    EditorGizmo() = default;
-    ~EditorGizmo() = default;
-
-    // Render and handle gizmo interaction
-    // true if the gizmo is being used (captured mouse)
-    bool RenderAndHandle(GizmoType type, ImVec2 viewportPos, ImVec2 viewportSize, const CHEngine::Camera3D& camera);
-
-    bool IsHovered() const
-    {
-        return ImGuizmo::IsOver();
-    }
-    bool IsDragging() const
-    {
-        return ImGuizmo::IsUsing();
-    }
-
-    // Snapping
-    void SetSnapping(bool enabled)
-    {
-        m_SnappingEnabled = enabled;
-    }
-    void SetGridSize(float size)
-    {
-        m_SnapValues[0] = m_SnapValues[1] = m_SnapValues[2] = size;
-    }
-    void SetRotationStep(float step)
-    {
-        m_SnapValues[0] = m_SnapValues[1] = m_SnapValues[2] = step;
-    }
-
-    bool IsSnappingEnabled() const
-    {
-        return m_SnappingEnabled;
-    }
-    float GetGridSize() const
-    {
-        return m_SnapValues[0];
-    }
-
-    void SetLocalSpace(bool local)
-    {
-        m_IsLocalSpace = local;
-    }
-    bool IsLocalSpace() const
-    {
-        return m_IsLocalSpace;
-    }
-
-private:
-    // Snapping
-    bool m_SnappingEnabled = false;
-    float m_SnapValues[3] = {1.0f, 1.0f, 1.0f};
-    bool m_IsLocalSpace = false;
-
-    // Undo state
-    TransformComponent m_OldTransform;
-    bool m_WasUsing = false;
-};
-
-} // namespace CHEngine
-
-#endif // CH_EDITOR_GIZMO_H
diff --git a/editor/viewport/gizmo.cpp b/editor/viewport/gizmo.cpp
new file mode 100644
index 000000000..9d7c9078c
--- /dev/null
+++ b/editor/viewport/gizmo.cpp
@@ -0,0 +1,155 @@
+#include "editor/viewport/gizmo.h"
+#include "engine/scene/systems/transform_system.h"
+#include "engine/scene/components/core/hierarchy_component.h"
+#include "gui.h"
+#include "imgui_internal.h"
+#include "editor/scene_manager.h"
+#include "layer.h"
+#include "undo/modify_component_command.h"
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+
+namespace Chained
+{
+
+	bool EditorGizmo::RenderAndHandle(GizmoType type, ImVec2 viewportPos, ImVec2 viewportSize,
+									  const Chained::Camera3D& camera)
+	{
+		auto& layer = EditorLayer::Get();
+		Scene* scene = layer.GetActiveScene().get();
+		Entity entity = layer.GetSelectedEntity();
+
+		if (!scene || !entity || !entity.HasComponent<TransformComponent>() || type == GizmoType::NONE ||
+			layer.GetSceneState() == SceneState::Play || layer.GetSceneManager().IsTransitioning())
+		{
+			return false;
+		}
+
+		// Disable gizmo in UI scenes with 2D (orthographic) camera
+		if (camera.Projection == ProjectionType::Orthographic && scene->GetSettings().Type == SceneType::UI)
+		{
+			return false;
+		}
+
+		if (viewportSize.x <= 1.0f || viewportSize.y <= 1.0f)
+		{
+			return false;
+		}
+
+		auto& transform = entity.GetComponent<TransformComponent>();
+		glm::mat4 modelMat = transform.WorldTransform;
+
+		// Setup ImGuizmo
+		ImGuizmo::SetOrthographic(camera.Projection != ProjectionType::Perspective);
+		ImGuizmo::SetDrawlist(ImGui::GetForegroundDrawList());
+		ImGuizmo::SetAlternativeWindow(ImGui::GetCurrentWindow());
+
+		// Ensure we are using absolute screen coordinates for SetRect
+		ImGuizmo::SetRect(viewportPos.x, viewportPos.y, viewportSize.x, viewportSize.y);
+
+		// 2. Use the pre-built View/Projection matrices from Camera3D so that the gizmo
+		//    is pixel-perfectly aligned with the renderer's own matrices.
+		const glm::mat4& view = camera.ViewMatrix;
+		const glm::mat4& projection = camera.ProjectionMatrix;
+
+		// Read snap value from scene grid settings (always in sync with visual grid)
+		float currentSnapValues[3] = {0.0f, 0.0f, 0.0f};
+		if (m_SnappingEnabled)
+		{
+			const float snapValue = scene->GetSettings().Grid.Spacing;
+			if (type == GizmoType::TRANSLATE)
+			{
+				currentSnapValues[0] = snapValue;
+				currentSnapValues[1] = snapValue;
+				currentSnapValues[2] = snapValue;
+			}
+			else if (type == GizmoType::ROTATE)
+			{
+
+				currentSnapValues[0] = m_RotationSnap;
+			}
+			else if (type == GizmoType::SCALE)
+			{
+				currentSnapValues[0] = m_ScaleSnap;
+				currentSnapValues[1] = m_ScaleSnap;
+				currentSnapValues[2] = m_ScaleSnap;
+			}
+		}
+
+		float* snap = m_SnappingEnabled ? currentSnapValues : nullptr;
+
+		// 4. Manipulation
+		ImGuizmo::MODE mode = m_IsLocalSpace ? ImGuizmo::LOCAL : ImGuizmo::WORLD;
+
+		ImGuizmo::OPERATION op = static_cast<ImGuizmo::OPERATION>(type);
+		if (m_Is2DMode)
+		{
+			if (op == ImGuizmo::TRANSLATE)
+			{
+				op = (ImGuizmo::OPERATION)(ImGuizmo::TRANSLATE_X | ImGuizmo::TRANSLATE_Y);
+			}
+			else if (op == ImGuizmo::SCALE)
+			{
+				op = (ImGuizmo::OPERATION)(ImGuizmo::SCALE_X | ImGuizmo::SCALE_Y);
+			}
+			else if (op == ImGuizmo::ROTATE)
+			{
+				op = ImGuizmo::ROTATE_Z;
+			}
+		}
+
+		const bool wasUsing = m_WasUsing;
+		const bool manipulated = ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), op, mode,
+													  glm::value_ptr(modelMat), nullptr, snap);
+
+		const bool isUsingNow = ImGuizmo::IsUsing();
+		if (isUsingNow && !wasUsing)
+		{
+			m_WasUsing = true;
+			m_OldTransform = transform;
+		}
+
+		if (manipulated || isUsingNow)
+		{
+			glm::mat4 localMat = modelMat;
+			if (entity.HasComponent<HierarchyComponent>())
+			{
+				auto& hierarchy = entity.GetComponent<HierarchyComponent>();
+				if (hierarchy.Parent != entt::null && scene->GetRegistry().valid(hierarchy.Parent) &&
+					scene->GetRegistry().all_of<TransformComponent>(hierarchy.Parent))
+				{
+					const auto& parentTransform = scene->GetRegistry().get<TransformComponent>(hierarchy.Parent);
+					localMat = glm::inverse(parentTransform.WorldTransform) * modelMat;
+				}
+			}
+
+			glm::vec3 translation, rotation, scale;
+			ImGuizmo::DecomposeMatrixToComponents(glm::value_ptr(localMat), glm::value_ptr(translation),
+												  glm::value_ptr(rotation), glm::value_ptr(scale));
+
+			TransformSystem::SetTranslation(transform, translation);
+			TransformSystem::SetRotation(transform, glm::radians(rotation));
+			TransformSystem::SetScale(transform, scale);
+			transform.WorldTransform = modelMat;
+			transform.InverseWorldTransform = glm::inverse(modelMat);
+		}
+		else if (m_WasUsing && !isUsingNow)
+		{
+			m_WasUsing = false;
+
+			const bool changed = glm::length(transform.Translation - m_OldTransform.Translation) > 0.0001f ||
+								 glm::length(transform.Rotation - m_OldTransform.Rotation) > 0.0001f ||
+								 glm::length(transform.Scale - m_OldTransform.Scale) > 0.0001f;
+
+			if (changed)
+			{
+				EditorLayer::Get().GetCommandHistory().PushCommand(
+					std::make_unique<ModifyComponentCommand<TransformComponent>>(entity, m_OldTransform, transform,
+																				 "Transform Entity"));
+			}
+		}
+
+		return ImGuizmo::IsOver() || isUsingNow;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/editor/viewport/gizmo.h b/editor/viewport/gizmo.h
new file mode 100644
index 000000000..e96467041
--- /dev/null
+++ b/editor/viewport/gizmo.h
@@ -0,0 +1,103 @@
+#ifndef CH_EDITOR_GIZMO_H
+#define CH_EDITOR_GIZMO_H
+
+#include "engine/graphics/camera_types.h"
+#include "engine/scene/components.h"
+#include "engine/scene/scene.h"
+#include <imgui.h>
+#include <ImGuizmo.h>
+
+namespace Chained
+{
+
+	enum class GizmoType
+	{
+		NONE = -1,
+		TRANSLATE = ImGuizmo::OPERATION::TRANSLATE,
+		ROTATE = ImGuizmo::OPERATION::ROTATE,
+		SCALE = ImGuizmo::OPERATION::SCALE,
+		BOUNDS = ImGuizmo::OPERATION::BOUNDS
+	};
+
+	class EditorGizmo
+	{
+	public:
+		EditorGizmo() = default;
+		~EditorGizmo() = default;
+
+		// Render and handle gizmo interaction
+		// true if the gizmo is being used (captured mouse)
+		bool RenderAndHandle(GizmoType type, ImVec2 viewportPos, ImVec2 viewportSize, const Camera3D& camera);
+
+		void Set2DMode(bool enabled)
+		{
+			m_Is2DMode = enabled;
+		}
+		bool Is2DMode() const
+		{
+			return m_Is2DMode;
+		}
+
+		bool IsHovered() const
+		{
+			return ImGuizmo::IsOver();
+		}
+		bool IsDragging() const
+		{
+			return ImGuizmo::IsUsing();
+		}
+
+		// Snapping
+		void SetSnapping(bool enabled)
+		{
+			m_SnappingEnabled = enabled;
+		}
+		bool IsSnappingEnabled() const
+		{
+			return m_SnappingEnabled;
+		}
+
+		void SetRotationStep(float step)
+		{
+			m_RotationSnap = step;
+		}
+		void SetScaleStep(float step)
+		{
+			m_ScaleSnap = step;
+		}
+
+		float GetRotationStep() const
+		{
+			return m_RotationSnap;
+		}
+		float GetScaleStep() const
+		{
+			return m_ScaleSnap;
+		}
+
+		void SetLocalSpace(bool local)
+		{
+			m_IsLocalSpace = local;
+		}
+		bool IsLocalSpace() const
+		{
+			return m_IsLocalSpace;
+		}
+
+	private:
+		bool m_SnappingEnabled = false;
+
+		float m_RotationSnap = 45.0f;
+		float m_ScaleSnap = 0.1f;
+
+		bool m_IsLocalSpace = false;
+		bool m_Is2DMode = false;
+
+		// Undo state
+		TransformComponent m_OldTransform;
+		bool m_WasUsing = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_EDITOR_GIZMO_H
\ No newline at end of file
diff --git a/editor/viewport/ui_manipulator.cpp b/editor/viewport/ui_manipulator.cpp
index 916353297..ade0869b5 100644
--- a/editor/viewport/ui_manipulator.cpp
+++ b/editor/viewport/ui_manipulator.cpp
@@ -1,164 +1,176 @@
 #include "ui_manipulator.h"
 #include "engine/core/log.h"
-#include "engine/graphics/pipeline/ui_renderer.h"
-#include "engine/scene/components/control_component.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/scene/components/ui/control_component.h"
 #include "engine/scene/scene.h"
+#include "engine/core/service_locator.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-static const float HANDLE_SIZE = 8.0f;
-static const ImU32 HANDLE_COLOR = IM_COL32(255, 255, 255, 255);
-static const ImU32 HANDLE_HOVERED_COLOR = IM_COL32(255, 255, 0, 255);
-static const ImU32 ACTIVE_COLOR = IM_COL32(0, 255, 0, 255);
-
-bool EditorUIManipulator::OnImGuiRender(Entity selectedEntity, ImVec2 viewportPos, ImVec2 viewportSize)
-{
-    if (!selectedEntity || !selectedEntity.HasComponent<ControlComponent>())
-    {
-        m_Dragging = false;
-        m_Resizing = false;
-        m_ActiveHandle = UIHandleType::None;
-        return false;
-    }
-
-    auto& cc = selectedEntity.GetComponent<ControlComponent>();
-    UIRect rect = UIRenderer::Get().GetEntityRect(selectedEntity, viewportSize, viewportPos);
-
-    float scaleFactor = 1.0f;
-    auto* sceneCtx = selectedEntity.GetRegistry().ctx().find<Scene*>();
-    if (sceneCtx && *sceneCtx)
-    {
-        const CanvasSettings& canvas = (*sceneCtx)->GetSettings().Canvas;
-        if (canvas.ScaleMode == CanvasScaleMode::ScaleWithScreenSize && canvas.ReferenceResolution.x > 0.0f &&
-            canvas.ReferenceResolution.y > 0.0f)
-        {
-            const float scaleX = viewportSize.x / canvas.ReferenceResolution.x;
-            const float scaleY = viewportSize.y / canvas.ReferenceResolution.y;
-            scaleFactor = scaleX * (1.0f - canvas.MatchWidthOrHeight) + scaleY * canvas.MatchWidthOrHeight;
-            if (scaleFactor <= 0.0001f)
-            {
-                scaleFactor = 1.0f;
-            }
-        }
-    }
-
-    const float toVirtual = 1.0f / scaleFactor;
-
-    ImDrawList* drawList = ImGui::GetWindowDrawList();
-    ImVec2 p1 = {rect.x, rect.y};
-    ImVec2 p2 = {p1.x + rect.width, p1.y + rect.height};
-    ImVec2 center = {p1.x + rect.width * 0.5f, p1.y + rect.height * 0.5f};
-
-    // Draw main frame
-    drawList->AddRect(p1, p2, ACTIVE_COLOR, 0, 0, 1.0f);
-
-    ImVec2 mousePos = ImGui::GetMousePos();
-    UIHandleType hoveredHandle = UIHandleType::None;
-
-    auto ProcessHandle = [&](UIHandleType type, ImVec2 pos, UIHandleType& hovered) {
-        bool hoveredItem = (mousePos.x >= pos.x - HANDLE_SIZE && mousePos.x <= pos.x + HANDLE_SIZE &&
-                            mousePos.y >= pos.y - HANDLE_SIZE && mousePos.y <= pos.y + HANDLE_SIZE);
-        DrawHandle(drawList, pos, type, hoveredItem || (m_ActiveHandle == type));
-        if (hoveredItem && !IsActive())
-        {
-            hovered = type;
-        }
-    };
-
-    ProcessHandle(UIHandleType::TopLeft, p1, hoveredHandle);
-    ProcessHandle(UIHandleType::TopRight, {p2.x, p1.y}, hoveredHandle);
-    ProcessHandle(UIHandleType::BottomLeft, {p1.x, p2.y}, hoveredHandle);
-    ProcessHandle(UIHandleType::BottomRight, p2, hoveredHandle);
-    ProcessHandle(UIHandleType::Top, {center.x, p1.y}, hoveredHandle);
-    ProcessHandle(UIHandleType::Bottom, {center.x, p2.y}, hoveredHandle);
-    ProcessHandle(UIHandleType::Left, {p1.x, center.y}, hoveredHandle);
-    ProcessHandle(UIHandleType::Right, {p2.x, center.y}, hoveredHandle);
-
-    // Processing interaction
-    if (ImGui::IsMouseClicked(0))
-    {
-        if (hoveredHandle != UIHandleType::None)
-        {
-            m_Resizing = true;
-            m_ActiveHandle = hoveredHandle;
-            m_StartMousePos = mousePos;
-            m_StartOffsetMin = cc.Transform.OffsetMin;
-            m_StartOffsetMax = cc.Transform.OffsetMax;
-        }
-        else if (ImGui::IsMouseHoveringRect(p1, p2))
-        {
-            m_Dragging = true;
-            m_StartMousePos = mousePos;
-            m_StartOffsetMin = cc.Transform.OffsetMin;
-            m_StartOffsetMax = cc.Transform.OffsetMax;
-        }
-    }
-
-    if (IsActive())
-    {
-        if (ImGui::IsMouseDown(0))
-        {
-            ImVec2 delta = {mousePos.x - m_StartMousePos.x, mousePos.y - m_StartMousePos.y};
-            ImVec2 virtualDelta = {delta.x * toVirtual, delta.y * toVirtual};
-
-            if (m_Dragging)
-            {
-                cc.Transform.OffsetMin = {m_StartOffsetMin.x + virtualDelta.x, m_StartOffsetMin.y + virtualDelta.y};
-                cc.Transform.OffsetMax = {m_StartOffsetMax.x + virtualDelta.x, m_StartOffsetMax.y + virtualDelta.y};
-            }
-            else if (m_Resizing)
-            {
-                switch (m_ActiveHandle)
-                {
-                case UIHandleType::TopLeft:
-                    cc.Transform.OffsetMin = {m_StartOffsetMin.x + virtualDelta.x, m_StartOffsetMin.y + virtualDelta.y};
-                    break;
-                case UIHandleType::TopRight:
-                    cc.Transform.OffsetMin.y = m_StartOffsetMin.y + virtualDelta.y;
-                    cc.Transform.OffsetMax.x = m_StartOffsetMax.x + virtualDelta.x;
-                    break;
-                case UIHandleType::BottomLeft:
-                    cc.Transform.OffsetMin.x = m_StartOffsetMin.x + virtualDelta.x;
-                    cc.Transform.OffsetMax.y = m_StartOffsetMax.y + virtualDelta.y;
-                    break;
-                case UIHandleType::BottomRight:
-                    cc.Transform.OffsetMax = {m_StartOffsetMax.x + virtualDelta.x, m_StartOffsetMax.y + virtualDelta.y};
-                    break;
-                case UIHandleType::Top:
-                    cc.Transform.OffsetMin.y = m_StartOffsetMin.y + virtualDelta.y;
-                    break;
-                case UIHandleType::Bottom:
-                    cc.Transform.OffsetMax.y = m_StartOffsetMax.y + virtualDelta.y;
-                    break;
-                case UIHandleType::Left:
-                    cc.Transform.OffsetMin.x = m_StartOffsetMin.x + virtualDelta.x;
-                    break;
-                case UIHandleType::Right:
-                    cc.Transform.OffsetMax.x = m_StartOffsetMax.x + virtualDelta.x;
-                    break;
-                }
-            }
-        }
-        else
-        {
-            m_Dragging = false;
-            m_Resizing = false;
-            m_ActiveHandle = UIHandleType::None;
-        }
-        return true;
-    }
-
-    return hoveredHandle != UIHandleType::None;
-}
-
-void EditorUIManipulator::DrawHandle(ImDrawList* drawList, ImVec2 pos, UIHandleType type, bool hovered)
-{
-    ImU32 color = hovered ? HANDLE_HOVERED_COLOR : HANDLE_COLOR;
-    drawList->AddRectFilled({pos.x - HANDLE_SIZE * 0.5f, pos.y - HANDLE_SIZE * 0.5f},
-                            {pos.x + HANDLE_SIZE * 0.5f, pos.y + HANDLE_SIZE * 0.5f}, color);
-    drawList->AddRect({pos.x - HANDLE_SIZE * 0.5f, pos.y - HANDLE_SIZE * 0.5f},
-                      {pos.x + HANDLE_SIZE * 0.5f, pos.y + HANDLE_SIZE * 0.5f}, IM_COL32(0, 0, 0, 255));
-}
-
-} // namespace CHEngine
+	static const float HANDLE_SIZE = 8.0f;
+	static const ImU32 HANDLE_COLOR = IM_COL32(255, 255, 255, 255);
+	static const ImU32 HANDLE_HOVERED_COLOR = IM_COL32(255, 255, 0, 255);
+	static const ImU32 ACTIVE_COLOR = IM_COL32(0, 255, 0, 255);
+
+	bool EditorUIManipulator::OnImGuiRender(Entity selectedEntity, ImVec2 viewportPos, ImVec2 viewportSize)
+	{
+		if (!selectedEntity || !selectedEntity.HasComponent<ControlComponent>())
+		{
+			m_Dragging = false;
+			m_Resizing = false;
+			m_ActiveHandle = UIHandleType::None;
+			return false;
+		}
+
+		auto& cc = selectedEntity.GetComponent<ControlComponent>();
+		auto* sceneCtx = selectedEntity.GetRegistry().ctx().find<Scene*>();
+		Scene* scene = (sceneCtx && *sceneCtx) ? *sceneCtx : nullptr;
+		auto* uiRenderer = ServiceLocator::TryGet<WidgetRenderer>();
+		UIRect rect = (scene && uiRenderer) ? uiRenderer->GetEntityRect(selectedEntity) : UIRect{};
+
+		float scaleFactor = 1.0f;
+		if (sceneCtx && *sceneCtx)
+		{
+			const CanvasSettings& canvas = (*sceneCtx)->GetSettings().Canvas;
+			if (canvas.ScaleMode == CanvasScaleMode::ScaleWithScreenSize && canvas.ReferenceResolution.x > 0.0f &&
+				canvas.ReferenceResolution.y > 0.0f)
+			{
+				const float scaleX = viewportSize.x / canvas.ReferenceResolution.x;
+				const float scaleY = viewportSize.y / canvas.ReferenceResolution.y;
+				scaleFactor = scaleX * (1.0f - canvas.MatchWidthOrHeight) + scaleY * canvas.MatchWidthOrHeight;
+				if (scaleFactor <= 0.0001f)
+				{
+					scaleFactor = 1.0f;
+				}
+			}
+		}
+
+		const float toVirtual = 1.0f / scaleFactor;
+
+		ImDrawList* drawList = ImGui::GetWindowDrawList();
+		ImVec2 p1 = {rect.x, rect.y};
+		ImVec2 p2 = {p1.x + rect.width, p1.y + rect.height};
+		ImVec2 center = {p1.x + rect.width * 0.5f, p1.y + rect.height * 0.5f};
+
+		// Draw main frame
+		drawList->AddRect(p1, p2, ACTIVE_COLOR, 0, 0, 1.0f);
+
+		ImVec2 mousePos = ImGui::GetMousePos();
+		UIHandleType hoveredHandle = UIHandleType::None;
+
+		bool isHoveredWindow =
+			ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem |
+								   ImGuiHoveredFlags_AllowWhenBlockedByPopup);
+
+		auto ProcessHandle = [&](UIHandleType type, ImVec2 pos, UIHandleType& hovered) {
+			bool hoveredItem =
+				(isHoveredWindow && mousePos.x >= pos.x - HANDLE_SIZE && mousePos.x <= pos.x + HANDLE_SIZE &&
+				 mousePos.y >= pos.y - HANDLE_SIZE && mousePos.y <= pos.y + HANDLE_SIZE);
+			DrawHandle(drawList, pos, type, hoveredItem || (m_ActiveHandle == type));
+			if (hoveredItem && !IsActive())
+			{
+				hovered = type;
+			}
+		};
+
+		ProcessHandle(UIHandleType::TopLeft, p1, hoveredHandle);
+		ProcessHandle(UIHandleType::TopRight, {p2.x, p1.y}, hoveredHandle);
+		ProcessHandle(UIHandleType::BottomLeft, {p1.x, p2.y}, hoveredHandle);
+		ProcessHandle(UIHandleType::BottomRight, p2, hoveredHandle);
+		ProcessHandle(UIHandleType::Top, {center.x, p1.y}, hoveredHandle);
+		ProcessHandle(UIHandleType::Bottom, {center.x, p2.y}, hoveredHandle);
+		ProcessHandle(UIHandleType::Left, {p1.x, center.y}, hoveredHandle);
+		ProcessHandle(UIHandleType::Right, {p2.x, center.y}, hoveredHandle);
+
+		// Processing interaction
+		if (ImGui::IsMouseClicked(0))
+		{
+			if (hoveredHandle != UIHandleType::None)
+			{
+				m_Resizing = true;
+				m_ActiveHandle = hoveredHandle;
+				m_StartMousePos = mousePos;
+				m_StartOffsetMin = cc.Transform.OffsetMin;
+				m_StartOffsetMax = cc.Transform.OffsetMax;
+			}
+			else if (isHoveredWindow && mousePos.x >= p1.x && mousePos.x <= p2.x && mousePos.y >= p1.y &&
+					 mousePos.y <= p2.y)
+			{
+				m_Dragging = true;
+				m_StartMousePos = mousePos;
+				m_StartOffsetMin = cc.Transform.OffsetMin;
+				m_StartOffsetMax = cc.Transform.OffsetMax;
+			}
+		}
+
+		if (IsActive())
+		{
+			if (ImGui::IsMouseDown(0))
+			{
+				ImVec2 delta = {mousePos.x - m_StartMousePos.x, mousePos.y - m_StartMousePos.y};
+				ImVec2 virtualDelta = {delta.x * toVirtual, delta.y * toVirtual};
+
+				if (m_Dragging)
+				{
+					cc.Transform.OffsetMin = {m_StartOffsetMin.x + virtualDelta.x, m_StartOffsetMin.y + virtualDelta.y};
+					cc.Transform.OffsetMax = {m_StartOffsetMax.x + virtualDelta.x, m_StartOffsetMax.y + virtualDelta.y};
+				}
+				else if (m_Resizing)
+				{
+					switch (m_ActiveHandle)
+					{
+					case UIHandleType::TopLeft:
+						cc.Transform.OffsetMin = {m_StartOffsetMin.x + virtualDelta.x,
+												  m_StartOffsetMin.y + virtualDelta.y};
+						break;
+					case UIHandleType::TopRight:
+						cc.Transform.OffsetMin.y = m_StartOffsetMin.y + virtualDelta.y;
+						cc.Transform.OffsetMax.x = m_StartOffsetMax.x + virtualDelta.x;
+						break;
+					case UIHandleType::BottomLeft:
+						cc.Transform.OffsetMin.x = m_StartOffsetMin.x + virtualDelta.x;
+						cc.Transform.OffsetMax.y = m_StartOffsetMax.y + virtualDelta.y;
+						break;
+					case UIHandleType::BottomRight:
+						cc.Transform.OffsetMax = {m_StartOffsetMax.x + virtualDelta.x,
+												  m_StartOffsetMax.y + virtualDelta.y};
+						break;
+					case UIHandleType::Top:
+						cc.Transform.OffsetMin.y = m_StartOffsetMin.y + virtualDelta.y;
+						break;
+					case UIHandleType::Bottom:
+						cc.Transform.OffsetMax.y = m_StartOffsetMax.y + virtualDelta.y;
+						break;
+					case UIHandleType::Left:
+						cc.Transform.OffsetMin.x = m_StartOffsetMin.x + virtualDelta.x;
+						break;
+					case UIHandleType::Right:
+						cc.Transform.OffsetMax.x = m_StartOffsetMax.x + virtualDelta.x;
+						break;
+					}
+				}
+			}
+			else
+			{
+				m_Dragging = false;
+				m_Resizing = false;
+				m_ActiveHandle = UIHandleType::None;
+			}
+			return true;
+		}
+
+		return hoveredHandle != UIHandleType::None;
+	}
+
+	void EditorUIManipulator::DrawHandle(ImDrawList* drawList, ImVec2 pos, UIHandleType type, bool hovered)
+	{
+		ImU32 color = hovered ? HANDLE_HOVERED_COLOR : HANDLE_COLOR;
+		drawList->AddRectFilled({pos.x - HANDLE_SIZE * 0.5f, pos.y - HANDLE_SIZE * 0.5f},
+								{pos.x + HANDLE_SIZE * 0.5f, pos.y + HANDLE_SIZE * 0.5f}, color);
+		drawList->AddRect({pos.x - HANDLE_SIZE * 0.5f, pos.y - HANDLE_SIZE * 0.5f},
+						  {pos.x + HANDLE_SIZE * 0.5f, pos.y + HANDLE_SIZE * 0.5f}, IM_COL32(0, 0, 0, 255));
+	}
+
+} // namespace Chained
diff --git a/editor/viewport/ui_manipulator.h b/editor/viewport/ui_manipulator.h
index 3c9380414..96b0a6e07 100644
--- a/editor/viewport/ui_manipulator.h
+++ b/editor/viewport/ui_manipulator.h
@@ -4,52 +4,51 @@
 #include "engine/scene/scene.h"
 #include "imgui.h"
 
-
-namespace CHEngine
-{
-
-enum class UIHandleType
+namespace Chained
 {
-    None = 0,
-    Center,
-    TopLeft,
-    TopRight,
-    BottomLeft,
-    BottomRight,
-    Top,
-    Bottom,
-    Left,
-    Right
-};
-
-class EditorUIManipulator
-{
-public:
-    EditorUIManipulator() = default;
-
-    // Returns true if interaction is happening
-    bool OnImGuiRender(Entity selectedEntity, ImVec2 viewportPos, ImVec2 viewportSize);
-
-    bool IsActive() const
-    {
-        return m_Dragging || m_Resizing;
-    }
-
-private:
-    void DrawHandle(ImDrawList* drawList, ImVec2 pos, UIHandleType type, bool hovered);
-    bool HandleInteraction(Entity entity, ImVec2 viewportSize);
-
-private:
-    bool m_Dragging = false;
-    bool m_Resizing = false;
-    UIHandleType m_ActiveHandle = UIHandleType::None;
-
-    // Interaction cache
-    ImVec2 m_StartMousePos;
-    glm::vec2 m_StartOffsetMin;
-    glm::vec2 m_StartOffsetMax;
-};
 
-} // namespace CHEngine
+	enum class UIHandleType
+	{
+		None = 0,
+		Center,
+		TopLeft,
+		TopRight,
+		BottomLeft,
+		BottomRight,
+		Top,
+		Bottom,
+		Left,
+		Right
+	};
+
+	class EditorUIManipulator
+	{
+	public:
+		EditorUIManipulator() = default;
+
+		// Returns true if interaction is happening
+		bool OnImGuiRender(Entity selectedEntity, ImVec2 viewportPos, ImVec2 viewportSize);
+
+		bool IsActive() const
+		{
+			return m_Dragging || m_Resizing;
+		}
+
+	private:
+		void DrawHandle(ImDrawList* drawList, ImVec2 pos, UIHandleType type, bool hovered);
+		bool HandleInteraction(Entity entity, ImVec2 viewportSize);
+
+	private:
+		bool m_Dragging = false;
+		bool m_Resizing = false;
+		UIHandleType m_ActiveHandle = UIHandleType::None;
+
+		// Interaction cache
+		ImVec2 m_StartMousePos;
+		glm::vec2 m_StartOffsetMin;
+		glm::vec2 m_StartOffsetMax;
+	};
+
+} // namespace Chained
 
 #endif // CH_UI_MANIPULATOR_H
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 843f1f3eb..8a2ecd1f3 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -1,16 +1,4 @@
-# Common include directories for all engine targets
-set(ENGINE_INCLUDE_DIRS
-    ${CMAKE_SOURCE_DIR}
-        .
-    ${glm_SOURCE_DIR}
-    ${yaml-cpp_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/entt/src
-    ${CMAKE_SOURCE_DIR}/include/coral/Coral.Native/Include
-    ${CMAKE_SOURCE_DIR}/include/miniaudio
-    ${CMAKE_SOURCE_DIR}/include/glfw/include
-)
-
-# SHARED for local development (hot-reload), STATIC for CI/distribution
+# SHARED for local development (hot-reload), STATIC for CI/distribution/stability
 option(CH_ENGINE_SHARED "Build engine as shared library (DLL)" OFF)
 if(CH_ENGINE_SHARED)
     set(ENGINE_LIB_TYPE SHARED)
@@ -18,66 +6,77 @@ else()
     set(ENGINE_LIB_TYPE STATIC)
 endif()
 
-# We use OBJECT libraries for sub-modules to handle circular dependencies (e.g. Core <-> Scene)
-# Unified through Unity Build and PCH for maximum compilation speed.
-set(SUBMODULE_LIB_TYPE OBJECT)
+# If building as a shared library, all internal static sub-modules need to be aware
+# they are part of a DLL build so they can dllexport their symbols.
+if(CH_ENGINE_SHARED)
+    add_compile_definitions(CH_DYNAMIC_LINK CH_ENGINE_BUILD)
+endif()
 
+add_subdirectory(common)
+add_subdirectory(reflection)
+add_subdirectory(imgui)
 add_subdirectory(core)
+add_subdirectory(assets)
 add_subdirectory(graphics)
+add_subdirectory(ui)
 add_subdirectory(physics)
 add_subdirectory(audio)
 add_subdirectory(scene)
+add_subdirectory(project)
+include(${CMAKE_SOURCE_DIR}/cmake/external/enet.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/external/sodium.cmake)
+add_subdirectory(networking)
+add_subdirectory(platform)
+add_subdirectory(scripting)
+add_subdirectory(app)
+add_subdirectory(runtime)
 
-# Create the final engine facade library that links all sub-modules together
-add_library(engine ${ENGINE_LIB_TYPE}
-    $<TARGET_OBJECTS:engine_core>
-    $<TARGET_OBJECTS:engine_graphics>
-    $<TARGET_OBJECTS:engine_physics>
-    $<TARGET_OBJECTS:engine_audio>
-    $<TARGET_OBJECTS:engine_scene>
-)
-
-target_compile_definitions(engine PRIVATE CH_ENGINE_BUILD)
+# ── Engine facade library ────────────────────────────────────────────────────
+# INTERFACE when static (header/dependency re-export only, no source needed),
+# SHARED when building as DLL (needs a translation unit for MSVC archiver).
+if(CH_ENGINE_SHARED)
+    add_library(engine SHARED engine_dummy.cpp)
+    target_compile_definitions(engine PRIVATE CH_ENGINE_BUILD)
+    target_compile_definitions(engine PUBLIC CH_DYNAMIC_LINK)
+    if(WIN32)
+        set_target_properties(engine PROPERTIES PREFIX "")
+    endif()
+    install(TARGETS engine
+        EXPORT ChainedEngineTargets
+        ARCHIVE DESTINATION lib COMPONENT Runtime
+        LIBRARY DESTINATION lib COMPONENT Runtime
+        RUNTIME DESTINATION bin COMPONENT Runtime
+    )
+else()
+    add_library(engine INTERFACE)
+endif()
 
-# MSVC needs exported symbols to generate the .lib import library
-set_target_properties(engine PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-if(WIN32)
-    set_target_properties(engine PROPERTIES PREFIX "")
+if(CH_ENGINE_SHARED)
+    target_link_libraries(engine PUBLIC engine_app)
+else()
+    target_link_libraries(engine INTERFACE engine_app)
 endif()
 
-target_include_directories(engine PUBLIC
-    ${ENGINE_INCLUDE_DIRS}
-    ${assimp_SOURCE_DIR}/include
-    ${assimp_BINARY_DIR}/include
-    ${glm_SOURCE_DIR}
-    ${yaml-cpp_SOURCE_DIR}/include
-INTERFACE
-    ${CMAKE_SOURCE_DIR}/include/imgui
-    ${CMAKE_SOURCE_DIR}/include/imgui/backends
-    ${imguizmo_SOURCE_DIR}
+target_include_directories(engine INTERFACE
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-target_link_libraries(engine 
-PUBLIC 
-    EnTT::EnTT
-PRIVATE
-    imguilib
-    yaml-cpp
-    assimp::assimp
-    nfd
-)
+# ── Unified Framework Interface ──────────────────────────────────────────────
+# This provides a single target for games to link against, encapsulating all
+# engine headers and dependencies in a clean way.
+add_library(ChainedEngineFramework INTERFACE)
+add_library(ChainedEngine::Framework ALIAS ChainedEngineFramework)
+add_library(ChainedEngine::API ALIAS ChainedEngineFramework)
 
-# (Redundant compiler flags removed - now in CompilerSettings.cmake)
+file(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}" PROJECT_ROOT_DIR_ESCAPED)
 
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(engine)
-endif()
+target_link_libraries(ChainedEngineFramework INTERFACE
+    engine
+)
 
-install(TARGETS engine
-    EXPORT ChainedEngineTargets
-    ARCHIVE DESTINATION lib COMPONENT Runtime
-    LIBRARY DESTINATION lib COMPONENT Runtime
-    RUNTIME DESTINATION bin COMPONENT Runtime
+target_compile_definitions(ChainedEngineFramework INTERFACE
+    PROJECT_ROOT_DIR="${PROJECT_ROOT_DIR_ESCAPED}"
 )
 
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/resources"
@@ -85,4 +84,3 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/resources"
     USE_SOURCE_PERMISSIONS
     COMPONENT Runtime
 )
-
diff --git a/engine/app/CMakeLists.txt b/engine/app/CMakeLists.txt
new file mode 100644
index 000000000..50e810686
--- /dev/null
+++ b/engine/app/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Create a high-level runtime module that owns the Application logic and initialization
+# This module depends on all other engine modules, but modules don't depend on it.
+add_library(engine_app STATIC
+    application.h
+    application.cpp
+    application_types.h
+    entry_point.h
+)
+
+target_include_directories(engine_app PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_app PUBLIC
+    engine_scripting
+    engine_scene
+    engine_project
+    engine_graphics
+    engine_physics
+    engine_audio
+    engine_assets
+    engine_core
+    engine_imgui
+    engine_platform
+    engine_network
+)
+
+target_include_directories(engine_app PRIVATE ${CMAKE_SOURCE_DIR})
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_app PRIVATE engine_pch)
+endif()
diff --git a/engine/app/application.cpp b/engine/app/application.cpp
new file mode 100644
index 000000000..d4edd0092
--- /dev/null
+++ b/engine/app/application.cpp
@@ -0,0 +1,268 @@
+#include "engine/app/application.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/core/profiler.h"
+#include "engine/core/platform.h"
+#include "engine/imgui/imgui_layer.h"
+#include "engine/core/events/window_events.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/component_registry.h"
+#include "engine/project/project.h"
+#include "engine/common/thread_pool.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/audio/audio.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/ui/ui_font_registry.h"
+#include "engine/graphics/pipeline/debug_renderer.h"
+#include "engine/physics/physics.h"
+#include "engine/core/input.h"
+#include "engine/scripting/scriptengine.h"
+#include "engine/networking/network_service.h"
+
+namespace Chained
+{
+	std::filesystem::path Application::GetExecutableDirectory()
+	{
+		return Platform::GetExecutableDirectory();
+	}
+
+	Application::Application(const ApplicationSpecification& spec)
+		: m_Specification(spec)
+	{
+		CH_ASSERT(!s_Instance);
+		s_Instance = this;
+
+		Log::Init();
+		ComponentRegistry::RegisterEngineComponents();
+
+		if (!m_Specification.WorkingDirectory.empty())
+		{
+			std::filesystem::current_path(m_Specification.WorkingDirectory);
+		}
+
+		InitializePlatform();
+		RegisterCoreServices();
+		RegisterRuntimeServices();
+		RegisterGameplayServices();
+
+		// Freeze the locator, then initialize all modules.
+		ServiceLocator::Lock();
+		ServiceLocator::InitializeModule();
+
+		if (m_Window)
+		{
+			if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+			{
+				renderer->SetViewportSize(m_Window->GetWidth(), m_Window->GetHeight());
+			}
+		}
+
+		m_LayerStack = std::make_unique<LayerStack>();
+		m_Timer.LastFrameTime = Platform::GetTime();
+		m_Running = true;
+
+		if (!m_Specification.Headless)
+		{
+			auto imguiLayer = std::make_unique<ImGuiLayer>();
+			m_ImGuiLayer = imguiLayer.get();
+			PushOverlay(std::move(imguiLayer));
+		}
+	}
+
+	void Application::InitializePlatform()
+	{
+		const bool isHeadless = m_Specification.Headless;
+		if (!isHeadless)
+		{
+			m_Window = Window::Create(m_Specification.Window);
+			m_Window->SetEventCallback(CH_BIND_EVENT_FN(Application::OnEvent));
+		}
+		else
+		{
+			GraphicsDevice::SetAPI(GraphicsDevice::API::None);
+		}
+	}
+
+	void Application::RegisterCoreServices()
+	{
+		unsigned int threads = std::thread::hardware_concurrency();
+		if (threads == 0)
+		{
+			threads = 1;
+		}
+		unsigned int workerCount = (threads > 1) ? (threads - 1) : 1;
+
+		std::filesystem::path resourcesDir;
+		if (!m_Specification.ResourcesDir.empty() && std::filesystem::exists(m_Specification.ResourcesDir))
+		{
+			resourcesDir = m_Specification.ResourcesDir;
+		}
+
+		// 1. Input — must be first (window callbacks fire during creation)
+		ServiceLocator::Provide<Core::Input>([] { return std::make_unique<Core::Input>(); });
+
+		// 2. ThreadPool
+		ServiceLocator::Provide<ThreadPool>([=] { return std::make_unique<ThreadPool>(workerCount); });
+
+		// 3. AssetManager — override asset directory only when explicitly provided
+		ServiceLocator::Provide<AssetManager>([&, resourcesDir] {
+			auto am = std::make_unique<AssetManager>();
+			am->SetEngineRoot(m_Specification.EngineRoot);
+			if (!resourcesDir.empty())
+			{
+				am->SetAssetDirectory(resourcesDir);
+			}
+			return am;
+		});
+	}
+
+	void Application::RegisterRuntimeServices()
+	{
+		const bool isHeadless = m_Specification.Headless;
+		if (!isHeadless)
+		{
+			ServiceLocator::Provide<Renderer>([] { return std::make_unique<Renderer>(); });
+			ServiceLocator::Provide<UIFontRegistry>([] { return std::make_unique<UIFontRegistry>(); });
+			ServiceLocator::Provide<WidgetRenderer>([] { return std::make_unique<WidgetRenderer>(); });
+			ServiceLocator::Provide<DebugRenderer>([] { return std::make_unique<DebugRenderer>(); });
+		}
+	}
+
+	void Application::RegisterGameplayServices()
+	{
+		ServiceLocator::Provide<Audio>([] { return std::make_unique<Audio>(); });
+		ServiceLocator::Provide<Physics>([] { return std::make_unique<Physics>(); });
+		if (m_Specification.EnableScripting)
+		{
+			ServiceLocator::Provide<ScriptEngine>(
+				[=] { return std::make_unique<ScriptEngine>(m_Specification.EnableScripting); });
+		}
+		ServiceLocator::Provide<Network>([] { return std::make_unique<Network>(); });
+	}
+
+	Application::~Application()
+	{
+
+		m_LayerStack.reset();
+
+		// WARNING: OpenGL resources held by the Project (like Environment maps)
+		// MUST be released before the OpenGL context is destroyed (via m_Window.reset()).
+		// Setting Active Project to nullptr invokes destructors cleanly.
+		Project::SetActive(nullptr);
+
+		ServiceLocator::Shutdown();
+		GraphicsDevice::ProcessResourceDeletions();
+		m_Window.reset();
+		// Log::Shutdown() MUST come after m_Window.reset(): ~GlfwWindow::Shutdown() emits
+		// CH_CORE_INFO("Glfw Window Closed"). If the core logger were reset first, that log
+		// call dereferences a null spdlog::logger and segfaults (access violation reading the
+		// atomic log level). Logging outlives every subsystem that can log during teardown.
+		Log::Shutdown();
+		s_Instance = nullptr;
+	}
+
+	void Application::Run()
+	{
+		while (m_Running && (!m_Window || !m_Window->ShouldClose()))
+		{
+			float time = Platform::GetTime();
+			float rawDelta = time - m_Timer.LastFrameTime;
+			m_Timer.LastFrameTime = time;
+			float clampedDelta = (rawDelta > 0.0f) ? std::min(rawDelta, 0.1f) : 0.0f;
+			m_Timer.DeltaTime = Timestep(clampedDelta);
+
+			Instrumentor::Get().BeginFrame();
+
+			if (m_Window)
+			{
+				m_Window->BeginFrame();
+			}
+
+			// Process any GPU resource deletions queued from worker threads
+			GraphicsDevice::ProcessResourceDeletions();
+
+			if (m_Window && m_Window->GetWidth() > 0 && m_Window->GetHeight() > 0)
+			{
+				if (auto* audio = ServiceLocator::TryGet<Audio>())
+				{
+					audio->Update(m_Timer.DeltaTime);
+				}
+				if (auto* am = ServiceLocator::TryGet<AssetManager>())
+				{
+					am->Update(m_Timer.DeltaTime);
+				}
+				m_Timer.Accumulator += (float)m_Timer.DeltaTime;
+				m_Timer.Accumulator = std::min(m_Timer.Accumulator, 0.1f);
+				while (m_Timer.Accumulator >= m_Timer.FixedStepCount)
+				{
+					for (auto& layer : *m_LayerStack)
+					{
+						layer->OnFixedUpdate(Timestep(m_Timer.FixedStepCount));
+					}
+
+					m_Timer.Accumulator -= m_Timer.FixedStepCount;
+				}
+
+				for (auto& layer : *m_LayerStack)
+				{
+					layer->OnUpdate(m_Timer.DeltaTime);
+				}
+
+				Core::Input::Update(m_Timer.DeltaTime);
+
+				for (auto& layer : *m_LayerStack)
+				{
+					layer->OnRender(m_Timer.DeltaTime);
+				}
+
+				if (m_ImGuiLayer)
+				{
+					m_ImGuiLayer->Begin();
+					for (auto& layer : *m_LayerStack)
+					{
+						layer->OnImGuiRender();
+					}
+					m_ImGuiLayer->End();
+				}
+
+				m_Window->EndFrame();
+			}
+		}
+	}
+
+	void Application::OnEvent(Event& e)
+	{
+		if (e.GetEventType() == EventType::WindowResize)
+		{
+			auto& re = static_cast<WindowResizeEvent&>(e);
+			if (auto* renderer = ServiceLocator::TryGet<Renderer>())
+			{
+				renderer->SetViewportSize(re.GetWidth(), re.GetHeight());
+			}
+		}
+
+		for (auto it = m_LayerStack->rbegin(); it != m_LayerStack->rend(); ++it)
+		{
+			if (e.Handled)
+			{
+				break;
+			}
+			(*it)->OnEvent(e);
+		}
+	}
+
+	void Application::PushLayer(std::unique_ptr<Layer> layer) const
+	{
+		Layer* raw = layer.get();
+		m_LayerStack->PushLayer(std::move(layer));
+		raw->OnAttach();
+	}
+
+	void Application::PushOverlay(std::unique_ptr<Layer> overlay) const
+	{
+		Layer* raw = overlay.get();
+		m_LayerStack->PushOverlay(std::move(overlay));
+		raw->OnAttach();
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/app/application.h b/engine/app/application.h
new file mode 100644
index 000000000..a28732ea9
--- /dev/null
+++ b/engine/app/application.h
@@ -0,0 +1,96 @@
+#ifndef CH_APPLICATION_H
+#define CH_APPLICATION_H
+
+#include "application_types.h"
+#include "engine/core/events/events.h"
+#include "engine/core/layer_stack.h"
+#include "engine/core/window.h"
+#include "engine/common/base.h"
+#include "engine/common/timestep.h"
+#include "engine/common/engine_assert.h"
+#include <filesystem>
+#include <memory>
+
+namespace Chained
+{
+	class ImGuiLayer;
+	class Layer;
+
+	class CH_API Application
+	{
+	public:
+		explicit Application(const ApplicationSpecification& specification);
+		virtual ~Application();
+
+		static Application& Get()
+		{
+			CH_CORE_ASSERT(s_Instance, "Application instance does not exist!");
+			return *s_Instance;
+		}
+
+		void Run();
+		void Close()
+		{
+			m_Running = false;
+		}
+
+		void OnEvent(Event& e);
+
+		Window& GetWindow()
+		{
+			return *m_Window;
+		}
+		const Window& GetWindow() const
+		{
+			return *m_Window;
+		}
+		ImGuiLayer* GetImGuiLayer()
+		{
+			return m_ImGuiLayer;
+		}
+		const ApplicationSpecification& GetSpecification() const
+		{
+			return m_Specification;
+		}
+		LayerStack& GetLayerStack()
+		{
+			return *m_LayerStack;
+		}
+		void PushLayer(std::unique_ptr<Layer> layer) const;
+		void PushOverlay(std::unique_ptr<Layer> overlay) const;
+		Timestep GetFrameTime() const
+		{
+			return m_Timer.DeltaTime;
+		}
+
+		static std::filesystem::path GetExecutableDirectory();
+
+	private:
+		void InitializePlatform();
+		void RegisterCoreServices();
+		void RegisterRuntimeServices();
+		void RegisterGameplayServices();
+
+	private:
+		ApplicationSpecification m_Specification;
+		std::unique_ptr<Window> m_Window;
+		std::unique_ptr<LayerStack> m_LayerStack;
+		ImGuiLayer* m_ImGuiLayer = nullptr;
+		bool m_Running;
+
+		struct
+		{
+			float Accumulator = 0.0f;
+			float FixedStepCount = 1.0f / 120.0f;
+			Timestep DeltaTime = 0.0f;
+			float LastFrameTime = 0.0f;
+		} m_Timer;
+
+	private:
+		inline static Application* s_Instance = nullptr;
+	};
+
+	Application* CreateApplication(ApplicationCommandLineArgs args);
+} // namespace Chained
+
+#endif // CH_APPLICATION_H
\ No newline at end of file
diff --git a/engine/app/application_types.h b/engine/app/application_types.h
new file mode 100644
index 000000000..980620227
--- /dev/null
+++ b/engine/app/application_types.h
@@ -0,0 +1,29 @@
+#ifndef CH_APPLICATION_TYPES_H
+#define CH_APPLICATION_TYPES_H
+
+#include "engine/core/window.h"
+#include <filesystem>
+#include <string>
+
+namespace Chained
+{
+	struct ApplicationCommandLineArgs
+	{
+		int Count = 0;
+		char** Args = nullptr;
+	};
+	struct ApplicationSpecification
+	{
+		std::string Name;
+		std::string WorkingDirectory;
+		std::filesystem::path EngineRoot;
+		std::string ResourcesDir;
+		WindowProperties Window;
+		ApplicationCommandLineArgs CommandLineArgs;
+		bool Headless = false;
+		bool EnableScripting = true;
+	};
+
+} // namespace Chained
+
+#endif // CH_APPLICATION_TYPES_H
diff --git a/engine/app/entry_point.h b/engine/app/entry_point.h
new file mode 100644
index 000000000..89dbc8597
--- /dev/null
+++ b/engine/app/entry_point.h
@@ -0,0 +1,20 @@
+#ifndef CH_ENTRY_POINT_H
+#define CH_ENTRY_POINT_H
+
+#include "engine/app/application.h"
+
+extern Chained::Application* Chained::CreateApplication(Chained::ApplicationCommandLineArgs args);
+
+int main(int argc, char** argv)
+{
+	Chained::ApplicationCommandLineArgs args;
+	args.Count = argc;
+	args.Args = argv;
+
+	auto app = Chained::CreateApplication(args);
+	app->Run();
+	delete app;
+	return 0;
+}
+
+#endif // CH_ENTRY_POINT_H
diff --git a/engine/assets/CMakeLists.txt b/engine/assets/CMakeLists.txt
new file mode 100644
index 000000000..f8e39ffb7
--- /dev/null
+++ b/engine/assets/CMakeLists.txt
@@ -0,0 +1,75 @@
+add_library(engine_assets STATIC
+    asset.h
+    asset_manager.h
+    asset_manager.cpp
+    asset_metadata.h
+    asset_metadata.cpp
+    asset_path_resolver.cpp
+    asset_path_resolver.h
+    model_data.h
+    types/audio_asset.h
+    types/environment_asset.h
+    types/font_asset.h
+    types/font_asset.cpp
+    types/material_asset.h
+    types/material_asset.cpp
+    types/model_asset.h
+    types/model_asset.cpp
+    types/shader_asset.h
+    types/texture_asset.h
+    types/texture_asset.cpp
+    types/animation_graph_asset.h
+    loaders/iasset_loader.h
+    loaders/anim_graph_loader.h
+    loaders/anim_graph_loader.cpp
+    loaders/assimp_importer.h
+    loaders/assimp_importer.cpp
+    loaders/assimp_helpers.h
+    loaders/pack_io.h
+    loaders/pack_io.cpp
+    loaders/material_extractor.h
+    loaders/material_extractor.cpp
+    loaders/animation_sampler.h
+    loaders/animation_sampler.cpp
+    loaders/mesh_merger.h
+    loaders/mesh_merger.cpp
+    loaders/audio_loader.h
+    loaders/audio_loader.cpp
+    loaders/environment_loader.h
+    loaders/environment_loader.cpp
+    loaders/font_loader.h
+    loaders/font_loader.cpp
+    loaders/material_loader.h
+    loaders/material_loader.cpp
+    loaders/model_loader.h
+    loaders/model_loader.cpp
+    loaders/shader_loader.h
+    loaders/shader_loader.cpp
+    loaders/stb_image_impl.h
+    loaders/texture_loader.h
+    loaders/texture_loader.cpp
+)
+
+target_include_directories(engine_assets PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_assets PUBLIC
+    engine_core
+    engine_project
+    engine_graphics
+    engine_external_glad
+    engine_external_stb
+    engine_external_miniaudio
+    yaml-cpp
+    assimp
+)
+
+if(TARGET pack-static)
+    target_link_libraries(engine_assets PUBLIC pack-static)
+endif()
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_assets PRIVATE engine_pch)
+endif()
diff --git a/engine/assets/asset.h b/engine/assets/asset.h
new file mode 100644
index 000000000..8d3c53a8a
--- /dev/null
+++ b/engine/assets/asset.h
@@ -0,0 +1,160 @@
+#ifndef CH_ASSET_H
+#define CH_ASSET_H
+
+#include "engine/common/uuid.h"
+#include "engine/core/log.h"
+#include <string>
+#include <atomic>
+
+namespace Chained
+{
+	using AssetHandle = UUID;
+
+	enum class AssetType : uint16_t
+	{
+		None = 0,
+		Model,
+		Texture,
+		Audio,
+		Shader,
+		Environment,
+		Material,
+		Font,
+		Scene,
+		Script,
+		AnimationGraph
+	};
+	// Asset loading state.
+	enum class AssetState : uint8_t
+	{
+		None = 0,
+		Loading,
+		Ready,
+		Failed
+	};
+
+	class Asset
+	{
+	public:
+		virtual ~Asset() = default;
+
+		// Returns the asset type discriminator.
+		AssetType GetType() const
+		{
+			return m_Type;
+		}
+
+		Asset(AssetType type = AssetType::None)
+			: m_Type(type),
+			  m_ID()
+		{
+		}
+		Asset(AssetType type, UUID id)
+			: m_Type(type),
+			  m_ID(id)
+		{
+		}
+
+		// Returns the current asset loading state using relaxed atomic reads.
+		AssetState GetState() const
+		{
+			return m_State.load(std::memory_order_relaxed);
+		}
+		// Updates the loading state and logs state transitions for diagnostics.
+		void SetState(AssetState state)
+		{
+			AssetState oldState = m_State.exchange(state, std::memory_order_release);
+			if (state != oldState)
+			{
+				CH_CORE_INFO("[ASSET] '{}' state change: {} -> {}", m_Path, (int)oldState, (int)state);
+
+				if (state == AssetState::Failed)
+				{
+					if (!m_Error.empty())
+					{
+						CH_CORE_WARN("Asset: FAILED for '{}' (Type: {}, ID: {}) - {}", m_Path, (int)m_Type,
+									 (uint64_t)m_ID, m_Error);
+					}
+					else
+					{
+						CH_CORE_WARN("Asset: FAILED for '{}' (Type: {}, ID: {})", m_Path, (int)m_Type, (uint64_t)m_ID);
+					}
+				}
+			}
+		}
+
+		// Returns the last loader or finalization error, if any.
+		const std::string& GetError() const
+		{
+			return m_Error;
+		}
+
+		// Stores a descriptive error message without changing the state.
+		void SetError(const std::string& error)
+		{
+			m_Error = error;
+		}
+
+		// Clears the stored error message.
+		void ClearError()
+		{
+			m_Error.clear();
+		}
+
+		// Marks the asset as failed and records the failure message.
+		void Fail(const std::string& error)
+		{
+			m_Error = error;
+			SetState(AssetState::Failed);
+		}
+
+		// Returns true when the asset reached the ready state.
+		bool IsReady() const
+		{
+			return m_State == AssetState::Ready;
+		}
+
+		// Returns the resolved asset path used by the loader.
+		const std::string& GetPath() const
+		{
+			return m_Path;
+		}
+		// Updates the resolved asset path used by the loader.
+		void SetPath(const std::string& path)
+		{
+			m_Path = path;
+		}
+
+		// Returns the stable UUID handle associated with this asset.
+		UUID GetID() const
+		{
+			return m_ID;
+		}
+
+		// Assigns the stable UUID handle, typically loaded from a .meta sidecar file.
+		void SetID(UUID id)
+		{
+			m_ID = id;
+		}
+
+		// Called on the main thread after loading completes; useful for GPU uploads.
+		virtual void OnLoaded()
+		{
+		}
+
+		// Called to release GPU resources and cached data. Safe to call on a Ready asset.
+		virtual void Unload()
+		{
+		}
+
+	protected:
+		std::string m_Path;
+		std::string m_Error;
+		UUID m_ID;
+		AssetType m_Type = AssetType::None;
+		std::atomic<AssetState> m_State = AssetState::None;
+	};
+
+} // namespace Chained
+
+#endif // CH_ASSET_H
\ No newline at end of file
diff --git a/engine/assets/asset_manager.cpp b/engine/assets/asset_manager.cpp
new file mode 100644
index 000000000..18fc1a643
--- /dev/null
+++ b/engine/assets/asset_manager.cpp
@@ -0,0 +1,841 @@
+#include "engine/assets/asset_manager.h"
+#include "engine/common/thread_pool.h"
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+
+#include "engine/assets/asset_metadata.h"
+#include "engine/assets/loaders/font_loader.h"
+#include "engine/assets/loaders/model_loader.h"
+#include "engine/assets/loaders/audio_loader.h"
+#include "engine/assets/loaders/material_loader.h"
+
+#include "engine/assets/loaders/texture_loader.h"
+#include "engine/assets/loaders/environment_loader.h"
+#include "engine/assets/loaders/shader_loader.h"
+#include "engine/assets/loaders/anim_graph_loader.h"
+
+#include "pack/reader.hpp"
+
+namespace Chained
+{
+	constexpr size_t kMaxAssetFinalizationsPerFrame = 32;
+	constexpr auto kMaxAssetFinalizeBudget = std::chrono::milliseconds(5);
+
+	AssetManager::AssetManager() = default;
+
+	void AssetManager::Initialize()
+	{
+		RegisterLoader(AssetType::Model, std::make_unique<ModelLoader>());
+		RegisterLoader(AssetType::Texture, std::make_unique<TextureLoader>());
+		RegisterLoader(AssetType::Shader, std::make_unique<ShaderLoader>());
+		RegisterLoader(AssetType::Environment, std::make_unique<EnvironmentLoader>());
+		RegisterLoader(AssetType::Font, std::make_unique<FontLoader>());
+		RegisterLoader(AssetType::Audio, std::make_unique<AudioLoader>());
+		RegisterLoader(AssetType::Material, std::make_unique<MaterialLoader>());
+		RegisterLoader(AssetType::AnimationGraph, std::make_unique<AnimGraphLoader>());
+	}
+
+	void AssetManager::Shutdown()
+	{
+		constexpr int kMaxIter = 5000;
+		int iter = 0;
+		while (HasBackgroundWork() && iter++ < kMaxIter)
+		{
+			FinalizePendingLoads();
+			std::this_thread::sleep_for(std::chrono::milliseconds(1));
+		}
+		if (iter >= kMaxIter)
+		{
+			CH_CORE_ERROR("AssetManager: Shutdown timed out — some assets may still be loading.");
+		}
+		if (auto* tp = ServiceLocator::TryGet<ThreadPool>())
+		{
+			tp->WaitIdle();
+		}
+	}
+
+	void AssetManager::Update(Timestep ts)
+	{
+		if (m_HotReloadInterval > 0.0f)
+		{
+			m_HotReloadAccumulator += ts.GetSeconds();
+			if (m_HotReloadAccumulator >= m_HotReloadInterval)
+			{
+				m_HotReloadAccumulator = 0.0f;
+				CheckAssetHotReload();
+			}
+		}
+
+		FinalizePendingLoads();
+	}
+
+	std::vector<uint8_t> AssetManager::TryPackFallback(const std::string& packKey) const
+	{
+		if (!m_PackOpen || m_PackReaders.empty())
+		{
+			return {};
+		}
+
+		if (packKey.rfind("assets/", 0) != 0 && packKey.rfind("resources/", 0) != 0)
+		{
+			std::string altAssets = "assets/" + packKey;
+			std::string altResources = "resources/" + packKey;
+
+			for (auto it = m_PackReaders.rbegin(); it != m_PackReaders.rend(); ++it)
+			{
+				auto& reader = *it;
+				uint64_t idx = 0;
+				if (reader->getItemIndex(altAssets.c_str(), idx))
+				{
+					std::vector<uint8_t> data;
+					reader->readItemData(idx, data);
+					return data;
+				}
+				if (reader->getItemIndex(altResources.c_str(), idx))
+				{
+					std::vector<uint8_t> data;
+					reader->readItemData(idx, data);
+					return data;
+				}
+			}
+		}
+		return {};
+	}
+
+	bool AssetManager::TryPackFallbackExists(const std::string& packKey) const
+	{
+		if (!m_PackOpen || m_PackReaders.empty())
+		{
+			return false;
+		}
+
+		if (packKey.rfind("assets/", 0) != 0 && packKey.rfind("resources/", 0) != 0)
+		{
+			std::string altAssets = "assets/" + packKey;
+			std::string altResources = "resources/" + packKey;
+
+			for (auto it = m_PackReaders.rbegin(); it != m_PackReaders.rend(); ++it)
+			{
+				auto& reader = *it;
+				uint64_t idx = 0;
+				if (reader->getItemIndex(altAssets.c_str(), idx) || reader->getItemIndex(altResources.c_str(), idx))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	std::vector<AssetManager::StaleAsset> AssetManager::CollectStaleAssets(int thresholdSeconds) const
+	{
+		CH_PROFILE_FUNCTION();
+		std::vector<StaleAsset> stale;
+
+		// Snapshot the cache under a short lock
+		std::vector<std::pair<AssetHandle, std::shared_ptr<Asset>>> snapshot;
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			snapshot.reserve(m_AssetCache.size());
+			for (const auto& [handle, asset] : m_AssetCache)
+			{
+				if (asset && asset->GetState() != AssetState::Loading)
+				{
+					snapshot.emplace_back(handle, asset);
+				}
+			}
+		}
+
+		auto now = std::filesystem::file_time_type::clock::now();
+		for (const auto& [handle, asset] : snapshot)
+		{
+			AssetType type = asset->GetType();
+			if (type != AssetType::Model && type != AssetType::Texture && type != AssetType::Material)
+			{
+				continue;
+			}
+
+			const std::string& path = asset->GetPath();
+			if (path.empty())
+			{
+				continue;
+			}
+
+			std::error_code ec;
+			auto fileTime = std::filesystem::last_write_time(path, ec);
+			if (ec)
+			{
+				continue;
+			}
+
+			auto age = std::chrono::duration_cast<std::chrono::seconds>(now - fileTime).count();
+			if (age < thresholdSeconds)
+			{
+				stale.push_back({handle, type, path});
+			}
+		}
+
+		return stale;
+	}
+
+	void AssetManager::CheckAssetHotReload()
+	{
+		auto stale = CollectStaleAssets(10);
+		for (const auto& [handle, type, path] : stale)
+		{
+			CH_CORE_INFO("AssetManager: Hot-reloading recently modified {} '{}'",
+						 type == AssetType::Model	  ? "model"
+						 : type == AssetType::Texture ? "texture"
+													  : "material",
+						 std::filesystem::path(path).filename().string());
+			ReloadAsset(handle, type);
+		}
+	}
+
+	AssetManager::~AssetManager()
+	{
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+		m_PackOpen = false;
+		m_AssetCache.clear();
+		m_PathResolver.ClearCache();
+		m_Loaders.clear();
+	}
+
+	void AssetManager::RegisterLoader(AssetType type, std::unique_ptr<IAssetLoader> loader)
+	{
+		m_Loaders[type] = std::move(loader);
+	}
+
+	bool AssetManager::ExecuteLoad(const std::shared_ptr<Asset>& asset, IAssetLoader* loader,
+								   const std::string& resolved)
+	{
+		try
+		{
+			std::string loaderError;
+			if (!loader->Load(asset, resolved, &loaderError))
+			{
+				asset->Fail(loaderError.empty() ? ("AssetManager: Load failed for '" + resolved + "'") : loaderError);
+				return false;
+			}
+
+			asset->ClearError();
+			return true;
+		} catch (const std::exception& e)
+		{
+			asset->Fail(std::string("AssetManager: Load exception for '") + resolved + "': " + e.what());
+		} catch (...)
+		{
+			asset->Fail(std::string("AssetManager: Load exception for '") + resolved + "' with unknown exception");
+		}
+		return false;
+	}
+
+	std::shared_ptr<Asset> AssetManager::LoadAsset(const std::string& path, AssetType type)
+	{
+		if (path.empty() || path.front() == '*')
+		{
+			return nullptr;
+		}
+
+		std::string resolved = ResolvePath(path);
+
+		IAssetLoader* loader = nullptr;
+		std::shared_ptr<Asset> asset;
+
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			if (auto it = m_PathResolver.ResolveToHandle(resolved); it != AssetHandle(0))
+			{
+				auto handle = it;
+				if (auto currentIt = m_AssetCache.find(handle); currentIt != m_AssetCache.end())
+				{
+					return currentIt->second;
+				}
+			}
+
+			auto loaderIt = m_Loaders.find(type);
+			if (loaderIt == m_Loaders.end())
+			{
+				CH_CORE_ERROR("AssetManager: No loader registered for type {}", (int)type);
+				return nullptr;
+			}
+
+			asset = loaderIt->second->Create();
+			if (!asset)
+			{
+				return nullptr;
+			}
+
+			loader = loaderIt->second.get();
+
+			// Load or create .meta sidecar to get a stable UUID
+			auto meta = MetaUtils::LoadOrCreateMeta(resolved, type);
+			AssetHandle stableHandle = meta.uuid;
+			asset->SetID(stableHandle);
+			asset->SetPath(resolved);
+			asset->SetState(AssetState::Loading);
+			asset->ClearError();
+			m_AssetCache[stableHandle] = asset;
+			m_PathResolver.RegisterHandle(resolved, stableHandle);
+		}
+
+		if (!loader->IsAsync())
+		{
+			if (ExecuteLoad(asset, loader, resolved))
+			{
+				asset->OnLoaded();
+				asset->SetState(AssetState::Ready);
+			}
+		}
+		else
+		{
+			if (auto* tp = ServiceLocator::TryGet<ThreadPool>())
+			{
+				tp->QueueTask([this, asset, loader, resolved]() {
+					if (ExecuteLoad(asset, loader, resolved))
+					{
+						std::lock_guard<std::mutex> lock(m_PendingMutex);
+						m_PendingAssets.push_back(asset);
+					}
+				});
+			}
+		}
+
+		return asset;
+	}
+
+	std::shared_ptr<Asset> AssetManager::GetAsset(AssetHandle handle)
+	{
+		if (handle != 0)
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			if (auto it = m_AssetCache.find(handle); it != m_AssetCache.end())
+			{
+				return it->second;
+			}
+		}
+
+		return nullptr;
+	}
+
+	void AssetManager::FinalizePendingLoads()
+	{
+		CH_PROFILE_FUNCTION();
+
+		const auto updateStart = std::chrono::steady_clock::now();
+		size_t finalizedCount = 0;
+
+		while (finalizedCount < kMaxAssetFinalizationsPerFrame)
+		{
+			std::shared_ptr<Asset> asset;
+			{
+				std::lock_guard<std::mutex> lock(m_PendingMutex);
+				if (m_PendingAssets.empty())
+				{
+					return;
+				}
+
+				asset = std::move(m_PendingAssets.front());
+				m_PendingAssets.pop_front();
+			}
+
+			if (!asset)
+			{
+				continue;
+			}
+
+			try
+			{
+				asset->ClearError();
+				asset->OnLoaded();
+				if (asset->GetState() != AssetState::Failed)
+				{
+					asset->SetState(AssetState::Ready);
+				}
+			} catch (const std::exception& e)
+			{
+				asset->Fail(std::string("AssetManager: Finalization failed for '") + asset->GetPath() +
+							"': " + e.what());
+			} catch (...)
+			{
+				asset->Fail(std::string("AssetManager: Finalization failed for '") + asset->GetPath() +
+							"' with an unknown exception");
+			}
+
+			++finalizedCount;
+
+			if ((std::chrono::steady_clock::now() - updateStart) >= kMaxAssetFinalizeBudget)
+			{
+				break;
+			}
+		}
+	}
+
+	size_t AssetManager::GetPendingFinalizeCount() const
+	{
+		std::lock_guard<std::mutex> lock(m_PendingMutex);
+		return m_PendingAssets.size();
+	}
+
+	size_t AssetManager::GetLoadingAssetCount() const
+	{
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+
+		size_t loadingCount = 0;
+		for (const auto& [handle, asset] : m_AssetCache)
+		{
+			(void)handle;
+			if (asset && asset->GetState() == AssetState::Loading)
+			{
+				++loadingCount;
+			}
+		}
+
+		return loadingCount;
+	}
+
+	bool AssetManager::HasBackgroundWork() const
+	{
+		{
+			std::lock_guard<std::mutex> lock(m_PendingMutex);
+			if (!m_PendingAssets.empty())
+			{
+				return true;
+			}
+		}
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+		for (const auto& [handle, asset] : m_AssetCache)
+		{
+			if (asset && asset->GetState() == AssetState::Loading)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	void AssetManager::ReloadAsset(AssetHandle handle, AssetType type)
+	{
+		std::shared_ptr<Asset> asset;
+		IAssetLoader* loader = nullptr;
+		std::string path;
+
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+
+			auto it = m_AssetCache.find(handle);
+			if (it == m_AssetCache.end())
+			{
+				return;
+			}
+
+			auto loaderIt = m_Loaders.find(type);
+			if (loaderIt == m_Loaders.end())
+			{
+				return;
+			}
+
+			asset = it->second;
+			loader = loaderIt->second.get();
+			path = asset->GetPath();
+			if (path.empty())
+			{
+				return;
+			}
+		}
+
+		std::string resolved = ResolvePath(path);
+		asset->SetState(AssetState::Loading);
+		if (ExecuteLoad(asset, loader, resolved))
+		{
+			asset->OnLoaded();
+			asset->SetState(AssetState::Ready);
+
+			// Update content hash in .meta after successful reload
+			if (std::filesystem::exists(resolved))
+			{
+				auto metaPath = MetaUtils::GetMetaPath(resolved);
+				if (std::filesystem::exists(metaPath))
+				{
+					auto meta = MetaUtils::ReadMeta(metaPath);
+					meta.contentHash = MetaUtils::ComputeFileHash(resolved);
+					MetaUtils::WriteMeta(metaPath, meta);
+				}
+			}
+		}
+	}
+
+	void AssetManager::Invalidate(const std::string& path, bool deleteFromDisk)
+	{
+		if (path.empty())
+		{
+			return;
+		}
+
+		std::string resolved = ResolvePath(path);
+
+		if (deleteFromDisk)
+		{
+			DeleteChasset(resolved);
+		}
+
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+
+		AssetHandle handle = m_PathResolver.ResolveToHandle(resolved);
+		if (handle != AssetHandle(0))
+		{
+			m_AssetCache.erase(handle);
+		}
+		m_PathResolver.ResetPath(path);
+
+		CH_CORE_INFO("AssetManager: Invalidated cache for '{}'", resolved);
+	}
+
+	void AssetManager::Unload(AssetHandle handle)
+	{
+		if (handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		std::shared_ptr<Asset> asset;
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			if (auto it = m_AssetCache.find(handle); it != m_AssetCache.end())
+			{
+				asset = it->second;
+			}
+		}
+
+		asset->Unload();
+
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			m_AssetCache.erase(handle);
+		}
+
+		// Remove path-to-handle mappings for this handle
+		m_PathResolver.UnregisterHandle(handle);
+
+		CH_CORE_INFO("AssetManager: Unloaded asset {}", (uint64_t)handle);
+	}
+
+	void AssetManager::Unload(const std::string& path)
+	{
+		AssetHandle handle = m_PathResolver.ResolveToHandle(path);
+		if (handle != AssetHandle(0))
+		{
+			Unload(handle);
+		}
+	}
+
+	void AssetManager::UnloadUnused()
+	{
+		std::vector<AssetHandle> toUnload;
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			for (const auto& [handle, asset] : m_AssetCache)
+			{
+				if (asset && asset.use_count() == 1)
+				{
+					toUnload.push_back(handle);
+				}
+			}
+		}
+
+		for (AssetHandle handle : toUnload)
+		{
+			Unload(handle);
+		}
+
+		if (!toUnload.empty())
+		{
+			CH_CORE_INFO("AssetManager: Unloaded {} unused assets", toUnload.size());
+		}
+	}
+
+	bool AssetManager::DeleteChasset(const std::string& path)
+	{
+		std::filesystem::path modelPath = path;
+		std::filesystem::path chassetPath = modelPath;
+		chassetPath.replace_extension(".chasset");
+
+		std::error_code ec;
+		if (std::filesystem::exists(chassetPath, ec))
+		{
+			std::filesystem::remove(chassetPath, ec);
+			if (!ec)
+			{
+				CH_CORE_INFO("AssetManager: Deleted .chasset '{}'", chassetPath.filename().string());
+				return true;
+			}
+			CH_CORE_WARN("AssetManager: Failed to delete .chasset '{}': {}", chassetPath.string(), ec.message());
+		}
+		return false;
+	}
+
+	size_t AssetManager::DeleteAllChassets()
+	{
+		if (m_PathResolver.GetAssetDirectory().empty())
+		{
+			CH_CORE_WARN("AssetManager: Asset directory not set, cannot clear .chasset cache");
+			return 0;
+		}
+
+		size_t deleted = 0;
+		std::error_code ec;
+		for (const auto& entry : std::filesystem::recursive_directory_iterator(m_PathResolver.GetAssetDirectory(), ec))
+		{
+			if (entry.is_regular_file() && entry.path().extension() == ".chasset")
+			{
+				std::filesystem::remove(entry.path(), ec);
+				if (!ec)
+				{
+					CH_CORE_INFO("AssetManager: Deleted .chasset '{}'", entry.path().filename().string());
+					++deleted;
+				}
+				else
+				{
+					CH_CORE_WARN("AssetManager: Failed to delete .chasset '{}': {}", entry.path().string(),
+								 ec.message());
+				}
+			}
+		}
+
+		CH_CORE_INFO("AssetManager: Cleared .chasset cache ({} file(s) deleted)", deleted);
+
+		if (deleted > 0)
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			m_AssetCache.clear();
+			m_PathResolver.ClearCache();
+		}
+
+		return deleted;
+	}
+
+	std::vector<std::string> AssetManager::GetStaleAssets() const
+	{
+		auto stale = CollectStaleAssets(30);
+		std::vector<std::string> paths;
+		paths.reserve(stale.size());
+		for (auto& s : stale)
+		{
+			paths.push_back(std::move(s.path));
+		}
+		return paths;
+	}
+
+	size_t AssetManager::ReloadAllStale()
+	{
+		auto stale = CollectStaleAssets(30);
+		for (const auto& [handle, type, path] : stale)
+		{
+			ReloadAsset(handle, type);
+		}
+
+		if (!stale.empty())
+		{
+			CH_CORE_INFO("AssetManager: Reloaded {} stale assets", stale.size());
+		}
+
+		return stale.size();
+	}
+
+	bool AssetManager::OpenPack(const std::filesystem::path& packPath)
+	{
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+
+		for (const auto& p : m_OpenedPackPaths)
+		{
+			if (p == packPath)
+			{
+				return true;
+			}
+		}
+
+		if (!std::filesystem::exists(packPath))
+		{
+			CH_CORE_WARN("AssetManager: Pack file not found: {}", packPath.string());
+			return false;
+		}
+
+		try
+		{
+			auto reader = std::make_unique<pack::Reader>(packPath);
+			CH_CORE_INFO("AssetManager: Opened pack '{}' ({} items)", packPath.string(), reader->getItemCount());
+			m_OpenedPackPaths.push_back(packPath);
+			m_PackReaders.push_back(std::move(reader));
+			m_PackOpen = true;
+			return true;
+		} catch (const pack::Error& err)
+		{
+			CH_CORE_ERROR("AssetManager: Failed to open pack '{}': {}", packPath.string(), err.what());
+			return false;
+		}
+	}
+
+	size_t AssetManager::OpenAllPacksInDirectory(const std::filesystem::path& dir)
+	{
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+		std::error_code ec;
+		if (!std::filesystem::exists(dir, ec) || !std::filesystem::is_directory(dir, ec))
+		{
+			return 0;
+		}
+
+		std::vector<std::filesystem::path> packFiles;
+		for (const auto& entry : std::filesystem::directory_iterator(dir, ec))
+		{
+			if (entry.is_regular_file() && entry.path().extension() == ".pack")
+			{
+				packFiles.push_back(entry.path());
+			}
+		}
+
+		std::sort(packFiles.begin(), packFiles.end());
+
+		size_t openedCount = 0;
+		for (const auto& p : packFiles)
+		{
+			if (OpenPack(p))
+			{
+				++openedCount;
+			}
+		}
+
+		return openedCount;
+	}
+
+	void AssetManager::CloseAllPacks()
+	{
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+		m_PackReaders.clear();
+		m_OpenedPackPaths.clear();
+		m_PackOpen = false;
+	}
+
+	std::vector<uint8_t> AssetManager::ReadAssetData(const std::string& assetPath)
+	{
+		{
+			std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+			if (m_PackOpen && !m_PackReaders.empty())
+			{
+				std::string packKey = m_PathResolver.ResolvePackKey(assetPath);
+
+				for (auto it = m_PackReaders.rbegin(); it != m_PackReaders.rend(); ++it)
+				{
+					auto& reader = *it;
+					uint64_t idx = 0;
+					if (reader->getItemIndex(packKey.c_str(), idx))
+					{
+						std::vector<uint8_t> data;
+						reader->readItemData(idx, data);
+						return data;
+					}
+				}
+
+				auto data = TryPackFallback(packKey);
+				if (!data.empty())
+				{
+					return data;
+				}
+			}
+		}
+
+		std::ifstream file(assetPath, std::ios::binary | std::ios::ate);
+		if (file.is_open())
+		{
+			auto size = file.tellg();
+			file.seekg(0);
+			std::vector<uint8_t> data(static_cast<size_t>(size));
+			file.read(reinterpret_cast<char*>(data.data()), size);
+			return data;
+		}
+
+		return {};
+	}
+
+	std::string AssetManager::ReadText(const std::string& path)
+	{
+		auto data = ReadAssetData(path);
+		if (data.empty())
+		{
+			return {};
+		}
+		return std::string(data.begin(), data.end());
+	}
+
+	bool AssetManager::FileExists(const std::string& path) const
+	{
+		std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
+		if (m_PackOpen && !m_PackReaders.empty())
+		{
+			std::string packKey = m_PathResolver.ResolvePackKey(path);
+
+			for (auto it = m_PackReaders.rbegin(); it != m_PackReaders.rend(); ++it)
+			{
+				auto& reader = *it;
+				uint64_t idx = 0;
+				if (reader->getItemIndex(packKey.c_str(), idx))
+				{
+					return true;
+				}
+			}
+
+			if (TryPackFallbackExists(packKey))
+			{
+				return true;
+			}
+		}
+
+		std::error_code ec;
+		std::string resolved = ResolvePath(path);
+		if (!resolved.empty() && std::filesystem::exists(resolved, ec))
+		{
+			return true;
+		}
+		return std::filesystem::exists(path, ec);
+	}
+
+	bool AssetManager::HasAsset(const std::string& path) const
+	{
+		return FileExists(path);
+	}
+
+	void AssetManager::EnumeratePackedPaths(const std::function<void(std::string_view)>& callback) const
+	{
+		if (!m_PackOpen || m_PackReaders.empty())
+		{
+			return;
+		}
+		std::unordered_set<std::string_view> seen;
+		for (const auto& reader : m_PackReaders)
+		{
+			const uint64_t count = reader->getItemCount();
+			for (uint64_t i = 0; i < count; ++i)
+			{
+				std::string_view itemPath = reader->getItemPath(i);
+				if (seen.insert(itemPath).second)
+				{
+					callback(itemPath);
+				}
+			}
+		}
+	}
+
+	std::vector<uint8_t> AssetManager::ReadProjectAsset(const std::filesystem::path& absolutePath)
+	{
+		if (!m_PackOpen || m_PackReaders.empty() || m_PathResolver.GetProjectDirectory().empty())
+		{
+			return {};
+		}
+		std::error_code ec;
+		auto rel = std::filesystem::relative(absolutePath, m_PathResolver.GetProjectDirectory(), ec);
+		if (ec || rel.empty())
+		{
+			return {};
+		}
+		return ReadAssetData(rel.generic_string());
+	}
+
+} // namespace Chained
diff --git a/engine/assets/asset_manager.h b/engine/assets/asset_manager.h
new file mode 100644
index 000000000..721952b10
--- /dev/null
+++ b/engine/assets/asset_manager.h
@@ -0,0 +1,179 @@
+#ifndef CH_ASSET_MANAGER_H
+#define CH_ASSET_MANAGER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/asset_path_resolver.h"
+#include "engine/core/service.h"
+#include "engine/common/timestep.h"
+#include <filesystem>
+#include <deque>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <vector>
+
+namespace pack
+{
+	class Reader;
+}
+
+namespace Chained
+{
+
+	class AssetManager : public Service
+	{
+	public:
+		AssetManager();
+		~AssetManager();
+		virtual void Initialize();
+		virtual void Shutdown();
+		void Update(Timestep ts);
+
+		void RegisterLoader(AssetType type, std::unique_ptr<IAssetLoader> loader);
+
+		void Unload(AssetHandle handle);
+		void Unload(const std::string& path);
+		void UnloadUnused();
+
+		void SetAssetDirectory(const std::filesystem::path& path)
+		{
+			m_PathResolver.SetAssetDirectory(path);
+		}
+		void SetProjectDirectory(const std::filesystem::path& path)
+		{
+			m_PathResolver.SetProjectDirectory(path);
+		}
+		void SetEngineRoot(const std::filesystem::path& path)
+		{
+			m_PathResolver.SetEngineRoot(path);
+		}
+
+		bool OpenPack(const std::filesystem::path& packPath);
+		size_t OpenAllPacksInDirectory(const std::filesystem::path& dir);
+		void CloseAllPacks();
+		size_t GetOpenPackCount() const
+		{
+			return m_PackReaders.size();
+		}
+		bool IsPacked() const
+		{
+			return m_PackOpen;
+		}
+		std::vector<uint8_t> ReadAssetData(const std::string& assetPath);
+		std::string ReadText(const std::string& path);
+		bool HasAsset(const std::string& path) const;
+		bool FileExists(const std::string& path) const;
+		void EnumeratePackedPaths(const std::function<void(std::string_view)>& callback) const;
+		std::vector<uint8_t> ReadProjectAsset(const std::filesystem::path& absolutePath);
+
+		const std::filesystem::path& GetAssetDirectory() const
+		{
+			return m_PathResolver.GetAssetDirectory();
+		}
+		const std::filesystem::path& GetProjectDirectory() const
+		{
+			return m_PathResolver.GetProjectDirectory();
+		}
+		const std::filesystem::path& GetEngineRoot() const
+		{
+			return m_PathResolver.GetEngineRoot();
+		}
+
+		std::string ResolvePath(const std::string& path) const
+		{
+			return m_PathResolver.ResolvePath(path);
+		}
+		AssetHandle ResolveToHandle(const std::string& path) const
+		{
+			return m_PathResolver.ResolveToHandle(path);
+		}
+
+		template <typename T> std::shared_ptr<T> Get(const std::string& path)
+		{
+			return Load<T>(path);
+		}
+
+		template <typename T> std::shared_ptr<T> Get(AssetHandle handle)
+		{
+			return std::static_pointer_cast<T>(GetAsset(handle));
+		}
+
+		template <typename T> std::shared_ptr<T> GetByUUID(uint64_t uuid)
+		{
+			return std::static_pointer_cast<T>(GetAsset(AssetHandle(uuid)));
+		}
+
+		template <typename T> std::shared_ptr<T> Load(const std::string& path)
+		{
+			return std::static_pointer_cast<T>(LoadAsset(path, T::GetStaticType()));
+		}
+
+		size_t GetPendingFinalizeCount() const;
+		size_t GetLoadingAssetCount() const;
+		bool HasBackgroundWork() const;
+
+		void FinalizePendingLoads();
+
+		void SetHotReloadInterval(float seconds)
+		{
+			m_HotReloadInterval = seconds;
+		}
+		float GetHotReloadInterval() const
+		{
+			return m_HotReloadInterval;
+		}
+
+		template <typename T> void Reload(const std::string& path)
+		{
+			AssetHandle handle = ResolveToHandle(path);
+			ReloadAsset(handle, T::GetStaticType());
+		}
+
+		void Invalidate(const std::string& path, bool deleteFromDisk = false);
+		bool DeleteChasset(const std::string& path);
+		size_t DeleteAllChassets();
+
+		std::vector<std::string> GetStaleAssets() const;
+		size_t ReloadAllStale();
+
+		std::shared_ptr<Asset> GetAsset(AssetHandle handle);
+		std::shared_ptr<Asset> LoadAsset(const std::string& path, AssetType type);
+
+	private:
+		struct StaleAsset
+		{
+			AssetHandle handle;
+			AssetType type;
+			std::string path;
+		};
+
+		void ReloadAsset(AssetHandle handle, AssetType type);
+		void CheckAssetHotReload();
+		std::vector<StaleAsset> CollectStaleAssets(int thresholdSeconds) const;
+		bool ExecuteLoad(const std::shared_ptr<Asset>& asset, IAssetLoader* loader, const std::string& resolved);
+
+		std::vector<uint8_t> TryPackFallback(const std::string& packKey) const;
+		bool TryPackFallbackExists(const std::string& packKey) const;
+
+		std::unordered_map<AssetHandle, std::shared_ptr<Asset>> m_AssetCache;
+		std::unordered_map<AssetType, std::unique_ptr<IAssetLoader>> m_Loaders;
+
+		mutable std::deque<std::shared_ptr<Asset>> m_PendingAssets;
+		mutable std::mutex m_PendingMutex;
+		mutable std::recursive_mutex m_AssetLock;
+
+		AssetPathResolver m_PathResolver;
+
+		std::vector<std::unique_ptr<pack::Reader>> m_PackReaders;
+		std::vector<std::filesystem::path> m_OpenedPackPaths;
+		bool m_PackOpen = false;
+
+		float m_HotReloadInterval = 3.0f;
+		float m_HotReloadAccumulator = 0.0f;
+	};
+} // namespace Chained
+
+#endif // CH_ASSET_MANAGER_H
diff --git a/engine/assets/asset_metadata.cpp b/engine/assets/asset_metadata.cpp
new file mode 100644
index 000000000..10de237e5
--- /dev/null
+++ b/engine/assets/asset_metadata.cpp
@@ -0,0 +1,266 @@
+#include "engine/assets/asset_metadata.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+
+namespace Chained
+{
+
+	std::filesystem::path MetaUtils::GetMetaPath(const std::filesystem::path& assetPath)
+	{
+		return assetPath.string() + ".meta";
+	}
+
+	bool MetaUtils::HasMeta(const std::filesystem::path& assetPath)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am && am->IsPacked())
+		{
+			std::filesystem::path metaPath = GetMetaPath(assetPath);
+			if (am->FileExists(metaPath.string()))
+			{
+				return true;
+			}
+		}
+		return std::filesystem::exists(GetMetaPath(assetPath));
+	}
+
+	uint64_t MetaUtils::ComputeFileHash(const std::filesystem::path& path)
+	{
+		constexpr size_t kChunkSize = 65536;
+		std::ifstream file(path, std::ios::binary);
+		if (!file.is_open())
+		{
+			return 0;
+		}
+		uint64_t hash = UINT64_C(14695981039346656037);
+		char buf[kChunkSize];
+		while (file.read(buf, kChunkSize) || file.gcount() > 0)
+		{
+			auto count = static_cast<size_t>(file.gcount());
+			for (size_t i = 0; i < count; ++i)
+			{
+				hash = (hash ^ static_cast<uint64_t>(static_cast<unsigned char>(buf[i]))) * 1099511628211ULL;
+			}
+			if (count < kChunkSize)
+			{
+				break;
+			}
+		}
+		return hash;
+	}
+
+	uint64_t MetaUtils::ComputeHashFromBuffer(const std::vector<uint8_t>& data)
+	{
+		uint64_t hash = UINT64_C(14695981039346656037);
+		for (size_t i = 0; i < data.size(); ++i)
+		{
+			hash = (hash ^ static_cast<uint64_t>(data[i])) * 1099511628211ULL;
+		}
+		return hash;
+	}
+
+	namespace
+	{
+		constexpr const char* kAssetTypeNames[] = {
+			"None",		"Model", "Texture", "Audio",  "Shader",			"Environment",
+			"Material", "Font",	 "Scene",	"Script", "AnimationGraph",
+		};
+
+		static_assert(sizeof(kAssetTypeNames) / sizeof(kAssetTypeNames[0]) ==
+						  static_cast<size_t>(AssetType::AnimationGraph) + 1,
+					  "kAssetTypeNames size does not match AssetType enum");
+
+		const char* AssetTypeToString(AssetType type)
+		{
+			auto idx = static_cast<size_t>(type);
+			return idx < sizeof(kAssetTypeNames) / sizeof(kAssetTypeNames[0]) ? kAssetTypeNames[idx] : "Unknown";
+		}
+
+		AssetType StringToAssetType(const std::string& str)
+		{
+			for (size_t i = 0; i < sizeof(kAssetTypeNames) / sizeof(kAssetTypeNames[0]); ++i)
+			{
+				if (str == kAssetTypeNames[i])
+				{
+					return static_cast<AssetType>(i);
+				}
+			}
+			return AssetType::None;
+		}
+	} // namespace
+
+	AssetMetadata MetaUtils::ReadMetaFromString(std::string_view yamlContent)
+	{
+		AssetMetadata meta;
+		try
+		{
+			YAML::Node root = YAML::Load(std::string(yamlContent));
+
+			meta.version = root["Version"] ? root["Version"].as<uint32_t>() : 1;
+			meta.contentHash = root["ContentHash"] ? root["ContentHash"].as<uint64_t>() : 0;
+			meta.isGenerated = root["IsGenerated"] ? root["IsGenerated"].as<bool>() : false;
+
+			if (root["UUID"])
+			{
+				meta.uuid = UUID(root["UUID"].as<uint64_t>());
+			}
+
+			if (root["Type"])
+			{
+				meta.assetType = StringToAssetType(root["Type"].as<std::string>());
+			}
+
+			if (root["ImporterSettings"])
+			{
+				meta.importerSettingsYaml = YAML::Dump(root["ImporterSettings"]);
+			}
+
+			if (root["Tags"] && root["Tags"].IsSequence())
+			{
+				for (auto tag : root["Tags"])
+				{
+					meta.tags.push_back(tag.as<std::string>());
+				}
+			}
+		} catch (const YAML::Exception& e)
+		{
+			CH_CORE_ERROR("Failed to parse meta YAML: {}", e.what());
+			return {};
+		}
+		return meta;
+	}
+
+	AssetMetadata MetaUtils::ReadMeta(const std::filesystem::path& metaPath)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am && am->IsPacked())
+		{
+			auto metaData = am->ReadAssetData(metaPath.string());
+			if (!metaData.empty())
+			{
+				std::string content(metaData.begin(), metaData.end());
+				return ReadMetaFromString(content);
+			}
+		}
+
+		AssetMetadata meta;
+		try
+		{
+			YAML::Node root = YAML::LoadFile(metaPath.string());
+
+			meta.version = root["Version"] ? root["Version"].as<uint32_t>() : 1;
+			meta.contentHash = root["ContentHash"] ? root["ContentHash"].as<uint64_t>() : 0;
+			meta.isGenerated = root["IsGenerated"] ? root["IsGenerated"].as<bool>() : false;
+
+			if (root["UUID"])
+			{
+				meta.uuid = UUID(root["UUID"].as<uint64_t>());
+			}
+
+			if (root["Type"])
+			{
+				meta.assetType = StringToAssetType(root["Type"].as<std::string>());
+			}
+
+			if (root["ImporterSettings"])
+			{
+				meta.importerSettingsYaml = YAML::Dump(root["ImporterSettings"]);
+			}
+
+			if (root["Tags"] && root["Tags"].IsSequence())
+			{
+				for (auto tag : root["Tags"])
+				{
+					meta.tags.push_back(tag.as<std::string>());
+				}
+			}
+		} catch (const YAML::Exception& e)
+		{
+			CH_CORE_ERROR("Failed to parse meta file {}: {}", metaPath.string(), e.what());
+			return {};
+		}
+		return meta;
+	}
+
+	bool MetaUtils::WriteMeta(const std::filesystem::path& metaPath, const AssetMetadata& meta)
+	{
+		try
+		{
+			YAML::Emitter out;
+			out << YAML::BeginMap;
+			out << YAML::Key << "Version" << YAML::Value << meta.version;
+			out << YAML::Key << "UUID" << YAML::Value << static_cast<uint64_t>(meta.uuid);
+			out << YAML::Key << "Type" << YAML::Value << AssetTypeToString(meta.assetType);
+			out << YAML::Key << "ContentHash" << YAML::Value << meta.contentHash;
+			out << YAML::Key << "IsGenerated" << YAML::Value << meta.isGenerated;
+
+			if (!meta.tags.empty())
+			{
+				out << YAML::Key << "Tags" << YAML::Value << YAML::BeginSeq;
+				for (const auto& tag : meta.tags)
+				{
+					out << tag;
+				}
+				out << YAML::EndSeq;
+			}
+
+			if (!meta.importerSettingsYaml.empty())
+			{
+				out << YAML::Key << "ImporterSettings" << YAML::Value << YAML::Load(meta.importerSettingsYaml);
+			}
+
+			out << YAML::EndMap;
+
+			std::ofstream file(metaPath);
+			if (!file.is_open())
+			{
+				CH_CORE_ERROR("Failed to open meta file for writing: {}", metaPath.string());
+				return false;
+			}
+			file << out.c_str();
+			return true;
+		} catch (const YAML::Exception& e)
+		{
+			CH_CORE_ERROR("Failed to write meta file {}: {}", metaPath.string(), e.what());
+			return false;
+		}
+	}
+
+	AssetMetadata MetaUtils::LoadOrCreateMeta(const std::filesystem::path& assetPath, AssetType type)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am && am->IsPacked())
+		{
+			std::filesystem::path metaPath = GetMetaPath(assetPath);
+			if (am->FileExists(metaPath.string()))
+			{
+				return ReadMeta(metaPath);
+			}
+		}
+
+		std::filesystem::path metaPath = GetMetaPath(assetPath);
+
+		if (std::filesystem::exists(metaPath))
+		{
+			AssetMetadata meta = ReadMeta(metaPath);
+
+			uint64_t currentHash = ComputeFileHash(assetPath);
+			if (currentHash != 0 && meta.contentHash != currentHash)
+			{
+				meta.contentHash = currentHash;
+				WriteMeta(metaPath, meta);
+			}
+			return meta;
+		}
+
+		AssetMetadata meta;
+		meta.uuid = UUID();
+		meta.assetType = type;
+		meta.contentHash = ComputeFileHash(assetPath);
+		meta.isGenerated = true;
+
+		WriteMeta(metaPath, meta);
+		return meta;
+	}
+
+} // namespace Chained
diff --git a/engine/assets/asset_metadata.h b/engine/assets/asset_metadata.h
new file mode 100644
index 000000000..99834780f
--- /dev/null
+++ b/engine/assets/asset_metadata.h
@@ -0,0 +1,37 @@
+#ifndef CH_ASSET_METADATA_H
+#define CH_ASSET_METADATA_H
+
+#include "engine/assets/asset.h"
+#include "engine/common/uuid.h"
+#include <filesystem>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace Chained
+{
+	struct AssetMetadata
+	{
+		uint32_t version = 1;
+		UUID uuid;
+		AssetType assetType = AssetType::None;
+		uint64_t contentHash = 0;
+		std::string importerSettingsYaml;
+		std::vector<std::string> tags;
+		bool isGenerated = false;
+	};
+
+	namespace MetaUtils
+	{
+		std::filesystem::path GetMetaPath(const std::filesystem::path& assetPath);
+		bool HasMeta(const std::filesystem::path& assetPath);
+		uint64_t ComputeFileHash(const std::filesystem::path& path);
+		uint64_t ComputeHashFromBuffer(const std::vector<uint8_t>& data);
+		AssetMetadata ReadMeta(const std::filesystem::path& metaPath);
+		AssetMetadata ReadMetaFromString(std::string_view yamlContent);
+		bool WriteMeta(const std::filesystem::path& metaPath, const AssetMetadata& meta);
+		AssetMetadata LoadOrCreateMeta(const std::filesystem::path& assetPath, AssetType type);
+	} // namespace MetaUtils
+} // namespace Chained
+
+#endif
diff --git a/engine/assets/asset_path_resolver.cpp b/engine/assets/asset_path_resolver.cpp
new file mode 100644
index 000000000..2e77eb1ee
--- /dev/null
+++ b/engine/assets/asset_path_resolver.cpp
@@ -0,0 +1,178 @@
+#include "engine/assets/asset_path_resolver.h"
+
+namespace Chained
+{
+
+	std::string AssetPathResolver::ResolvePackKey(const std::string& assetPath) const
+	{
+		auto NormalizeSlashes = [](std::string& s) { std::replace(s.begin(), s.end(), '\\', '/'); };
+
+		auto StripPrefix = [](std::string& input, const std::filesystem::path& base) {
+			if (base.empty())
+			{
+				return;
+			}
+			std::string basePath = base.generic_string();
+			if (!basePath.empty() && basePath.back() != '/')
+			{
+				basePath += '/';
+			}
+			if (input.size() >= basePath.size() && input.compare(0, basePath.size(), basePath) == 0)
+			{
+				input = input.substr(basePath.size());
+			}
+		};
+
+		std::string packKey = assetPath;
+		NormalizeSlashes(packKey);
+		StripPrefix(packKey, m_EngineRoot);
+
+		// Strip the "engine/" virtual prefix — pack stores engine resources
+		// under "resources/" directly, not "engine/resources/".
+		if (packKey.rfind("engine/", 0) == 0)
+		{
+			packKey = packKey.substr(7);
+		}
+
+		StripPrefix(packKey, m_ProjectDirectory);
+
+		packKey = std::filesystem::path(packKey).lexically_normal().generic_string();
+		return packKey;
+	}
+
+	std::string AssetPathResolver::ResolvePath(const std::string& path) const
+	{
+		if (path.empty())
+		{
+			return "";
+		}
+
+		{
+			std::lock_guard<std::mutex> lock(m_PathMutex);
+			if (auto it = m_PathCache.find(path); it != m_PathCache.end())
+			{
+				return it->second;
+			}
+		}
+
+		std::filesystem::path inputPath(path);
+		std::filesystem::path resolvedPath;
+
+		if (inputPath.is_absolute())
+		{
+			resolvedPath = inputPath;
+		}
+		else
+		{
+			std::string pathStr = inputPath.generic_string();
+			bool isEngineResource = false;
+			if (pathStr.find("engine/") == 0)
+			{
+				pathStr = pathStr.substr(7);
+				isEngineResource = true;
+			}
+
+			if (isEngineResource)
+			{
+				if (!m_EngineRoot.empty())
+				{
+					std::filesystem::path candidate = m_EngineRoot / pathStr;
+					if (std::filesystem::exists(candidate))
+					{
+						resolvedPath = candidate;
+					}
+				}
+			}
+			else
+			{
+				if (!m_AssetDirectory.empty())
+				{
+					std::filesystem::path candidate = m_AssetDirectory / pathStr;
+					if (std::filesystem::exists(candidate))
+					{
+						resolvedPath = candidate;
+					}
+				}
+
+				if (resolvedPath.empty() && !m_ProjectDirectory.empty())
+				{
+					std::filesystem::path candidate = m_ProjectDirectory / pathStr;
+					if (std::filesystem::exists(candidate))
+					{
+						resolvedPath = candidate;
+					}
+				}
+			}
+
+			if (resolvedPath.empty())
+			{
+				if (!isEngineResource && !m_AssetDirectory.empty())
+				{
+					resolvedPath = m_AssetDirectory / pathStr;
+				}
+				else if (!m_EngineRoot.empty())
+				{
+					resolvedPath = m_EngineRoot / pathStr;
+				}
+				else
+				{
+					resolvedPath = m_ProjectDirectory / pathStr;
+				}
+			}
+		}
+
+		std::string resolved = std::filesystem::absolute(resolvedPath).lexically_normal().generic_string();
+
+		std::lock_guard<std::mutex> lock(m_PathMutex);
+		m_PathCache[path] = resolved;
+		return resolved;
+	}
+
+	void AssetPathResolver::RegisterHandle(const std::string& path, AssetHandle handle)
+	{
+		std::string resolved = ResolvePath(path);
+		std::lock_guard<std::mutex> lock(m_PathMutex);
+		m_PathToHandle[resolved] = handle;
+	}
+
+	void AssetPathResolver::UnregisterHandle(AssetHandle handle)
+	{
+		std::lock_guard<std::mutex> lock(m_PathMutex);
+		for (auto it = m_PathToHandle.begin(); it != m_PathToHandle.end();)
+		{
+			if (it->second == handle)
+			{
+				it = m_PathToHandle.erase(it);
+			}
+			else
+			{
+				++it;
+			}
+		}
+	}
+
+	AssetHandle AssetPathResolver::ResolveToHandle(const std::string& path) const
+	{
+		std::string resolved = ResolvePath(path);
+		std::lock_guard<std::mutex> lock(m_PathMutex);
+		if (auto it = m_PathToHandle.find(resolved); it != m_PathToHandle.end())
+		{
+			return it->second;
+		}
+		return AssetHandle(0);
+	}
+
+	void AssetPathResolver::ResetPath(const std::string& path)
+	{
+		std::lock_guard<std::mutex> lock(m_PathMutex);
+		m_PathCache.erase(path);
+	}
+
+	void AssetPathResolver::ClearCache()
+	{
+		std::lock_guard<std::mutex> lock(m_PathMutex);
+		m_PathCache.clear();
+		m_PathToHandle.clear();
+	}
+
+} // namespace Chained
diff --git a/engine/assets/asset_path_resolver.h b/engine/assets/asset_path_resolver.h
new file mode 100644
index 000000000..e76c3247d
--- /dev/null
+++ b/engine/assets/asset_path_resolver.h
@@ -0,0 +1,66 @@
+#ifndef CH_ASSET_PATH_RESOLVER_H
+#define CH_ASSET_PATH_RESOLVER_H
+
+#include "engine/assets/asset.h"
+#include <filesystem>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace Chained
+{
+
+	class AssetPathResolver
+	{
+	public:
+		void SetAssetDirectory(const std::filesystem::path& path)
+		{
+			m_AssetDirectory = path;
+		}
+		void SetProjectDirectory(const std::filesystem::path& path)
+		{
+			m_ProjectDirectory = path;
+		}
+		void SetEngineRoot(const std::filesystem::path& path)
+		{
+			m_EngineRoot = path;
+		}
+
+	public:
+		std::string ResolvePath(const std::string& path) const;
+		AssetHandle ResolveToHandle(const std::string& path) const;
+		void RegisterHandle(const std::string& path, AssetHandle handle);
+		void UnregisterHandle(AssetHandle handle);
+
+		void ResetPath(const std::string& path);
+		void ClearCache();
+
+		std::string ResolvePackKey(const std::string& assetPath) const;
+
+	public:
+		const std::filesystem::path& GetAssetDirectory() const
+		{
+			return m_AssetDirectory;
+		}
+		const std::filesystem::path& GetProjectDirectory() const
+		{
+			return m_ProjectDirectory;
+		}
+		const std::filesystem::path& GetEngineRoot() const
+		{
+			return m_EngineRoot;
+		}
+
+	private:
+		mutable std::mutex m_PathMutex;
+		mutable std::unordered_map<std::string, std::string> m_PathCache;
+		mutable std::unordered_map<std::string, AssetHandle> m_PathToHandle;
+
+		std::filesystem::path m_AssetDirectory;
+		std::filesystem::path m_ProjectDirectory;
+		std::filesystem::path m_EngineRoot;
+	};
+
+} // namespace Chained
+
+#endif // CH_ASSET_PATH_RESOLVER_H
diff --git a/engine/assets/loaders/anim_graph_loader.cpp b/engine/assets/loaders/anim_graph_loader.cpp
new file mode 100644
index 000000000..8e7a1e5df
--- /dev/null
+++ b/engine/assets/loaders/anim_graph_loader.cpp
@@ -0,0 +1,295 @@
+#include "anim_graph_loader.h"
+#include "engine/scene/components/animation/animation_component.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+
+namespace Chained
+{
+
+	std::shared_ptr<Asset> AnimGraphLoader::Create()
+	{
+		return std::make_shared<AnimationGraphAsset>();
+	}
+
+	bool AnimGraphLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		auto graph = std::dynamic_pointer_cast<AnimationGraphAsset>(asset);
+		if (!graph)
+		{
+			if (outError)
+			{
+				*outError = "Asset is not an AnimationGraphAsset";
+			}
+			return false;
+		}
+
+		try
+		{
+			std::string content;
+
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				content = am->ReadText(resolvedPath);
+			}
+
+			if (content.empty())
+			{
+				std::ifstream stream(resolvedPath);
+				if (!stream.is_open())
+				{
+					if (outError)
+					{
+						*outError = "AnimGraphLoader: File not found: " + resolvedPath;
+					}
+					return false;
+				}
+				std::stringstream ss;
+				ss << stream.rdbuf();
+				content = ss.str();
+			}
+
+			YAML::Node data = YAML::Load(content);
+			if (!data["AnimationGraph"])
+			{
+				if (outError)
+				{
+					*outError = "Invalid AnimGraph format";
+				}
+				return false;
+			}
+
+			graph->Nodes.clear();
+			graph->Transitions.clear();
+
+			auto root = data["AnimationGraph"];
+			if (root["EntryNodeID"])
+			{
+				graph->EntryNodeID = root["EntryNodeID"].as<int>();
+			}
+			if (root["NextNodeID"])
+			{
+				graph->NextNodeID = root["NextNodeID"].as<int>();
+			}
+			if (root["NextLinkID"])
+			{
+				graph->NextLinkID = root["NextLinkID"].as<int>();
+			}
+
+			if (auto nodes = root["Nodes"])
+			{
+				for (auto n : nodes)
+				{
+					AnimNode node;
+					if (n["ID"])
+					{
+						node.ID = n["ID"].as<int>();
+					}
+					if (n["Name"])
+					{
+						node.Name = n["Name"].as<std::string>();
+					}
+					if (n["AnimationIndex"])
+					{
+						node.AnimationIndex = n["AnimationIndex"].as<int>();
+					}
+					if (n["IsLooping"])
+					{
+						node.IsLooping = n["IsLooping"].as<bool>();
+					}
+					if (n["StartFrame"])
+					{
+						node.StartFrame = n["StartFrame"].as<int>();
+					}
+					if (n["EndFrame"])
+					{
+						node.EndFrame = n["EndFrame"].as<int>();
+					}
+					if (n["Speed"])
+					{
+						node.Speed = n["Speed"].as<float>();
+					}
+					if (n["EditorX"])
+					{
+						node.EditorX = n["EditorX"].as<float>();
+					}
+					if (n["EditorY"])
+					{
+						node.EditorY = n["EditorY"].as<float>();
+					}
+					graph->Nodes.push_back(node);
+				}
+			}
+
+			if (auto links = root["Transitions"])
+			{
+				for (auto l : links)
+				{
+					AnimTransition tr;
+					if (l["ID"])
+					{
+						tr.ID = l["ID"].as<int>();
+					}
+					if (l["SourceNodeID"])
+					{
+						tr.SourceNodeID = l["SourceNodeID"].as<int>();
+					}
+					if (l["TargetNodeID"])
+					{
+						tr.TargetNodeID = l["TargetNodeID"].as<int>();
+					}
+					if (l["BlendDuration"])
+					{
+						tr.BlendDuration = l["BlendDuration"].as<float>();
+					}
+					if (l["HasExitTime"])
+					{
+						tr.HasExitTime = l["HasExitTime"].as<bool>();
+					}
+					if (l["ExitTime"])
+					{
+						tr.ExitTime = l["ExitTime"].as<float>();
+					}
+					if (l["Priority"])
+					{
+						tr.Priority = l["Priority"].as<int>();
+					}
+					if (l["ExitTimeMode"])
+					{
+						tr.ExitTimeMode = (decltype(tr.ExitTimeMode))l["ExitTimeMode"].as<int>();
+					}
+
+					if (auto conds = l["Conditions"])
+					{
+						for (auto c : conds)
+						{
+							AnimCondition cond;
+							if (c["VariableName"])
+							{
+								cond.VariableName = c["VariableName"].as<std::string>();
+							}
+							if (c["Op"])
+							{
+								cond.Op = (AnimConditionOp)c["Op"].as<int>();
+							}
+							if (c["Value"])
+							{
+								cond.Value = c["Value"].as<float>();
+							}
+							tr.Conditions.push_back(cond);
+						}
+					}
+					graph->Transitions.push_back(tr);
+				}
+			}
+			// Load DefaultVariables (schema: name -> default value)
+			if (auto vars = root["Variables"])
+			{
+				for (auto it = vars.begin(); it != vars.end(); ++it)
+				{
+					graph->DefaultVariables[it->first.as<std::string>()] = it->second.as<float>();
+				}
+			}
+
+			return true;
+		} catch (const YAML::Exception& e)
+		{
+			if (outError)
+			{
+				*outError = std::string("YAML Exception: ") + e.what();
+			}
+			return false;
+		}
+	}
+
+	bool AnimGraphLoader::Save(const AnimationGraphAsset& graph, const std::string& path)
+	{
+		try
+		{
+			YAML::Emitter out;
+			out << YAML::BeginMap;
+			out << YAML::Key << "AnimationGraph" << YAML::Value << YAML::BeginMap;
+
+			out << YAML::Key << "EntryNodeID" << YAML::Value << graph.EntryNodeID;
+			out << YAML::Key << "NextNodeID" << YAML::Value << graph.NextNodeID;
+			out << YAML::Key << "NextLinkID" << YAML::Value << graph.NextLinkID;
+
+			out << YAML::Key << "Nodes" << YAML::Value << YAML::BeginSeq;
+			for (const auto& node : graph.Nodes)
+			{
+				out << YAML::BeginMap;
+				out << YAML::Key << "ID" << YAML::Value << node.ID;
+				out << YAML::Key << "Name" << YAML::Value << node.Name;
+				out << YAML::Key << "AnimationIndex" << YAML::Value << node.AnimationIndex;
+				out << YAML::Key << "IsLooping" << YAML::Value << node.IsLooping;
+				out << YAML::Key << "StartFrame" << YAML::Value << node.StartFrame;
+				out << YAML::Key << "EndFrame" << YAML::Value << node.EndFrame;
+				out << YAML::Key << "Speed" << YAML::Value << node.Speed;
+				out << YAML::Key << "EditorX" << YAML::Value << node.EditorX;
+				out << YAML::Key << "EditorY" << YAML::Value << node.EditorY;
+				out << YAML::EndMap;
+			}
+			out << YAML::EndSeq;
+
+			out << YAML::Key << "Transitions" << YAML::Value << YAML::BeginSeq;
+			for (const auto& tr : graph.Transitions)
+			{
+				out << YAML::BeginMap;
+				out << YAML::Key << "ID" << YAML::Value << tr.ID;
+				out << YAML::Key << "SourceNodeID" << YAML::Value << tr.SourceNodeID;
+				out << YAML::Key << "TargetNodeID" << YAML::Value << tr.TargetNodeID;
+				out << YAML::Key << "BlendDuration" << YAML::Value << tr.BlendDuration;
+				out << YAML::Key << "HasExitTime" << YAML::Value << tr.HasExitTime;
+				out << YAML::Key << "ExitTime" << YAML::Value << tr.ExitTime;
+				out << YAML::Key << "ExitTimeMode" << YAML::Value << static_cast<int>(tr.ExitTimeMode);
+				out << YAML::Key << "Priority" << YAML::Value << tr.Priority;
+
+				if (!tr.Conditions.empty())
+				{
+					out << YAML::Key << "Conditions" << YAML::Value << YAML::BeginSeq;
+					for (const auto& cond : tr.Conditions)
+					{
+						out << YAML::BeginMap;
+						out << YAML::Key << "VariableName" << YAML::Value << cond.VariableName;
+						out << YAML::Key << "Op" << YAML::Value << static_cast<int>(cond.Op);
+						out << YAML::Key << "Value" << YAML::Value << cond.Value;
+						out << YAML::EndMap;
+					}
+					out << YAML::EndSeq;
+				}
+				out << YAML::EndMap;
+			}
+			out << YAML::EndSeq;
+
+			// Save DefaultVariables
+			if (!graph.DefaultVariables.empty())
+			{
+				out << YAML::Key << "Variables" << YAML::Value << YAML::BeginMap;
+				for (const auto& [name, val] : graph.DefaultVariables)
+				{
+					out << YAML::Key << name << YAML::Value << val;
+				}
+				out << YAML::EndMap;
+			}
+
+			out << YAML::EndMap;
+			out << YAML::EndMap;
+
+			std::filesystem::path filePath(path);
+			std::filesystem::create_directories(filePath.parent_path());
+
+			std::ofstream file(path);
+			if (!file.is_open())
+			{
+				CH_CORE_ERROR("AnimGraphLoader: Failed to open file for writing: {}", path);
+				return false;
+			}
+			file << out.c_str();
+			return true;
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("AnimGraphLoader: Save exception: {}", e.what());
+			return false;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/anim_graph_loader.h b/engine/assets/loaders/anim_graph_loader.h
new file mode 100644
index 000000000..36da2e447
--- /dev/null
+++ b/engine/assets/loaders/anim_graph_loader.h
@@ -0,0 +1,26 @@
+#ifndef CH_ANIM_GRAPH_LOADER_H
+#define CH_ANIM_GRAPH_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/animation_graph_asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class AnimGraphLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return false;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+
+		bool Save(const AnimationGraphAsset& graph, const std::string& path);
+	};
+} // namespace Chained
+
+#endif // CH_ANIM_GRAPH_LOADER_H
diff --git a/engine/assets/loaders/animation_sampler.cpp b/engine/assets/loaders/animation_sampler.cpp
new file mode 100644
index 000000000..c7110ef31
--- /dev/null
+++ b/engine/assets/loaders/animation_sampler.cpp
@@ -0,0 +1,131 @@
+#include "engine/assets/loaders/animation_sampler.h"
+#include "engine/assets/loaders/assimp_helpers.h"
+#include "engine/common/thread_pool.h"
+
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+
+#include <cmath>
+#include <future>
+
+namespace Chained
+{
+
+	void AnimationSampler::Process(const aiScene* scene, int samplingFPS, const std::vector<std::string>& nodeNames,
+								   const std::unordered_map<std::string, int>& nameToIndex,
+								   std::vector<AnimationData>& animations)
+	{
+		CH_PROFILE_SCOPE("AnimationSampler::Process");
+		animations.resize(scene->mNumAnimations);
+		for (unsigned int a = 0; a < scene->mNumAnimations; ++a)
+		{
+			SampleAnimation(scene->mAnimations[a], samplingFPS, scene, nodeNames, nameToIndex, animations[a]);
+		}
+	}
+
+	void AnimationSampler::SampleAnimation(aiAnimation* anim, int samplingFPS, const aiScene* scene,
+										   const std::vector<std::string>& nodeNames,
+										   const std::unordered_map<std::string, int>& nameToIndex, AnimationData& out)
+	{
+		out.name = anim->mName.C_Str();
+		if (out.name.empty())
+		{
+			return;
+		}
+
+		const double ticksPerSecond =
+			(anim->mTicksPerSecond > 0.0) ? anim->mTicksPerSecond : (double)std::max(1, samplingFPS);
+		out.frameRate = (float)std::max(1, samplingFPS);
+
+		double durationTicks = anim->mDuration;
+		if (durationTicks == 0.0)
+		{
+			for (unsigned int c = 0; c < anim->mNumChannels; ++c)
+			{
+				if (anim->mChannels[c]->mNumPositionKeys > 0)
+				{
+					durationTicks =
+						std::max(durationTicks,
+								 anim->mChannels[c]->mPositionKeys[anim->mChannels[c]->mNumPositionKeys - 1].mTime);
+				}
+				if (anim->mChannels[c]->mNumRotationKeys > 0)
+				{
+					durationTicks =
+						std::max(durationTicks,
+								 anim->mChannels[c]->mRotationKeys[anim->mChannels[c]->mNumRotationKeys - 1].mTime);
+				}
+				if (anim->mChannels[c]->mNumScalingKeys > 0)
+				{
+					durationTicks = std::max(
+						durationTicks, anim->mChannels[c]->mScalingKeys[anim->mChannels[c]->mNumScalingKeys - 1].mTime);
+				}
+			}
+		}
+
+		const double durationSeconds = (ticksPerSecond > 0.0) ? (durationTicks / ticksPerSecond) : 0.0;
+		out.frameCount = std::max(1, (int)std::ceil(durationSeconds * (double)out.frameRate) + 1);
+		out.boneCount = (int)nodeNames.size();
+		out.framePoses.resize(out.frameCount * out.boneCount);
+		const double ticksPerFrame = ticksPerSecond / (double)out.frameRate;
+
+		std::vector<TransformData> bindPoses(out.boneCount);
+		for (int b = 0; b < out.boneCount; ++b)
+		{
+			aiNode* node = scene->mRootNode->FindNode(nodeNames[b].c_str());
+			if (node)
+			{
+				aiVector3D p, s;
+				aiQuaternion r;
+				node->mTransformation.Decompose(s, r, p);
+				bindPoses[b] = {ToVec3(p), ToQuat(r), ToVec3(s)};
+			}
+			else
+			{
+				bindPoses[b] = {glm::vec3(0), glm::quat(1, 0, 0, 0), glm::vec3(1)};
+			}
+		}
+
+		for (int f = 0; f < out.frameCount; ++f)
+		{
+			for (int b = 0; b < out.boneCount; ++b)
+			{
+				out.framePoses[f * out.boneCount + b] = bindPoses[b];
+			}
+		}
+
+		std::vector<std::future<void>> animFutures;
+		animFutures.reserve(anim->mNumChannels);
+		for (unsigned int c = 0; c < anim->mNumChannels; ++c)
+		{
+			aiNodeAnim* channel = anim->mChannels[c];
+			auto boneIt = nameToIndex.find(channel->mNodeName.C_Str());
+			if (boneIt == nameToIndex.end())
+			{
+				continue;
+			}
+
+			const int boneIdx = boneIt->second;
+			if (auto* tp = ServiceLocator::TryGet<ThreadPool>())
+			{
+				animFutures.push_back(tp->Enqueue([&out, channel, boneIdx, &bindPoses, ticksPerFrame]() {
+					unsigned int lastPosKey = 0, lastRotKey = 0, lastSclKey = 0;
+					for (int f = 0; f < out.frameCount; ++f)
+					{
+						double time = (double)f * ticksPerFrame;
+						glm::vec3 pos = InterpolatePosition(time, channel, lastPosKey, bindPoses[boneIdx].translation);
+						glm::quat rot = InterpolateRotation(time, channel, lastRotKey, bindPoses[boneIdx].rotation);
+						glm::vec3 scale = InterpolateScale(time, channel, lastSclKey, bindPoses[boneIdx].scale);
+						out.framePoses[f * out.boneCount + boneIdx] = {pos, rot, scale};
+					}
+				}));
+			}
+		}
+		for (auto& f : animFutures)
+		{
+			f.get();
+		}
+		CH_CORE_INFO("AnimationSampler: Loaded animation '{}' ({} frames, {} fps, {} channels)", out.name,
+					 out.frameCount, out.frameRate, anim->mNumChannels);
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/animation_sampler.h b/engine/assets/loaders/animation_sampler.h
new file mode 100644
index 000000000..2fb701141
--- /dev/null
+++ b/engine/assets/loaders/animation_sampler.h
@@ -0,0 +1,28 @@
+#ifndef CH_ANIMATION_SAMPLER_H
+#define CH_ANIMATION_SAMPLER_H
+
+#include "engine/assets/model_data.h"
+#include <assimp/scene.h>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace Chained
+{
+
+	class AnimationSampler
+	{
+	public:
+		static void Process(const aiScene* scene, int samplingFPS, const std::vector<std::string>& nodeNames,
+							const std::unordered_map<std::string, int>& nameToIndex,
+							std::vector<AnimationData>& animations);
+
+	private:
+		static void SampleAnimation(aiAnimation* anim, int samplingFPS, const aiScene* scene,
+									const std::vector<std::string>& nodeNames,
+									const std::unordered_map<std::string, int>& nameToIndex, AnimationData& out);
+	};
+
+} // namespace Chained
+
+#endif // CH_ANIMATION_SAMPLER_H
diff --git a/engine/assets/loaders/assimp_helpers.h b/engine/assets/loaders/assimp_helpers.h
new file mode 100644
index 000000000..4616045fd
--- /dev/null
+++ b/engine/assets/loaders/assimp_helpers.h
@@ -0,0 +1,100 @@
+#ifndef CH_ASSIMP_HELPERS_H
+#define CH_ASSIMP_HELPERS_H
+
+#include <assimp/types.h>
+#include <assimp/anim.h>
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtx/quaternion.hpp>
+
+namespace Chained
+{
+
+	inline glm::mat4 ToMat4(const aiMatrix4x4& m)
+	{
+		return glm::transpose(glm::make_mat4(&m.a1));
+	}
+
+	inline glm::vec3 ToVec3(const aiVector3D& v)
+	{
+		return {v.x, v.y, v.z};
+	}
+
+	inline glm::quat ToQuat(const aiQuaternion& q)
+	{
+		return {q.w, q.x, q.y, q.z};
+	}
+
+	inline glm::vec4 ToColor(const aiColor4D& c)
+	{
+		return {c.r, c.g, c.b, c.a};
+	}
+
+	template <typename KeyT, typename T, typename ConvertFn, typename InterpolateFn>
+	inline T InterpolateKeys(double time, const KeyT* keys, unsigned int count, unsigned int& lastKey,
+							 const T& defaultVal, ConvertFn convert, InterpolateFn lerpFn)
+	{
+		if (count == 0)
+		{
+			return defaultVal;
+		}
+		if (count == 1)
+		{
+			return convert(keys[0].mValue);
+		}
+
+		unsigned int p1 = lastKey, p2 = lastKey;
+		for (unsigned int k = lastKey; k < count - 1; ++k)
+		{
+			if (time < keys[k + 1].mTime)
+			{
+				p1 = k;
+				p2 = k + 1;
+				lastKey = k;
+				break;
+			}
+			p1 = k;
+			p2 = k + 1;
+		}
+
+		if (time >= keys[count - 1].mTime)
+		{
+			lastKey = count - 1;
+			return convert(keys[count - 1].mValue);
+		}
+
+		double dt = keys[p2].mTime - keys[p1].mTime;
+		float factor = (dt > 0.0) ? (float)((time - keys[p1].mTime) / dt) : 0.0f;
+		return lerpFn(convert(keys[p1].mValue), convert(keys[p2].mValue), factor);
+	}
+
+	inline glm::vec3 InterpolatePosition(double time, const aiNodeAnim* channel, unsigned int& lastKey,
+										 const glm::vec3& defaultVal)
+	{
+		return InterpolateKeys(time, channel->mPositionKeys, channel->mNumPositionKeys, lastKey, defaultVal, ToVec3,
+							   [](const glm::vec3& a, const glm::vec3& b, float f) { return glm::mix(a, b, f); });
+	}
+
+	inline glm::quat InterpolateRotation(double time, const aiNodeAnim* channel, unsigned int& lastKey,
+										 const glm::quat& defaultVal)
+	{
+		return InterpolateKeys(time, channel->mRotationKeys, channel->mNumRotationKeys, lastKey, defaultVal, ToQuat,
+							   [](const glm::quat& a, const glm::quat& b, float f) {
+								   aiQuaternion result;
+								   aiQuaternion::Interpolate(result, aiQuaternion(a.w, a.x, a.y, a.z),
+															 aiQuaternion(b.w, b.x, b.y, b.z), f);
+								   return ToQuat(result);
+							   });
+	}
+
+	inline glm::vec3 InterpolateScale(double time, const aiNodeAnim* channel, unsigned int& lastKey,
+									  const glm::vec3& defaultVal)
+	{
+		return InterpolateKeys(time, channel->mScalingKeys, channel->mNumScalingKeys, lastKey, defaultVal, ToVec3,
+							   [](const glm::vec3& a, const glm::vec3& b, float f) { return glm::mix(a, b, f); });
+	}
+
+} // namespace Chained
+
+#endif // CH_ASSIMP_HELPERS_H
diff --git a/engine/assets/loaders/assimp_importer.cpp b/engine/assets/loaders/assimp_importer.cpp
new file mode 100644
index 000000000..907b7eced
--- /dev/null
+++ b/engine/assets/loaders/assimp_importer.cpp
@@ -0,0 +1,439 @@
+#include "engine/assets/loaders/assimp_importer.h"
+#include "engine/assets/loaders/pack_io.h"
+#include "engine/assets/loaders/assimp_helpers.h"
+#include "engine/assets/loaders/material_extractor.h"
+#include "engine/assets/loaders/animation_sampler.h"
+#include "engine/assets/loaders/mesh_merger.h"
+#include "engine/assets/asset_manager.h"
+
+#include "engine/core/profiler.h"
+#include "engine/common/thread_pool.h"
+
+#include <assimp/Importer.hpp>
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
+#include "engine/core/service_locator.h"
+#include <cstring>
+
+#include <stb_image.h>
+
+namespace Chained
+{
+
+	static bool DecodeEmbeddedTexture(const aiTexture* texture, EmbeddedTextureData& out)
+	{
+		if (!texture)
+		{
+			return false;
+		}
+
+		if (texture->mHeight == 0)
+		{
+			const unsigned char* bytes = reinterpret_cast<const unsigned char*>(texture->pcData);
+			int byteCount = (int)texture->mWidth;
+			if (stbi_is_hdr_from_memory(bytes, byteCount))
+			{
+				CH_CORE_WARN("Assimp embedded HDR texture is not supported by the current texture pipeline. Skipping.");
+				return false;
+			}
+
+			int width = 0;
+			int height = 0;
+			int channels = 0;
+			unsigned char* decoded = stbi_load_from_memory(bytes, byteCount, &width, &height, &channels, 4);
+			if (!decoded)
+			{
+				return false;
+			}
+
+			out.width = width;
+			out.height = height;
+			out.channels = 4;
+			out.isHDR = false;
+			out.data.resize((size_t)width * (size_t)height * 4);
+			std::memcpy(out.data.data(), decoded, out.data.size());
+			stbi_image_free(decoded);
+			return true;
+		}
+
+		out.width = (int)texture->mWidth;
+		out.height = (int)texture->mHeight;
+		out.channels = 4;
+		out.isHDR = false;
+		const size_t pixelCount = (size_t)out.width * (size_t)out.height;
+		out.data.resize(pixelCount * 4);
+		const aiTexel* src = texture->pcData;
+		for (size_t i = 0; i < pixelCount; ++i)
+		{
+			out.data[i * 4 + 0] = src[i].r;
+			out.data[i * 4 + 1] = src[i].g;
+			out.data[i * 4 + 2] = src[i].b;
+			out.data[i * 4 + 3] = src[i].a;
+		}
+		return true;
+	}
+
+	PendingModelData AssimpImporter::Import(const std::filesystem::path& path, int samplingFPS)
+	{
+		CH_PROFILE_FUNCTION();
+		PendingModelData data{};
+
+		Assimp::Importer importer;
+		importer.SetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, aiPrimitiveType_POINT | aiPrimitiveType_LINE);
+
+		std::string ext = path.extension().string();
+		std::transform(ext.begin(), ext.end(), ext.begin(), [](unsigned char c) { return (char)std::tolower(c); });
+
+		// Use fast realtime import flags to bypass Assimp's heavy CPU mesh-merging (OptimizeMeshes / FindInstances)
+		unsigned int flags = aiProcess_Triangulate | aiProcess_GenSmoothNormals | aiProcess_CalcTangentSpace |
+							 aiProcess_JoinIdenticalVertices | aiProcess_LimitBoneWeights;
+
+		if (ext != ".gltf" && ext != ".glb")
+		{
+			flags |= aiProcess_FlipUVs;
+		}
+
+		const aiScene* scene = nullptr;
+
+		auto tryLoad = [&](const char* desc, auto loadFn) -> bool {
+			try
+			{
+				scene = loadFn();
+				return scene && scene->mRootNode;
+			} catch (const std::exception& e)
+			{
+				CH_CORE_WARN("AssimpImporter: {} threw for '{}': {}", desc, path.string(), e.what());
+				return false;
+			} catch (...)
+			{
+				CH_CORE_WARN("AssimpImporter: {} threw for '{}' with unknown exception", desc, path.string());
+				return false;
+			}
+		};
+
+		tryLoad("ReadFile", [&]() { return importer.ReadFile(path.string(), flags); });
+
+		if ((!scene || !scene->mRootNode) && ext == ".gltf")
+		{
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			if (am && am->IsPacked())
+			{
+				auto packData = am->ReadAssetData(path.string());
+				if (!packData.empty())
+				{
+					std::string baseDir = path.parent_path().string();
+					auto* ioSystem = new PackIOSystem(baseDir, true);
+					importer.SetIOHandler(ioSystem);
+
+					tryLoad("ReadFile(PackIO)", [&]() { return importer.ReadFile(path.string(), flags); });
+
+					if (!scene || !scene->mRootNode)
+					{
+						importer.SetIOHandler(nullptr);
+						tryLoad("ReadFileFromMemory", [&]() {
+							return importer.ReadFileFromMemory(packData.data(), packData.size(), flags,
+															   path.extension().string().c_str());
+						});
+					}
+				}
+			}
+		}
+
+		if (!scene || !scene->mRootNode)
+		{
+			CH_CORE_WARN("AssimpImporter: ReadFile failed for '{}', trying memory fallback...", path.string());
+
+			std::vector<char> modelFileData;
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				if (am->IsPacked())
+				{
+					auto packData = am->ReadAssetData(path.string());
+					if (!packData.empty())
+					{
+						modelFileData.assign(packData.begin(), packData.end());
+					}
+				}
+			}
+
+			if (modelFileData.empty())
+			{
+				std::ifstream file(path, std::ios::binary | std::ios::ate);
+				if (file.is_open())
+				{
+					std::streamsize size = file.tellg();
+					if (size > 0)
+					{
+						file.seekg(0);
+						modelFileData.resize(static_cast<size_t>(size), 0);
+						file.read(modelFileData.data(), size);
+					}
+				}
+			}
+
+			if (!modelFileData.empty())
+			{
+				tryLoad("ReadFileFromMemory", [&]() {
+					return importer.ReadFileFromMemory(modelFileData.data(), modelFileData.size(), flags,
+													   path.extension().string().c_str());
+				});
+			}
+		}
+
+		if (!scene || !scene->mRootNode)
+		{
+			CH_CORE_ERROR("Assimp Model Load Failed: {} | Error: {}", path.filename().string(),
+						  importer.GetErrorString());
+			return data;
+		}
+
+		AssimpImporter instance(path, samplingFPS, scene);
+		return instance.Execute();
+	}
+
+	AssimpImporter::AssimpImporter(const std::filesystem::path& path, int samplingFPS, const aiScene* scene)
+		: m_Path(path),
+		  m_SamplingFPS(samplingFPS),
+		  m_Scene(scene)
+	{
+		m_ModelDir = path.parent_path();
+	}
+
+	PendingModelData AssimpImporter::Execute()
+	{
+		ProcessHierarchy();
+		ProcessMeshes();
+		DecodeEmbeddedTextures();
+
+		MaterialExtractor::Process(m_Scene, m_ModelDir, m_Data.materials, m_Data.meshes);
+		AnimationSampler::Process(m_Scene, m_SamplingFPS, m_Data.nodeNames, m_NameToIndex, m_Data.animations);
+		MeshMerger::Process(m_Path, m_Data.meshes, m_Data.materials, m_Data.instances);
+
+		m_Data.isValid = true;
+		return std::move(m_Data);
+	}
+
+	void AssimpImporter::ProcessNode(aiNode* node, int parentIdx)
+	{
+		if (!node)
+		{
+			return;
+		}
+
+		int currentIdx = (int)m_Data.nodeNames.size();
+		m_Data.nodeNames.push_back(node->mName.C_Str());
+		m_Data.nodeParents.push_back(parentIdx);
+
+		glm::mat4 local = ToMat4(node->mTransformation);
+		m_Data.nodeLocalTransforms.push_back(local);
+		m_Data.globalBindPoses.push_back((parentIdx == -1) ? local : m_Data.globalBindPoses[parentIdx] * local);
+
+		for (unsigned int i = 0; i < node->mNumMeshes; ++i)
+		{
+			unsigned int meshIndex = node->mMeshes[i];
+			if (meshIndex < m_Scene->mNumMeshes)
+			{
+				m_Data.instances.push_back({(int)meshIndex, m_Data.globalBindPoses[currentIdx]});
+			}
+		}
+
+		for (unsigned int i = 0; i < node->mNumChildren; ++i)
+		{
+			ProcessNode(node->mChildren[i], currentIdx);
+		}
+	}
+
+	void AssimpImporter::ProcessHierarchy()
+	{
+		CH_PROFILE_SCOPE("AssimpImporter::ProcessHierarchy");
+		ProcessNode(m_Scene->mRootNode, -1);
+
+		m_Data.nodeCount = (int)m_Data.nodeNames.size();
+		m_NameToIndex.reserve(m_Data.nodeNames.size());
+		for (int i = 0; i < (int)m_Data.nodeNames.size(); ++i)
+		{
+			m_NameToIndex[m_Data.nodeNames[i]] = i;
+		}
+	}
+
+	void AssimpImporter::ProcessSingleMesh(uint32_t m)
+	{
+		aiMesh* am = m_Scene->mMeshes[m];
+		MeshData rm;
+		rm.materialIndex = am->mMaterialIndex;
+
+		rm.vertices.reserve((size_t)am->mNumVertices * 3);
+		if (am->mTextureCoords[0])
+		{
+			rm.texcoords.reserve((size_t)am->mNumVertices * 2);
+		}
+		if (am->mNormals)
+		{
+			rm.normals.reserve((size_t)am->mNumVertices * 3);
+		}
+		if (am->mTangents)
+		{
+			rm.tangents.reserve((size_t)am->mNumVertices * 3);
+		}
+		if (am->mColors[0])
+		{
+			rm.colors.reserve((size_t)am->mNumVertices * 4);
+		}
+		rm.indices.reserve((size_t)am->mNumFaces * 3);
+
+		for (unsigned int v = 0; v < am->mNumVertices; ++v)
+		{
+			rm.vertices.insert(rm.vertices.end(), {am->mVertices[v].x, am->mVertices[v].y, am->mVertices[v].z});
+			if (am->mTextureCoords[0])
+			{
+				rm.texcoords.insert(rm.texcoords.end(), {am->mTextureCoords[0][v].x, am->mTextureCoords[0][v].y});
+			}
+			if (am->mNormals)
+			{
+				rm.normals.insert(rm.normals.end(), {am->mNormals[v].x, am->mNormals[v].y, am->mNormals[v].z});
+			}
+			if (am->mTangents)
+			{
+				rm.tangents.insert(rm.tangents.end(), {am->mTangents[v].x, am->mTangents[v].y, am->mTangents[v].z});
+			}
+			if (am->mColors[0])
+			{
+				rm.colors.insert(rm.colors.end(), {(unsigned char)(am->mColors[0][v].r * 255.0f),
+												   (unsigned char)(am->mColors[0][v].g * 255.0f),
+												   (unsigned char)(am->mColors[0][v].b * 255.0f),
+												   (unsigned char)(am->mColors[0][v].a * 255.0f)});
+			}
+		}
+
+		for (unsigned int f = 0; f < am->mNumFaces; ++f)
+		{
+			const aiFace& face = am->mFaces[f];
+			if (face.mNumIndices != 3)
+			{
+				continue;
+			}
+			rm.indices.insert(rm.indices.end(), {face.mIndices[0], face.mIndices[1], face.mIndices[2]});
+		}
+
+		rm.MinBounds = {FLT_MAX, FLT_MAX, FLT_MAX};
+		rm.MaxBounds = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
+		for (size_t v = 0; v < rm.vertices.size(); v += 3)
+		{
+			glm::vec3 pos = {rm.vertices[v], rm.vertices[v + 1], rm.vertices[v + 2]};
+			rm.MinBounds = glm::min(rm.MinBounds, pos);
+			rm.MaxBounds = glm::max(rm.MaxBounds, pos);
+		}
+
+		if (am->mNumBones > 0)
+		{
+			rm.joints.resize((size_t)am->mNumVertices * 4, 0);
+			rm.weights.resize((size_t)am->mNumVertices * 4, 0.0f);
+			std::vector<int> jointCounts(am->mNumVertices, 0);
+			auto& offsetWrites = m_MeshOffsetWrites[m];
+			offsetWrites.reserve(am->mNumBones);
+
+			for (unsigned int b = 0; b < am->mNumBones; ++b)
+			{
+				aiBone* bone = am->mBones[b];
+				auto boneIt = m_NameToIndex.find(bone->mName.C_Str());
+				if (boneIt == m_NameToIndex.end())
+				{
+					continue;
+				}
+
+				const int boneIdx = boneIt->second;
+				offsetWrites.emplace_back(boneIdx, ToMat4(bone->mOffsetMatrix));
+
+				if (boneIdx > 255)
+				{
+					CH_CORE_WARN("AssimpImporter: Bone '{}' node index {} exceeds uint8 max — vertex weights skipped",
+								 bone->mName.C_Str(), boneIdx);
+					continue;
+				}
+
+				for (unsigned int w = 0; w < bone->mNumWeights; ++w)
+				{
+					const int vIdx = bone->mWeights[w].mVertexId;
+					if (vIdx < 0 || vIdx >= (int)am->mNumVertices)
+					{
+						continue;
+					}
+
+					if (jointCounts[vIdx] < 4)
+					{
+						const int slot = vIdx * 4 + jointCounts[vIdx]++;
+						rm.joints[slot] = (unsigned char)boneIdx;
+						rm.weights[slot] = bone->mWeights[w].mWeight;
+					}
+				}
+			}
+		}
+		m_Data.meshes[m] = std::move(rm);
+	}
+
+	void AssimpImporter::ProcessMeshes()
+	{
+		CH_PROFILE_SCOPE("AssimpImporter::ProcessMeshes");
+		m_Data.meshes.resize(m_Scene->mNumMeshes);
+		m_MeshOffsetWrites.resize(m_Scene->mNumMeshes);
+
+		if (m_Scene->mNumMeshes == 0)
+		{
+			return;
+		}
+		else if (m_Scene->mNumMeshes == 1)
+		{
+			ProcessSingleMesh(0);
+		}
+		else
+		{
+			std::vector<std::future<void>> futures;
+			futures.reserve(m_Scene->mNumMeshes);
+			for (uint32_t m = 0; m < m_Scene->mNumMeshes; ++m)
+			{
+				if (auto* tp = ServiceLocator::TryGet<ThreadPool>())
+				{
+					futures.push_back(tp->Enqueue([this, m]() { ProcessSingleMesh(m); }));
+				}
+			}
+			for (auto& ft : futures)
+			{
+				ft.wait();
+			}
+		}
+
+		m_Data.offsetMatrices.assign(m_Data.nodeNames.size(), glm::mat4(1.0f));
+		for (const auto& meshOffsets : m_MeshOffsetWrites)
+		{
+			for (const auto& [boneIdx, offset] : meshOffsets)
+			{
+				if (boneIdx >= 0 && boneIdx < (int)m_Data.offsetMatrices.size())
+				{
+					m_Data.offsetMatrices[boneIdx] = offset;
+				}
+			}
+		}
+	}
+
+	void AssimpImporter::DecodeEmbeddedTextures()
+	{
+		CH_PROFILE_SCOPE("AssimpImporter::DecodeEmbeddedTextures");
+		for (unsigned int i = 0; i < m_Scene->mNumTextures; ++i)
+		{
+			const aiTexture* texture = m_Scene->mTextures[i];
+			if (!texture)
+			{
+				continue;
+			}
+
+			EmbeddedTextureData embedded;
+			if (!DecodeEmbeddedTexture(texture, embedded))
+			{
+				continue;
+			}
+
+			m_Data.embeddedTextures.emplace("*" + std::to_string(i), std::move(embedded));
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/assimp_importer.h b/engine/assets/loaders/assimp_importer.h
new file mode 100644
index 000000000..9a5bdd5ee
--- /dev/null
+++ b/engine/assets/loaders/assimp_importer.h
@@ -0,0 +1,43 @@
+#ifndef CH_ASSIMP_IMPORTER_H
+#define CH_ASSIMP_IMPORTER_H
+
+#include "engine/assets/loaders/model_loader.h"
+#include <filesystem>
+#include <unordered_map>
+#include <vector>
+#include <cstdint>
+
+struct aiScene;
+struct aiNode;
+
+namespace Chained
+{
+	class AssimpImporter
+	{
+	public:
+		static PendingModelData Import(const std::filesystem::path& path, int samplingFPS);
+
+	private:
+		AssimpImporter(const std::filesystem::path& path, int samplingFPS, const aiScene* scene);
+		~AssimpImporter() = default;
+
+		PendingModelData Execute();
+
+		void ProcessNode(aiNode* node, int parentIdx);
+		void ProcessHierarchy();
+		void ProcessSingleMesh(uint32_t meshIndex);
+		void ProcessMeshes();
+		void DecodeEmbeddedTextures();
+
+	private:
+		std::filesystem::path m_Path;
+		std::filesystem::path m_ModelDir;
+		int m_SamplingFPS = 30;
+		const aiScene* m_Scene = nullptr;
+
+		PendingModelData m_Data;
+		std::unordered_map<std::string, int> m_NameToIndex;
+		std::vector<std::vector<std::pair<int, glm::mat4>>> m_MeshOffsetWrites;
+	};
+} // namespace Chained
+#endif
diff --git a/engine/assets/loaders/audio_loader.cpp b/engine/assets/loaders/audio_loader.cpp
new file mode 100644
index 000000000..412e24e84
--- /dev/null
+++ b/engine/assets/loaders/audio_loader.cpp
@@ -0,0 +1,94 @@
+#include "engine/assets/loaders/audio_loader.h"
+#include "engine/assets/asset_manager.h"
+
+#include "engine/core/service_locator.h"
+#include <miniaudio.h>
+
+namespace Chained
+{
+
+	std::shared_ptr<Asset> AudioLoader::Create()
+	{
+		return std::make_shared<AudioAsset>();
+	}
+
+	bool AudioLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		auto audioAsset = std::static_pointer_cast<AudioAsset>(asset);
+
+		ma_decoder_config config = ma_decoder_config_init(ma_format_f32, 0, 0);
+		ma_decoder decoder;
+		ma_result result;
+
+		// Try reading from pack first
+		std::vector<uint8_t> packData;
+		bool usePack = false;
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am)
+		{
+			packData = am->ReadAssetData(resolvedPath);
+			usePack = !packData.empty();
+		}
+
+		if (usePack)
+		{
+			result = ma_decoder_init_memory(packData.data(), packData.size(), &config, &decoder);
+		}
+		else
+		{
+			if (!am || !am->FileExists(resolvedPath))
+			{
+				if (outError)
+				{
+					*outError = "AudioLoader: File not found: " + resolvedPath;
+				}
+				return false;
+			}
+			result = ma_decoder_init_file(resolvedPath.c_str(), &config, &decoder);
+		}
+
+		if (result != MA_SUCCESS)
+		{
+			if (outError)
+			{
+				*outError = "AudioLoader: Failed to decode " + resolvedPath;
+			}
+			return false;
+		}
+
+		ma_uint64 frameCount = 0;
+		ma_decoder_get_length_in_pcm_frames(&decoder, &frameCount);
+
+		ma_format format;
+		ma_uint32 channels = 0;
+		ma_uint32 sampleRate = 0;
+		result = ma_decoder_get_data_format(&decoder, &format, &channels, &sampleRate, NULL, 0);
+		if (result != MA_SUCCESS)
+		{
+			ma_decoder_uninit(&decoder);
+			if (outError)
+			{
+				*outError = "AudioLoader: Failed to get data format for " + resolvedPath;
+			}
+			return false;
+		}
+
+		float duration = 0.0f;
+		if (sampleRate > 0)
+		{
+			duration = static_cast<float>(frameCount) / static_cast<float>(sampleRate);
+		}
+
+		audioAsset->SetDuration(duration);
+		audioAsset->SetSampleRate(sampleRate);
+		audioAsset->SetChannels(channels);
+		audioAsset->SetFrameCount(frameCount);
+
+		ma_decoder_uninit(&decoder);
+
+		CH_CORE_INFO("AudioLoader: Loaded '{}' — {} ch, {} Hz, {:.2f}s",
+					 std::filesystem::path(resolvedPath).filename().string(), channels, sampleRate, duration);
+		return true;
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/audio_loader.h b/engine/assets/loaders/audio_loader.h
new file mode 100644
index 000000000..f76d1d180
--- /dev/null
+++ b/engine/assets/loaders/audio_loader.h
@@ -0,0 +1,24 @@
+#ifndef CH_AUDIO_LOADER_H
+#define CH_AUDIO_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/audio_asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class AudioLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return false;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+	};
+} // namespace Chained
+
+#endif // CH_AUDIO_LOADER_H
diff --git a/engine/assets/loaders/environment_loader.cpp b/engine/assets/loaders/environment_loader.cpp
new file mode 100644
index 000000000..6d90d2a1e
--- /dev/null
+++ b/engine/assets/loaders/environment_loader.cpp
@@ -0,0 +1,187 @@
+#include "engine/assets/loaders/environment_loader.h"
+
+#include "engine/assets/types/environment_asset.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/yaml.h"
+#include "yaml-cpp/yaml.h"
+
+namespace Chained
+{
+	std::shared_ptr<Asset> EnvironmentLoader::Create()
+	{
+		return std::make_shared<EnvironmentAsset>();
+	}
+
+	bool EnvironmentLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		std::string content;
+
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			content = am->ReadText(resolvedPath);
+		}
+
+		// Fallback to disk
+		if (content.empty())
+		{
+			std::filesystem::path fullPath(resolvedPath);
+			std::ifstream stream(fullPath);
+			if (!stream.is_open())
+			{
+				CH_CORE_ERROR("EnvironmentLoader: Failed to open environment file: {0}", resolvedPath);
+				if (outError)
+				{
+					*outError = "EnvironmentLoader: failed to open environment file '" + resolvedPath + "'";
+				}
+				return false;
+			}
+			std::stringstream ss;
+			ss << stream.rdbuf();
+			content = ss.str();
+		}
+
+		auto envAsset = std::static_pointer_cast<EnvironmentAsset>(asset);
+
+		try
+		{
+			YAML::Node data = YAML::Load(content);
+			if (!data["Environment"])
+			{
+				if (outError)
+				{
+					*outError = "EnvironmentLoader: missing Environment node in '" + resolvedPath + "'";
+				}
+				return false;
+			}
+
+			auto envNode = data["Environment"];
+			EnvironmentSettings settings;
+
+			// New format: Lighting section
+			if (envNode["Lighting"])
+			{
+				auto lighting = envNode["Lighting"];
+				if (lighting["Direction"])
+				{
+					settings.Lighting.Direction = lighting["Direction"].as<glm::vec3>();
+				}
+				if (lighting["LightColor"])
+				{
+					settings.Lighting.LightColor = lighting["LightColor"].as<Color>();
+				}
+				if (lighting["Ambient"])
+				{
+					settings.Lighting.Ambient = lighting["Ambient"].as<float>();
+				}
+				if (lighting["Exposure"])
+				{
+					settings.Lighting.Exposure = lighting["Exposure"].as<float>();
+				}
+				if (lighting["Gamma"])
+				{
+					settings.Lighting.Gamma = lighting["Gamma"].as<float>();
+				}
+			}
+			else
+			{
+				// Backward compat: old flat field names
+				if (envNode["LightDirection"])
+				{
+					settings.Lighting.Direction = envNode["LightDirection"].as<glm::vec3>();
+				}
+				if (envNode["LightColor"])
+				{
+					settings.Lighting.LightColor = envNode["LightColor"].as<Color>();
+				}
+				if (envNode["AmbientIntensity"])
+				{
+					settings.Lighting.Ambient = envNode["AmbientIntensity"].as<float>();
+				}
+			}
+
+			auto skyboxNode = envNode["Skybox"];
+			if (skyboxNode)
+			{
+				if (skyboxNode["TexturePath"])
+				{
+					settings.Skybox.TexturePath = skyboxNode["TexturePath"].as<std::string>();
+				}
+				if (skyboxNode["Mode"])
+				{
+					settings.Skybox.Mode = skyboxNode["Mode"].as<int>();
+				}
+				for (int i = 0; i < 6; ++i)
+				{
+					std::string key = "CubeFace" + std::to_string(i);
+					if (skyboxNode[key])
+					{
+						settings.Skybox.CubeFaces[i] = skyboxNode[key].as<std::string>();
+					}
+				}
+				if (skyboxNode["Exposure"])
+				{
+					settings.Skybox.Exposure = skyboxNode["Exposure"].as<float>();
+				}
+				if (skyboxNode["Brightness"])
+				{
+					settings.Skybox.Brightness = skyboxNode["Brightness"].as<float>();
+				}
+				if (skyboxNode["Contrast"])
+				{
+					settings.Skybox.Contrast = skyboxNode["Contrast"].as<float>();
+				}
+			}
+
+			auto fogNode = envNode["Fog"];
+			if (fogNode)
+			{
+				if (fogNode["Enabled"])
+				{
+					settings.Fog.Enabled = fogNode["Enabled"].as<bool>();
+				}
+				if (fogNode["Color"])
+				{
+					settings.Fog.FogColor = fogNode["Color"].as<Color>();
+				}
+				if (fogNode["Density"])
+				{
+					settings.Fog.Density = fogNode["Density"].as<float>();
+				}
+				if (fogNode["Start"])
+				{
+					settings.Fog.Start = fogNode["Start"].as<float>();
+				}
+				if (fogNode["End"])
+				{
+					settings.Fog.End = fogNode["End"].as<float>();
+				}
+				if (fogNode["HeightFalloff"])
+				{
+					settings.Fog.HeightFalloff = fogNode["HeightFalloff"].as<float>();
+				}
+			}
+
+			envAsset->SetSettings(settings);
+			return true;
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("EnvironmentLoader: Failed to parse environment file {0}: {1}", resolvedPath, e.what());
+			if (outError)
+			{
+				*outError = std::string("EnvironmentLoader: failed to parse '") + resolvedPath + "': " + e.what();
+			}
+			return false;
+		} catch (...)
+		{
+			CH_CORE_ERROR("EnvironmentLoader: Failed to parse environment file {0} with an unknown exception",
+						  resolvedPath);
+			if (outError)
+			{
+				*outError =
+					std::string("EnvironmentLoader: failed to parse '") + resolvedPath + "' with an unknown exception";
+			}
+			return false;
+		}
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/loaders/environment_loader.h b/engine/assets/loaders/environment_loader.h
new file mode 100644
index 000000000..f2df70f04
--- /dev/null
+++ b/engine/assets/loaders/environment_loader.h
@@ -0,0 +1,24 @@
+#ifndef CH_ENVIRONMENT_LOADER_H
+#define CH_ENVIRONMENT_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/environment_asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class EnvironmentLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return false;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+	};
+} // namespace Chained
+
+#endif // CH_ENVIRONMENT_LOADER_H
diff --git a/engine/assets/loaders/font_loader.cpp b/engine/assets/loaders/font_loader.cpp
new file mode 100644
index 000000000..15f1902cf
--- /dev/null
+++ b/engine/assets/loaders/font_loader.cpp
@@ -0,0 +1,105 @@
+#include "engine/assets/loaders/font_loader.h"
+#include "engine/assets/types/font_asset.h"
+#include "engine/graphics/freetype_gl_atlas.h"
+
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+#include <glad/gl.h>
+
+// Provide stb_truetype symbols for ui_font_registry.cpp (font validation).
+// ImGui's imgui_draw.cpp normally provides these via imstb_truetype.h, but
+// thin LTO can strip them when no intra-TU reference exists.
+#define STB_TRUETYPE_IMPLEMENTATION
+#include <stb_truetype.h>
+
+namespace Chained
+{
+	std::shared_ptr<Asset> FontLoader::Create()
+	{
+		return std::make_shared<FontAsset>();
+	}
+
+	bool FontLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+
+		auto fail = [&](const std::string& msg, bool logError = true) {
+			std::string fullMsg = "FontLoader: " + msg;
+			if (logError)
+			{
+				CH_CORE_ERROR("{0}", fullMsg);
+			}
+			if (outError)
+			{
+				*outError = fullMsg;
+			}
+			return false;
+		};
+
+		if (resolvedPath.empty())
+		{
+			return fail("empty path", false);
+		}
+
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+		// Try reading from pack first
+		auto data = assetManager ? assetManager->ReadAssetData(resolvedPath) : std::vector<uint8_t>{};
+		if (data.empty())
+		{
+			return fail("font not found '" + resolvedPath + "'");
+		}
+
+		Font font;
+		font.fontSize = 24.0f;
+		font.atlasWidth = 1024;
+		font.atlasHeight = 1024;
+
+		auto* ftAtlas = new FreeTypeGLAtlas();
+		if (!ftAtlas->InitFromMemory(data.data(), data.size(), font.fontSize, font.atlasWidth, font.atlasHeight))
+		{
+			delete ftAtlas;
+			return fail("FreeTypeGLAtlas::InitFromMemory failed for '" + resolvedPath + "'");
+		}
+
+		// Build RGBA8 atlasPixels from the alpha-only atlas
+		const uint8_t* alphaData = ftAtlas->GetAlphaData();
+		std::vector<uint8_t> rgbaPixels(font.atlasWidth * font.atlasHeight * 4);
+		if (alphaData)
+		{
+			for (size_t i = 0; i < static_cast<size_t>(font.atlasWidth) * font.atlasHeight; ++i)
+			{
+				rgbaPixels[i * 4 + 0] = 255;
+				rgbaPixels[i * 4 + 1] = 255;
+				rgbaPixels[i * 4 + 2] = 255;
+				rgbaPixels[i * 4 + 3] = alphaData[i];
+			}
+		}
+
+		font.textureAtlas = Texture::Create(font.atlasWidth, font.atlasHeight, TextureFormat::RGBA8);
+		font.textureAtlas->SetData(rgbaPixels.data(), rgbaPixels.size());
+		font.atlasPixels = std::move(rgbaPixels);
+
+		// Populate chars map from the atlas wrapper's cached glyphs
+		// (PreloadRange already populated them during InitFromMemory)
+		const auto& cachedGlyphs = ftAtlas->GetCachedGlyphs();
+		for (const auto& [codepoint, glyph] : cachedGlyphs)
+		{
+			FontChar c;
+			c.x0 = glyph.s0;
+			c.y0 = glyph.t0;
+			c.x1 = glyph.s1;
+			c.y1 = glyph.t1;
+			c.xoff = static_cast<float>(glyph.offsetX);
+			c.yoff = static_cast<float>(glyph.offsetY);
+			c.xadvance = glyph.advanceX;
+			font.chars[codepoint] = c;
+		}
+
+		font.freeTypeAtlas = ftAtlas;
+
+		std::static_pointer_cast<FontAsset>(asset)->SetFont(font);
+
+		CH_CORE_INFO("FontLoader: Imported font atlas for {} (glyphs={})", resolvedPath, font.chars.size());
+
+		return true;
+	}
+} // namespace Chained
diff --git a/engine/assets/loaders/font_loader.h b/engine/assets/loaders/font_loader.h
new file mode 100644
index 000000000..c517e1a9f
--- /dev/null
+++ b/engine/assets/loaders/font_loader.h
@@ -0,0 +1,24 @@
+#ifndef CH_FONT_LOADER_H
+#define CH_FONT_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class FontLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return false;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+	};
+} // namespace Chained
+
+#endif // CH_FONT_LOADER_H
diff --git a/engine/assets/loaders/iasset_loader.h b/engine/assets/loaders/iasset_loader.h
new file mode 100644
index 000000000..53a2f21c2
--- /dev/null
+++ b/engine/assets/loaders/iasset_loader.h
@@ -0,0 +1,24 @@
+#ifndef CH_IASSET_LOADER_H
+#define CH_IASSET_LOADER_H
+
+#include "engine/assets/asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class IAssetLoader
+	{
+	public:
+		virtual ~IAssetLoader() = default;
+
+		virtual bool IsAsync() const = 0;
+
+		virtual std::shared_ptr<Asset> Create() = 0;
+
+		virtual bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+						  std::string* outError = nullptr) = 0;
+	};
+} // namespace Chained
+
+#endif // CH_IASSET_LOADER_H
diff --git a/engine/assets/loaders/material_extractor.cpp b/engine/assets/loaders/material_extractor.cpp
new file mode 100644
index 000000000..9aad475a2
--- /dev/null
+++ b/engine/assets/loaders/material_extractor.cpp
@@ -0,0 +1,196 @@
+#include "engine/assets/loaders/material_extractor.h"
+#include "engine/assets/loaders/assimp_helpers.h"
+
+#include "engine/core/profiler.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+
+#include <set>
+
+namespace Chained
+{
+
+	void MaterialExtractor::Process(const aiScene* scene, const std::filesystem::path& modelDir,
+									std::vector<MaterialData>& materials, std::vector<MeshData>& meshes)
+	{
+		CH_PROFILE_SCOPE("MaterialExtractor::Process");
+		materials.resize(scene->mNumMaterials);
+		for (unsigned int i = 0; i < scene->mNumMaterials; ++i)
+		{
+			ExtractMaterial(scene->mMaterials[i], modelDir, materials[i]);
+		}
+		RemoveUnreferenced(materials, meshes);
+	}
+
+	void MaterialExtractor::ExtractMaterial(aiMaterial* am, const std::filesystem::path& modelDir, MaterialData& out)
+	{
+		aiString matName;
+		if (am->Get(AI_MATKEY_NAME, matName) == AI_SUCCESS)
+		{
+			out.name = matName.C_Str();
+		}
+
+		aiColor4D col(1.0f, 1.0f, 1.0f, 1.0f);
+		if (aiGetMaterialColor(am, AI_MATKEY_BASE_COLOR, &col) == AI_SUCCESS)
+		{
+			out.albedoColor = ToColor(col);
+		}
+		else if (aiGetMaterialColor(am, AI_MATKEY_COLOR_DIFFUSE, &col) == AI_SUCCESS)
+		{
+			out.albedoColor = ToColor(col);
+		}
+
+		if (out.albedoColor.a < 0.001f)
+		{
+			out.albedoColor.a = 1.0f;
+		}
+
+		float opacity = 1.0f;
+		if (aiGetMaterialFloat(am, AI_MATKEY_OPACITY, &opacity) == AI_SUCCESS)
+		{
+			out.albedoColor.a *= opacity;
+		}
+
+		if (aiGetMaterialColor(am, AI_MATKEY_COLOR_EMISSIVE, &col) == AI_SUCCESS)
+		{
+			out.emissiveColor = ToColor(col);
+		}
+
+		aiGetMaterialFloat(am, AI_MATKEY_EMISSIVE_INTENSITY, &out.emissiveIntensity);
+		aiGetMaterialFloat(am, AI_MATKEY_METALLIC_FACTOR, &out.metalness);
+		aiGetMaterialFloat(am, AI_MATKEY_ROUGHNESS_FACTOR, &out.roughness);
+
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+		auto resolvePath = [&](const std::string& texPath) -> std::string {
+			if (texPath.empty())
+			{
+				return "";
+			}
+			if (assetManager && assetManager->FileExists(texPath))
+			{
+				return texPath;
+			}
+			if (std::filesystem::exists(texPath))
+			{
+				return texPath;
+			}
+			std::filesystem::path p1 = modelDir / texPath;
+			if (assetManager && assetManager->FileExists(p1.string()))
+			{
+				return p1.string();
+			}
+			if (std::filesystem::exists(p1))
+			{
+				return p1.string();
+			}
+			std::string filename = std::filesystem::path(texPath).filename().string();
+			std::filesystem::path p2 = modelDir / filename;
+			if (assetManager && assetManager->FileExists(p2.string()))
+			{
+				return p2.string();
+			}
+			if (std::filesystem::exists(p2))
+			{
+				return p2.string();
+			}
+			std::filesystem::path p3 = modelDir / "textures" / filename;
+			if (assetManager && assetManager->FileExists(p3.string()))
+			{
+				return p3.string();
+			}
+			if (std::filesystem::exists(p3))
+			{
+				return p3.string();
+			}
+			return texPath;
+		};
+
+		auto getTex = [&](aiTextureType type) -> std::string {
+			aiString str;
+			if (am->GetTexture(type, 0, &str) == AI_SUCCESS)
+			{
+				return resolvePath(str.C_Str());
+			}
+			return "";
+		};
+
+		auto getTexWithFallback = [&](aiTextureType primary, aiTextureType fallback) -> std::string {
+			std::string path = getTex(primary);
+			return path.empty() ? getTex(fallback) : path;
+		};
+
+		out.albedoPath = getTexWithFallback(aiTextureType_DIFFUSE, aiTextureType_BASE_COLOR);
+		out.normalPath = getTexWithFallback(aiTextureType_NORMALS, aiTextureType_HEIGHT);
+		out.emissivePath = getTex(aiTextureType_EMISSIVE);
+		out.metallicRoughnessPath = getTexWithFallback(aiTextureType_METALNESS, aiTextureType_UNKNOWN);
+		out.occlusionPath = getTexWithFallback(aiTextureType_LIGHTMAP, aiTextureType_AMBIENT_OCCLUSION);
+
+		int blendMode = 0;
+		if (aiGetMaterialInteger(am, AI_MATKEY_BLEND_FUNC, &blendMode) == AI_SUCCESS)
+		{
+			if (blendMode != aiBlendMode_Default && blendMode != aiBlendMode_Additive)
+			{
+				out.transparent = true;
+			}
+		}
+
+		if (out.albedoColor.a < 0.999f || opacity < 0.999f)
+		{
+			out.transparent = true;
+		}
+
+		unsigned int isTransparent = 0;
+		if (aiGetMaterialInteger(am, "$mat.isTransparent", 0, 0, (int*)&isTransparent) == AI_SUCCESS)
+		{
+			if (isTransparent)
+			{
+				out.transparent = true;
+			}
+		}
+	}
+
+	void MaterialExtractor::RemoveUnreferenced(std::vector<MaterialData>& materials, std::vector<MeshData>& meshes)
+	{
+		if (materials.size() <= 1)
+		{
+			return;
+		}
+
+		std::set<int> usedIndices;
+		for (const auto& mesh : meshes)
+		{
+			usedIndices.insert(mesh.materialIndex);
+		}
+
+		std::vector<int> remap(materials.size(), -1);
+		std::vector<MaterialData> filtered;
+		filtered.reserve(usedIndices.size());
+
+		int newIdx = 0;
+		for (int oldIdx = 0; oldIdx < (int)materials.size(); ++oldIdx)
+		{
+			if (usedIndices.count(oldIdx))
+			{
+				remap[oldIdx] = newIdx++;
+				filtered.push_back(materials[oldIdx]);
+			}
+		}
+
+		if (filtered.size() < materials.size())
+		{
+			CH_CORE_INFO("MaterialExtractor: Removed {} unreferenced material(s) ({} -> {})",
+						 materials.size() - filtered.size(), materials.size(), filtered.size());
+
+			materials = std::move(filtered);
+
+			for (auto& mesh : meshes)
+			{
+				if (mesh.materialIndex >= 0 && mesh.materialIndex < (int)remap.size())
+				{
+					mesh.materialIndex = remap[mesh.materialIndex];
+				}
+			}
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/material_extractor.h b/engine/assets/loaders/material_extractor.h
new file mode 100644
index 000000000..8f02bd311
--- /dev/null
+++ b/engine/assets/loaders/material_extractor.h
@@ -0,0 +1,25 @@
+#ifndef CH_MATERIAL_EXTRACTOR_H
+#define CH_MATERIAL_EXTRACTOR_H
+
+#include "engine/assets/model_data.h"
+#include <assimp/scene.h>
+#include <filesystem>
+#include <vector>
+
+namespace Chained
+{
+
+	class MaterialExtractor
+	{
+	public:
+		static void Process(const aiScene* scene, const std::filesystem::path& modelDir,
+							std::vector<MaterialData>& materials, std::vector<MeshData>& meshes);
+
+	private:
+		static void ExtractMaterial(aiMaterial* am, const std::filesystem::path& modelDir, MaterialData& out);
+		static void RemoveUnreferenced(std::vector<MaterialData>& materials, std::vector<MeshData>& meshes);
+	};
+
+} // namespace Chained
+
+#endif // CH_MATERIAL_EXTRACTOR_H
diff --git a/engine/assets/loaders/material_loader.cpp b/engine/assets/loaders/material_loader.cpp
new file mode 100644
index 000000000..0cd7e8ecb
--- /dev/null
+++ b/engine/assets/loaders/material_loader.cpp
@@ -0,0 +1,122 @@
+#include "engine/assets/loaders/material_loader.h"
+#include "engine/assets/types/material_asset.h"
+#include "engine/assets/loaders/yaml_helpers.h"
+#include "engine/assets/asset_manager.h"
+
+#include "engine/core/service_locator.h"
+
+namespace Chained
+{
+
+	std::shared_ptr<Asset> MaterialLoader::Create()
+	{
+		return std::make_shared<MaterialAsset>();
+	}
+
+	bool MaterialLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		auto matAsset = std::static_pointer_cast<MaterialAsset>(asset);
+
+		std::string content;
+
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			content = am->ReadText(resolvedPath);
+		}
+
+		if (content.empty())
+		{
+			if (!std::filesystem::exists(resolvedPath))
+			{
+				if (outError)
+				{
+					*outError = "MaterialLoader: File not found: " + resolvedPath;
+				}
+				return false;
+			}
+			std::ifstream stream(resolvedPath);
+			std::stringstream ss;
+			ss << stream.rdbuf();
+			content = ss.str();
+		}
+
+		try
+		{
+			YAML::Node root = YAML::Load(content);
+			if (!root["Material"])
+			{
+				if (outError)
+				{
+					*outError = "MaterialLoader: Missing 'Material' key in " + resolvedPath;
+				}
+				return false;
+			}
+
+			YAML::Node mat = root["Material"];
+			Material& m = matAsset->GetMaterial();
+
+			if (mat["Name"])
+			{
+				m.Name = mat["Name"].as<std::string>();
+			}
+			if (mat["AlbedoColor"])
+			{
+				m.AlbedoColor = Vec4FromYAML(mat["AlbedoColor"]);
+			}
+			if (mat["EmissiveColor"])
+			{
+				m.EmissiveColor = Vec4FromYAML(mat["EmissiveColor"]);
+			}
+			if (mat["EmissiveIntensity"])
+			{
+				m.EmissiveIntensity = mat["EmissiveIntensity"].as<float>();
+			}
+			if (mat["Metalness"])
+			{
+				m.Metalness = mat["Metalness"].as<float>();
+			}
+			if (mat["Roughness"])
+			{
+				m.Roughness = mat["Roughness"].as<float>();
+			}
+			if (mat["Transparent"])
+			{
+				m.Transparent = mat["Transparent"].as<bool>();
+			}
+			if (mat["Alpha"])
+			{
+				m.Alpha = mat["Alpha"].as<float>();
+			}
+			if (mat["AlbedoMap"])
+			{
+				m.AlbedoPath = mat["AlbedoMap"].as<std::string>();
+			}
+			if (mat["NormalMap"])
+			{
+				m.NormalPath = mat["NormalMap"].as<std::string>();
+			}
+			if (mat["MetallicRoughnessMap"])
+			{
+				m.MetallicRoughnessPath = mat["MetallicRoughnessMap"].as<std::string>();
+			}
+			if (mat["EmissiveMap"])
+			{
+				m.EmissivePath = mat["EmissiveMap"].as<std::string>();
+			}
+			if (mat["OcclusionMap"])
+			{
+				m.OcclusionPath = mat["OcclusionMap"].as<std::string>();
+			}
+		} catch (const YAML::Exception& e)
+		{
+			if (outError)
+			{
+				*outError = std::string("MaterialLoader: YAML parse error in ") + resolvedPath + ": " + e.what();
+			}
+			return false;
+		}
+
+		return true;
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/material_loader.h b/engine/assets/loaders/material_loader.h
new file mode 100644
index 000000000..7fe54f26f
--- /dev/null
+++ b/engine/assets/loaders/material_loader.h
@@ -0,0 +1,24 @@
+#ifndef CH_MATERIAL_LOADER_H
+#define CH_MATERIAL_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/material_asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class MaterialLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return false;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+	};
+} // namespace Chained
+
+#endif // CH_MATERIAL_LOADER_H
diff --git a/engine/assets/loaders/mesh_merger.cpp b/engine/assets/loaders/mesh_merger.cpp
new file mode 100644
index 000000000..b15b94529
--- /dev/null
+++ b/engine/assets/loaders/mesh_merger.cpp
@@ -0,0 +1,225 @@
+#include "engine/assets/loaders/mesh_merger.h"
+
+#include "engine/core/profiler.h"
+#include <cfloat>
+
+namespace Chained
+{
+
+	void MeshMerger::Process(const std::filesystem::path& modelPath, std::vector<MeshData>& meshes,
+							 std::vector<MaterialData>& /*materials*/, std::vector<MeshInstance>& instances)
+	{
+		CH_PROFILE_FUNCTION();
+		if (instances.empty() || meshes.empty())
+		{
+			return;
+		}
+
+		try
+		{
+			struct InstanceGroup
+			{
+				std::vector<int> instanceIndices;
+			};
+			std::unordered_map<int, InstanceGroup> groups;
+			for (int i = 0; i < (int)instances.size(); ++i)
+			{
+				int meshIdx = instances[i].meshIndex;
+				if (meshIdx >= 0 && meshIdx < (int)meshes.size())
+				{
+					groups[meshes[meshIdx].materialIndex].instanceIndices.push_back(i);
+				}
+			}
+
+			CH_CORE_INFO("MeshMerger: Merging {} instances into {} material groups", instances.size(), groups.size());
+
+			std::vector<MeshData> mergedMeshes;
+			std::vector<MeshInstance> mergedInstances;
+			mergedMeshes.reserve(groups.size());
+			mergedInstances.reserve(groups.size());
+
+			for (auto& [matIdx, group] : groups)
+			{
+				MeshData merged;
+				merged.materialIndex = matIdx;
+
+				size_t totalVertices = 0;
+				size_t totalIndices = 0;
+				for (int instIdx : group.instanceIndices)
+				{
+					int srcIdx = instances[instIdx].meshIndex;
+					totalVertices += meshes[srcIdx].vertices.size();
+					totalIndices += meshes[srcIdx].indices.size();
+				}
+
+				merged.vertices.reserve(totalVertices);
+				merged.texcoords.reserve(totalVertices / 3 * 2);
+				merged.normals.reserve(totalVertices);
+				merged.tangents.reserve(totalVertices);
+				merged.colors.reserve(totalVertices / 3 * 4);
+				merged.indices.reserve(totalIndices);
+
+				int firstMeshIdx = instances[group.instanceIndices[0]].meshIndex;
+				bool hasSkins = !meshes[firstMeshIdx].joints.empty();
+				if (hasSkins)
+				{
+					merged.joints.reserve(totalVertices / 3 * 4);
+					merged.weights.reserve(totalVertices / 3 * 4);
+				}
+
+				merged.MinBounds = {FLT_MAX, FLT_MAX, FLT_MAX};
+				merged.MaxBounds = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
+
+				for (int instIdx : group.instanceIndices)
+				{
+					const auto& inst = instances[instIdx];
+					const auto& src = meshes[inst.meshIndex];
+					uint32_t vertexOffset = (uint32_t)(merged.vertices.size() / 3);
+
+					glm::mat4 t = inst.localTransform;
+					glm::mat3 normalMatrix = glm::transpose(glm::inverse(glm::mat3(t)));
+
+					merged.texcoords.insert(merged.texcoords.end(), src.texcoords.begin(), src.texcoords.end());
+					merged.colors.insert(merged.colors.end(), src.colors.begin(), src.colors.end());
+
+					const size_t vertCount = src.vertices.size() / 3;
+					const bool hasNormals = src.normals.size() == src.vertices.size();
+					const bool hasTangents = src.tangents.size() == src.vertices.size();
+
+					if (!hasSkins)
+					{
+						merged.vertices.reserve(merged.vertices.size() + src.vertices.size());
+						if (hasNormals)
+						{
+							merged.normals.reserve(merged.normals.size() + src.normals.size());
+						}
+						if (hasTangents)
+						{
+							merged.tangents.reserve(merged.tangents.size() + src.tangents.size());
+						}
+
+						for (size_t v = 0, n = 0, tg = 0; v < src.vertices.size(); v += 3, n += 3, tg += 3)
+						{
+							glm::vec4 pos =
+								t * glm::vec4(src.vertices[v], src.vertices[v + 1], src.vertices[v + 2], 1.0f);
+							merged.vertices.push_back(pos.x);
+							merged.vertices.push_back(pos.y);
+							merged.vertices.push_back(pos.z);
+
+							if (hasNormals)
+							{
+								glm::vec3 norm = glm::normalize(
+									normalMatrix * glm::vec3(src.normals[n], src.normals[n + 1], src.normals[n + 2]));
+								merged.normals.push_back(norm.x);
+								merged.normals.push_back(norm.y);
+								merged.normals.push_back(norm.z);
+							}
+
+							if (hasTangents)
+							{
+								glm::vec3 tan =
+									glm::normalize(normalMatrix * glm::vec3(src.tangents[tg], src.tangents[tg + 1],
+																			src.tangents[tg + 2]));
+								merged.tangents.push_back(tan.x);
+								merged.tangents.push_back(tan.y);
+								merged.tangents.push_back(tan.z);
+							}
+						}
+					}
+					else
+					{
+						merged.vertices.reserve(merged.vertices.size() + src.vertices.size());
+						if (hasNormals)
+						{
+							merged.normals.reserve(merged.normals.size() + src.normals.size());
+						}
+						if (hasTangents)
+						{
+							merged.tangents.reserve(merged.tangents.size() + src.tangents.size());
+						}
+
+						for (size_t v = 0, n = 0, tg = 0; v < src.vertices.size(); v += 3, n += 3, tg += 3)
+						{
+							merged.vertices.push_back(src.vertices[v]);
+							merged.vertices.push_back(src.vertices[v + 1]);
+							merged.vertices.push_back(src.vertices[v + 2]);
+
+							if (hasNormals)
+							{
+								merged.normals.push_back(src.normals[n]);
+								merged.normals.push_back(src.normals[n + 1]);
+								merged.normals.push_back(src.normals[n + 2]);
+							}
+
+							if (hasTangents)
+							{
+								merged.tangents.push_back(src.tangents[tg]);
+								merged.tangents.push_back(src.tangents[tg + 1]);
+								merged.tangents.push_back(src.tangents[tg + 2]);
+							}
+						}
+					}
+
+					for (uint32_t idx : src.indices)
+					{
+						merged.indices.push_back(idx + vertexOffset);
+					}
+
+					if (hasSkins)
+					{
+						if (!src.joints.empty())
+						{
+							merged.joints.insert(merged.joints.end(), src.joints.begin(), src.joints.end());
+							merged.weights.insert(merged.weights.end(), src.weights.begin(), src.weights.end());
+						}
+						else
+						{
+							size_t padSize = (src.vertices.size() / 3) * 4;
+							merged.joints.insert(merged.joints.end(), padSize, (unsigned char)0);
+							merged.weights.insert(merged.weights.end(), padSize, 0.0f);
+						}
+					}
+
+					if (!hasSkins)
+					{
+						glm::vec3 corners[8] = {{src.MinBounds.x, src.MinBounds.y, src.MinBounds.z},
+												{src.MaxBounds.x, src.MinBounds.y, src.MinBounds.z},
+												{src.MinBounds.x, src.MaxBounds.y, src.MinBounds.z},
+												{src.MaxBounds.x, src.MaxBounds.y, src.MinBounds.z},
+												{src.MinBounds.x, src.MinBounds.y, src.MaxBounds.z},
+												{src.MaxBounds.x, src.MinBounds.y, src.MaxBounds.z},
+												{src.MinBounds.x, src.MaxBounds.y, src.MaxBounds.z},
+												{src.MaxBounds.x, src.MaxBounds.y, src.MaxBounds.z}};
+						for (auto& c : corners)
+						{
+							glm::vec3 tp = glm::vec3(t * glm::vec4(c, 1.0f));
+							merged.MinBounds = glm::min(merged.MinBounds, tp);
+							merged.MaxBounds = glm::max(merged.MaxBounds, tp);
+						}
+					}
+					else
+					{
+						for (size_t v = 0; v < src.vertices.size(); v += 3)
+						{
+							glm::vec3 p = {src.vertices[v], src.vertices[v + 1], src.vertices[v + 2]};
+							merged.MinBounds = glm::min(merged.MinBounds, p);
+							merged.MaxBounds = glm::max(merged.MaxBounds, p);
+						}
+					}
+				}
+
+				int newMeshIdx = (int)mergedMeshes.size();
+				mergedMeshes.push_back(std::move(merged));
+				mergedInstances.push_back({newMeshIdx, glm::mat4(1.0f)});
+			}
+
+			meshes = std::move(mergedMeshes);
+			instances = std::move(mergedInstances);
+		} catch (const std::bad_alloc& e)
+		{
+			CH_CORE_ERROR("MeshMerger: Out of memory during mesh merge for '{}', keeping unmerged meshes: {}",
+						  modelPath.string(), e.what());
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/mesh_merger.h b/engine/assets/loaders/mesh_merger.h
new file mode 100644
index 000000000..f8a29fc4e
--- /dev/null
+++ b/engine/assets/loaders/mesh_merger.h
@@ -0,0 +1,21 @@
+#ifndef CH_MESH_MERGER_H
+#define CH_MESH_MERGER_H
+
+#include "engine/assets/model_data.h"
+#include <vector>
+#include <string>
+#include <filesystem>
+
+namespace Chained
+{
+
+	class MeshMerger
+	{
+	public:
+		static void Process(const std::filesystem::path& modelPath, std::vector<MeshData>& meshes,
+							std::vector<MaterialData>& materials, std::vector<MeshInstance>& instances);
+	};
+
+} // namespace Chained
+
+#endif // CH_MESH_MERGER_H
diff --git a/engine/assets/loaders/model_loader.cpp b/engine/assets/loaders/model_loader.cpp
new file mode 100644
index 000000000..9d52e8ee0
--- /dev/null
+++ b/engine/assets/loaders/model_loader.cpp
@@ -0,0 +1,229 @@
+#include "engine/assets/loaders/model_loader.h"
+#include "engine/assets/loaders/assimp_importer.h"
+#include "engine/assets/model_data.h"
+
+#include "engine/assets/types/model_asset.h"
+#include "engine/graphics/pipeline/geometry_generator.h"
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/asset_metadata.h"
+#include <cereal/archives/binary.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/unordered_map.hpp>
+#include "engine/common/zstd_compression.h"
+
+namespace Chained
+{
+
+	std::shared_ptr<Asset> ModelLoader::Create()
+	{
+		return std::make_shared<ModelAsset>();
+	}
+
+	bool ModelLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		auto modelAsset = std::static_pointer_cast<ModelAsset>(asset);
+
+		if (resolvedPath.starts_with(":"))
+		{
+			auto pendingData = GeometryGenerator::GeneratePrimitivePendingData(resolvedPath, ProceduralParameters());
+			if (pendingData.isValid)
+			{
+				modelAsset->SetPendingData(std::move(pendingData));
+				return true;
+			}
+			if (outError)
+			{
+				*outError = "ModelLoader: failed to generate procedural model for: " + resolvedPath;
+			}
+			return false;
+		}
+
+		auto pendingData = LoadMeshDataFromDisk(resolvedPath);
+		if (pendingData.isValid)
+		{
+			modelAsset->SetPendingData(std::move(pendingData));
+			return true;
+		}
+		if (outError)
+		{
+			*outError = "ModelLoader: failed to import model data from '" + resolvedPath + "'";
+		}
+		return false;
+	}
+
+	PendingModelData ModelLoader::LoadMeshDataFromDisk(const std::filesystem::path& path, int samplingFPS)
+	{
+		std::filesystem::path chassetPath = path;
+		bool isDirectMesh = (path.extension() == ".chmesh" || path.extension() == ".chasset");
+		if (!isDirectMesh)
+		{
+			chassetPath.replace_extension(".chasset");
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+
+		std::vector<uint8_t> chassetBytes;
+		if (am)
+		{
+			chassetBytes = am->ReadProjectAsset(chassetPath);
+			if (chassetBytes.empty())
+			{
+				chassetBytes = am->ReadAssetData(chassetPath.generic_string());
+			}
+		}
+		else if (std::filesystem::exists(chassetPath))
+		{
+			std::ifstream is(chassetPath, std::ios::binary | std::ios::ate);
+			if (is.is_open())
+			{
+				auto sz = is.tellg();
+				is.seekg(0);
+				chassetBytes.resize(static_cast<size_t>(sz));
+				is.read(reinterpret_cast<char*>(chassetBytes.data()), sz);
+			}
+		}
+
+		if (!chassetBytes.empty())
+		{
+			try
+			{
+				std::string rawData(chassetBytes.begin(), chassetBytes.end());
+				std::istringstream is(rawData, std::ios::binary);
+				cereal::BinaryInputArchive archive(is);
+
+				ChainedAssetHeader header;
+				archive(header);
+
+				ChainedAssetHeader currentHeader;
+
+				if (header.magic != currentHeader.magic)
+				{
+					CH_CORE_WARN("Invalid .chasset/.chmesh format (magic mismatch) for: {}", chassetPath.string());
+				}
+				else if (header.version != currentHeader.version)
+				{
+					CH_CORE_WARN("Engine data structure changed! file is outdated for: {}", chassetPath.string());
+				}
+				else if (header.dataStructSize != sizeof(PendingModelData))
+				{
+					CH_CORE_WARN("struct size mismatch (got {}, expected {}), re-importing: {}", header.dataStructSize,
+								 sizeof(PendingModelData), chassetPath.string());
+				}
+				else
+				{
+					bool hashValid = true;
+					if (!isDirectMesh && header.sourceHash != 0 && (!am || !am->IsPacked()))
+					{
+						uint64_t currentHash = MetaUtils::ComputeFileHash(path);
+						if (currentHash != 0 && header.sourceHash != currentHash)
+						{
+							CH_CORE_WARN("Source file changed since .chasset was created, re-importing: {}",
+										 path.string());
+							hashValid = false;
+						}
+					}
+
+					if (hashValid)
+					{
+						PendingModelData data;
+						if (header.compressed)
+						{
+							std::vector<char> compressedData(static_cast<size_t>(header.compressedSize));
+							is.read(compressedData.data(), static_cast<std::streamsize>(header.compressedSize));
+
+							auto decompressed =
+								Zstd::Decompress(compressedData.data(), compressedData.size(), header.uncompressedSize);
+
+							if (decompressed.empty())
+							{
+								CH_CORE_WARN("Failed to decompress .chasset, falling back to Assimp: {}",
+											 chassetPath.string());
+							}
+							else
+							{
+								std::istringstream dis(std::string(decompressed.begin(), decompressed.end()),
+													   std::ios::binary);
+								cereal::BinaryInputArchive decompressedArchive(dis);
+								decompressedArchive(data);
+								return data;
+							}
+						}
+						else
+						{
+							archive(data);
+							return data;
+						}
+					}
+				}
+			} catch (const std::bad_alloc& e)
+			{
+				CH_CORE_ERROR("Out of memory deserializing .chasset ({}), falling back to Assimp: {}",
+							  chassetPath.string(), e.what());
+			} catch (const std::exception& e)
+			{
+				CH_CORE_WARN("Failed to deserialize .chasset ({}), falling back to Assimp: {}", chassetPath.string(),
+							 e.what());
+			}
+		}
+
+		PendingModelData data = AssimpImporter::Import(path, samplingFPS);
+
+		if (data.isValid && !path.string().starts_with(":"))
+		{
+			// Skip .chasset cache writes in packed/exported mode (directory may be read-only)
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			bool skipCache = am && am->IsPacked();
+
+			if (!skipCache)
+			{
+				try
+				{
+					std::ostringstream dataStream(std::ios::binary);
+					{
+						cereal::BinaryOutputArchive dataArchive(dataStream);
+						dataArchive(data);
+					}
+
+					std::string serializedData = dataStream.str();
+					uint64_t sourceHash = MetaUtils::ComputeFileHash(path);
+
+					auto compressed = Zstd::Compress(serializedData.data(), serializedData.size(), 3);
+
+					ChainedAssetHeader header;
+					header.sourceHash = sourceHash;
+					header.compressed = !compressed.empty();
+					header.compressedSize = compressed.size();
+					header.uncompressedSize = serializedData.size();
+
+					std::ofstream os(chassetPath, std::ios::binary);
+					cereal::BinaryOutputArchive archive(os);
+					archive(header);
+
+					if (header.compressed)
+					{
+						os.write(reinterpret_cast<const char*>(compressed.data()),
+								 static_cast<std::streamsize>(compressed.size()));
+					}
+					else
+					{
+						os.write(serializedData.data(), static_cast<std::streamsize>(serializedData.size()));
+					}
+
+					CH_CORE_INFO("ModelAsset: Saved .chasset '{}' (compressed: {}, ratio: {:.1f}%)",
+								 chassetPath.filename().string(), header.compressed ? "yes" : "no",
+								 header.compressed ? (100.0 * compressed.size() / serializedData.size()) : 100.0);
+				} catch (const std::bad_alloc& e)
+				{
+					CH_CORE_ERROR("Out of memory serializing .chasset for {}: {}", chassetPath.string(), e.what());
+				} catch (const std::exception& e)
+				{
+					CH_CORE_WARN("Failed to serialize .chasset for {}: {}", chassetPath.string(), e.what());
+				}
+			}
+		}
+
+		return data;
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/loaders/model_loader.h b/engine/assets/loaders/model_loader.h
new file mode 100644
index 000000000..25a169fd4
--- /dev/null
+++ b/engine/assets/loaders/model_loader.h
@@ -0,0 +1,54 @@
+#ifndef CH_MODEL_LOADER_H
+#define CH_MODEL_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/model_asset.h"
+#include <memory>
+#include <string>
+#include <vector>
+#include <filesystem>
+
+namespace Chained
+{
+	struct ProceduralParameters
+	{
+		float Radius = 0.5f;
+		float InnerRadius = 0.2f;
+		float Height = 1.0f;
+		int Slices = 16;
+		int Stacks = 16;
+		glm::vec3 Dimensions = {1.0f, 1.0f, 1.0f};
+	};
+
+	struct ChainedAssetHeader
+	{
+		uint32_t magic = 0x43484153;
+		uint32_t version = 2;
+		uint32_t dataStructSize = sizeof(PendingModelData);
+		uint64_t sourceHash = 0;
+		bool compressed = false;
+		uint64_t compressedSize = 0;
+		uint64_t uncompressedSize = 0;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(magic, version, dataStructSize, sourceHash, compressed, compressedSize, uncompressedSize);
+		}
+	};
+
+	class ModelLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return true;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+
+		PendingModelData LoadMeshDataFromDisk(const std::filesystem::path& path, int samplingFPS = 30);
+	};
+} // namespace Chained
+
+#endif // CH_MODEL_LOADER_H
diff --git a/engine/assets/loaders/pack_io.cpp b/engine/assets/loaders/pack_io.cpp
new file mode 100644
index 000000000..cf51b424f
--- /dev/null
+++ b/engine/assets/loaders/pack_io.cpp
@@ -0,0 +1,146 @@
+#include "engine/assets/loaders/pack_io.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+
+#include <cstring>
+
+namespace Chained
+{
+
+	size_t PackIOStream::Read(void* pBuffer, size_t pSize, size_t pCount)
+	{
+		size_t bytesAvail = m_Data.size() - m_Pos;
+		size_t bytesNeeded = pSize * pCount;
+		size_t toRead = std::min(bytesAvail, bytesNeeded);
+		if (toRead == 0)
+		{
+			return 0;
+		}
+		std::memcpy(pBuffer, m_Data.data() + m_Pos, toRead);
+		m_Pos += toRead;
+		return toRead / pSize;
+	}
+
+	size_t PackIOStream::Write(const void*, size_t, size_t)
+	{
+		return 0;
+	}
+
+	aiReturn PackIOStream::Seek(size_t pOffset, aiOrigin pOrigin)
+	{
+		switch (pOrigin)
+		{
+		case aiOrigin_SET:
+			m_Pos = pOffset;
+			break;
+		case aiOrigin_CUR:
+			m_Pos += pOffset;
+			break;
+		case aiOrigin_END:
+			m_Pos = m_Data.size() + pOffset;
+			break;
+		}
+		return (m_Pos <= m_Data.size()) ? aiReturn_SUCCESS : aiReturn_FAILURE;
+	}
+
+	size_t PackIOStream::Tell() const
+	{
+		return m_Pos;
+	}
+
+	size_t PackIOStream::FileSize() const
+	{
+		return m_Data.size();
+	}
+
+	void PackIOStream::Flush()
+	{
+	}
+
+	PackIOSystem::PackIOSystem(const std::string& baseDir, bool packed)
+		: m_BaseDir(baseDir),
+		  m_Packed(packed)
+	{
+		if (!m_BaseDir.empty() && m_BaseDir.back() != '/')
+		{
+			m_BaseDir += '/';
+		}
+	}
+
+	bool PackIOSystem::ChangeDirectory(const std::string&)
+	{
+		return true;
+	}
+
+	const std::string& PackIOSystem::CurrentDirectory() const
+	{
+		return m_BaseDir;
+	}
+
+	bool PackIOSystem::Exists(const char* pFile) const
+	{
+		if (!m_Packed)
+		{
+			return std::filesystem::exists(pFile);
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am || !am->IsPacked())
+		{
+			return std::filesystem::exists(pFile);
+		}
+
+		return am->HasAsset(pFile);
+	}
+
+	char PackIOSystem::getOsSeparator() const
+	{
+#ifdef _WIN32
+		return '\\';
+#else
+		return '/';
+#endif
+	}
+
+	Assimp::IOStream* PackIOSystem::Open(const char* pFile, const char* pMode)
+	{
+		if (std::string(pMode).find('w') != std::string::npos)
+		{
+			return nullptr;
+		}
+
+		if (!m_Packed)
+		{
+			auto* fs = new std::ifstream(pFile, std::ios::binary);
+			if (!fs->is_open())
+			{
+				delete fs;
+				return nullptr;
+			}
+			std::vector<char> data((std::istreambuf_iterator<char>(*fs)), std::istreambuf_iterator<char>());
+			delete fs;
+			return new PackIOStream(std::move(data));
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am || !am->IsPacked())
+		{
+			return nullptr;
+		}
+
+		auto packData = am->ReadAssetData(pFile);
+		if (packData.empty())
+		{
+			return nullptr;
+		}
+
+		std::vector<char> charData(packData.begin(), packData.end());
+		return new PackIOStream(std::move(charData));
+	}
+
+	void PackIOSystem::Close(Assimp::IOStream* pFile)
+	{
+		delete pFile;
+	}
+
+} // namespace Chained
diff --git a/engine/assets/loaders/pack_io.h b/engine/assets/loaders/pack_io.h
new file mode 100644
index 000000000..445fc920b
--- /dev/null
+++ b/engine/assets/loaders/pack_io.h
@@ -0,0 +1,54 @@
+#ifndef CH_PACK_IO_H
+#define CH_PACK_IO_H
+
+#include <assimp/IOSystem.hpp>
+#include <assimp/IOStream.hpp>
+#include <vector>
+#include <string>
+
+namespace Chained
+{
+
+	class PackIOStream : public Assimp::IOStream
+	{
+		friend class PackIOSystem;
+
+		std::vector<char> m_Data;
+		size_t m_Pos = 0;
+
+		PackIOStream(std::vector<char> data)
+			: m_Data(std::move(data))
+		{
+		}
+
+	public:
+		~PackIOStream() override = default;
+
+		size_t Read(void* pBuffer, size_t pSize, size_t pCount) override;
+		size_t Write(const void*, size_t, size_t) override;
+		aiReturn Seek(size_t pOffset, aiOrigin pOrigin) override;
+		size_t Tell() const override;
+		size_t FileSize() const override;
+		void Flush() override;
+	};
+
+	class PackIOSystem : public Assimp::IOSystem
+	{
+		std::string m_BaseDir;
+		bool m_Packed;
+
+	public:
+		PackIOSystem(const std::string& baseDir, bool packed);
+		~PackIOSystem() override = default;
+
+		bool ChangeDirectory(const std::string&) override;
+		const std::string& CurrentDirectory() const override;
+		bool Exists(const char* pFile) const override;
+		char getOsSeparator() const override;
+		Assimp::IOStream* Open(const char* pFile, const char* pMode = "rb") override;
+		void Close(Assimp::IOStream* pFile) override;
+	};
+
+} // namespace Chained
+
+#endif // CH_PACK_IO_H
diff --git a/engine/assets/loaders/shader_loader.cpp b/engine/assets/loaders/shader_loader.cpp
new file mode 100644
index 000000000..92cae628d
--- /dev/null
+++ b/engine/assets/loaders/shader_loader.cpp
@@ -0,0 +1,159 @@
+#include "engine/assets/loaders/shader_loader.h"
+
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+
+#include <regex>
+
+#include "engine/assets/types/shader_asset.h"
+
+namespace Chained
+{
+	std::shared_ptr<Asset> ShaderLoader::Create()
+	{
+		return std::make_shared<ShaderAsset>();
+	}
+
+	bool ShaderLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		auto shaderAsset = std::static_pointer_cast<ShaderAsset>(asset);
+		auto shader = LoadShaderFromPath(resolvedPath);
+		if (shader)
+		{
+			shaderAsset->SetShader(shader);
+			return true;
+		}
+		if (outError)
+		{
+			*outError = "ShaderLoader: failed to load shader from '" + resolvedPath + "'";
+		}
+		return false;
+	}
+
+	std::shared_ptr<Shader> ShaderLoader::LoadShaderFromPath(const std::string& path)
+	{
+		std::filesystem::path absolutePath(path);
+
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+
+		std::string ext = absolutePath.extension().string();
+		std::ranges::transform(ext, ext.begin(), ::tolower);
+
+		if (ext == ".chshader")
+		{
+			try
+			{
+				std::string content = assetManager->ReadText(path);
+				if (content.empty())
+				{
+					return nullptr;
+				}
+
+				YAML::Node config = YAML::Load(content);
+
+				std::string vsRel = config["VertexShader"].as<std::string>();
+				std::string fsRel = config["FragmentShader"].as<std::string>();
+
+				std::filesystem::path basePath = absolutePath.parent_path();
+				std::string vsPath = (basePath / vsRel).string();
+				std::string fsPath = (basePath / fsRel).string();
+
+				return LoadShaderFromPaths(vsPath, fsPath);
+			} catch (...)
+			{
+				return nullptr;
+			}
+		}
+		else if (ext == ".vs" || ext == ".vert" || ext == ".glsl")
+		{
+			std::filesystem::path fsPath = absolutePath;
+
+			// Prefer the modern .frag extension; fall back to legacy .fs
+			if (ext == ".vs")
+			{
+				fsPath.replace_extension(".fs");
+				if (!assetManager->FileExists(fsPath.string()))
+				{
+					fsPath.replace_extension(".frag");
+				}
+			}
+			else // .vert / .glsl  — try .frag first, then .fs for backwards compat
+			{
+				fsPath.replace_extension(".frag");
+				if (!assetManager->FileExists(fsPath.string()))
+				{
+					fsPath.replace_extension(".fs");
+				}
+			}
+
+			if (assetManager->FileExists(fsPath.string()))
+			{
+				return LoadShaderFromPaths(absolutePath.string(), fsPath.string());
+			}
+		}
+		return nullptr;
+	}
+
+	std::shared_ptr<Shader> ShaderLoader::LoadShaderFromPaths(const std::string& vsPath, const std::string& fsPath)
+	{
+		std::vector<std::string> vsIncl, fsIncl;
+		std::string vsSource = ProcessShaderSource(vsPath, vsIncl);
+		std::string fsSource = ProcessShaderSource(fsPath, fsIncl);
+
+		return Shader::Create(vsSource.c_str(), fsSource.c_str());
+	}
+
+	std::string ShaderLoader::ProcessShaderSource(const std::string& path, std::vector<std::string>& includedFiles)
+	{
+		std::filesystem::path fullPath = std::filesystem::weakly_canonical(path);
+
+		for (const auto& included : includedFiles)
+		{
+			if (included == fullPath.string())
+			{
+				CH_CORE_WARN("ShaderPreprocessor: Circular include detected: {}", path);
+				return "";
+			}
+		}
+		includedFiles.push_back(fullPath.string());
+
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+
+		// Read file content (pack or disk)
+		std::string fileContent = assetManager->ReadText(fullPath.string());
+		if (fileContent.empty())
+		{
+			CH_CORE_ERROR("ShaderPreprocessor: File not found: {}", path);
+			return "";
+		}
+
+		// Process includes
+		std::stringstream ss;
+		std::regex includeRegex(R"(^\s*#include\s+["<](.*)[">])");
+		std::smatch match;
+		std::istringstream stream(fileContent);
+		std::string line;
+
+		while (std::getline(stream, line))
+		{
+			if (std::regex_search(line, match, includeRegex))
+			{
+				std::string includeFile = match[1].str();
+				std::filesystem::path includePath = fullPath.parent_path() / includeFile;
+
+				std::string includedSource = ProcessShaderSource(includePath.string(), includedFiles);
+				if (includedSource.empty() && std::filesystem::exists(includePath))
+				{
+					CH_CORE_WARN("ShaderPreprocessor: Failed to process include: {}", includeFile);
+				}
+				ss << includedSource << "\n";
+			}
+			else
+			{
+				ss << line << "\n";
+			}
+		}
+
+		return ss.str();
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/loaders/shader_loader.h b/engine/assets/loaders/shader_loader.h
new file mode 100644
index 000000000..d3a1058c6
--- /dev/null
+++ b/engine/assets/loaders/shader_loader.h
@@ -0,0 +1,29 @@
+#ifndef CH_SHADER_LOADER_H
+#define CH_SHADER_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/shader_asset.h"
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+	class ShaderLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return false;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+
+		std::shared_ptr<Shader> LoadShaderFromPath(const std::string& path);
+		std::shared_ptr<Shader> LoadShaderFromPaths(const std::string& vsPath, const std::string& fsPath);
+		std::string ProcessShaderSource(const std::string& path, std::vector<std::string>& includedFiles);
+	};
+} // namespace Chained
+
+#endif // CH_SHADER_LOADER_H
diff --git a/engine/assets/loaders/stb_image_impl.h b/engine/assets/loaders/stb_image_impl.h
new file mode 100644
index 000000000..9e955a7d5
--- /dev/null
+++ b/engine/assets/loaders/stb_image_impl.h
@@ -0,0 +1,3 @@
+#pragma once
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb_image.h>
diff --git a/engine/assets/loaders/texture_loader.cpp b/engine/assets/loaders/texture_loader.cpp
new file mode 100644
index 000000000..11376095c
--- /dev/null
+++ b/engine/assets/loaders/texture_loader.cpp
@@ -0,0 +1,170 @@
+#include "engine/assets/loaders/texture_loader.h"
+
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+
+#include "stb_image_impl.h"
+
+namespace Chained
+{
+	namespace
+	{
+		void FlipImageVertically(void* pixels, int width, int height, int channels, size_t bytesPerChannel)
+		{
+			if (pixels == nullptr || width <= 0 || height <= 0 || channels <= 0)
+			{
+				return;
+			}
+
+			const size_t rowBytes = static_cast<size_t>(width) * static_cast<size_t>(channels) * bytesPerChannel;
+			std::vector<unsigned char> temp(rowBytes);
+			auto* bytes = static_cast<unsigned char*>(pixels);
+
+			for (int row = 0; row < height / 2; ++row)
+			{
+				const size_t topOffset = static_cast<size_t>(row) * rowBytes;
+				const size_t bottomOffset = static_cast<size_t>(height - row - 1) * rowBytes;
+
+				std::memcpy(temp.data(), bytes + topOffset, rowBytes);
+				std::memcpy(bytes + topOffset, bytes + bottomOffset, rowBytes);
+				std::memcpy(bytes + bottomOffset, temp.data(), rowBytes);
+			}
+		}
+	} // namespace
+
+	std::shared_ptr<Asset> TextureLoader::Create()
+	{
+		return std::make_shared<TextureAsset>();
+	}
+
+	bool TextureLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
+	{
+		auto texAsset = std::static_pointer_cast<TextureAsset>(asset);
+
+		if (resolvedPath.empty())
+		{
+			if (outError)
+			{
+				*outError = "TextureLoader: empty path";
+			}
+			return false;
+		}
+
+		std::string ext = std::filesystem::path(resolvedPath).extension().string();
+		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+		int width, height, channels;
+
+		// Check if we should read from pack or filesystem
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+		bool usePack = assetManager && assetManager->IsPacked();
+
+		// Determine if HDR by checking file header or extension.
+		// This is intentionally per-asset and not a single global rule: UI and editor
+		// textures often need their source pixels kept in the original orientation,
+		// while scene/game textures are typically loaded to OpenGL's bottom-left UV convention.
+		bool isHDR = (ext == ".hdr" || ext == ".exr");
+
+		const auto isUiLikePath = [](const std::string& path) {
+			const std::string lower = [&]() {
+				std::string result = path;
+				std::transform(result.begin(), result.end(), result.begin(), ::tolower);
+				return result;
+			}();
+
+			return lower.find("/ui/") != std::string::npos || lower.find("\\ui\\") != std::string::npos ||
+				   lower.find("/icons/") != std::string::npos || lower.find("\\icons\\") != std::string::npos ||
+				   lower.find("/font/") != std::string::npos || lower.find("\\font\\") != std::string::npos ||
+				   lower.find("logo") != std::string::npos || lower.find("menu") != std::string::npos;
+		};
+
+		const TextureUsage usage = isUiLikePath(resolvedPath) ? TextureUsage::UI : TextureUsage::Scene;
+		texAsset->SetUsage(usage);
+
+		const bool shouldFlipVertically = !isHDR && usage == TextureUsage::Scene &&
+										  (ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".bmp" ||
+										   ext == ".tga" || ext == ".gif" || ext == ".webp");
+		texAsset->SetFlipYOnLoad(shouldFlipVertically);
+
+		void* data = nullptr;
+
+		if (usePack)
+		{
+			auto fileData = assetManager->ReadAssetData(resolvedPath);
+			if (!fileData.empty())
+			{
+				if (isHDR)
+				{
+
+					data = stbi_loadf_from_memory(fileData.data(), (int)fileData.size(), &width, &height, &channels, 0);
+				}
+				else
+				{
+					data = stbi_load_from_memory(fileData.data(), (int)fileData.size(), &width, &height, &channels, 4);
+					channels = 4;
+				}
+			}
+		}
+		else
+		{
+			isHDR = stbi_is_hdr(resolvedPath.c_str());
+			const TextureUsage usage = isUiLikePath(resolvedPath) ? TextureUsage::UI : TextureUsage::Scene;
+			texAsset->SetUsage(usage);
+
+			const bool shouldFlipVertically = !isHDR && usage == TextureUsage::Scene &&
+											  (ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".bmp" ||
+											   ext == ".tga" || ext == ".gif" || ext == ".webp");
+			texAsset->SetFlipYOnLoad(shouldFlipVertically);
+
+			if (isHDR)
+			{
+				data = stbi_loadf(resolvedPath.c_str(), &width, &height, &channels, 0);
+			}
+			else
+			{
+				data = stbi_load(resolvedPath.c_str(), &width, &height, &channels, 4);
+				channels = 4;
+			}
+		}
+
+		if (shouldFlipVertically && data != nullptr)
+		{
+			if (isHDR)
+			{
+				FlipImageVertically(data, width, height, channels > 0 ? channels : 4, sizeof(float));
+			}
+			else
+			{
+				FlipImageVertically(data, width, height, channels > 0 ? channels : 4, sizeof(unsigned char));
+			}
+		}
+
+		if (data == nullptr)
+		{
+			const char* reason = stbi_failure_reason();
+			CH_CORE_ERROR("TextureLoader: Failed to load image {}. Reason: {}", resolvedPath,
+						  reason ? reason : "Unknown");
+			if (outError)
+			{
+				*outError = "TextureLoader: failed to load image '" + resolvedPath +
+							"'. Reason: " + (reason ? reason : "Unknown");
+			}
+			return false;
+		}
+
+		texAsset->SetIsHDR(isHDR);
+
+		DecodedImage rawImage;
+		rawImage.data = data;
+		rawImage.width = width;
+		rawImage.height = height;
+		rawImage.channels = channels;
+		rawImage.isHDR = isHDR;
+		rawImage.format = isHDR ? 11 : 7; // Matching previous constants
+		rawImage.mipmaps = 1;
+
+		texAsset->SetPendingImage(rawImage);
+		return true;
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/loaders/texture_loader.h b/engine/assets/loaders/texture_loader.h
new file mode 100644
index 000000000..e4fa63926
--- /dev/null
+++ b/engine/assets/loaders/texture_loader.h
@@ -0,0 +1,24 @@
+#ifndef CH_TEXTURE_LOADER_H
+#define CH_TEXTURE_LOADER_H
+
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/assets/types/texture_asset.h"
+#include <memory>
+#include <string>
+
+namespace Chained
+{
+	class TextureLoader : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return true;
+		}
+		std::shared_ptr<Asset> Create() override;
+		bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath,
+				  std::string* outError = nullptr) override;
+	};
+} // namespace Chained
+
+#endif // CH_TEXTURE_LOADER_H
diff --git a/engine/assets/loaders/yaml_helpers.h b/engine/assets/loaders/yaml_helpers.h
new file mode 100644
index 000000000..e5049b851
--- /dev/null
+++ b/engine/assets/loaders/yaml_helpers.h
@@ -0,0 +1,31 @@
+#ifndef CH_YAML_HELPERS_H
+#define CH_YAML_HELPERS_H
+
+#include <glm/glm.hpp>
+#include <yaml-cpp/yaml.h>
+
+namespace Chained
+{
+
+	inline YAML::Node Vec4ToYAML(const glm::vec4& v)
+	{
+		YAML::Node node;
+		node.push_back(v.x);
+		node.push_back(v.y);
+		node.push_back(v.z);
+		node.push_back(v.w);
+		return node;
+	}
+
+	inline glm::vec4 Vec4FromYAML(const YAML::Node& node)
+	{
+		if (!node || !node.IsSequence() || node.size() < 4)
+		{
+			return {0, 0, 0, 1};
+		}
+		return {node[0].as<float>(), node[1].as<float>(), node[2].as<float>(), node[3].as<float>()};
+	}
+
+} // namespace Chained
+
+#endif // CH_YAML_HELPERS_H
diff --git a/engine/assets/model_data.h b/engine/assets/model_data.h
new file mode 100644
index 000000000..16f12daf7
--- /dev/null
+++ b/engine/assets/model_data.h
@@ -0,0 +1,196 @@
+#ifndef CH_MODEL_DATA_H
+#define CH_MODEL_DATA_H
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <unordered_map>
+#include <string>
+#include <vector>
+
+#include <cereal/cereal.hpp>
+
+// GLM serialization helpers for Cereal
+namespace glm
+{
+	template <class Archive> void serialize(Archive& archive, vec3& v)
+	{
+		archive(v.x, v.y, v.z);
+	}
+	template <class Archive> void serialize(Archive& archive, vec4& v)
+	{
+		archive(v.x, v.y, v.z, v.w);
+	}
+	template <class Archive> void serialize(Archive& archive, quat& q)
+	{
+		archive(q.x, q.y, q.z, q.w);
+	}
+	template <class Archive> void serialize(Archive& archive, mat4& m)
+	{
+		archive(m[0], m[1], m[2], m[3]);
+	}
+} // namespace glm
+
+namespace Chained
+{
+	struct BoundingBox
+	{
+		glm::vec3 Min;
+		glm::vec3 Max;
+	};
+	struct TransformData
+	{
+		glm::vec3 translation;
+		glm::quat rotation;
+		glm::vec3 scale;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(translation, rotation, scale);
+		}
+	};
+
+	struct MeshData
+	{
+		std::vector<float> vertices;
+		std::vector<float> texcoords;
+		std::vector<float> normals;
+		std::vector<float> tangents;
+		std::vector<unsigned char> colors;
+		std::vector<uint32_t> indices;
+
+		// Skinning data
+		std::vector<unsigned char> joints; // 4 joints per vertex
+		std::vector<float> weights;		   // 4 weights per vertex
+
+		int materialIndex = -1;
+
+		glm::vec3 MinBounds = {0, 0, 0};
+		glm::vec3 MaxBounds = {0, 0, 0};
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(vertices, texcoords, normals, tangents, colors, indices, joints, weights, materialIndex, MinBounds,
+					MaxBounds);
+		}
+	};
+
+	struct MaterialData
+	{
+		std::string name;
+		std::string albedoPath;
+		glm::vec4 albedoColor = {1.0f, 1.0f, 1.0f, 1.0f};
+
+		std::string emissivePath;
+		glm::vec4 emissiveColor = {0.0f, 0.0f, 0.0f, 1.0f};
+		float emissiveIntensity = 0.0f;
+
+		std::string normalPath;
+		std::string metallicRoughnessPath;
+		std::string occlusionPath;
+
+		float metalness = 0.0f;
+		float roughness = 0.5f;
+
+		bool transparent = false;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(name, albedoPath, albedoColor, emissivePath, emissiveColor, emissiveIntensity, normalPath,
+					metallicRoughnessPath, occlusionPath, metalness, roughness, transparent);
+		}
+	};
+
+	struct EmbeddedTextureData
+	{
+		std::vector<unsigned char> data;
+		int width = 0;
+		int height = 0;
+		int channels = 0;
+		bool isHDR = false;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(data, width, height, channels, isHDR);
+		}
+	};
+
+	// Track textures that are still loading
+	struct PendingTexture
+	{
+		int materialIndex;
+		std::string path;
+		int mapIndex; // MATERIAL_MAP_ALBEDO, MATERIAL_MAP_EMISSION, etc.
+	};
+
+	struct AnimationData
+	{
+		std::string name;
+		int frameCount;
+		int boneCount;
+		float frameRate = 30.0f;			   // FPS of the animation source asset
+		std::vector<TransformData> framePoses; // flattened [frameCount * boneCount]
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(name, frameCount, boneCount, frameRate, framePoses);
+		}
+	};
+
+	struct MeshInstance
+	{
+		int meshIndex;
+		glm::mat4 localTransform;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(meshIndex, localTransform);
+		}
+	};
+
+	struct BoneInfoData
+	{
+		std::string name;
+		int parent;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(name, parent);
+		}
+	};
+
+	// CPU-side data for async loading (loaded in worker thread)
+	struct PendingModelData
+	{
+		std::string fullPath;
+		std::vector<MeshData> meshes;
+		std::vector<MaterialData> materials;
+		std::unordered_map<std::string, EmbeddedTextureData> embeddedTextures;
+
+		// Skeletal / Hierarchy data (Original data for animations only)
+		std::vector<BoneInfoData> bones;
+		std::vector<TransformData> bindPose;
+
+		// Flattened render data
+		std::vector<MeshInstance> instances;
+
+		// Support for hierarchy (only for animation system/skeleton mapping)
+		std::vector<std::string> nodeNames;
+		int nodeCount = 0; // Added for convenience
+		std::vector<int> nodeParents;
+		std::vector<glm::mat4> nodeLocalTransforms;
+		std::vector<glm::mat4> globalBindPoses;
+		std::vector<glm::mat4> offsetMatrices;
+
+		std::vector<AnimationData> animations;
+		int FinalizationProgress = 0; // Index of the next mesh to be finalized
+		bool isValid = false;
+
+		template <class Archive> void serialize(Archive& archive)
+		{
+			archive(fullPath, meshes, materials, embeddedTextures, bones, bindPose, instances, nodeNames, nodeCount,
+					nodeParents, nodeLocalTransforms, globalBindPoses, offsetMatrices, animations, isValid);
+		}
+	};
+} // namespace Chained
+
+#endif // CH_MODEL_DATA_H
diff --git a/engine/assets/types/animation_graph_asset.h b/engine/assets/types/animation_graph_asset.h
new file mode 100644
index 000000000..65c811b9b
--- /dev/null
+++ b/engine/assets/types/animation_graph_asset.h
@@ -0,0 +1,138 @@
+#ifndef CH_ANIMATION_GRAPH_ASSET_H
+#define CH_ANIMATION_GRAPH_ASSET_H
+
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <memory>
+#include "engine/assets/asset.h"
+
+namespace Chained
+{
+
+	enum class AnimConditionOp
+	{
+		Equal,
+		NotEqual,
+		Greater,
+		Less,
+		GreaterOrEqual,
+		LessOrEqual
+	};
+
+	struct AnimCondition
+	{
+		std::string VariableName;
+		AnimConditionOp Op = AnimConditionOp::Equal;
+		float Value = 0.0f;
+
+		bool Evaluate(const std::unordered_map<std::string, float>& variables) const
+		{
+			auto it = variables.find(VariableName);
+			float currentVal = (it != variables.end()) ? it->second : 0.0f;
+
+			switch (Op)
+			{
+			case AnimConditionOp::Equal:
+				return currentVal == Value;
+			case AnimConditionOp::NotEqual:
+				return currentVal != Value;
+			case AnimConditionOp::Greater:
+				return currentVal > Value;
+			case AnimConditionOp::Less:
+				return currentVal < Value;
+			case AnimConditionOp::GreaterOrEqual:
+				return currentVal >= Value;
+			case AnimConditionOp::LessOrEqual:
+				return currentVal <= Value;
+			}
+			return false;
+		}
+	};
+
+	struct AnimTransition
+	{
+		int ID = 0;
+		int SourceNodeID = 0;
+		int TargetNodeID = 0;
+		float BlendDuration = 0.2f;
+		std::vector<AnimCondition> Conditions;
+		bool HasExitTime = false;
+		float ExitTime = 0.9f;
+
+		enum class ExitTimeMode
+		{
+			SourceAnimation,
+			TargetAnimation,
+			AbsoluteTime
+		} ExitTimeMode = ExitTimeMode::SourceAnimation;
+
+		int Priority = 0;
+	};
+
+	struct AnimNode
+	{
+		int ID = 0;
+		std::string Name = "New State";
+		int AnimationIndex = 0;
+		bool IsLooping = true;
+		int StartFrame = 0;
+		int EndFrame = -1;
+		float Speed = 1.0f;
+
+		float EditorX = 0.0f;
+		float EditorY = 0.0f;
+	};
+
+	class AnimationGraphAsset : public Asset
+	{
+	public:
+		AnimationGraphAsset()
+			: Asset(AssetType::AnimationGraph)
+		{
+		}
+		~AnimationGraphAsset() override = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::AnimationGraph;
+		}
+
+		std::vector<AnimNode> Nodes;
+		std::vector<AnimTransition> Transitions;
+		int EntryNodeID = -1;
+
+		std::unordered_map<std::string, float> DefaultVariables;
+
+		int NextNodeID = 1;
+		int NextLinkID = 1;
+
+		AnimNode* FindNode(int id)
+		{
+			for (auto& node : Nodes)
+			{
+				if (node.ID == id)
+				{
+					return &node;
+				}
+			}
+			return nullptr;
+		}
+
+		AnimTransition* FindTransition(int id)
+		{
+			for (auto& transition : Transitions)
+			{
+				if (transition.ID == id)
+				{
+					return &transition;
+				}
+			}
+			return nullptr;
+		}
+
+		bool Save(const std::string& path);
+	};
+
+} // namespace Chained
+#endif
diff --git a/engine/assets/types/audio_asset.h b/engine/assets/types/audio_asset.h
new file mode 100644
index 000000000..d93db6683
--- /dev/null
+++ b/engine/assets/types/audio_asset.h
@@ -0,0 +1,68 @@
+#ifndef CH_AUDIO_ASSET_H
+#define CH_AUDIO_ASSET_H
+
+#include "engine/assets/asset.h"
+#include <cstdint>
+#include <string>
+
+namespace Chained
+{
+
+	class AudioAsset : public Asset
+	{
+	public:
+		AudioAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~AudioAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Audio;
+		}
+
+		float GetDuration() const
+		{
+			return m_Duration;
+		}
+		uint32_t GetSampleRate() const
+		{
+			return m_SampleRate;
+		}
+		uint32_t GetChannels() const
+		{
+			return m_Channels;
+		}
+		uint64_t GetFrameCount() const
+		{
+			return m_FrameCount;
+		}
+
+		void SetDuration(float duration)
+		{
+			m_Duration = duration;
+		}
+		void SetSampleRate(uint32_t sampleRate)
+		{
+			m_SampleRate = sampleRate;
+		}
+		void SetChannels(uint32_t channels)
+		{
+			m_Channels = channels;
+		}
+		void SetFrameCount(uint64_t frameCount)
+		{
+			m_FrameCount = frameCount;
+		}
+
+	private:
+		float m_Duration = 0.0f;
+		uint32_t m_SampleRate = 0;
+		uint32_t m_Channels = 0;
+		uint64_t m_FrameCount = 0;
+	};
+
+} // namespace Chained
+
+#endif // CH_AUDIO_ASSET_H
diff --git a/engine/assets/types/environment_asset.h b/engine/assets/types/environment_asset.h
new file mode 100644
index 000000000..22fb17ead
--- /dev/null
+++ b/engine/assets/types/environment_asset.h
@@ -0,0 +1,95 @@
+#ifndef CH_ENVIRONMENT_H
+#define CH_ENVIRONMENT_H
+
+#include "engine/assets/asset.h"
+#include "engine/common/color.h"
+#include <glm/glm.hpp>
+#include <string>
+
+namespace Chained
+{
+
+	// Face index constants for mode 3 (Six Faces cubemap)
+	constexpr int SKYBOX_FACE_PX = 0; // Right  (+X)
+	constexpr int SKYBOX_FACE_NX = 1; // Left   (-X)
+	constexpr int SKYBOX_FACE_PY = 2; // Up     (+Y)
+	constexpr int SKYBOX_FACE_NY = 3; // Down   (-Y)
+	constexpr int SKYBOX_FACE_PZ = 4; // Front  (+Z)
+	constexpr int SKYBOX_FACE_NZ = 5; // Back   (-Z)
+
+	struct SkyboxSettings
+	{
+		std::string TexturePath;
+		std::string CubeFaces[6]; // [0]=+X, [1]=-X, [2]=+Y, [3]=-Y, [4]=+Z, [5]=-Z
+		int Mode = 0;			  // 0: Sphere, 1: Cross, 2: Cubemap (GPU), 3: Six Faces
+		float Exposure = 1.0f;
+		float Brightness = 0.0f;
+		float Contrast = 1.0f;
+	};
+
+	struct FogSettings
+	{
+		bool Enabled = false;
+		int Mode = 0; // 0: Linear, 1: Exp, 2: Exp2
+		Color FogColor = {158, 148, 148, 255};
+		float Density = 0.001f;
+		float Start = 10.0f;
+		float End = 5000.0f;
+		float HeightFalloff = 0.2f;
+	};
+
+	struct LightingSettings
+	{
+		glm::vec3 Direction = {-1.0f, -1.0f, -1.0f};
+		Color LightColor = {255, 255, 255, 255}; // WHITE
+		float Ambient = 0.3f;
+		float Exposure = 1.0f;
+		float Gamma = 2.2f;
+	};
+
+	struct EnvironmentSettings
+	{
+		LightingSettings Lighting;
+		SkyboxSettings Skybox;
+		FogSettings Fog;
+	};
+
+	class EnvironmentAsset : public Asset
+	{
+	public:
+		EnvironmentAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~EnvironmentAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Environment;
+		}
+
+		void OnLoaded() override
+		{
+			CH_CORE_INFO("Environment asset loaded: {}", GetPath());
+		}
+
+		const EnvironmentSettings& GetSettings() const
+		{
+			return m_Settings;
+		}
+		EnvironmentSettings& GetSettings()
+		{
+			return m_Settings;
+		}
+		void SetSettings(const EnvironmentSettings& settings)
+		{
+			m_Settings = settings;
+		}
+
+	private:
+		EnvironmentSettings m_Settings;
+	};
+
+} // namespace Chained
+
+#endif // CH_ENVIRONMENT_H
\ No newline at end of file
diff --git a/engine/assets/types/font_asset.cpp b/engine/assets/types/font_asset.cpp
new file mode 100644
index 000000000..8db44945a
--- /dev/null
+++ b/engine/assets/types/font_asset.cpp
@@ -0,0 +1,33 @@
+#include "engine/assets/types/font_asset.h"
+#include "engine/graphics/freetype_gl_atlas.h"
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+
+namespace Chained
+{
+	void FontAsset::Unload()
+	{
+		if (m_Font.freeTypeAtlas)
+		{
+			delete m_Font.freeTypeAtlas;
+			m_Font.freeTypeAtlas = nullptr;
+		}
+		m_Font = Font();
+	}
+
+	Font FontAsset::CreateFromFile(const std::string& path)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			return Font{};
+		}
+
+		auto asset = am->Get<FontAsset>(path);
+		if (asset && asset->GetState() == AssetState::Ready)
+		{
+			return asset->GetFont();
+		}
+		return Font{};
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/types/font_asset.h b/engine/assets/types/font_asset.h
new file mode 100644
index 000000000..b878e67db
--- /dev/null
+++ b/engine/assets/types/font_asset.h
@@ -0,0 +1,78 @@
+#ifndef CH_FONT_ASSET_H
+#define CH_FONT_ASSET_H
+
+#include "engine/assets/asset.h"
+#include <cstdint>
+#include <memory>
+#include <vector>
+#include <unordered_map>
+#include "engine/graphics/api/texture.h"
+
+namespace Chained
+{
+	class FreeTypeGLAtlas;
+
+	struct FontChar
+	{
+		float x0, y0, x1, y1; // Texture coordinates
+		float xoff, yoff, xadvance;
+	};
+
+	struct Font
+	{
+		std::shared_ptr<Texture> textureAtlas = nullptr;
+		int atlasWidth = 0;
+		int atlasHeight = 0;
+		std::unordered_map<uint32_t, FontChar> chars;
+		float fontSize = 32.0f;
+		std::vector<uint8_t> atlasPixels; // CPU-side RGBA8 copy for text rasterization
+
+		// Direct access to the freetype-gl atlas (owned by FontAsset)
+		FreeTypeGLAtlas* freeTypeAtlas = nullptr;
+
+		const FontChar& GetChar(uint32_t codepoint) const
+		{
+			static const FontChar empty = {0, 0, 0, 0, 0, 0, 0};
+			auto it = chars.find(codepoint);
+			return (it != chars.end()) ? it->second : empty;
+		}
+	};
+
+	class FontAsset : public Asset
+	{
+	public:
+		FontAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~FontAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Font;
+		}
+
+		void OnLoaded() override
+		{
+		}
+
+		void Unload() override;
+
+		const Font& GetFont() const
+		{
+			return m_Font;
+		}
+		void SetFont(const Font& font)
+		{
+			m_Font = font;
+		}
+
+		// Hazel-style asset loading
+		static Font CreateFromFile(const std::string& path);
+
+	private:
+		Font m_Font = {0};
+	};
+} // namespace Chained
+
+#endif // CH_FONT_ASSET_H
diff --git a/engine/assets/types/material_asset.cpp b/engine/assets/types/material_asset.cpp
new file mode 100644
index 000000000..1018ef554
--- /dev/null
+++ b/engine/assets/types/material_asset.cpp
@@ -0,0 +1,68 @@
+#include "engine/assets/types/material_asset.h"
+#include "engine/assets/loaders/yaml_helpers.h"
+
+namespace Chained
+{
+
+	void MaterialAsset::SaveToFile(const std::string& path) const
+	{
+		try
+		{
+			YAML::Emitter out;
+			out << YAML::BeginMap;
+			out << YAML::Key << "Material" << YAML::Value << YAML::BeginMap;
+
+			out << YAML::Key << "Name" << YAML::Value << m_Material.Name;
+			out << YAML::Key << "AlbedoColor" << YAML::Value << Vec4ToYAML(m_Material.AlbedoColor);
+			out << YAML::Key << "EmissiveColor" << YAML::Value << Vec4ToYAML(m_Material.EmissiveColor);
+			out << YAML::Key << "EmissiveIntensity" << YAML::Value << m_Material.EmissiveIntensity;
+			out << YAML::Key << "Metalness" << YAML::Value << m_Material.Metalness;
+			out << YAML::Key << "Roughness" << YAML::Value << m_Material.Roughness;
+			out << YAML::Key << "Transparent" << YAML::Value << m_Material.Transparent;
+			out << YAML::Key << "Alpha" << YAML::Value << m_Material.Alpha;
+
+			if (!m_Material.AlbedoPath.empty())
+			{
+				out << YAML::Key << "AlbedoMap" << YAML::Value << m_Material.AlbedoPath;
+			}
+			if (!m_Material.NormalPath.empty())
+			{
+				out << YAML::Key << "NormalMap" << YAML::Value << m_Material.NormalPath;
+			}
+			if (!m_Material.MetallicRoughnessPath.empty())
+			{
+				out << YAML::Key << "MetallicRoughnessMap" << YAML::Value << m_Material.MetallicRoughnessPath;
+			}
+			if (!m_Material.EmissivePath.empty())
+			{
+				out << YAML::Key << "EmissiveMap" << YAML::Value << m_Material.EmissivePath;
+			}
+			if (!m_Material.OcclusionPath.empty())
+			{
+				out << YAML::Key << "OcclusionMap" << YAML::Value << m_Material.OcclusionPath;
+			}
+
+			out << YAML::EndMap;
+			out << YAML::EndMap;
+
+			std::filesystem::path filePath(path);
+			if (filePath.has_parent_path())
+			{
+				std::filesystem::create_directories(filePath.parent_path());
+			}
+
+			std::ofstream file(path);
+			if (!file.is_open())
+			{
+				CH_CORE_ERROR("MaterialAsset: Failed to open file for writing: {}", path);
+				return;
+			}
+			file << out.c_str();
+			CH_CORE_INFO("MaterialAsset: Saved to {}", path);
+		} catch (const YAML::Exception& e)
+		{
+			CH_CORE_ERROR("MaterialAsset: Failed to save {}: {}", path, e.what());
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/assets/types/material_asset.h b/engine/assets/types/material_asset.h
new file mode 100644
index 000000000..f73de5006
--- /dev/null
+++ b/engine/assets/types/material_asset.h
@@ -0,0 +1,47 @@
+#ifndef CH_MATERIAL_ASSET_H
+#define CH_MATERIAL_ASSET_H
+
+#include "engine/assets/asset.h"
+#include "engine/graphics/api/renderer_types.h"
+#include <string>
+
+namespace Chained
+{
+
+	class MaterialAsset : public Asset
+	{
+	public:
+		MaterialAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~MaterialAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Material;
+		}
+
+		Material& GetMaterial()
+		{
+			return m_Material;
+		}
+		const Material& GetMaterial() const
+		{
+			return m_Material;
+		}
+
+		void SetMaterial(const Material& mat)
+		{
+			m_Material = mat;
+		}
+
+		void SaveToFile(const std::string& path) const;
+
+	private:
+		Material m_Material;
+	};
+
+} // namespace Chained
+
+#endif // CH_MATERIAL_ASSET_H
diff --git a/engine/assets/types/model_asset.cpp b/engine/assets/types/model_asset.cpp
new file mode 100644
index 000000000..04003d2a0
--- /dev/null
+++ b/engine/assets/types/model_asset.cpp
@@ -0,0 +1,428 @@
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+#include "engine/project/project.h"
+#include <cstring>
+
+namespace Chained
+{
+	std::string ModelAsset::GetAnimationName(int index) const
+	{
+		return (index >= 0 && index < (int)m_Animations.size()) ? m_Animations[index].name : "";
+	}
+
+	std::vector<glm::mat4> ModelAsset::GetBoneMatrices(int animationIndex, int frame) const
+	{
+		if (animationIndex < 0 || animationIndex >= (int)m_Animations.size())
+		{
+			return {};
+		}
+		const auto& anim = m_Animations[animationIndex];
+		if (frame < 0 || frame >= anim.frameCount)
+		{
+			return {};
+		}
+
+		int boneCount = anim.boneCount;
+		if (boneCount == 0)
+		{
+			return {};
+		}
+
+		std::vector<glm::mat4> globalTransforms(boneCount);
+		std::vector<glm::mat4> finalMatrices;
+		finalMatrices.reserve(boneCount);
+
+		for (int boneIndex = 0; boneIndex < boneCount; ++boneIndex)
+		{
+			const auto& pose = anim.framePoses[frame * boneCount + boneIndex];
+
+			glm::mat4 local = glm::translate(glm::mat4(1.0f), pose.translation) * glm::mat4_cast(pose.rotation) *
+							  glm::scale(glm::mat4(1.0f), pose.scale);
+
+			if (m_NodeParents[boneIndex] == -1)
+			{
+				globalTransforms[boneIndex] = local;
+			}
+			else
+			{
+				globalTransforms[boneIndex] = globalTransforms[m_NodeParents[boneIndex]] * local;
+			}
+
+			glm::mat4 offset =
+				(boneIndex < (int)m_OffsetMatrices.size()) ? m_OffsetMatrices[boneIndex] : glm::mat4(1.0f);
+			finalMatrices.push_back(globalTransforms[boneIndex] * offset);
+		}
+
+		return finalMatrices;
+	}
+
+	void ModelAsset::OnLoaded()
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (!m_HasPendingData || !m_PendingData.isValid)
+		{
+			return;
+		}
+
+		CH_CORE_INFO("ModelAsset: Uploading model to GPU: '{}' ({} meshes, {} materials)", GetPath(),
+					 static_cast<uint32_t>(m_PendingData.meshes.size()),
+					 static_cast<uint32_t>(m_PendingData.materials.size()));
+
+		Model newModel;
+		newModel.Materials.resize(m_PendingData.materials.empty() ? 1 : m_PendingData.materials.size());
+
+		m_EmbeddedTextures.clear();
+		if (!m_PendingData.embeddedTextures.empty())
+		{
+			size_t maxTexIndex = 0;
+			for (const auto& [name, data] : m_PendingData.embeddedTextures)
+			{
+				if (name.front() == '*')
+				{
+					try
+					{
+						size_t idx = std::stoul(name.substr(1));
+						if (idx > maxTexIndex)
+						{
+							maxTexIndex = idx;
+						}
+					} catch (...)
+					{
+					}
+				}
+			}
+			m_EmbeddedTextures.resize(maxTexIndex + 1);
+
+			for (const auto& [name, embedded] : m_PendingData.embeddedTextures)
+			{
+				if (name.front() != '*')
+				{
+					continue;
+				}
+
+				try
+				{
+					size_t idx = std::stoul(name.substr(1));
+
+					if (embedded.data.empty() || embedded.width <= 0 || embedded.height <= 0 || embedded.isHDR)
+					{
+						continue;
+					}
+
+					auto texture =
+						Texture::Create((uint32_t)embedded.width, (uint32_t)embedded.height, TextureFormat::RGBA8);
+					if (texture)
+					{
+						texture->SetData((void*)embedded.data.data(), 0);
+						m_EmbeddedTextures[idx] = texture;
+					}
+				} catch (...)
+				{
+					CH_CORE_ERROR("ModelAsset: Failed to process embedded texture key: {0}", name);
+				}
+			}
+		}
+
+		auto project = Project::GetActive();
+
+		auto loadTex = [&](int matIdx, const std::string& path, int mapIndex) {
+			if (path.empty())
+			{
+				return;
+			}
+
+			if (path.front() == '*')
+			{
+				try
+				{
+					size_t texIdx = std::stoul(path.substr(1));
+					if (texIdx < m_EmbeddedTextures.size() && m_EmbeddedTextures[texIdx])
+					{
+						std::shared_ptr<Texture> tex = m_EmbeddedTextures[texIdx];
+						switch (mapIndex)
+						{
+						case 0:
+							newModel.Materials[matIdx].AlbedoMap = tex;
+							break;
+						case 2:
+							newModel.Materials[matIdx].NormalMap = tex;
+							break;
+						case 3:
+							newModel.Materials[matIdx].MetallicRoughnessMap = tex;
+							break;
+						case 4:
+							newModel.Materials[matIdx].EmissiveMap = tex;
+							break;
+						case 5:
+							newModel.Materials[matIdx].OcclusionMap = tex;
+							break;
+						}
+					}
+				} catch (...)
+				{
+					CH_CORE_ERROR("ModelAsset: Invalid embedded texture path reference: {0}", path);
+				}
+				return;
+			}
+
+			if (!project)
+			{
+				return;
+			}
+
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			if (!am)
+			{
+				return;
+			}
+
+			auto tex = am->Get<TextureAsset>(path);
+			if (!tex)
+			{
+				return;
+			}
+
+			std::shared_ptr<Texture> texPtr;
+			if (tex->IsReady() && tex->GetTexture())
+			{
+				texPtr = tex->GetTexture();
+			}
+
+			switch (mapIndex)
+			{
+			case 0:
+				newModel.Materials[matIdx].AlbedoMap = texPtr;
+				break;
+			case 2:
+				newModel.Materials[matIdx].NormalMap = texPtr;
+				break;
+			case 3:
+				newModel.Materials[matIdx].MetallicRoughnessMap = texPtr;
+				break;
+			case 4:
+				newModel.Materials[matIdx].EmissiveMap = texPtr;
+				break;
+			case 5:
+				newModel.Materials[matIdx].OcclusionMap = texPtr;
+				break;
+			}
+		};
+
+		for (int materialIndex = 0; materialIndex < (int)newModel.Materials.size(); ++materialIndex)
+		{
+			if (!m_PendingData.materials.empty())
+			{
+				const auto& rawMaterial = m_PendingData.materials[materialIndex];
+				newModel.Materials[materialIndex].AlbedoColor = rawMaterial.albedoColor;
+				newModel.Materials[materialIndex].EmissiveColor = rawMaterial.emissiveColor;
+				newModel.Materials[materialIndex].EmissiveIntensity = rawMaterial.emissiveIntensity;
+				newModel.Materials[materialIndex].Metalness = rawMaterial.metalness;
+				newModel.Materials[materialIndex].Roughness = rawMaterial.roughness;
+				newModel.Materials[materialIndex].Transparent = rawMaterial.transparent;
+				newModel.Materials[materialIndex].Alpha = rawMaterial.albedoColor.a;
+				newModel.Materials[materialIndex].Name = rawMaterial.name;
+
+				loadTex(materialIndex, rawMaterial.albedoPath, 0);
+				if (!rawMaterial.albedoPath.empty() && rawMaterial.albedoPath.front() != '*')
+				{
+					newModel.Materials[materialIndex].AlbedoPath = rawMaterial.albedoPath;
+				}
+
+				loadTex(materialIndex, rawMaterial.normalPath, 2);
+				if (!rawMaterial.normalPath.empty() && rawMaterial.normalPath.front() != '*')
+				{
+					newModel.Materials[materialIndex].NormalPath = rawMaterial.normalPath;
+				}
+
+				loadTex(materialIndex, rawMaterial.occlusionPath, 5);
+				if (!rawMaterial.occlusionPath.empty() && rawMaterial.occlusionPath.front() != '*')
+				{
+					newModel.Materials[materialIndex].OcclusionPath = rawMaterial.occlusionPath;
+				}
+
+				loadTex(materialIndex, rawMaterial.emissivePath, 4);
+				if (!rawMaterial.emissivePath.empty() && rawMaterial.emissivePath.front() != '*')
+				{
+					newModel.Materials[materialIndex].EmissivePath = rawMaterial.emissivePath;
+				}
+
+				loadTex(materialIndex, rawMaterial.metallicRoughnessPath, 3);
+				if (!rawMaterial.metallicRoughnessPath.empty() && rawMaterial.metallicRoughnessPath.front() != '*')
+				{
+					newModel.Materials[materialIndex].MetallicRoughnessPath = rawMaterial.metallicRoughnessPath;
+				}
+			}
+		}
+
+		for (int meshIndex = 0; meshIndex < (int)m_PendingData.meshes.size(); ++meshIndex)
+		{
+			const auto& rawMesh = m_PendingData.meshes[meshIndex];
+			Mesh mesh;
+			mesh.VertexCount = (uint32_t)rawMesh.vertices.size() / 3;
+			mesh.TriangleCount = (uint32_t)rawMesh.indices.size() / 3;
+			mesh.MaterialIndex = (rawMesh.materialIndex >= 0 && rawMesh.materialIndex < (int)newModel.Materials.size())
+									 ? rawMesh.materialIndex
+									 : 0;
+			mesh.HasSkinning = !rawMesh.joints.empty() && !rawMesh.weights.empty();
+
+			if (mesh.VertexCount > 0)
+			{
+				mesh.VAO = VertexArray::Create();
+
+				if (mesh.VAO)
+				{
+					auto vboPos = VertexBuffer::Create(rawMesh.vertices.data(),
+													   (uint32_t)rawMesh.vertices.size() * sizeof(float));
+					vboPos->SetLayout({{VertexAttributeType::Float3, "a_Position"}});
+					mesh.VAO->AddVertexBuffer(vboPos);
+
+					if (!rawMesh.texcoords.empty())
+					{
+						auto vboTex = VertexBuffer::Create(rawMesh.texcoords.data(),
+														   (uint32_t)rawMesh.texcoords.size() * sizeof(float));
+						vboTex->SetLayout({{VertexAttributeType::Float2, "a_TexCoord"}});
+						mesh.VAO->AddVertexBuffer(vboTex);
+					}
+
+					if (!rawMesh.normals.empty())
+					{
+						auto vboNorm = VertexBuffer::Create(rawMesh.normals.data(),
+															(uint32_t)rawMesh.normals.size() * sizeof(float));
+						vboNorm->SetLayout({{VertexAttributeType::Float3, "a_Normal"}});
+						mesh.VAO->AddVertexBuffer(vboNorm);
+					}
+
+					if (!rawMesh.joints.empty())
+					{
+						std::vector<int32_t> jointsInt;
+						jointsInt.reserve(rawMesh.joints.size());
+						for (auto jointId : rawMesh.joints)
+						{
+							jointsInt.push_back(static_cast<int32_t>(jointId));
+						}
+
+						auto vboJoints = VertexBuffer::Create((float*)jointsInt.data(),
+															  (uint32_t)jointsInt.size() * sizeof(int32_t));
+						vboJoints->SetLayout({{VertexAttributeType::Int4, "a_JointIDs"}});
+						mesh.VAO->AddVertexBuffer(vboJoints);
+					}
+
+					if (!rawMesh.weights.empty())
+					{
+						auto vboWeights = VertexBuffer::Create(rawMesh.weights.data(),
+															   (uint32_t)rawMesh.weights.size() * sizeof(float));
+						vboWeights->SetLayout({{VertexAttributeType::Float4, "a_Weights"}});
+						mesh.VAO->AddVertexBuffer(vboWeights);
+					}
+
+					if (!rawMesh.indices.empty())
+					{
+						auto ibo = IndexBuffer::Create(rawMesh.indices.data(), (uint32_t)rawMesh.indices.size());
+						mesh.VAO->SetIndexBuffer(ibo);
+					}
+				}
+
+				mesh.MinBounds = {FLT_MAX, FLT_MAX, FLT_MAX};
+				mesh.MaxBounds = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
+				for (size_t vertexOffset = 0; vertexOffset < rawMesh.vertices.size(); vertexOffset += 3)
+				{
+					mesh.MinBounds =
+						glm::min(mesh.MinBounds, {rawMesh.vertices[vertexOffset], rawMesh.vertices[vertexOffset + 1],
+												  rawMesh.vertices[vertexOffset + 2]});
+					mesh.MaxBounds =
+						glm::max(mesh.MaxBounds, {rawMesh.vertices[vertexOffset], rawMesh.vertices[vertexOffset + 1],
+												  rawMesh.vertices[vertexOffset + 2]});
+				}
+			}
+			newModel.Meshes.push_back(mesh);
+		}
+
+		BoundingBox totalBox = {{FLT_MAX, FLT_MAX, FLT_MAX}, {-FLT_MAX, -FLT_MAX, -FLT_MAX}};
+		bool anyMesh = false;
+		for (const auto& inst : m_PendingData.instances)
+		{
+			if (inst.meshIndex < 0 || inst.meshIndex >= (int)newModel.Meshes.size())
+			{
+				continue;
+			}
+
+			const Mesh& mesh = newModel.Meshes[inst.meshIndex];
+			glm::vec3 corners[8] = {{mesh.MinBounds.x, mesh.MinBounds.y, mesh.MinBounds.z},
+									{mesh.MaxBounds.x, mesh.MinBounds.y, mesh.MinBounds.z},
+									{mesh.MinBounds.x, mesh.MaxBounds.y, mesh.MinBounds.z},
+									{mesh.MaxBounds.x, mesh.MaxBounds.y, mesh.MinBounds.z},
+									{mesh.MinBounds.x, mesh.MinBounds.y, mesh.MaxBounds.z},
+									{mesh.MaxBounds.x, mesh.MinBounds.y, mesh.MaxBounds.z},
+									{mesh.MinBounds.x, mesh.MaxBounds.y, mesh.MaxBounds.z},
+									{mesh.MaxBounds.x, mesh.MaxBounds.y, mesh.MaxBounds.z}};
+
+			for (int cornerIndex = 0; cornerIndex < 8; ++cornerIndex)
+			{
+				glm::vec4 transformed = inst.localTransform * glm::vec4(corners[cornerIndex], 1.0f);
+				totalBox.Min = glm::min(totalBox.Min, glm::vec3(transformed));
+				totalBox.Max = glm::max(totalBox.Max, glm::vec3(transformed));
+			}
+			anyMesh = true;
+		}
+
+		if (!anyMesh)
+		{
+			totalBox = {{0, 0, 0}, {0, 0, 0}};
+		}
+
+		m_Model = std::move(newModel);
+		m_Materials = m_Model.Materials;
+		m_BoundingBox = totalBox;
+		m_Meshes = std::move(m_PendingData.meshes);
+		m_Animations = std::move(m_PendingData.animations);
+		m_Instances = std::move(m_PendingData.instances);
+		m_OffsetMatrices = std::move(m_PendingData.offsetMatrices);
+		m_NodeNames = std::move(m_PendingData.nodeNames);
+		m_NodeParents = std::move(m_PendingData.nodeParents);
+
+		m_PendingData = PendingModelData();
+		m_HasPendingData = false;
+		SetState(AssetState::Ready);
+	}
+
+	uint32_t ModelAsset::GetEmbeddedTextureID(const std::string& path) const
+	{
+		if (path.empty() || path.front() != '*')
+		{
+			return 0;
+		}
+		try
+		{
+			size_t index = std::stoul(path.substr(1));
+			if (index < m_EmbeddedTextures.size() && m_EmbeddedTextures[index])
+			{
+				return m_EmbeddedTextures[index]->GetNativeHandle();
+			}
+		} catch (const std::exception&)
+		{
+			CH_CORE_ERROR("ModelAsset: Embedded texture ID not found for path '{0}'", path);
+			return 0;
+		}
+		return 0;
+	}
+
+	void ModelAsset::Unload()
+	{
+		m_Model = Model();
+		m_Meshes.clear();
+		m_Materials.clear();
+		m_Instances.clear();
+		m_Animations.clear();
+		m_EmbeddedTextures.clear();
+		m_PendingData = PendingModelData();
+		m_HasPendingData = false;
+		m_BoundingBox = {{0, 0, 0}, {0, 0, 0}};
+		SetState(AssetState::None);
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/types/model_asset.h b/engine/assets/types/model_asset.h
new file mode 100644
index 000000000..290e2f737
--- /dev/null
+++ b/engine/assets/types/model_asset.h
@@ -0,0 +1,142 @@
+#ifndef CH_MODEL_ASSET_H
+#define CH_MODEL_ASSET_H
+
+#include "engine/assets/asset.h"
+#include "engine/common/base.h"
+#include "engine/assets/model_data.h"
+#include "engine/graphics/api/renderer_types.h"
+#include <future>
+// #include <mutex>
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+	class Texture;
+
+	class ModelAsset : public Asset
+	{
+	public:
+		ModelAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~ModelAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Model;
+		}
+
+		void OnLoaded() override;
+		void Unload() override;
+
+		const Model& GetModel() const
+		{
+			return m_Model;
+		}
+		const std::vector<AnimationData>& GetAnimations() const
+		{
+			return m_Animations;
+		}
+		const std::vector<MeshInstance>& GetInstances() const
+		{
+			return m_Instances;
+		}
+		const BoundingBox& GetBoundingBox() const
+		{
+			return m_BoundingBox;
+		}
+
+		const std::vector<MeshData>& GetMeshes() const
+		{
+			return m_Meshes;
+		}
+
+		const std::vector<Material>& GetMaterials() const
+		{
+			return m_Materials;
+		}
+		std::vector<Material>& GetMaterials()
+		{
+			return m_Materials;
+		}
+
+		// Helpers
+		int GetAnimationCount() const
+		{
+			return (int)m_Animations.size();
+		}
+		void SetPendingData(PendingModelData&& data)
+		{
+			m_PendingData = std::move(data);
+			m_HasPendingData = true;
+		}
+		PendingModelData& GetPendingData()
+		{
+			return m_PendingData;
+		}
+		bool HasPendingData() const
+		{
+			return m_HasPendingData;
+		}
+
+		void SetModel(const Model& model)
+		{
+			m_Model = model;
+		}
+		void SetAnimations(const std::vector<AnimationData>& animations)
+		{
+			m_Animations = animations;
+		}
+		void SetInstances(const std::vector<MeshInstance>& instances)
+		{
+			m_Instances = instances;
+		}
+		void SetBoundingBox(const BoundingBox& bbox)
+		{
+			m_BoundingBox = bbox;
+		}
+		void SetMeshes(const std::vector<MeshData>& meshes)
+		{
+			m_Meshes = meshes;
+		}
+		void SetOffsetMatrices(const std::vector<glm::mat4>& matrices)
+		{
+			m_OffsetMatrices = matrices;
+		}
+		void SetNodeNames(const std::vector<std::string>& names)
+		{
+			m_NodeNames = names;
+		}
+		void SetNodeParents(const std::vector<int>& parents)
+		{
+			m_NodeParents = parents;
+		}
+		std::string GetAnimationName(int index) const;
+		std::vector<glm::mat4> GetBoneMatrices(int animationIndex, int frame) const;
+		// Get renderer ID for embedded texture (e.g., "*0", "*1").
+		// Returns 0 if the texture is not found or path is not an embedded texture marker.
+		uint32_t GetEmbeddedTextureID(const std::string& path) const;
+
+	private:
+		Model m_Model;
+		std::vector<MeshData> m_Meshes;
+		std::vector<AnimationData> m_Animations;
+		std::vector<MeshInstance> m_Instances;
+		std::vector<Material> m_Materials;
+		BoundingBox m_BoundingBox = {{0, 0, 0}, {0, 0, 0}};
+
+		// Skeleton data
+		std::vector<glm::mat4> m_OffsetMatrices;
+		std::vector<std::string> m_NodeNames;
+		std::vector<int> m_NodeParents;
+
+		// Loading data
+		PendingModelData m_PendingData;
+		std::vector<std::shared_ptr<Texture>> m_EmbeddedTextures;
+		bool m_HasPendingData = false;
+	};
+} // namespace Chained
+
+#endif // CH_MODEL_ASSET_H
\ No newline at end of file
diff --git a/engine/assets/types/shader_asset.h b/engine/assets/types/shader_asset.h
new file mode 100644
index 000000000..d89ef19e6
--- /dev/null
+++ b/engine/assets/types/shader_asset.h
@@ -0,0 +1,44 @@
+#ifndef CH_SHADER_ASSET_H
+#define CH_SHADER_ASSET_H
+
+#include "engine/assets/asset.h"
+#include "engine/graphics/api/shader.h"
+#include <memory>
+
+namespace Chained
+{
+
+	class ShaderAsset : public Asset
+	{
+	public:
+		ShaderAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~ShaderAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Shader;
+		}
+
+		void OnLoaded() override
+		{
+		} // Shaders are usually loaded synchronously on GPU
+
+		std::shared_ptr<Shader> GetShader() const
+		{
+			return m_Shader;
+		}
+		void SetShader(const std::shared_ptr<Shader>& shader)
+		{
+			m_Shader = shader;
+		}
+
+	private:
+		std::shared_ptr<Shader> m_Shader;
+	};
+
+} // namespace Chained
+
+#endif // CH_SHADER_ASSET_H
\ No newline at end of file
diff --git a/engine/assets/types/texture_asset.cpp b/engine/assets/types/texture_asset.cpp
new file mode 100644
index 000000000..fdac73881
--- /dev/null
+++ b/engine/assets/types/texture_asset.cpp
@@ -0,0 +1,88 @@
+#include "engine/assets/types/texture_asset.h"
+
+#include "engine/core/profiler.h"
+#include <stb_image.h>
+
+namespace Chained
+{
+
+	uint32_t TextureAsset::GetWidth() const
+	{
+		if (m_Texture)
+		{
+			return m_Texture->GetWidth();
+		}
+		return m_PendingImage.width;
+	}
+
+	uint32_t TextureAsset::GetHeight() const
+	{
+		if (m_Texture)
+		{
+			return m_Texture->GetHeight();
+		}
+		return m_PendingImage.height;
+	}
+
+	void TextureAsset::OnLoaded()
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (GetState() == AssetState::Ready || GetState() == AssetState::Failed)
+		{
+			return;
+		}
+
+		if (m_HasPendingImage && m_PendingImage.data != nullptr)
+		{
+			TextureFormat format = TextureFormat::RGBA8;
+			if (m_IsHDR)
+			{
+				format = (m_PendingImage.channels == 3) ? TextureFormat::RGB16F : TextureFormat::RGBA16F;
+			}
+			else
+			{
+				format = (m_PendingImage.channels == 3) ? TextureFormat::RGB8 : TextureFormat::RGBA8;
+			}
+
+			if (m_IsCubemap)
+			{
+				m_Texture = Texture::CreateCubemap(m_PendingImage.width, format);
+			}
+			else
+			{
+				m_Texture = Texture::Create(m_PendingImage.width, m_PendingImage.height, format);
+				if (m_Texture)
+				{
+					m_Texture->SetData(m_PendingImage.data, 0);
+				}
+			}
+
+			if (m_PendingImage.data != nullptr)
+			{
+				stbi_image_free(m_PendingImage.data);
+				m_PendingImage.data = nullptr;
+			}
+			m_HasPendingImage = false;
+
+			if (m_Texture)
+			{
+				SetState(AssetState::Ready);
+			}
+			else
+			{
+				CH_CORE_ERROR("TextureAsset: Failed to create GPU texture for '{}'", m_Path);
+				SetState(AssetState::Failed);
+			}
+		}
+	}
+
+	void TextureAsset::Unload()
+	{
+		m_Texture.reset();
+		m_PendingImage = {0};
+		m_HasPendingImage = false;
+		SetState(AssetState::None);
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/assets/types/texture_asset.h b/engine/assets/types/texture_asset.h
new file mode 100644
index 000000000..395198366
--- /dev/null
+++ b/engine/assets/types/texture_asset.h
@@ -0,0 +1,106 @@
+#ifndef CH_TEXTURE_ASSET_H
+#define CH_TEXTURE_ASSET_H
+
+#include "engine/assets/asset.h"
+#include "engine/graphics/api/texture.h"
+#include <memory>
+#include <cstdint>
+
+namespace Chained
+{
+
+	enum class TextureUsage
+	{
+		Scene,
+		UI,
+		Skybox,
+		Cubemap,
+	};
+
+	struct DecodedImage
+	{
+		void* data = nullptr;
+		int width = 0;
+		int height = 0;
+		int mipmaps = 0;
+		int format = 0;
+		int channels = 0;
+		bool isHDR = false;
+	};
+
+	class TextureAsset : public Asset
+	{
+	public:
+		TextureAsset()
+			: Asset(GetStaticType())
+		{
+		}
+		virtual ~TextureAsset() = default;
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::Texture;
+		}
+
+		void OnLoaded() override;
+		void Unload() override;
+
+		std::shared_ptr<Texture> GetTexture() const
+		{
+			return m_Texture;
+		}
+		uint32_t GetWidth() const;
+		uint32_t GetHeight() const;
+
+		bool IsCubemap() const
+		{
+			return m_IsCubemap;
+		}
+		bool IsHDR() const
+		{
+			return m_IsHDR;
+		}
+
+		void SetPendingImage(const DecodedImage& image)
+		{
+			m_PendingImage = image;
+			m_HasPendingImage = true;
+		}
+		void SetIsCubemap(bool isCubemap)
+		{
+			m_IsCubemap = isCubemap;
+		}
+		void SetIsHDR(bool isHDR)
+		{
+			m_IsHDR = isHDR;
+		}
+		void SetUsage(TextureUsage usage)
+		{
+			m_Usage = usage;
+		}
+		TextureUsage GetUsage() const
+		{
+			return m_Usage;
+		}
+		void SetFlipYOnLoad(bool flipY)
+		{
+			m_FlipYOnLoad = flipY;
+		}
+		bool ShouldFlipYOnLoad() const
+		{
+			return m_FlipYOnLoad;
+		}
+
+	private:
+		std::shared_ptr<Texture> m_Texture;
+		DecodedImage m_PendingImage = {0};
+		bool m_HasPendingImage = false;
+		bool m_IsCubemap = false;
+		bool m_IsHDR = false;
+		bool m_FlipYOnLoad = true;
+		TextureUsage m_Usage = TextureUsage::Scene;
+	};
+
+} // namespace Chained
+
+#endif // CH_TEXTURE_ASSET_H
\ No newline at end of file
diff --git a/engine/audio/CMakeLists.txt b/engine/audio/CMakeLists.txt
index 40ff04b77..6d08105a9 100644
--- a/engine/audio/CMakeLists.txt
+++ b/engine/audio/CMakeLists.txt
@@ -1,29 +1,24 @@
-add_library(engine_audio ${SUBMODULE_LIB_TYPE}
-        audio.cpp
-        audio.h
+add_library(engine_audio STATIC
+    audio.h
+    audio.cpp
 )
 
 target_include_directories(engine_audio PUBLIC
-    ${ENGINE_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/include/entt/src
-    ${CMAKE_SOURCE_DIR}/include/miniaudio
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
 )
 
-
-target_link_libraries(engine_audio PUBLIC 
+target_link_libraries(engine_audio PUBLIC
     engine_core
+    engine_project
+    glm
+    engine_external_miniaudio
 )
 
 if(WIN32)
     target_link_libraries(engine_audio PUBLIC winmm ole32)
 endif()
 
-if(MSVC)
-    target_compile_options(engine_audio PRIVATE /bigobj)
-elseif(MINGW)
-    target_compile_options(engine_audio PRIVATE -Wa,-mbig-obj)
-endif()
-
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(engine_audio)
+if(TARGET engine_pch)
+    target_link_libraries(engine_audio PRIVATE engine_pch)
 endif()
diff --git a/engine/audio/audio.cpp b/engine/audio/audio.cpp
index 369b8050c..ddced993f 100644
--- a/engine/audio/audio.cpp
+++ b/engine/audio/audio.cpp
@@ -1,282 +1,401 @@
 #define MINIAUDIO_IMPLEMENTATION
 #include "miniaudio.h"
 #include "audio.h"
-#include "engine/core/log.h"
-#include "engine/scene/project.h"
-#include <filesystem>
-
-namespace CHEngine
-{
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/audio_asset.h"
+#include "engine/core/service_locator.h"
 
+#include "engine/project/project.h"
 
-static std::vector<std::shared_ptr<SoundInstance>> s_ActiveSounds;
-
-Audio::Audio()
-{
-    m_Engine = new ma_engine();
-    ma_result result = ma_engine_init(NULL, (ma_engine*)m_Engine);
-    if (result != MA_SUCCESS)
-    {
-        delete (ma_engine*)m_Engine;
-        m_Engine = nullptr;
-        CH_CORE_ERROR("Audio System: Failed to initialize ma_engine!");
-        return;
-    }
-
-    CH_CORE_INFO("Audio System: High-level ma_engine initialized.");
-}
-
-Audio::~Audio()
+namespace Chained
 {
-    if (m_Engine)
-    {
-        StopAll();
-        ma_engine_uninit((ma_engine*)m_Engine);
-        delete (ma_engine*)m_Engine;
-        m_Engine = nullptr;
-        CH_CORE_INFO("Audio System: Shutdown.");
-    }
-}
-
-void Audio::Update(Timestep ts)
-{
-    if (!m_Engine) return;
-
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    for (auto it = s_ActiveSounds.begin(); it != s_ActiveSounds.end(); )
-    {
-        if (ma_sound_at_end(&(*it)->Sound))
-        {
-            ma_sound_uninit(&(*it)->Sound);
-            ma_audio_buffer_uninit(&(*it)->Buffer);
-            it = s_ActiveSounds.erase(it);
-        }
-        else
-        {
-            ++it;
-        }
-    }
-}
-
-AudioHandle Audio::LoadSound(const std::string& filepath)
-{
-    if (filepath.empty())
-    {
-        return 0;
-    }
-
-    std::filesystem::path resolvedPath = Project::GetAbsolutePath(filepath);
-    if (resolvedPath.empty() || !std::filesystem::exists(resolvedPath))
-    {
-        CH_CORE_ERROR("Audio System: File not found: {}", filepath);
-        return 0; // Returning 0 (INVALID_HANDLE equivalent for UUIDs typically)
-    }
-
-    std::string cacheKey = resolvedPath.generic_string();
-
-    {
-        std::lock_guard<std::mutex> lock(m_DataMutex);
-        auto existing = m_PathRegistry.find(cacheKey);
-        if (existing != m_PathRegistry.end())
-        {
-            return existing->second;
-        }
-    }
-
-    ma_decoder decoder;
-    ma_result result = ma_decoder_init_file(cacheKey.c_str(), NULL, &decoder);
-    if (result != MA_SUCCESS)
-    {
-        CH_CORE_ERROR("Audio System: Failed to initialize decoder for {}", filepath);
-        return 0;
-    }
-
-    ma_uint64 frameCount;
-    result = ma_decoder_get_length_in_pcm_frames(&decoder, &frameCount);
-    if (result != MA_SUCCESS)
-    {
-        CH_CORE_ERROR("Audio System: Failed to get length for {}", filepath);
-        ma_decoder_uninit(&decoder);
-        return 0;
-    }
-
-    std::vector<float> pcmData(frameCount * decoder.outputChannels);
-    ma_uint64 framesRead;
-    result = ma_decoder_read_pcm_frames(&decoder, pcmData.data(), frameCount, &framesRead);
-    
-    uint32_t channels = decoder.outputChannels;
-    uint32_t sampleRate = decoder.outputSampleRate;
-
-    ma_decoder_uninit(&decoder);
-
-    if (result != MA_SUCCESS)
-    {
-        CH_CORE_ERROR("Audio System: Failed to read PCM frames for {}", filepath);
-        return 0;
-    }
-
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    AudioHandle newHandle = UUID(); // Generate new unique ID
-    
-    AudioData data;
-    data.PCMData = std::move(pcmData);
-    data.Channels = channels;
-    data.SampleRate = sampleRate;
-
-    m_AudioDataRegistry[newHandle] = std::move(data);
-    m_PathRegistry[cacheKey] = newHandle;
-    
-    CH_CORE_INFO("Audio System: Successfully loaded {} ({} frames)", filepath, frameCount);
-    return newHandle;
-}
-
-bool Audio::IsSoundLoaded(AudioHandle handle) const
-{
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    return m_AudioDataRegistry.find(handle) != m_AudioDataRegistry.end();
-}
 
-bool Audio::IsPlaying(AudioHandle handle) const
-{
-    if (handle == 0)
-    {
-        return false;
-    }
-
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    for (const auto& instance : s_ActiveSounds)
-    {
-        if (instance && instance->Handle == handle)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-void Audio::SetListenerPosition(const glm::vec3& position, const glm::vec3& forward, const glm::vec3& up)
-{
-    if (!m_Engine) return;
-
-    ma_engine_listener_set_position((ma_engine*)m_Engine, 0, position.x, position.y, position.z);
-    ma_engine_listener_set_direction((ma_engine*)m_Engine, 0, forward.x, forward.y, forward.z);
-    ma_engine_listener_set_world_up((ma_engine*)m_Engine, 0, up.x, up.y, up.z);
-}
-
-void Audio::Play(AudioHandle handle, float volume, float pitch, bool loop, bool spatial, const glm::vec3& pos)
-{
-    if (!m_Engine || handle == 0) return;
-
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    auto it = m_AudioDataRegistry.find(handle);
-    if (it == m_AudioDataRegistry.end()) return;
-
-    const AudioData& data = it->second;
-
-    if (data.PCMData.empty() || data.Channels == 0 || data.SampleRate == 0)
-    {
-        CH_CORE_WARN("Audio System: Invalid data in registry for Handle {}", (uint64_t)handle);
-        return;
-    }
-
-    auto instance = std::make_shared<SoundInstance>();
-    instance->Handle = handle;
-    
-    ma_uint32 frameCount = data.Size() / data.Channels;
-    ma_audio_buffer_config config = ma_audio_buffer_config_init(ma_format_f32, data.Channels, frameCount, data.Data(), NULL);
-    config.sampleRate = data.SampleRate; 
-    
-    ma_result result = ma_audio_buffer_init(&config, &instance->Buffer);
-    if (result != MA_SUCCESS)
-    {
-        CH_CORE_ERROR("Audio System: Failed to initialize audio buffer.");
-        return;
-    }
-
-    result = ma_sound_init_from_data_source((ma_engine*)m_Engine, &instance->Buffer, 0, NULL, &instance->Sound);
-    if (result != MA_SUCCESS)
-    {
-        ma_audio_buffer_uninit(&instance->Buffer);
-        CH_CORE_ERROR("Audio System: Failed to init sound from data source.");
-        return;
-    }
-
-    ma_sound_set_volume(&instance->Sound, volume);
-    ma_sound_set_pitch(&instance->Sound, pitch);
-    ma_sound_set_looping(&instance->Sound, loop);
-    
-    if (spatial)
-    {
-        ma_sound_set_position(&instance->Sound, pos.x, pos.y, pos.z);
-        ma_sound_set_spatialization_enabled(&instance->Sound, MA_TRUE);
-    }
-
-    result = ma_sound_start(&instance->Sound);
-    if (result != MA_SUCCESS)
-    {
-        ma_sound_uninit(&instance->Sound);
-        ma_audio_buffer_uninit(&instance->Buffer);
-        CH_CORE_ERROR("Audio System: Failed to start sound.");
-        return;
-    }
-
-    s_ActiveSounds.push_back(instance);
-}
-
-void Audio::Stop(const std::string& filepath)
-{
-    if (!m_Engine || filepath.empty()) return;
-
-    std::filesystem::path resolvedPath = Project::GetAbsolutePath(filepath);
-    if (resolvedPath.empty()) return;
-
-    AudioHandle handle = 0;
-    {
-        std::lock_guard<std::mutex> lock(m_DataMutex);
-        auto it = m_PathRegistry.find(resolvedPath.generic_string());
-        if (it == m_PathRegistry.end())
-        {
-            return;
-        }
-        handle = it->second;
-    }
-
-    Stop(handle);
-}
-
-void Audio::Stop(AudioHandle handle)
-{
-    if (!m_Engine || handle == 0) return;
-
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    for (auto it = s_ActiveSounds.begin(); it != s_ActiveSounds.end(); )
-    {
-        if ((*it)->Handle == handle)
-        {
-            ma_sound_stop(&(*it)->Sound);
-            ma_sound_uninit(&(*it)->Sound);
-            ma_audio_buffer_uninit(&(*it)->Buffer);
-            it = s_ActiveSounds.erase(it);
-        }
-        else
-        {
-            ++it;
-        }
-    }
-}
-
-void Audio::StopAll()
-{
-    if (!m_Engine) return;
-
-    std::lock_guard<std::mutex> lock(m_DataMutex);
-    for (auto& instance : s_ActiveSounds)
-    {
-        ma_sound_stop(&instance->Sound);
-        ma_sound_uninit(&instance->Sound);
-        ma_audio_buffer_uninit(&instance->Buffer);
-    }
-    s_ActiveSounds.clear();
-}
-
-} // namespace CHEngine
+	Audio::Audio()
+		: m_engine(nullptr)
+	{
+	}
+
+	Audio::~Audio()
+	{
+		if (m_engine)
+		{
+			CH_CORE_WARN("Audio System: Destructor called before explicit Shutdown(). Force shutting down.");
+			Shutdown();
+		}
+	}
+
+	void Audio::Initialize()
+	{
+		if (m_engine)
+		{
+			CH_CORE_WARN("Audio System: Already initialized.");
+			return;
+		}
+
+		m_engine = std::unique_ptr<ma_engine, MiniaudioEngineDeleter>(new ma_engine());
+		ma_result result = ma_engine_init(NULL, m_engine.get());
+		if (result != MA_SUCCESS)
+		{
+			CH_CORE_ERROR("Audio System: Failed to initialize miniaudio engine.");
+			m_engine.reset();
+		}
+		else
+		{
+			CH_CORE_INFO("Audio System: Initialized miniaudio engine successfully via Service.");
+		}
+	}
+
+	void Audio::Shutdown()
+	{
+		if (!m_engine)
+		{
+			return;
+		}
+
+		StopAll();
+
+		m_engine.reset();
+
+		CH_CORE_INFO("Audio System: Shutdown complete.");
+	}
+
+	static void UninitInstance(Chained::SoundInstance& instance)
+	{
+		if (instance.HasSound)
+		{
+			ma_sound_stop(&instance.Sound);
+			ma_sound_uninit(&instance.Sound);
+			instance.HasSound = false;
+		}
+		if (instance.HasDecoder)
+		{
+			ma_decoder_uninit(&instance.Decoder);
+			instance.HasDecoder = false;
+		}
+	}
+
+	void Audio::Update(Timestep ts)
+	{
+		if (!m_engine)
+		{
+			return;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (auto it = m_ActiveSounds.begin(); it != m_ActiveSounds.end();)
+		{
+			auto& inst = **it;
+			// HasSound is always true here (sounds that failed init are never added to queue)
+			// Remove finished non-looping sounds
+			if (inst.HasSound && ma_sound_at_end(&inst.Sound))
+			{
+				UninitInstance(inst);
+				it = m_ActiveSounds.erase(it);
+			}
+			else
+			{
+				++it;
+			}
+		}
+	}
+
+	AssetHandle Audio::LoadSound(const std::string& filepath)
+	{
+		if (filepath.empty())
+		{
+			return AssetHandle(0);
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			CH_CORE_ERROR("Audio System: AssetManager not available");
+			return AssetHandle(0);
+		}
+
+		auto asset = am->Load<AudioAsset>(filepath);
+		if (!asset)
+		{
+			CH_CORE_ERROR("Audio System: Failed to load audio asset: {}", filepath);
+			return AssetHandle(0);
+		}
+
+		return asset->GetID();
+	}
+
+	bool Audio::IsSoundLoaded(AssetHandle handle) const
+	{
+		if (handle == AssetHandle(0))
+		{
+			return false;
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			return false;
+		}
+
+		auto asset = am->GetAsset(handle);
+		return asset != nullptr;
+	}
+
+	bool Audio::IsPlaying(AssetHandle handle) const
+	{
+		if (handle == AssetHandle(0))
+		{
+			return false;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (const auto& instance : m_ActiveSounds)
+		{
+			if (instance && instance->Handle == handle && instance->HasSound)
+			{
+				if (ma_sound_is_playing(&instance->Sound))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	void Audio::SetListenerPosition(const glm::vec3& position, const glm::vec3& forward, const glm::vec3& up)
+	{
+		if (!m_engine)
+		{
+			return;
+		}
+
+		ma_engine_listener_set_position(m_engine.get(), 0, position.x, position.y, position.z);
+		ma_engine_listener_set_direction(m_engine.get(), 0, forward.x, forward.y, forward.z);
+		ma_engine_listener_set_world_up(m_engine.get(), 0, up.x, up.y, up.z);
+	}
+
+	void Audio::SetInstancePosition(AssetHandle handle, const glm::vec3& pos)
+	{
+		if (!m_engine || handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (const auto& instance : m_ActiveSounds)
+		{
+			if (instance && instance->Handle == handle && instance->HasSound)
+			{
+				ma_sound_set_position(&instance->Sound, pos.x, pos.y, pos.z);
+			}
+		}
+	}
+
+	void Audio::Play(AssetHandle handle, float volume, float pitch, bool loop, bool spatial, const glm::vec3& pos)
+	{
+		if (!m_engine || handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			CH_CORE_WARN("Audio System: AssetManager not available");
+			return;
+		}
+
+		auto asset = am->GetAsset(handle);
+		if (!asset)
+		{
+			CH_CORE_WARN("Audio System: Try to play unknown handle {}", (uint64_t)handle);
+			return;
+		}
+
+		std::string filepath = asset->GetPath();
+
+		// Resolve to absolute path if relative, so ReadProjectAsset and
+		// ma_sound_init_from_file both find the file on disk.
+		std::filesystem::path resolvedPath = filepath;
+		if (resolvedPath.is_relative())
+		{
+			if (auto project = Project::GetActive())
+			{
+				resolvedPath = project->GetAssetDirectory() / filepath;
+			}
+		}
+		std::string resolvedStr = resolvedPath.string();
+
+		auto instance = std::make_unique<SoundInstance>();
+		instance->Handle = handle;
+
+		// Use synchronous decode (no ASYNC) so ma_sound_at_end/is_playing are safe immediately
+		ma_uint32 flags = MA_SOUND_FLAG_DECODE;
+		ma_result result = MA_ERROR;
+
+		// Try reading from pack/memory first (works in both editor and packaged builds)
+		instance->SoundData = am->ReadProjectAsset(resolvedPath);
+		if (instance->SoundData.empty())
+		{
+			instance->SoundData = am->ReadAssetData(resolvedStr);
+		}
+
+		if (!instance->SoundData.empty())
+		{
+			ma_decoder_config config = ma_decoder_config_init(ma_format_f32, 0, 0);
+			result = ma_decoder_init_memory(instance->SoundData.data(), instance->SoundData.size(), &config,
+											&instance->Decoder);
+			if (result == MA_SUCCESS)
+			{
+				instance->HasDecoder = true;
+				result =
+					ma_sound_init_from_data_source(m_engine.get(), &instance->Decoder, flags, NULL, &instance->Sound);
+				if (result == MA_SUCCESS)
+				{
+					instance->HasSound = true;
+				}
+			}
+		}
+
+		if (!instance->HasSound)
+		{
+			// Fallback: load directly from disk
+			result = ma_sound_init_from_file(m_engine.get(), resolvedStr.c_str(), flags, NULL, NULL, &instance->Sound);
+			if (result == MA_SUCCESS)
+			{
+				instance->HasSound = true;
+			}
+		}
+
+		if (!instance->HasSound)
+		{
+			CH_CORE_ERROR("Audio System: Failed to init sound '{}' (result={})", resolvedStr, (int)result);
+			// Clean up decoder if it was created but sound init failed
+			if (instance->HasDecoder)
+			{
+				ma_decoder_uninit(&instance->Decoder);
+				instance->HasDecoder = false;
+			}
+			return;
+		}
+
+		ma_sound_set_volume(&instance->Sound, volume);
+		ma_sound_set_pitch(&instance->Sound, pitch);
+		ma_sound_set_looping(&instance->Sound, loop ? MA_TRUE : MA_FALSE);
+
+		if (spatial)
+		{
+			ma_sound_set_position(&instance->Sound, pos.x, pos.y, pos.z);
+			ma_sound_set_spatialization_enabled(&instance->Sound, MA_TRUE);
+		}
+
+		result = ma_sound_start(&instance->Sound);
+		if (result != MA_SUCCESS)
+		{
+			UninitInstance(*instance);
+			CH_CORE_ERROR("Audio System: Failed to start sound.");
+			return;
+		}
+
+		std::lock_guard lock(m_DataMutex);
+		m_ActiveSounds.push_back(std::move(instance));
+	}
+
+	void Audio::SetVolume(AssetHandle handle, float volume)
+	{
+		if (!m_engine || handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (const auto& instance : m_ActiveSounds)
+		{
+			if (instance && instance->Handle == handle)
+			{
+				ma_sound_set_volume(&instance->Sound, volume);
+			}
+		}
+	}
+
+	void Audio::SetPitch(AssetHandle handle, float pitch)
+	{
+		if (!m_engine || handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (const auto& instance : m_ActiveSounds)
+		{
+			if (instance && instance->Handle == handle)
+			{
+				ma_sound_set_pitch(&instance->Sound, pitch);
+			}
+		}
+	}
+
+	void Audio::Stop(const std::string& filepath)
+	{
+		if (!m_engine || filepath.empty())
+		{
+			return;
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			return;
+		}
+
+		AssetHandle handle = am->ResolveToHandle(filepath);
+		if (handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		Stop(handle);
+	}
+
+	void Audio::Stop(AssetHandle handle)
+	{
+		if (!m_engine || handle == AssetHandle(0))
+		{
+			return;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (auto it = m_ActiveSounds.begin(); it != m_ActiveSounds.end();)
+		{
+			if ((*it)->Handle == handle)
+			{
+				UninitInstance(**it);
+				it = m_ActiveSounds.erase(it);
+			}
+			else
+			{
+				++it;
+			}
+		}
+	}
+
+	void Audio::StopAll()
+	{
+		if (!m_engine)
+		{
+			return;
+		}
+
+		std::lock_guard<std::mutex> lock(m_DataMutex);
+		for (auto& instance : m_ActiveSounds)
+		{
+			UninitInstance(*instance);
+		}
+		m_ActiveSounds.clear();
+	}
+
+	ma_engine* Audio::GetEngine() const
+	{
+		return m_engine.get();
+	}
+
+} // namespace Chained
diff --git a/engine/audio/audio.h b/engine/audio/audio.h
index 04115a70b..0ba5e2c22 100644
--- a/engine/audio/audio.h
+++ b/engine/audio/audio.h
@@ -1,86 +1,83 @@
 #ifndef CH_AUDIO_H
 #define CH_AUDIO_H
 
-#include "engine/core/timestep.h"
-#include "engine/core/uuid.h" // Assuming AssetHandle / UUID is here. If not, include where AssetHandle is.
+#include "engine/assets/asset.h"
+#include "engine/common/timestep.h"
 #include <glm/glm.hpp>
 #include <memory>
 #include <miniaudio.h>
 #include <mutex>
 #include <string>
-#include <unordered_map>
 #include <vector>
+#include "engine/core/service.h"
 
-namespace CHEngine
+namespace Chained
 {
-using AudioHandle = UUID;
 
-struct SoundInstance
-{
-    ma_sound Sound;
-    ma_audio_buffer Buffer;
-    AudioHandle Handle;
-};
-struct AudioData
-{
-    std::vector<float> PCMData;
-    uint32_t Channels = 0;
-    uint32_t SampleRate = 0;
-
-    // For play usage inside Audio
-    const float* Data() const
-    {
-        return PCMData.data();
-    }
-    uint32_t Size() const
-    {
-        return (uint32_t)PCMData.size();
-    }
-};
-
-class Audio
-{
-public:
-    static Audio& Get()
-    {
-        static Audio instance;
-        return instance;
-    }
-
-    Audio(const Audio&) = delete;
-    Audio& operator=(const Audio&) = delete;
-
-    void Update(Timestep ts);
-    void SetListenerPosition(const glm::vec3& position, const glm::vec3& forward, const glm::vec3& up);
-
-    // Loads audio from disk synchronously. Returns a Handle that is fast & safe to use.
-    AudioHandle LoadSound(const std::string& filepath);
-    // Returns true if handle is valid and data is loaded. (0 is invalid handle in Hazel style)
-    bool IsSoundLoaded(AudioHandle handle) const;
-    bool IsPlaying(AudioHandle handle) const;
-
-    // Plays a sound.
-    void Play(AudioHandle handle, float volume = 1.0f, float pitch = 1.0f, bool loop = false, bool spatial = false,
-              const glm::vec3& pos = {0, 0, 0});
-
-    // Stops any active instance that was loaded from the given path.
-    void Stop(const std::string& filepath);
-    void Stop(AudioHandle handle);
-
-    void StopAll();
-
-private:
-    Audio();
-    ~Audio();
-
-private:
-    ma_engine* m_Engine = nullptr;
-
-    mutable std::mutex m_DataMutex;
-    std::unordered_map<AudioHandle, AudioData> m_AudioDataRegistry;
-    std::unordered_map<std::string, AudioHandle> m_PathRegistry;
-};
-
-} // namespace CHEngine
+	struct SoundInstance
+	{
+		ma_sound Sound;
+		ma_decoder Decoder;
+		std::vector<uint8_t> SoundData;
+		bool HasDecoder = false;
+		bool HasSound = false; // true only after ma_sound_init_* succeeded
+		AssetHandle Handle;
+	};
+
+	// Custom deleter for ma_engine
+	struct MiniaudioEngineDeleter
+	{
+		void operator()(ma_engine* engine) const
+		{
+			if (engine)
+			{
+				ma_engine_uninit(engine);
+				delete engine;
+			}
+		}
+	};
+
+	class Audio : public Service
+	{
+	public:
+		virtual void Initialize() override;
+		void Update(Timestep ts);
+		virtual void Shutdown() override;
+
+	public:
+		Audio();
+		virtual ~Audio() override;
+
+	public:
+		void SetListenerPosition(const glm::vec3& position, const glm::vec3& forward, const glm::vec3& up);
+
+	public:
+		AssetHandle LoadSound(const std::string& filepath);
+		bool IsSoundLoaded(AssetHandle handle) const;
+		bool IsPlaying(AssetHandle handle) const;
+
+		void Play(AssetHandle handle, float volume = 1.0f, float pitch = 1.0f, bool loop = false, bool spatial = false,
+				  const glm::vec3& pos = {0, 0, 0});
+
+		void SetInstancePosition(AssetHandle handle, const glm::vec3& pos);
+		void SetVolume(AssetHandle handle, float volume);
+		void SetPitch(AssetHandle handle, float pitch);
+
+		void Stop(const std::string& filepath);
+		void Stop(AssetHandle handle);
+		void StopAll();
+
+	public:
+		ma_engine* GetEngine() const;
+
+	private:
+		std::unique_ptr<ma_engine, MiniaudioEngineDeleter> m_engine;
+
+	private:
+		mutable std::mutex m_DataMutex;
+		std::vector<std::unique_ptr<SoundInstance>> m_ActiveSounds;
+	};
+
+} // namespace Chained
 
 #endif // CH_AUDIO_H
diff --git a/engine/common/CMakeLists.txt b/engine/common/CMakeLists.txt
new file mode 100644
index 000000000..ecdcb9c27
--- /dev/null
+++ b/engine/common/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_library(engine_common STATIC
+    base.h
+    color.h
+    engine_assert.h
+    platform_detection.h
+    thread_pool.h
+    timestep.h
+    uuid.h
+    uuid.cpp
+)
+
+target_include_directories(engine_common PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_common PUBLIC
+    spdlog
+    glm
+    libzstd_static
+)
diff --git a/engine/common/asset_path.h b/engine/common/asset_path.h
new file mode 100644
index 000000000..99063e40c
--- /dev/null
+++ b/engine/common/asset_path.h
@@ -0,0 +1,58 @@
+#ifndef CH_ASSET_PATH_H
+#define CH_ASSET_PATH_H
+
+#include <algorithm>
+#include <filesystem>
+#include <string>
+
+namespace Chained
+{
+
+	inline bool FileExists(const std::filesystem::path& path)
+	{
+		std::error_code ec;
+		return std::filesystem::exists(path, ec);
+	}
+
+	inline std::string TrimCopy(const std::string& value)
+	{
+		auto begin =
+			std::find_if_not(value.begin(), value.end(), [](unsigned char ch) { return std::isspace(ch) != 0; });
+		auto end = std::find_if_not(value.rbegin(), value.rend(), [](unsigned char ch) {
+					   return std::isspace(ch) != 0;
+				   }).base();
+
+		if (begin >= end)
+		{
+			return {};
+		}
+
+		return std::string(begin, end);
+	}
+
+	inline std::string NormalizeAssetPath(const std::string& path)
+	{
+		std::string normalized = TrimCopy(path);
+		if (normalized.empty())
+		{
+			return normalized;
+		}
+
+		std::replace(normalized.begin(), normalized.end(), '\\', '/');
+
+		while (normalized.rfind("./", 0) == 0)
+		{
+			normalized = normalized.substr(2);
+		}
+
+		if (normalized.rfind("assets/", 0) == 0)
+		{
+			normalized = normalized.substr(7);
+		}
+
+		return normalized;
+	}
+
+} // namespace Chained
+
+#endif // CH_ASSET_PATH_H
diff --git a/engine/common/base.h b/engine/common/base.h
new file mode 100644
index 000000000..eaff3a040
--- /dev/null
+++ b/engine/common/base.h
@@ -0,0 +1,62 @@
+#ifndef CH_BASE_H
+#define CH_BASE_H
+
+#define GLM_ENABLE_EXPERIMENTAL
+
+#include "engine/common/platform_detection.h"
+
+// DLL Export/Import Macros
+#if CH_PLATFORM_WINDOWS
+#if CH_DYNAMIC_LINK
+#ifdef CH_ENGINE_BUILD
+#define CH_API __declspec(dllexport)
+#else
+#define CH_API __declspec(dllimport)
+#endif
+#else
+#define CH_API
+#endif
+#elif CH_PLATFORM_LINUX
+#define CH_API __attribute__((visibility("default")))
+#else
+#define CH_API
+#endif
+
+// Debug/Release detection
+#ifdef _DEBUG
+#define CH_DEBUG
+#else
+#define CH_RELEASE
+#endif
+
+// Debug break
+#ifdef CH_DEBUG
+#if CH_PLATFORM_WINDOWS
+#define CH_DEBUGBREAK() __debugbreak()
+#elif CH_PLATFORM_LINUX
+#include <csignal>
+#define CH_DEBUGBREAK() std::raise(SIGTRAP)
+#else
+#define CH_DEBUGBREAK()
+#endif
+#define CH_ENABLE_ASSERTS
+#else
+#define CH_DEBUGBREAK()
+#endif
+
+// Macro helpers
+#define CH_EXPAND_MACRO(x) x
+#define CH_STRINGIFY_MACRO(x) #x
+
+#ifdef CH_DEBUG
+#define CH_ENABLE_ASSERTS
+#endif
+
+// Bit manipulation
+#define BIT(x) (1 << (x))
+
+// Bind event function helper
+#define CH_BIND_EVENT_FN(fn)                                                                                           \
+	[this](auto&&... args) -> decltype(auto) { return this->fn(std::forward<decltype(args)>(args)...); }
+
+#endif // CH_BASE_H
diff --git a/engine/common/color.h b/engine/common/color.h
new file mode 100644
index 000000000..512bfb971
--- /dev/null
+++ b/engine/common/color.h
@@ -0,0 +1,53 @@
+#ifndef CH_STRUCTURES_H
+#define CH_STRUCTURES_H
+
+#include "engine/common/base.h"
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+namespace Chained
+{
+	struct CH_API Color
+	{
+		unsigned char r, g, b, a;
+
+		Color()
+			: r(0),
+			  g(0),
+			  b(0),
+			  a(255)
+		{
+		}
+		Color(unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255)
+			: r(r),
+			  g(g),
+			  b(b),
+			  a(a)
+		{
+		}
+
+		static Color White()
+		{
+			return {255, 255, 255, 255};
+		}
+		static Color Black()
+		{
+			return {0, 0, 0, 255};
+		}
+		static Color Red()
+		{
+			return {255, 0, 0, 255};
+		}
+		static Color Green()
+		{
+			return {0, 255, 0, 255};
+		}
+		static Color Blue()
+		{
+			return {0, 0, 255, 255};
+		}
+	};
+
+} // namespace Chained
+
+#endif // CH_STRUCTURES_H
diff --git a/engine/common/engine_assert.h b/engine/common/engine_assert.h
new file mode 100644
index 000000000..2a0c33981
--- /dev/null
+++ b/engine/common/engine_assert.h
@@ -0,0 +1,31 @@
+#ifndef CH_ASSERT_H
+#define CH_ASSERT_H
+
+#include "engine/common/base.h"
+#include "engine/core/log.h"
+
+// Internal implementations
+#define CH_INTERNAL_ASSERT_IMPL(type, check, msg, ...)                                                                 \
+	{                                                                                                                  \
+		if (!(check))                                                                                                  \
+		{                                                                                                              \
+			CH##type##ERROR(msg, __VA_ARGS__);                                                                         \
+			CH_DEBUGBREAK();                                                                                           \
+		}                                                                                                              \
+	}
+#define CH_INTERNAL_ASSERT_WITH_MSG(type, check, ...)                                                                  \
+	CH_INTERNAL_ASSERT_IMPL(type, check, "Assertion failed: {0}", __VA_ARGS__)
+#define CH_INTERNAL_ASSERT_NO_MSG(type, check)                                                                         \
+	CH_INTERNAL_ASSERT_IMPL(type, check, "Assertion '{0}' failed at {1}:{2}", CH_STRINGIFY_MACRO(check),               \
+							std::filesystem::path(__FILE__).filename().string(), __LINE__)
+
+#define CH_INTERNAL_ASSERT_GET_MACRO_NAME(arg1, arg2, macro, ...) macro
+#define CH_INTERNAL_ASSERT_GET_MACRO(...)                                                                              \
+	CH_EXPAND_MACRO(                                                                                                   \
+		CH_INTERNAL_ASSERT_GET_MACRO_NAME(__VA_ARGS__, CH_INTERNAL_ASSERT_WITH_MSG, CH_INTERNAL_ASSERT_NO_MSG))
+
+// Core API
+#define CH_ASSERT(...) CH_EXPAND_MACRO(CH_INTERNAL_ASSERT_GET_MACRO(__VA_ARGS__)(_, __VA_ARGS__))
+#define CH_CORE_ASSERT(...) CH_EXPAND_MACRO(CH_INTERNAL_ASSERT_GET_MACRO(__VA_ARGS__)(_CORE_, __VA_ARGS__))
+
+#endif // CH_ASSERT_H
diff --git a/engine/common/platform_detection.h b/engine/common/platform_detection.h
new file mode 100644
index 000000000..f47f878f1
--- /dev/null
+++ b/engine/common/platform_detection.h
@@ -0,0 +1,38 @@
+#ifndef CH_PLATFORM_DETECTION_H
+#define CH_PLATFORM_DETECTION_H
+
+#define CH_PLATFORM_WINDOWS 0
+#define CH_PLATFORM_LINUX 0
+#define CH_PLATFORM_MACOS 0
+#define CH_PLATFORM_IOS 0
+#define CH_PLATFORM_ANDROID 0
+
+#if defined(_WIN32)
+#ifndef _WIN64
+#error "x86 Builds are not supported!"
+#endif
+#undef CH_PLATFORM_WINDOWS
+#define CH_PLATFORM_WINDOWS 1
+
+#elif defined(__APPLE__) || defined(__MACH__)
+#include <TargetConditionals.h>
+#if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
+#error "iOS / Simulator is not supported!"
+#elif TARGET_OS_OSX == 1
+#error "MacOS is not supported!"
+#else
+#error "Unknown Apple platform!"
+#endif
+
+#elif defined(__ANDROID__)
+#error "Android is not supported!"
+
+#elif defined(__linux__)
+#undef CH_PLATFORM_LINUX
+#define CH_PLATFORM_LINUX 1
+
+#else
+#error "Unknown platform!"
+#endif
+
+#endif // CH_PLATFORM_DETECTION_H
\ No newline at end of file
diff --git a/engine/common/thread_pool.h b/engine/common/thread_pool.h
new file mode 100644
index 000000000..dc3c6df45
--- /dev/null
+++ b/engine/common/thread_pool.h
@@ -0,0 +1,152 @@
+#ifndef CH_THREAD_POOL_H
+#define CH_THREAD_POOL_H
+
+#include <thread>
+#include <vector>
+#include <queue>
+#include <mutex>
+#include <condition_variable>
+#include <future>
+#include <functional>
+#include <memory>
+#include <type_traits>
+
+#include "engine/core/service.h"
+
+namespace Chained
+{
+	class ThreadPool : public Service
+	{
+	public:
+		void Initialize() override
+		{
+		}
+
+		void Shutdown() override
+		{
+			Stop();
+		}
+
+		// Enqueues a task and returns a future for the result.
+		template <class F, class... Args>
+		auto Enqueue(F&& f, Args&&... args) -> std::future<typename std::invoke_result<F, Args...>::type>
+		{
+			using ReturnType = typename std::invoke_result<F, Args...>::type;
+
+			auto task = std::make_shared<std::packaged_task<ReturnType()>>(
+				[f = std::forward<F>(f), ... args = std::forward<Args>(args)]() mutable {
+					return std::invoke(std::move(f), std::move(args)...);
+				});
+
+			std::future<ReturnType> taskFuture = task->get_future();
+			{
+				std::unique_lock<std::mutex> lock(m_QueueMutex);
+
+				if (m_Stop)
+				{
+					throw std::runtime_error("Enqueue on stopped ThreadPool");
+				}
+
+				m_Tasks.emplace([task]() { (*task)(); });
+			}
+
+			m_Condition.notify_one();
+			return taskFuture;
+		}
+
+		void QueueTask(std::function<void()> task)
+		{
+			{
+				std::unique_lock<std::mutex> lock(m_QueueMutex);
+				if (m_Stop)
+				{
+					throw std::runtime_error("QueueTask on stopped ThreadPool");
+				}
+
+				m_Tasks.emplace(std::move(task));
+			}
+			m_Condition.notify_one();
+		}
+
+		void WaitIdle()
+		{
+			std::unique_lock<std::mutex> lock(m_QueueMutex);
+			m_Condition.wait(lock, [this]() { return m_Tasks.empty(); });
+		}
+
+	public:
+		explicit ThreadPool(unsigned int workerCount)
+			: m_Stop(false)
+		{
+			m_Workers.reserve(workerCount);
+			for (unsigned int i = 0; i < workerCount; ++i)
+			{
+				m_Workers.emplace_back([this]() {
+					while (true)
+					{
+						std::function<void()> task;
+						{
+							std::unique_lock<std::mutex> lock(this->m_QueueMutex);
+
+							this->m_Condition.wait(lock, [this]() { return this->m_Stop || !this->m_Tasks.empty(); });
+
+							if (this->m_Stop && this->m_Tasks.empty())
+							{
+								return;
+							}
+
+							task = std::move(this->m_Tasks.front());
+							this->m_Tasks.pop();
+						}
+
+						task();
+					}
+				});
+			}
+		}
+
+		~ThreadPool()
+		{
+			Stop();
+		}
+
+		ThreadPool(const ThreadPool&) = delete;
+		ThreadPool& operator=(const ThreadPool&) = delete;
+
+	private:
+		void Stop()
+		{
+			{
+				std::unique_lock<std::mutex> lock(m_QueueMutex);
+				if (m_Stop)
+				{
+					return;
+				}
+				m_Stop = true;
+			}
+
+			m_Condition.notify_all();
+
+			for (std::thread& worker : m_Workers)
+			{
+				if (worker.joinable())
+				{
+					worker.join();
+				}
+			}
+			m_Workers.clear();
+		}
+
+	private:
+		std::vector<std::thread> m_Workers;
+
+		std::queue<std::function<void()>> m_Tasks;
+
+		std::mutex m_QueueMutex;
+		std::condition_variable m_Condition;
+		bool m_Stop;
+	};
+
+} // namespace Chained
+
+#endif // CH_THREAD_POOL_H
\ No newline at end of file
diff --git a/engine/common/timestep.h b/engine/common/timestep.h
new file mode 100644
index 000000000..6d090c4b7
--- /dev/null
+++ b/engine/common/timestep.h
@@ -0,0 +1,33 @@
+#ifndef CH_TIMESTEP_H
+#define CH_TIMESTEP_H
+
+namespace Chained
+{
+	class Timestep
+	{
+	public:
+		Timestep(float time = 0.0f)
+			: m_Time(time)
+		{
+		}
+
+		operator float() const
+		{
+			return m_Time;
+		}
+
+		float GetSeconds() const
+		{
+			return m_Time;
+		}
+		float GetMilliseconds() const
+		{
+			return m_Time * 1000.0f;
+		}
+
+	private:
+		float m_Time;
+	};
+} // namespace Chained
+
+#endif // CH_TIMESTEP_H
diff --git a/engine/common/uuid.cpp b/engine/common/uuid.cpp
new file mode 100644
index 000000000..ae009cbba
--- /dev/null
+++ b/engine/common/uuid.cpp
@@ -0,0 +1,34 @@
+#include "uuid.h"
+#include <random>
+#include <charconv>
+
+namespace Chained
+{
+	static thread_local std::random_device s_RandomDevice;
+	static thread_local std::mt19937_64 s_Engine(s_RandomDevice());
+	static std::uniform_int_distribution<uint64_t> s_UniformDistribution;
+
+	UUID::UUID()
+		: m_UUID(s_UniformDistribution(s_Engine))
+	{
+	}
+
+	UUID::UUID(uint64_t uuid)
+		: m_UUID(uuid)
+	{
+	}
+
+	UUID::UUID(const std::string& uuidStr)
+	{
+		auto [ptr, ec] = std::from_chars(uuidStr.data(), uuidStr.data() + uuidStr.size(), m_UUID);
+		if (ec != std::errc{})
+		{
+			m_UUID = 0;
+		}
+	}
+
+	std::string UUID::ToString() const
+	{
+		return std::to_string(m_UUID);
+	}
+} // namespace Chained
diff --git a/engine/common/uuid.h b/engine/common/uuid.h
new file mode 100644
index 000000000..76ea9563b
--- /dev/null
+++ b/engine/common/uuid.h
@@ -0,0 +1,43 @@
+#ifndef CH_UUID_H
+#define CH_UUID_H
+
+#include "engine/common/base.h"
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <string>
+
+namespace Chained
+{
+	class CH_API UUID
+	{
+	public:
+		UUID();
+		UUID(uint64_t uuid);
+		explicit UUID(const std::string& uuidStr);
+		UUID(const UUID&) = default;
+
+		std::string ToString() const;
+
+		operator uint64_t() const
+		{
+			return m_UUID;
+		}
+
+	private:
+		uint64_t m_UUID;
+	};
+} // namespace Chained
+
+namespace std
+{
+	template <> struct hash<Chained::UUID>
+	{
+		std::size_t operator()(const Chained::UUID& uuid) const noexcept
+		{
+			return std::hash<uint64_t>()((uint64_t)uuid);
+		}
+	};
+} // namespace std
+
+#endif // CH_UUID_H
diff --git a/engine/common/zstd_compression.h b/engine/common/zstd_compression.h
new file mode 100644
index 000000000..e18ad050d
--- /dev/null
+++ b/engine/common/zstd_compression.h
@@ -0,0 +1,54 @@
+
+#ifndef CH_ZSTD_COMPRESSION_H
+#define CH_ZSTD_COMPRESSION_H
+
+#include <vector>
+#include <string>
+#include <zstd.h>
+#include "engine/core/log.h"
+
+namespace Chained
+{
+	class Zstd
+	{
+	public:
+		static std::vector<unsigned char> Compress(const void* src, size_t srcSize, int compressionLevel = 3)
+		{
+			size_t const maxBounds = ZSTD_compressBound(srcSize);
+			std::vector<unsigned char> compressed(maxBounds);
+
+			size_t const cSize = ZSTD_compress(compressed.data(), maxBounds, src, srcSize, compressionLevel);
+			if (ZSTD_isError(cSize))
+			{
+				CH_CORE_ERROR("Zstd: Compression failed: {}", ZSTD_getErrorName(cSize));
+				return {};
+			}
+
+			compressed.resize(cSize);
+			return compressed;
+		}
+
+		static std::vector<unsigned char> Decompress(const void* src, size_t srcSize, size_t expectedOriginalSize)
+		{
+			std::vector<unsigned char> decompressed(expectedOriginalSize);
+
+			size_t const dSize = ZSTD_decompress(decompressed.data(), expectedOriginalSize, src, srcSize);
+			if (ZSTD_isError(dSize))
+			{
+				CH_CORE_ERROR("Zstd: Decompression failed: {}", ZSTD_getErrorName(dSize));
+				return {};
+			}
+
+			if (dSize != expectedOriginalSize)
+			{
+				CH_CORE_ERROR("Zstd: Decompression result size mismatch ({} vs expected {})", dSize,
+							  expectedOriginalSize);
+				return {};
+			}
+
+			return decompressed;
+		}
+	};
+} // namespace Chained
+
+#endif // CH_ZSTD_COMPRESSION_H
diff --git a/engine/core/CMakeLists.txt b/engine/core/CMakeLists.txt
index f245543f1..175d33ac9 100644
--- a/engine/core/CMakeLists.txt
+++ b/engine/core/CMakeLists.txt
@@ -1,64 +1,50 @@
-add_library(engine_core ${SUBMODULE_LIB_TYPE}
-        layer_stack.cpp
-        profiler.cpp
-        uuid.cpp
-        input.cpp
-        imgui_layer.cpp
-        thread_pool.cpp
-        application.cpp
-        project_launcher.cpp
-        assets/asset_manager.cpp
-        application.h
-        project_launcher.h
-        imgui_layer.h
-        base.h
-        ch_assert.h
-        platform_detection.h
-        thread_pool.h
-        entry_point.h
-        events.h
-        input.h
-        layer.h
-        layer_stack.h
-        log.h
-        profiler.h
-        timestep.h
-        uuid.h
-        window.h
-        ../platform/utils/dialogs.cpp
-        ../platform/utils/dialogs.h
-        ../platform/glfw/glfw_window.cpp
-        ../platform/glfw/glfw_window.h
+add_library(engine_core STATIC
+    service.h
+    service_registry.h
+    service_registry.cpp
+    service_locator.h
+    service_locator.cpp
+    input.h
+    input.cpp
+    key_codes.h
+    layer.h
+    layer_stack.h
+    layer_stack.cpp
+    log.h
+    mouse_codes.h
+    platform.h
+    platform.cpp
+    profiler.h
+    window.h
+    events/events.h
+    events/input_events.h
+    events/window_events.h
 )
 
 target_include_directories(engine_core PUBLIC
-    ${ENGINE_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/include/imgui
-    ${CMAKE_SOURCE_DIR}/include/imgui/backends
-    ${CMAKE_SOURCE_DIR}/include/glfw/include
-    ${CMAKE_SOURCE_DIR}/include/assimp/include
-    ${CMAKE_BINARY_DIR}/include/assimp/include
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/stb
-    ${CMAKE_SOURCE_DIR}/include/miniaudio
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
 )
 
-# Core module uses yaml-cpp, glfw, glad, imguilib, EnTT, Coral.Native, nfd, assimp
-target_link_libraries(engine_core PUBLIC 
-    yaml-cpp 
-    glfw
-    glad
-    imguilib 
-    EnTT 
-    Coral.Native 
-    nfd 
-    assimp
+target_link_libraries(engine_core PUBLIC
+    engine_reflection
+    yaml-cpp
+    engine_external_entt
+    glm
+    engine_external_stb
+    Coral.Native
+    reflectcpp
+    cereal
+    spdlog
+    libzstd_static
 )
 
-# Apply common macro configurations and compiler flags
-# (Redundant /bigobj flags removed - now in CompilerSettings.cmake)
+target_include_directories(engine_core PUBLIC
+    "${CMAKE_SOURCE_DIR}/thirdparty/reflect-cpp/include"
+    "${CMAKE_SOURCE_DIR}/thirdparty/cereal/include"
+    "${ZSTD_INCLUDE_DIR}"
+)
 
-# We apply optimizations and precompiled headers specific to core
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(engine_core)
+if(TARGET engine_pch)
+    target_link_libraries(engine_core PRIVATE engine_pch)
 endif()
diff --git a/engine/core/application.cpp b/engine/core/application.cpp
deleted file mode 100644
index 7482fa3b6..000000000
--- a/engine/core/application.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-#include "application.h"
-#if CH_PLATFORM_WINDOWS
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#elif CH_PLATFORM_LINUX
-#include <unistd.h>
-#endif
-
-#include "engine/audio/audio.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/ch_assert.h"
-#include "engine/core/imgui_layer.h"
-#include "engine/core/input.h"
-#include "engine/core/layer.h"
-#include "engine/core/log.h"
-#include "engine/core/profiler.h"
-#include "engine/graphics/pipeline/renderer.h"
-#include "engine/physics/physics.h"
-#include "engine/scene/component_serializer.h"
-#include "engine/scene/project.h"
-#include <nfd.h>
-
-#include <algorithm>
-#include <filesystem>
-
-#ifndef GLFW_INCLUDE_NONE
-#define GLFW_INCLUDE_NONE
-#endif
-
-#include "engine/graphics/pipeline/ui_renderer.h"
-#include <GLFW/glfw3.h>
-
-namespace CHEngine
-{
-Application* Application::s_Instance = nullptr;
-
-Application::Application(const ApplicationSpecification& specification)
-    : m_Specification(specification)
-{
-    CH_CORE_ASSERT(!s_Instance, "Application already exists!");
-    s_Instance = this;
-
-    if (!m_Specification.WorkingDirectory.empty())
-    {
-        std::filesystem::current_path(m_Specification.WorkingDirectory);
-    }
-
-    // --- Window Setup ---
-    WindowProperties windowProps;
-    windowProps.Title = m_Specification.Name;
-    windowProps.Width = m_Specification.WindowWidth;
-    windowProps.Height = m_Specification.WindowHeight;
-    windowProps.VSync = m_Specification.VSync;
-    windowProps.Fullscreen = m_Specification.Fullscreen;
-    windowProps.Resizable = m_Specification.Resizable;
-    windowProps.IconPath = m_Specification.AppIcon;
-
-    // ImGui Ini path setup
-    std::string iniName = m_Specification.Name;
-    std::replace(iniName.begin(), iniName.end(), ' ', '_');
-    std::transform(iniName.begin(), iniName.end(), iniName.begin(), ::tolower);
-
-#ifdef PROJECT_ROOT_DIR
-    windowProps.ImGuiConfigurationPath = std::string(PROJECT_ROOT_DIR) + "/imgui_" + iniName + ".ini";
-#else
-    windowProps.ImGuiConfigurationPath = "imgui_" + iniName + ".ini";
-#endif
-
-    // --- System Initialization ---
-    // Systems are singletons and manage their own lifetimes
-    if (!m_Specification.Headless)
-    {
-        m_Window = std::unique_ptr<Window>(Window::Create(windowProps));
-#ifdef PROJECT_ROOT_DIR
-        Project::SetEngineRoot(PROJECT_ROOT_DIR);
-#endif
-        Renderer::Init();
-        UIRenderer::Init();
-    }
-
-    Physics::Init();
-    ComponentSerializer::Init();
-
-    if (m_Specification.EnableScripting && m_Specification.InitScripting)
-        m_Specification.InitScripting();
-
-    m_LayerStack = std::make_unique<LayerStack>();
-    m_Running = true;
-
-    // ImGui Layer setup (always needed for Editor/Debugging)
-    if (!m_Specification.Headless)
-    {
-        NFD_Init();
-        auto imguiLayer = std::make_unique<ImGuiLayer>();
-        m_ImGuiLayer = imguiLayer.get();
-        PushOverlay(std::move(imguiLayer));
-    }
-
-    CH_CORE_INFO("Application Initialized: {}", m_Specification.Name);
-}
-
-Application::~Application()
-{
-    CH_CORE_INFO("Shutting down Application...");
-
-    m_LayerStack.reset();
-
-    if (m_Specification.EnableScripting && m_Specification.ShutdownScripting)
-        m_Specification.ShutdownScripting();
-
-    ComponentSerializer::Shutdown();
-    Physics::Shutdown();
-
-    if (UIRenderer::IsInitialized())
-    {
-        UIRenderer::Shutdown();
-    }
-
-    if (Renderer::IsInitialized())
-    {
-        Renderer::Shutdown();
-    }
-
-    AssetManager::Shutdown();
-
-    m_Window.reset();
-
-    if (!m_Specification.Headless)
-    {
-        NFD_Quit();
-    }
-
-    s_Instance = nullptr;
-    CH_CORE_INFO("Engine Shutdown Successfully.");
-}
-
-void Application::PushLayer(std::unique_ptr<Layer> layer)
-{
-    CH_CORE_ASSERT(layer, "Layer is null!");
-    Layer* rawLayer = layer.get();
-    m_LayerStack->PushLayer(std::move(layer));
-    rawLayer->OnAttach();
-    CH_CORE_INFO("Layer Attached: {}", rawLayer->GetName());
-}
-
-void Application::PushLayer(Layer* layer)
-{
-    PushLayer(std::unique_ptr<Layer>(layer));
-}
-
-void Application::PushOverlay(std::unique_ptr<Layer> overlay)
-{
-    CH_CORE_ASSERT(overlay, "Overlay is null!");
-    Layer* rawOverlay = overlay.get();
-    m_LayerStack->PushOverlay(std::move(overlay));
-    rawOverlay->OnAttach();
-    CH_CORE_INFO("Overlay Attached: {}", rawOverlay->GetName());
-}
-
-void Application::PushOverlay(Layer* overlay)
-{
-    PushOverlay(std::unique_ptr<Layer>(overlay));
-}
-
-void Application::OnEvent(Event& e)
-{
-    EventDispatcher dispatcher(e);
-    dispatcher.Dispatch<WindowCloseEvent>(CH_BIND_EVENT_FN(Application::OnWindowClose));
-    dispatcher.Dispatch<WindowResizeEvent>(CH_BIND_EVENT_FN(Application::OnWindowResize));
-
-    // Propagate events from top to bottom (overlays first)
-    // We use a copy of the layer stack to avoid iterator invalidation if a layer is removed during event handling
-    auto layers = m_LayerStack->GetLayerPointersSnapshot();
-    for (auto it = layers.rbegin(); it != layers.rend(); ++it)
-    {
-        if (e.Handled)
-        {
-            break;
-        }
-        if ((*it)->IsEnabled())
-        {
-            (*it)->OnEvent(e);
-        }
-    }
-}
-
-bool Application::OnWindowClose(WindowCloseEvent& e)
-{
-    m_Running = false;
-    return true;
-}
-
-bool Application::OnWindowResize(WindowResizeEvent& e)
-{
-    if (e.GetWidth() == 0 || e.GetHeight() == 0)
-    {
-        m_Minimized = true;
-        CH_CORE_WARN("Window minimized or dimensions are zero ({}x{})", e.GetWidth(), e.GetHeight());
-        return false;
-    }
-
-    m_Minimized = false;
-    m_Window->SetSizeDirect(e.GetWidth(), e.GetHeight());
-    Renderer::Get().SetViewport(0, 0, e.GetWidth(), e.GetHeight());
-    CH_CORE_INFO("Window resized to {}x{}", e.GetWidth(), e.GetHeight());
-
-    return false;
-}
-
-void Application::SubmitToMainThread(const std::function<void()>& function)
-{
-    std::scoped_lock<std::mutex> lock(m_MainThreadQueueMutex);
-    m_MainThreadQueue.emplace_back(function);
-}
-
-void Application::ExecuteMainThreadQueue()
-{
-    std::vector<std::function<void()>> localQueue;
-    {
-        std::scoped_lock<std::mutex> lock(m_MainThreadQueueMutex);
-        localQueue = std::move(m_MainThreadQueue);
-    }
-
-    for (auto& func : localQueue)
-    {
-        func();
-    }
-}
-
-void Application::Run()
-{
-    while (m_Running && !m_Window->ShouldClose())
-    {
-        CH_PROFILE_FUNCTION();
-
-        ExecuteMainThreadQueue();
-
-        // 1. Time Tracking
-        float time = (float)glfwGetTime();
-
-        // FPS Capping
-        int targetFPS = m_Window->GetTargetFramesPerSecond();
-        if (targetFPS > 0)
-        {
-            float minFrameTime = 1.0f / (float)targetFPS;
-            while (time - m_LastFrameTime < minFrameTime)
-            {
-                time = (float)glfwGetTime();
-            }
-        }
-
-        m_DeltaTime = Timestep(time - m_LastFrameTime);
-        m_LastFrameTime = time;
-
-        // 2. Input Polling
-        Input::Update();
-
-        // 3. Core Systems Update
-        AssetManager::Get().Update();
-        if (auto project = Project::GetActive())
-        {
-            Audio::Get().Update(m_DeltaTime);
-        }
-
-        // 4. Layers Update & Rendering
-        Profiler::BeginFrame();
-        {
-            CH_PROFILE_SCOPE("MainThread_Frame");
-
-            if (!m_Minimized)
-            {
-                // -- Logic/Simulation --
-
-                // 1. Variable Update
-                for (auto& layer : *m_LayerStack)
-                {
-                    if (layer->IsEnabled())
-                    {
-                        layer->OnUpdate(m_DeltaTime);
-                    }
-                }
-
-                // 2. Fixed Update
-                m_Accumulator += (float)m_DeltaTime;
-                while (m_Accumulator >= m_FixedTimestep)
-                {
-                    for (auto& layer : *m_LayerStack)
-                    {
-                        if (layer->IsEnabled())
-                        {
-                            layer->OnFixedUpdate(Timestep(m_FixedTimestep));
-                        }
-                    }
-                    m_Accumulator -= m_FixedTimestep;
-                }
-
-                // -- Rendering --
-                m_Window->BeginFrame();
-
-                for (auto& layer : *m_LayerStack)
-                {
-                    if (layer->IsEnabled())
-                    {
-                        layer->OnRender(m_DeltaTime);
-                    }
-                }
-
-                // ImGui
-                m_ImGuiLayer->Begin();
-                for (auto& layer : *m_LayerStack)
-                {
-                    if (layer->IsEnabled())
-                    {
-                        layer->OnImGuiRender();
-                    }
-                }
-                m_ImGuiLayer->End();
-
-                m_Window->EndFrame();
-            }
-        }
-        Profiler::EndFrame();
-    }
-}
-
-std::filesystem::path Application::GetExecutableDirectory()
-{
-#if CH_PLATFORM_WINDOWS
-    wchar_t path[MAX_PATH];
-    GetModuleFileNameW(NULL, path, MAX_PATH);
-    return std::filesystem::path(path).parent_path();
-#elif CH_PLATFORM_LINUX
-    char path[1024];
-    ssize_t count = readlink("/proc/self/exe", path, sizeof(path));
-    if (count != -1)
-    {
-        return std::filesystem::path(std::string(path, count)).parent_path();
-    }
-#endif
-    return std::filesystem::current_path();
-}
-
-Window& Application::GetWindow()
-{
-    CH_CORE_ASSERT(m_Window, "Window is null (Headless mode?)");
-    return *m_Window;
-}
-
-LayerStack& Application::GetLayerStack()
-{
-    return *m_LayerStack;
-}
-
-} // namespace CHEngine
diff --git a/engine/core/application.h b/engine/core/application.h
deleted file mode 100644
index 8fd2866aa..000000000
--- a/engine/core/application.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef CH_APPLICATION_H
-#define CH_APPLICATION_H
-
-#include "engine/core/ch_assert.h"
-#include "engine/core/base.h"
-#include "engine/core/events.h"
-#include "engine/core/layer_stack.h"
-#include "engine/core/timestep.h"
-#include "engine/core/window.h"
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <vector>
-#include <filesystem>
-
-
-namespace CHEngine
-{
-class ImGuiLayer;
-class Layer;
-class ScriptEngine;
-
-// Command-line arguments passed into application startup.
-struct ApplicationCommandLineArgs
-{
-    int Count = 0;
-    char** Args = nullptr;
-
-    const char* operator[](int index) const
-    {
-        CH_CORE_ASSERT(index < Count);
-        return Args[index];
-    }
-};
-
-// Construction parameters and persistent app settings.
-struct ApplicationSpecification
-{
-    std::string Name = "Chained Application";
-    std::string WorkingDirectory;
-    int WindowWidth = 1280;
-    int WindowHeight = 720;
-    bool VSync = true;
-    bool Fullscreen = false;
-    bool Resizable = true;
-    std::string AppIcon = "";
-    
-    ApplicationCommandLineArgs CommandLineArgs;
-    std::string ImGuiConfigurationPath = "imgui.ini";
-    bool Headless = false;
-    bool EnableScripting = true;
-    std::function<void()> InitScripting;
-    std::function<void()> ShutdownScripting;
-};
-
-// Owns the window, layer stack, and main loop for the process.
-class Application
-{
-public:
-    Application(const ApplicationSpecification& specification);
-    virtual ~Application();
-
-    // Requests the main loop to exit.
-    void Close()
-    {
-        m_Running = false;
-    }
-    // Runs the frame loop until Close() is called.
-    void Run();
-
-    void PushLayer(std::unique_ptr<Layer> layer);
-    void PushLayer(Layer* layer);
-
-    void PushOverlay(std::unique_ptr<Layer> overlay);
-    void PushOverlay(Layer* overlay);
-
-    void OnEvent(Event& e);
-
-    static Application& Get()
-    {
-        return *s_Instance;
-    }
-
-    // Returns the directory containing the executable.
-    static std::filesystem::path GetExecutableDirectory();
-
-    Window& GetWindow();
-    ImGuiLayer* GetImGuiLayer()
-    {
-        return m_ImGuiLayer;
-    }
-    const ApplicationSpecification& GetSpecification() const
-    {
-        return m_Specification;
-    }
-    LayerStack& GetLayerStack();
-    float GetFrameTime() const { return m_DeltaTime; }
-
-
-
-    // Schedules work to run on the main thread at a safe point in the frame.
-    void SubmitToMainThread(const std::function<void()>& function);
-
-private:
-    bool OnWindowClose(WindowCloseEvent& e);
-    bool OnWindowResize(WindowResizeEvent& e);
-    void ExecuteMainThreadQueue();
-
-private:
-    static Application* s_Instance;
-
-    ApplicationSpecification m_Specification;
-    std::unique_ptr<LayerStack> m_LayerStack;
-
-    ImGuiLayer* m_ImGuiLayer = nullptr;
-    std::unique_ptr<Window> m_Window;
-
-    bool m_Running = false;
-    bool m_Minimized = false;
-
-    Timestep m_DeltaTime = 0.0f;
-    Timestep m_LastFrameTime = 0.0f;
-
-    float m_FixedTimestep = 1.0f / 60.0f;
-    float m_Accumulator = 0.0f;
-
-    std::vector<std::function<void()>> m_MainThreadQueue;
-    std::mutex m_MainThreadQueueMutex;
-};
-
-Application* CreateApplication(ApplicationCommandLineArgs args);
-
-} // namespace CHEngine
-
-#endif // CH_APPLICATION_H
diff --git a/engine/core/assets/asset.h b/engine/core/assets/asset.h
deleted file mode 100644
index 0ddb25a29..000000000
--- a/engine/core/assets/asset.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef CH_ASSET_H
-#define CH_ASSET_H
-
-#include "engine/core/base.h"
-#include "engine/core/uuid.h"
-#include <cstdio>
-#include <string>
-#include <atomic>
-
-namespace CHEngine
-{
-using AssetHandle = UUID;
-
-enum class AssetType : uint16_t
-{
-    None = 0,
-    Model,
-    Texture,
-    Audio,
-    Shader,
-    Environment,
-    Material,
-    Font,
-    AnimationGraph // Not existing yet, reserved for future use
-};
-// Asset loading state.
-enum class AssetState : uint8_t
-{
-    None = 0,
-    Loading,
-    Ready,
-    Failed
-};
-
-class Asset
-{
-public:
-    virtual ~Asset() = default;
-
-    // Returns the asset type discriminator.
-    AssetType GetType() const
-    {
-        return m_Type;
-    }
-
-    Asset(AssetType type = AssetType::None)
-        : m_Type(type),
-          m_ID()
-    {
-    }
-    Asset(AssetType type, UUID id)
-        : m_Type(type),
-          m_ID(id)
-    {
-    }
-
-    // Returns the current asset loading state using relaxed atomic reads.
-    AssetState GetState() const
-    {
-        return m_State.load(std::memory_order_relaxed);
-    }
-    // Updates the loading state and logs state transitions for diagnostics.
-    void SetState(AssetState state)
-    {
-        AssetState oldState = m_State.exchange(state, std::memory_order_release);
-        if (state != oldState)
-        {
-            printf("[ASSET] '%s' state change: %d -> %d\n", m_Path.c_str(), (int)oldState, (int)state);
-            fflush(stdout);
-            
-            if (state == AssetState::Failed)
-            {
-                if (!m_Error.empty())
-                {
-                    CH_CORE_WARN("Asset: FAILED for '{}' (Type: {}, ID: {}) - {}", m_Path, (int)m_Type,
-                                 (uint64_t)m_ID, m_Error);
-                }
-                else
-                {
-                    CH_CORE_WARN("Asset: FAILED for '{}' (Type: {}, ID: {})", m_Path, (int)m_Type, (uint64_t)m_ID);
-                }
-            }
-        }
-    }
-
-    // Returns the last loader or finalization error, if any.
-    const std::string& GetError() const
-    {
-        return m_Error;
-    }
-
-    // Stores a descriptive error message without changing the state.
-    void SetError(const std::string& error)
-    {
-        m_Error = error;
-    }
-
-    // Clears the stored error message.
-    void ClearError()
-    {
-        m_Error.clear();
-    }
-
-    // Marks the asset as failed and records the failure message.
-    void Fail(const std::string& error)
-    {
-        m_Error = error;
-        SetState(AssetState::Failed);
-    }
-
-    // Returns true when the asset reached the ready state.
-    bool IsReady() const
-    {
-        return m_State == AssetState::Ready;
-    }
-
-    // Returns the resolved asset path used by the loader.
-    const std::string& GetPath() const
-    {
-        return m_Path;
-    }
-    // Updates the resolved asset path used by the loader.
-    void SetPath(const std::string& path)
-    {
-        m_Path = path;
-    }
-
-    // Returns the stable UUID handle associated with this asset.
-    UUID GetID() const
-    {
-        return m_ID;
-    }
-
-    // Called on the main thread after loading completes; useful for GPU uploads.
-    virtual void OnLoaded() {}
-protected:
-    std::string m_Path;
-    std::string m_Error;
-    UUID m_ID;
-    AssetType m_Type = AssetType::None;
-    std::atomic<AssetState> m_State = AssetState::None;
-};
-
-} // namespace CHEngine
-
-#endif // CH_ASSET_H
diff --git a/engine/core/assets/asset_loader.h b/engine/core/assets/asset_loader.h
deleted file mode 100644
index 2a4a312fd..000000000
--- a/engine/core/assets/asset_loader.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef CH_ASSET_LOADER_H
-#define CH_ASSET_LOADER_H
-
-#include "engine/core/assets/asset.h"
-#include <memory>
-#include <string>
-
-namespace CHEngine
-{
-// Base interface for asset loaders. Each asset type provides its own loader.
-class IAssetLoader
-{
-public:
-    virtual ~IAssetLoader() = default;
-
-    // Creates a new, empty asset of the specific type.
-    virtual std::shared_ptr<Asset> Create() = 0;
-
-    // Loads the asset data from the given path.
-    // For asynchronous loaders, this is called on a background thread.
-    virtual bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) = 0;
-
-    // Indicates whether Load() should run on a background thread.
-    virtual bool IsAsync() const { return false; }
-};
-} // namespace CHEngine
-
-#endif // CH_ASSET_LOADER_H
diff --git a/engine/core/assets/asset_manager.cpp b/engine/core/assets/asset_manager.cpp
deleted file mode 100644
index 757b4a319..000000000
--- a/engine/core/assets/asset_manager.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/thread_pool.h"
-#include "engine/core/profiler.h"
-
-#include <chrono>
-
-namespace CHEngine
-{
-namespace
-{
-constexpr size_t kMaxAssetFinalizationsPerFrame = 16;
-constexpr auto kMaxAssetFinalizeBudget = std::chrono::milliseconds(2);
-}
-
-static std::unique_ptr<AssetManager> s_Instance = nullptr;
-
-AssetManager::AssetManager()
-{
-}
-
-AssetManager::~AssetManager()
-{
-    std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-    m_AssetCache.clear();
-    m_PathToHandle.clear();
-    m_PathCache.clear();
-    m_Loaders.clear();
-}
-
-AssetManager& AssetManager::Get()
-{
-    if (!s_Instance)
-    {
-        s_Instance = std::make_unique<AssetManager>();
-    }
-    return *s_Instance;
-}
-
-void AssetManager::Shutdown()
-{
-    s_Instance.reset();
-}
-
-void AssetManager::RegisterLoader(AssetType type, std::unique_ptr<IAssetLoader> loader)
-{
-    m_Loaders[type] = std::move(loader);
-}
-
-std::string AssetManager::ResolvePath(const std::string& path) const
-{
-    if (path.empty())
-    {
-        return "";
-    }
-
-    {
-        std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-        if (auto it = m_PathCache.find(path); it != m_PathCache.end())
-        {
-            return it->second;
-        }
-    }
-
-    std::filesystem::path inputPath(path);
-    std::filesystem::path resolvedPath;
-
-    if (inputPath.is_absolute())
-    {
-        resolvedPath = inputPath;
-    }
-    else
-    {
-        std::string pathStr = inputPath.generic_string();
-        bool isEngineResource = false;
-        if (pathStr.find("engine/") == 0)
-        {
-            pathStr = pathStr.substr(7);
-            isEngineResource = true;
-        }
-
-        if (isEngineResource)
-        {
-            if (!m_EngineRoot.empty())
-            {
-                std::filesystem::path candidate = m_EngineRoot / pathStr;
-                if (std::filesystem::exists(candidate))
-                {
-                    resolvedPath = candidate;
-                }
-            }
-        }
-        else
-        {
-            // Try asset directory first
-            if (!m_AssetDirectory.empty())
-            {
-                std::filesystem::path candidate = m_AssetDirectory / pathStr;
-                if (std::filesystem::exists(candidate))
-                {
-                    resolvedPath = candidate;
-                }
-            }
-
-            // Try project root next
-            if (resolvedPath.empty() && !m_ProjectDirectory.empty())
-            {
-                std::filesystem::path candidate = m_ProjectDirectory / pathStr;
-                if (std::filesystem::exists(candidate))
-                {
-                    resolvedPath = candidate;
-                }
-            }
-        }
-
-        // Fallback
-        if (resolvedPath.empty())
-        {
-            if (!isEngineResource && !m_AssetDirectory.empty())
-            {
-                resolvedPath = m_AssetDirectory / pathStr;
-            }
-            else if (!m_EngineRoot.empty())
-            {
-                resolvedPath = m_EngineRoot / pathStr;
-            }
-            else
-            {
-                resolvedPath = m_ProjectDirectory / pathStr;
-            }
-        }
-    }
-
-    // Normalize and convert to string
-    std::string resolved = std::filesystem::absolute(resolvedPath).lexically_normal().generic_string();
-
-    std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-    m_PathCache[path] = resolved;
-    return resolved;
-}
-
-AssetHandle AssetManager::ResolveToHandle(const std::string& path) const
-{
-    std::string resolved = ResolvePath(path);
-    std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-    if (auto it = m_PathToHandle.find(resolved); it != m_PathToHandle.end())
-    {
-        return it->second;
-    }
-    return AssetHandle(0);
-}
-
-std::shared_ptr<Asset> AssetManager::LoadAsset(const std::string& path, AssetType type)
-{
-    if (path.empty())
-    {
-        return nullptr;
-    }
-
-    std::string resolved = ResolvePath(path);
-
-    {
-        std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-        if (auto it = m_PathToHandle.find(resolved); it != m_PathToHandle.end())
-        {
-            auto handle = it->second;
-            if (auto currentIt = m_AssetCache.find(handle); currentIt != m_AssetCache.end())
-            {
-                return currentIt->second;
-            }
-        }
-    }
-
-    IAssetLoader* loader = nullptr;
-    std::shared_ptr<Asset> asset;
-
-    {
-        std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-        auto loaderIt = m_Loaders.find(type);
-        if (loaderIt == m_Loaders.end())
-        {
-            CH_CORE_ERROR("AssetManager: No loader registered for type {}", (int)type);
-            return nullptr;
-        }
-
-        asset = loaderIt->second->Create();
-        if (!asset)
-        {
-            return nullptr;
-        }
-
-        loader = loaderIt->second.get();
-        AssetHandle newHandle = asset->GetID();
-        asset->SetPath(resolved);
-        asset->SetState(AssetState::Loading);
-        asset->ClearError();
-        m_AssetCache[newHandle] = asset;
-        m_PathToHandle[resolved] = newHandle;
-    }
-
-    if (!loader->IsAsync())
-    {
-        try
-        {
-            std::string loaderError;
-            if (!loader->Load(asset, resolved, &loaderError))
-            {
-                asset->Fail(loaderError.empty() ? ("AssetManager: Synchronous loader returned false for '" + resolved + "'")
-                                                : loaderError);
-                return asset;
-            }
-
-            asset->ClearError();
-            asset->OnLoaded();
-            asset->SetState(AssetState::Ready);
-        }
-        catch (const std::exception& e)
-        {
-            asset->Fail(std::string("AssetManager: Synchronous load failed for '") + resolved + "': " + e.what());
-        }
-        catch (...)
-        {
-            asset->Fail(std::string("AssetManager: Synchronous load failed for '") + resolved + "' with an unknown exception");
-        }
-    }
-    else
-    {
-        ThreadPool::Get().QueueTask([this, asset, loader, resolved]() {
-            try
-            {
-                std::string loaderError;
-                if (!loader->Load(asset, resolved, &loaderError))
-                {
-                    asset->Fail(loaderError.empty() ? ("AssetManager: Async loader returned false for '" + resolved + "'")
-                                                    : loaderError);
-                    return;
-                }
-
-                asset->ClearError();
-                std::lock_guard<std::mutex> lock(m_PendingMutex);
-                m_PendingAssets.push_back(asset);
-            }
-            catch (const std::exception& e)
-            {
-                asset->Fail(std::string("AssetManager: Async load failed for '") + resolved + "': " + e.what());
-            }
-            catch (...)
-            {
-                asset->Fail(std::string("AssetManager: Async load failed for '") + resolved + "' with an unknown exception");
-            }
-        });
-    }
-
-    return asset;
-}
-
-std::shared_ptr<Asset> AssetManager::GetAsset(AssetHandle handle, AssetType type)
-{
-    (void)type;
-
-    if (handle != 0)
-    {
-        std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-        if (auto it = m_AssetCache.find(handle); it != m_AssetCache.end())
-        {
-            return it->second;
-        }
-    }
-
-    return nullptr;
-}
-
-void AssetManager::Update()
-{
-    CH_PROFILE_FUNCTION();
-
-    const auto updateStart = std::chrono::steady_clock::now();
-    size_t finalizedCount = 0;
-
-    while (finalizedCount < kMaxAssetFinalizationsPerFrame)
-    {
-        std::shared_ptr<Asset> asset;
-        {
-            std::lock_guard<std::mutex> lock(m_PendingMutex);
-            if (m_PendingAssets.empty())
-            {
-                return;
-            }
-
-            asset = std::move(m_PendingAssets.front());
-            m_PendingAssets.pop_front();
-        }
-
-        if (!asset)
-        {
-            continue;
-        }
-
-        try
-        {
-            asset->ClearError();
-            asset->OnLoaded();
-            if (asset->GetState() != AssetState::Failed)
-            {
-                asset->SetState(AssetState::Ready);
-            }
-        }
-        catch (const std::exception& e)
-        {
-            asset->Fail(std::string("AssetManager: Finalization failed for '") + asset->GetPath() + "': " + e.what());
-        }
-        catch (...)
-        {
-            asset->Fail(std::string("AssetManager: Finalization failed for '") + asset->GetPath() + "' with an unknown exception");
-        }
-
-        ++finalizedCount;
-
-        if ((std::chrono::steady_clock::now() - updateStart) >= kMaxAssetFinalizeBudget)
-        {
-            break;
-        }
-    }
-}
-
-size_t AssetManager::GetPendingFinalizeCount() const
-{
-    std::lock_guard<std::mutex> lock(m_PendingMutex);
-    return m_PendingAssets.size();
-}
-
-size_t AssetManager::GetLoadingAssetCount() const
-{
-    std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-
-    size_t loadingCount = 0;
-    for (const auto& [handle, asset] : m_AssetCache)
-    {
-        (void)handle;
-        if (asset && asset->GetState() == AssetState::Loading)
-        {
-            ++loadingCount;
-        }
-    }
-
-    return loadingCount;
-}
-
-bool AssetManager::HasBackgroundWork() const
-{
-    return GetPendingFinalizeCount() > 0 || GetLoadingAssetCount() > 0;
-}
-
-void AssetManager::ReloadAsset(AssetHandle handle, AssetType type)
-{
-    std::shared_ptr<Asset> asset;
-    IAssetLoader* loader = nullptr;
-    std::string path;
-
-    {
-        std::lock_guard<std::recursive_mutex> lock(m_AssetLock);
-
-        auto it = m_AssetCache.find(handle);
-        if (it == m_AssetCache.end())
-        {
-            return;
-        }
-
-        auto loaderIt = m_Loaders.find(type);
-        if (loaderIt == m_Loaders.end())
-        {
-            return;
-        }
-
-        asset = it->second;
-        loader = loaderIt->second.get();
-        path = asset->GetPath();
-        if (path.empty())
-        {
-            return;
-        }
-    }
-
-    std::string resolved = ResolvePath(path);
-    asset->SetState(AssetState::Loading);
-    asset->ClearError();
-
-    try
-    {
-        std::string loaderError;
-        if (!loader->Load(asset, resolved, &loaderError))
-        {
-            asset->Fail(loaderError.empty() ? ("AssetManager: Reload failed for '" + resolved + "'") : loaderError);
-            return;
-        }
-
-        asset->ClearError();
-        asset->OnLoaded();
-        asset->SetState(AssetState::Ready);
-    }
-    catch (const std::exception& e)
-    {
-        asset->Fail(std::string("AssetManager: Reload failed for '") + resolved + "': " + e.what());
-    }
-    catch (...)
-    {
-        asset->Fail(std::string("AssetManager: Reload failed for '") + resolved + "' with an unknown exception");
-    }
-}
-
-} // namespace CHEngine
diff --git a/engine/core/assets/asset_manager.h b/engine/core/assets/asset_manager.h
deleted file mode 100644
index baecae8ef..000000000
--- a/engine/core/assets/asset_manager.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef CH_ASSET_MANAGER_H
-#define CH_ASSET_MANAGER_H
-
-#include "engine/core/assets/asset_loader.h"
-#include <filesystem>
-#include <deque>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-namespace CHEngine
-{
-// Central asset cache and loader coordinator. Resolves project-relative paths,
-// deduplicates loads, and finalizes async loads on the main thread.
-class AssetManager
-{
-public:
-    AssetManager();
-    ~AssetManager();
-
-    static AssetManager& Get();
-    static void Shutdown();
-
-    // Registers the loader for a specific asset type and transfers ownership.
-    void RegisterLoader(AssetType type, std::unique_ptr<IAssetLoader> loader);
-
-    void SetAssetDirectory(const std::filesystem::path& path) { m_AssetDirectory = path; }
-    void SetProjectDirectory(const std::filesystem::path& path) { m_ProjectDirectory = path; }
-    void SetEngineRoot(const std::filesystem::path& path) { m_EngineRoot = path; }
-
-    [[nodiscard]] const std::filesystem::path& GetAssetDirectory() const { return m_AssetDirectory; }
-    [[nodiscard]] const std::filesystem::path& GetProjectDirectory() const { return m_ProjectDirectory; }
-    [[nodiscard]] const std::filesystem::path& GetEngineRoot() const { return m_EngineRoot; }
-
-    // Resolves a path through the project root and caches the resolved value.
-    [[nodiscard]] std::string ResolvePath(const std::string& path) const;
-    // Resolves a path to an already-loaded asset handle, or 0 when missing.
-    AssetHandle ResolveToHandle(const std::string& path) const;
-
-    // Get by path — returns a cached asset when available, otherwise loads it.
-    template <typename T> std::shared_ptr<T> Get(const std::string& path)
-    {
-        AssetHandle handle = ResolveToHandle(path);
-        if (handle != AssetHandle(0))
-        {
-            auto asset = GetAsset(handle, T::GetStaticType());
-            if (asset)
-            {
-                return std::static_pointer_cast<T>(asset);
-            }
-        }
-        // Not in cache — load it now
-        return Load<T>(path);
-    }
-
-    template <typename T> std::shared_ptr<T> Get(AssetHandle handle)
-    {
-        return std::static_pointer_cast<T>(GetAsset(handle, T::GetStaticType()));
-    }
-
-    // Explicit load — creates, loads and caches the asset, returning nullptr on failure.
-    template <typename T> std::shared_ptr<T> Load(const std::string& path)
-    {
-        return std::static_pointer_cast<T>(LoadAsset(path, T::GetStaticType()));
-    }
-
-    [[nodiscard]] size_t GetPendingFinalizeCount() const;
-    [[nodiscard]] size_t GetLoadingAssetCount() const;
-    [[nodiscard]] bool HasBackgroundWork() const;
-
-    // Finalizes completed async loads and calls OnLoaded() within a small per-frame budget.
-    void Update();
-
-private:
-    void ReloadAsset(AssetHandle handle, AssetType type);
-
-public:
-    template <typename T> void Reload(const std::string& path)
-    {
-        AssetHandle handle = ResolveToHandle(path);
-        ReloadAsset(handle, T::GetStaticType());
-    }
-
-private:
-    std::shared_ptr<Asset> GetAsset(AssetHandle handle, AssetType type);
-    std::shared_ptr<Asset> LoadAsset(const std::string& path, AssetType type);
-
-    // Asset cache.
-    std::unordered_map<AssetHandle, std::shared_ptr<Asset>> m_AssetCache;
-    std::unordered_map<AssetType, std::unique_ptr<IAssetLoader>> m_Loaders;
-
-    // Path-to-handle mapping for quick lookup and a path resolution cache.
-    mutable std::unordered_map<std::string, AssetHandle> m_PathToHandle;
-    mutable std::unordered_map<std::string, std::string> m_PathCache;
-
-    // Async loading support.
-    std::deque<std::shared_ptr<Asset>> m_PendingAssets;
-    mutable std::mutex m_PendingMutex;
-    mutable std::recursive_mutex m_AssetLock;
-
-    std::filesystem::path m_AssetDirectory;
-    std::filesystem::path m_ProjectDirectory;
-    std::filesystem::path m_EngineRoot;
-};
-} // namespace CHEngine
-
-#endif // CH_ASSET_MANAGER_H
diff --git a/engine/core/base.h b/engine/core/base.h
deleted file mode 100644
index 799dbdcaa..000000000
--- a/engine/core/base.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef CH_BASE_H
-#define CH_BASE_H
-
- #define GLM_ENABLE_EXPERIMENTAL
-#include "engine/core/log.h"
-#include "engine/core/ch_math.h"
-#include <memory>
-
-#include "engine/core/platform_detection.h"
-
-// Debug/Release detection
-#ifdef _DEBUG
-#define CH_DEBUG
-#else
-#define CH_RELEASE
-#endif
-
-// Debug break
-#ifdef CH_DEBUG
-#if CH_PLATFORM_WINDOWS
-#define CH_DEBUGBREAK() __debugbreak()
-#elif CH_PLATFORM_LINUX
-#include <csignal>
-#define CH_DEBUGBREAK() std::raise(SIGTRAP)
-#else
-#define CH_DEBUGBREAK()
-#endif
-#define CH_ENABLE_ASSERTS
-#else
-#define CH_DEBUGBREAK()
-#endif
-
-
-// Macro helpers
-#define CH_EXPAND_MACRO(x) x
-#define CH_STRINGIFY_MACRO(x) #x
-
-#ifdef CH_DEBUG
-#define CH_ENABLE_ASSERTS
-#endif
-
-
-
-// Bit manipulation
-#define BIT(x) (1 << (x))
-
-// Bind event function helper
-#define CH_BIND_EVENT_FN(fn)                                                                                           \
-    [this](auto&&... args) -> decltype(auto) { return this->fn(std::forward<decltype(args)>(args)...); }
-
-
-// --- Scripting & Reflection Macros ---
-#define CH_CLASS(...)
-#define CH_PROPERTY(...)
-#define CH_FUNCTION(...)
-
-#endif // CH_BASE_H
-
diff --git a/engine/core/ch_assert.h b/engine/core/ch_assert.h
deleted file mode 100644
index 27ff714f6..000000000
--- a/engine/core/ch_assert.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CH_ASSERT_H
-#define CH_ASSERT_H
-
-#include "engine/core/base.h"
-#include "engine/core/log.h"
-#include <filesystem>
-
-#ifdef CH_ENABLE_ASSERTS
-
-// Internal implementations
-#define CH_INTERNAL_ASSERT_IMPL(type, check, msg, ...)                                                                 \
-    {                                                                                                                  \
-        if (!(check))                                                                                                  \
-        {                                                                                                              \
-            CH##type##ERROR(msg, __VA_ARGS__);                                                                         \
-            CH_DEBUGBREAK();                                                                                           \
-        }                                                                                                              \
-    }
-#define CH_INTERNAL_ASSERT_WITH_MSG(type, check, ...)                                                                  \
-    CH_INTERNAL_ASSERT_IMPL(type, check, "Assertion failed: {0}", __VA_ARGS__)
-#define CH_INTERNAL_ASSERT_NO_MSG(type, check)                                                                         \
-    CH_INTERNAL_ASSERT_IMPL(type, check, "Assertion '{0}' failed at {1}:{2}", CH_STRINGIFY_MACRO(check),               \
-                            std::filesystem::path(__FILE__).filename().string(), __LINE__)
-
-#define CH_INTERNAL_ASSERT_GET_MACRO_NAME(arg1, arg2, macro, ...) macro
-#define CH_INTERNAL_ASSERT_GET_MACRO(...)                                                                              \
-    CH_EXPAND_MACRO(                                                                                                   \
-        CH_INTERNAL_ASSERT_GET_MACRO_NAME(__VA_ARGS__, CH_INTERNAL_ASSERT_WITH_MSG, CH_INTERNAL_ASSERT_NO_MSG))
-
-// Core API
-#define CH_ASSERT(...) CH_EXPAND_MACRO(CH_INTERNAL_ASSERT_GET_MACRO(__VA_ARGS__)(_, __VA_ARGS__))
-#define CH_CORE_ASSERT(...) CH_EXPAND_MACRO(CH_INTERNAL_ASSERT_GET_MACRO(__VA_ARGS__)(_CORE_, __VA_ARGS__))
-#else
-#define CH_ASSERT(...)
-#define CH_CORE_ASSERT(...)
-#endif
-
-#endif // CH_ASSERT_H
diff --git a/engine/core/ch_math.h b/engine/core/ch_math.h
deleted file mode 100644
index 92b64df24..000000000
--- a/engine/core/ch_math.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CH_MATH_H
-#define CH_MATH_H
-
-#include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/quaternion.hpp>
-
-namespace CHEngine
-{
-    struct Color
-    {
-        unsigned char r, g, b, a;
-
-        Color() : r(0), g(0), b(0), a(255) {}
-        Color(unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255)
-            : r(r), g(g), b(b), a(a) {}
-        
-        static Color White() { return { 255, 255, 255, 255 }; }
-        static Color Black() { return { 0, 0, 0, 255 }; }
-        static Color Red()   { return { 255, 0, 0, 255 }; }
-        static Color Green() { return { 0, 255, 0, 255 }; }
-        static Color Blue()  { return { 0, 0, 255, 255 }; }
-    };
-
-    struct BoundingBox
-    {
-        glm::vec3 Min;
-        glm::vec3 Max;
-    };
-
-    struct Ray
-    {
-        glm::vec3 position;
-        glm::vec3 direction;
-    };
-}
-
-#endif // CH_MATH_H
diff --git a/engine/core/constants.h b/engine/core/constants.h
deleted file mode 100644
index 656750ea0..000000000
--- a/engine/core/constants.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CH_CONSTANTS_H
-#define CH_CONSTANTS_H
-
-#include <string_view>
-
-namespace CHEngine::Constants
-{
-    namespace Paths
-    {
-        constexpr std::string_view EnginePrefix = "engine/";
-        constexpr size_t EnginePrefixSize = EnginePrefix.size();
-        
-        constexpr std::string_view DefaultAssetDir = "assets";
-    }
-
-    namespace Limits
-    {
-        constexpr int MaxLights = 16;
-    }
-
-    namespace Assets
-    {
-        constexpr std::string_view ProjectExtension = ".chproject";
-        constexpr std::string_view SceneExtension = ".chscene";
-        constexpr std::string_view PrefabExtension = ".chprefab";
-    }
-}
-
-#endif // CH_CONSTANTS_H
diff --git a/engine/core/entry_point.h b/engine/core/entry_point.h
deleted file mode 100644
index ccb2cc727..000000000
--- a/engine/core/entry_point.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CH_ENTRY_POINT_H
-#define CH_ENTRY_POINT_H
-
-#include "engine/core/application.h"
-#include "engine/scene/project.h"
-#include "engine/core/base.h"
-#include <memory>
-
-extern CHEngine::Application* CHEngine::CreateApplication(CHEngine::ApplicationCommandLineArgs args);
-
-// Main entry point for the engine and application.
-int main(int argc, char** argv)
-{
-    CHEngine::ApplicationCommandLineArgs args;
-    args.Count = argc;
-    args.Args = argv;
-
-    std::unique_ptr<CHEngine::Application> app(CHEngine::CreateApplication(args));
-    app->Run();
-
-    return 0;
-}
-
-#if CH_PLATFORM_WINDOWS && !defined(CH_DEBUG)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, PSTR cmdline, int cmdshow)
-{
-#if defined(_MSC_VER)
-    return main(__argc, __argv);
-#else
-    return main(0, nullptr); // MinGW might need a different approach if arguments are needed
-#endif
-}
-#endif
-
-#endif // CH_ENTRY_POINT_H
diff --git a/engine/core/events.h b/engine/core/events.h
deleted file mode 100644
index 87b5ad48d..000000000
--- a/engine/core/events.h
+++ /dev/null
@@ -1,180 +0,0 @@
-#ifndef CH_EVENTS_H
-#define CH_EVENTS_H
-
-#include <functional>
-#include <string>
-
-namespace CHEngine
-{
-enum class EventType
-{
-    None = 0,
-    WindowClose, WindowResize,
-    KeyPressed, KeyReleased, KeyTyped,
-    MouseButtonPressed, MouseButtonReleased, MouseMoved, MouseScrolled,
-    ProjectCreated, ProjectOpened, SceneOpened, SceneSaved,
-    ScenePlay, SceneStop, SceneChangeRequest, EntitySelected,
-    AppLaunchRuntime, AppResetLayout, AppSaveLayout, ViewportFocusEntity,
-    ButtonPressed, Undo, Redo
-};
-
-enum EventCategory
-{
-    NoneCategory = 0,
-    EventCategoryApplication = 1 << 0,
-    EventCategoryInput       = 1 << 1,
-    EventCategoryKeyboard    = 1 << 2,
-    EventCategoryMouse       = 1 << 3,
-    EventCategoryMouseButton = 1 << 4,
-    EventCategoryButton      = 1 << 5
-};
-
-#define EVENT_CLASS_TYPE(type) \
-    static EventType GetStaticType() { return EventType::type; } \
-    virtual EventType GetEventType() const override { return GetStaticType(); } \
-    virtual const char* GetName() const override { return #type; }
-
-#define EVENT_CLASS_CATEGORY(category) \
-    virtual int GetCategoryFlags() const override { return category; }
-
-class Event
-{
-public:
-    virtual ~Event() = default;
-    bool Handled = false;
-    virtual EventType GetEventType() const = 0;
-    virtual const char* GetName() const = 0;
-    virtual int GetCategoryFlags() const = 0;
-    virtual std::string ToString() const { return GetName(); }
-    bool IsInCategory(EventCategory category) { return GetCategoryFlags() & category; }
-};
-
-class EventDispatcher
-{
-public:
-    EventDispatcher(Event& event) : m_Event(event) {}
-    template <typename T, typename F> bool Dispatch(const F& func)
-    {
-        if (m_Event.GetEventType() == T::GetStaticType()) {
-            m_Event.Handled |= func(static_cast<T&>(m_Event));
-            return true;
-        }
-        return false;
-    }
-private:
-    Event& m_Event;
-};
-
-using EventCallbackFn = std::function<void(Event&)>;
-
-// --- Keyboard Events ---
-class KeyEvent : public Event
-{
-public:
-    int GetKeyCode() const { return m_KeyCode; }
-    EVENT_CLASS_CATEGORY(EventCategoryKeyboard | EventCategoryInput)
-protected:
-    KeyEvent(int keycode) : m_KeyCode(keycode) {}
-    int m_KeyCode;
-};
-
-class KeyPressedEvent : public KeyEvent
-{
-public:
-    KeyPressedEvent(int keycode, bool isRepeat = false) : KeyEvent(keycode), m_IsRepeat(isRepeat) {}
-    bool IsRepeat() const { return m_IsRepeat; }
-    EVENT_CLASS_TYPE(KeyPressed)
-private:
-    bool m_IsRepeat;
-};
-
-class KeyReleasedEvent : public KeyEvent
-{
-public:
-    KeyReleasedEvent(int keycode) : KeyEvent(keycode) {}
-    EVENT_CLASS_TYPE(KeyReleased)
-};
-
-class KeyTypedEvent : public KeyEvent
-{
-public:
-    KeyTypedEvent(int keycode) : KeyEvent(keycode) {}
-    EVENT_CLASS_TYPE(KeyTyped)
-};
-
-// --- Mouse Events ---
-class MouseMovedEvent : public Event
-{
-public:
-    MouseMovedEvent(float x, float y) : m_MouseX(x), m_MouseY(y) {}
-    float GetX() const { return m_MouseX; }
-    float GetY() const { return m_MouseY; }
-    EVENT_CLASS_TYPE(MouseMoved)
-    EVENT_CLASS_CATEGORY(EventCategoryMouse | EventCategoryInput)
-private:
-    float m_MouseX, m_MouseY;
-};
-
-class MouseScrolledEvent : public Event
-{
-public:
-    MouseScrolledEvent(float xOffset, float yOffset) : m_XOffset(xOffset), m_YOffset(yOffset) {}
-    float GetXOffset() const { return m_XOffset; }
-    float GetYOffset() const { return m_YOffset; }
-    EVENT_CLASS_TYPE(MouseScrolled)
-    EVENT_CLASS_CATEGORY(EventCategoryMouse | EventCategoryInput)
-private:
-    float m_XOffset, m_YOffset;
-};
-
-class MouseButtonEvent : public Event
-{
-public:
-    enum class Action { None = 0, Pressed, Released };
-    int GetMouseButton() const { return m_Button; }
-    Action GetAction() const { return m_Action; }
-    EVENT_CLASS_CATEGORY(EventCategoryMouse | EventCategoryInput | EventCategoryMouseButton)
-protected:
-    MouseButtonEvent(int button, Action action) : m_Button(button), m_Action(action) {}
-    int m_Button;
-    Action m_Action;
-};
-
-class MouseButtonPressedEvent : public MouseButtonEvent
-{
-public:
-    MouseButtonPressedEvent(int button) : MouseButtonEvent(button, Action::Pressed) {}
-    EVENT_CLASS_TYPE(MouseButtonPressed)
-};
-
-class MouseButtonReleasedEvent : public MouseButtonEvent
-{
-public:
-    MouseButtonReleasedEvent(int button) : MouseButtonEvent(button, Action::Released) {}
-    EVENT_CLASS_TYPE(MouseButtonReleased)
-};
-
-// --- Window Events ---
-class WindowResizeEvent : public Event
-{
-public:
-    WindowResizeEvent(unsigned int width, unsigned int height) : m_Width(width), m_Height(height) {}
-    unsigned int GetWidth() const { return m_Width; }
-    unsigned int GetHeight() const { return m_Height; }
-    std::string ToString() const override { return "WindowResizeEvent: " + std::to_string(m_Width) + ", " + std::to_string(m_Height); }
-    EVENT_CLASS_TYPE(WindowResize)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-private:
-    unsigned int m_Width, m_Height;
-};
-
-class WindowCloseEvent : public Event
-{
-public:
-    EVENT_CLASS_TYPE(WindowClose)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-} // namespace CHEngine
-
-#endif // CH_EVENTS_H
diff --git a/engine/core/events/events.h b/engine/core/events/events.h
new file mode 100644
index 000000000..b7391ac06
--- /dev/null
+++ b/engine/core/events/events.h
@@ -0,0 +1,170 @@
+#ifndef CH_EVENTS_H
+#define CH_EVENTS_H
+
+#include <functional>
+#include <string>
+#include <deque>
+#include <memory>
+
+namespace Chained
+{
+	enum class EventType
+	{
+		None = 0,
+		WindowClose,
+		WindowResize,
+		KeyPressed,
+		ProjectCreated,
+		ProjectOpened,
+		SceneOpened,
+		ScenePlay,
+		SceneSimulate,
+		SceneStop,
+		SceneChangeRequest,
+		SceneModified,
+		EntitySelected,
+		AppLaunchRuntime,
+		AppResetLayout,
+		AppSaveLayout,
+		ViewportFocusEntity
+	};
+
+	using EventTypeID = uint32_t;
+
+	namespace Detail
+	{
+		inline EventTypeID GetNextEventTypeID()
+		{
+			static EventTypeID s_CurrentID = 1000; // Dynamic IDs start at 1000
+			return ++s_CurrentID;
+		}
+
+		template <typename T> inline EventTypeID GetTypeID()
+		{
+			static EventTypeID s_ID = GetNextEventTypeID();
+			return s_ID;
+		}
+	} // namespace Detail
+
+	enum EventCategory
+	{
+		NoneCategory = 0,
+		EventCategoryApplication = 1 << 0,
+		EventCategoryInput = 1 << 1,
+		EventCategoryKeyboard = 1 << 2,
+		EventCategoryEditor = 1 << 3,
+		EventCategoryScene = 1 << 4,
+		EventCategoryGameplay = 1 << 5
+	};
+
+#define EVENT_CLASS_TYPE(type)                                                                                         \
+	static EventType GetStaticType()                                                                                   \
+	{                                                                                                                  \
+		return EventType::type;                                                                                        \
+	}                                                                                                                  \
+	virtual EventType GetEventType() const override                                                                    \
+	{                                                                                                                  \
+		return GetStaticType();                                                                                        \
+	}                                                                                                                  \
+	virtual const char* GetName() const override                                                                       \
+	{                                                                                                                  \
+		return #type;                                                                                                  \
+	}
+
+#define CUSTOM_EVENT_CLASS_TYPE(typeName)                                                                              \
+	static EventType GetStaticType()                                                                                   \
+	{                                                                                                                  \
+		return static_cast<EventType>(::Chained::Detail::GetTypeID<typeName>());                                       \
+	}                                                                                                                  \
+	virtual EventType GetEventType() const override                                                                    \
+	{                                                                                                                  \
+		return GetStaticType();                                                                                        \
+	}                                                                                                                  \
+	virtual const char* GetName() const override                                                                       \
+	{                                                                                                                  \
+		return #typeName;                                                                                              \
+	}
+
+#define EVENT_CLASS_CATEGORY(category)                                                                                 \
+	virtual int GetCategoryFlags() const override                                                                      \
+	{                                                                                                                  \
+		return category;                                                                                               \
+	}
+
+	class Event
+	{
+	public:
+		virtual ~Event() = default;
+		bool Handled = false;
+
+		virtual EventType GetEventType() const = 0;
+		virtual const char* GetName() const = 0;
+		virtual int GetCategoryFlags() const = 0;
+		virtual std::string ToString() const
+		{
+			return GetName();
+		}
+		bool IsInCategory(EventCategory category) const
+		{
+			return GetCategoryFlags() & category;
+		}
+	};
+
+	class EventDispatcher
+	{
+	public:
+		EventDispatcher(Event& event)
+			: m_Event(event)
+		{
+		}
+
+		template <typename T, typename F> bool Dispatch(const F& func)
+		{
+			if (m_Event.GetEventType() == T::GetStaticType())
+			{
+				m_Event.Handled |= func(static_cast<T&>(m_Event));
+				return true;
+			}
+			return false;
+		}
+
+	private:
+		Event& m_Event;
+	};
+
+	class EventQueue
+	{
+	public:
+		void Push(std::unique_ptr<Event> event)
+		{
+			m_Queue.push_back(std::move(event));
+		}
+
+		template <typename T, typename... Args> void Enqueue(Args&&... args)
+		{
+			m_Queue.push_back(std::make_unique<T>(std::forward<Args>(args)...));
+		}
+
+		void Process(const std::function<void(Event&)>& callback)
+		{
+			while (!m_Queue.empty())
+			{
+				auto event = std::move(m_Queue.front());
+				m_Queue.pop_front();
+				callback(*event);
+			}
+		}
+
+		bool IsEmpty() const
+		{
+			return m_Queue.empty();
+		}
+
+	private:
+		std::deque<std::unique_ptr<Event>> m_Queue;
+	};
+
+	using EventCallbackFn = std::function<void(Event&)>;
+} // namespace Chained
+
+#endif // CH_EVENTS_H
\ No newline at end of file
diff --git a/engine/core/events/input_events.h b/engine/core/events/input_events.h
new file mode 100644
index 000000000..64778e282
--- /dev/null
+++ b/engine/core/events/input_events.h
@@ -0,0 +1,31 @@
+#ifndef CH_INPUT_EVENTS_H
+#define CH_INPUT_EVENTS_H
+#include "engine/core/key_codes.h"
+#include "engine/core/events/events.h"
+
+namespace Chained
+{
+	class KeyPressedEvent : public Event
+	{
+	public:
+		KeyPressedEvent(KeyCode keycode, bool isRepeat = false)
+			: m_KeyCode(keycode),
+			  m_IsRepeat(isRepeat)
+		{
+		}
+		KeyCode GetKeyCode() const
+		{
+			return m_KeyCode;
+		}
+		bool IsRepeat() const
+		{
+			return m_IsRepeat;
+		}
+		EVENT_CLASS_TYPE(KeyPressed)
+		EVENT_CLASS_CATEGORY(EventCategoryKeyboard | EventCategoryInput)
+	private:
+		KeyCode m_KeyCode;
+		bool m_IsRepeat;
+	};
+} // namespace Chained
+#endif // CH_INPUT_EVENTS_H
diff --git a/engine/core/events/window_events.h b/engine/core/events/window_events.h
new file mode 100644
index 000000000..ba49ff1d3
--- /dev/null
+++ b/engine/core/events/window_events.h
@@ -0,0 +1,44 @@
+#ifndef CH_WINDOW_EVENTS_H
+#define CH_WINDOW_EVENTS_H
+
+#include "engine/core/events/events.h"
+
+namespace Chained
+{
+
+	class WindowResizeEvent : public Event
+	{
+	public:
+		WindowResizeEvent(unsigned int width, unsigned int height)
+			: m_Width(width),
+			  m_Height(height)
+		{
+		}
+		unsigned int GetWidth() const
+		{
+			return m_Width;
+		}
+		unsigned int GetHeight() const
+		{
+			return m_Height;
+		}
+		std::string ToString() const override
+		{
+			return "WindowResizeEvent: " + std::to_string(m_Width) + ", " + std::to_string(m_Height);
+		}
+		EVENT_CLASS_TYPE(WindowResize)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	private:
+		unsigned int m_Width, m_Height;
+	};
+
+	class WindowCloseEvent : public Event
+	{
+	public:
+		EVENT_CLASS_TYPE(WindowClose)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	};
+
+} // namespace Chained
+
+#endif
\ No newline at end of file
diff --git a/engine/core/imgui_layer.cpp b/engine/core/imgui_layer.cpp
deleted file mode 100644
index 2146f38d0..000000000
--- a/engine/core/imgui_layer.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "imgui_layer.h"
-#include "application.h"
-#include "engine/core/profiler.h"
-#include "window.h"
-
-#define IMGUI_DEFINE_MATH_OPERATORS
-#include "imgui.h"
-#include "ImGuizmo.h"
-#include "backends/imgui_impl_glfw.h"
-#include "backends/imgui_impl_opengl3.h"
-
-#include <GLFW/glfw3.h>
-
-namespace CHEngine
-{
-void ImGuiLayer::SetContext(ImGuiContext* context)
-{
-    ImGui::SetCurrentContext(context);
-}
-
-ImGuiLayer::ImGuiLayer()
-    : Layer("ImGuiLayer")
-{
-}
-
-ImGuiLayer::~ImGuiLayer()
-{
-}
-
-void ImGuiLayer::OnAttach()
-{
-    CH_PROFILE_FUNCTION();
-
-    // Setup ImGui context
-    IMGUI_CHECKVERSION();
-    ImGui::CreateContext();
-    ImGuiIO& io = ImGui::GetIO();
-
-    auto& app = Application::Get();
-    const auto& spec = app.GetSpecification();
-    io.IniFilename = spec.ImGuiConfigurationPath.c_str();
-
-    // Docking and viewports are always enabled
-    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
-    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
-
-    // Setup style
-    ImGui::StyleColorsDark();
-
-    ImGuiStyle& style = ImGui::GetStyle();
-    if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
-    {
-        style.WindowRounding = 0.0f;
-        style.Colors[ImGuiCol_WindowBg].w = 1.0f;
-    }
-
-    // Setup Platform/Renderer backends
-    GLFWwindow* window = (GLFWwindow*)app.GetWindow().GetNativeWindow();
-    
-    if (!window)
-    {
-        CH_CORE_ERROR("ImGuiLayer: Failed to get native window handle! GLFW context might not be current.");
-        return;
-    }
-
-    ImGui_ImplGlfw_InitForOpenGL(window, true);
-    ImGui_ImplOpenGL3_Init("#version 430");
-}
-
-void ImGuiLayer::OnDetach()
-{
-    CH_PROFILE_FUNCTION();
-
-    ImGui_ImplOpenGL3_Shutdown();
-    ImGui_ImplGlfw_Shutdown();
-    ImGui::DestroyContext();
-}
-
-void ImGuiLayer::Begin()
-{
-    CH_PROFILE_FUNCTION();
-
-    ImGui_ImplOpenGL3_NewFrame();
-    ImGui_ImplGlfw_NewFrame();
-    ImGui::NewFrame();
-    ImGuizmo::BeginFrame();
-}
-
-void ImGuiLayer::End()
-{
-    CH_PROFILE_FUNCTION();
-
-    ImGuiIO& io = ImGui::GetIO();
-    Application& app = Application::Get();
-    io.DisplaySize = ImVec2((float)app.GetWindow().GetWidth(), (float)app.GetWindow().GetHeight());
-
-    // Rendering
-    ImGui::Render();
-    ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
-
-    if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
-    {
-        GLFWwindow* backup_current_context = glfwGetCurrentContext();
-        ImGui::UpdatePlatformWindows();
-        ImGui::RenderPlatformWindowsDefault();
-        glfwMakeContextCurrent(backup_current_context);
-    }
-}
-
-bool ImGuiLayer::RefreshFontAtlasTexture()
-{
-    if (!ImGui::GetCurrentContext())
-    {
-        CH_CORE_WARN("ImGuiLayer: Cannot refresh font atlas without an active ImGui context.");
-        return false;
-    }
-
-    ImGui_ImplOpenGL3_DestroyDeviceObjects();
-    if (!ImGui_ImplOpenGL3_CreateDeviceObjects())
-    {
-        CH_CORE_ERROR("ImGuiLayer: Failed to recreate OpenGL device objects for font atlas refresh.");
-        return false;
-    }
-
-    CH_CORE_INFO("ImGuiLayer: Refreshed font atlas texture.");
-    return true;
-}
-
-void ImGuiLayer::OnEvent(Event& e)
-{
-    if (m_BlockEvents)
-    {
-        ImGuiIO& io = ImGui::GetIO();
-        e.Handled |= e.IsInCategory(EventCategoryMouse) & io.WantCaptureMouse;
-        e.Handled |= e.IsInCategory(EventCategoryKeyboard) & io.WantCaptureKeyboard;
-    }
-}
-} // namespace CHEngine
diff --git a/engine/core/imgui_layer.h b/engine/core/imgui_layer.h
deleted file mode 100644
index 4baa0c87b..000000000
--- a/engine/core/imgui_layer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CH_IMGUI_LAYER_H
-#define CH_IMGUI_LAYER_H
-
-#include "engine/core/layer.h"
-#include <imgui.h>
-
-namespace CHEngine
-{
-class ImGuiLayer : public Layer
-{
-public:
-    ImGuiLayer();
-    ~ImGuiLayer() override;
-
-    void OnAttach() override;
-    void OnDetach() override;
-    void OnEvent(Event& e) override;
-
-    void Begin();
-    void End();
-
-    // Recreate renderer device objects so newly added ImGui fonts become visible.
-    bool RefreshFontAtlasTexture();
-
-    void BlockEvents(bool block)
-    {
-        m_BlockEvents = block;
-    }
-
-    static void SetContext(ImGuiContext* context);
-    ImGuiContext* GetContext() const { return ImGui::GetCurrentContext(); }
-
-private:
-    bool m_BlockEvents = true;
-};
-} // namespace CHEngine
-
-#endif // CH_IMGUI_LAYER_H
diff --git a/engine/core/input.cpp b/engine/core/input.cpp
index 1d8f1c9d0..06904de8a 100644
--- a/engine/core/input.cpp
+++ b/engine/core/input.cpp
@@ -1,98 +1,246 @@
 #include "input.h"
-#include "engine/core/application.h"
-#include "engine/core/events.h"
-#include <GLFW/glfw3.h>
 
-namespace CHEngine
-{
-void Input::Update()
-{
-    auto window = static_cast<GLFWwindow*>(Application::Get().GetWindow().GetNativeWindow());
-    if (!window) return;
-
-    // 1. Sync Key States
-    // GLFW_KEY_SPACE (32) is the first valid named key; indices 0..31 are reserved and
-    // trigger GLFW's error callback if polled. Poll only the valid range.
-    for (int i = GLFW_KEY_SPACE; i <= GLFW_KEY_LAST; i++)
-    {
-        Input::s_LastKeyStates[i] = Input::s_KeyStates[i];
-        Input::s_KeyStates[i] = glfwGetKey(window, i) == GLFW_PRESS;
-    }
-
-    // 2. Sync Mouse States (GLFW_MOUSE_BUTTON_LAST = 7)
-    for (int i = 0; i <= GLFW_MOUSE_BUTTON_LAST; i++)
-    {
-        Input::s_LastMouseStates[i] = Input::s_MouseStates[i];
-        Input::s_MouseStates[i] = glfwGetMouseButton(window, i) == GLFW_PRESS;
-    }
-
-    // 3. Sync Mouse Position
-    Input::s_LastMousePosition = Input::s_MousePosition;
-    double xpos, ypos;
-    glfwGetCursorPos(window, &xpos, &ypos);
-    Input::s_MousePosition = { (float)xpos, (float)ypos };
-
-    // 4. Sync Mouse Wheel (Impulse)
-    Input::s_CurrentMouseWheelDelta = Input::s_MouseWheelDelta;
-    Input::s_MouseWheelDelta = 0.0f;
-}
-
-void Input::PollEvents()
-{
-}
-
-bool Input::IsKeyPressed(KeyCode key)
-{
-    return Input::s_KeyStates[key] && !Input::s_LastKeyStates[key];
-}
-
-bool Input::IsKeyDown(KeyCode key)
-{
-    return Input::s_KeyStates[key];
-}
-
-bool Input::IsKeyReleased(KeyCode key)
-{
-    return !Input::s_KeyStates[key] && Input::s_LastKeyStates[key];
-}
-
-bool Input::IsKeyUp(KeyCode key)
-{
-    return !Input::s_KeyStates[key];
-}
-
-bool Input::IsMouseButtonPressed(MouseCode button)
-{
-    return Input::s_MouseStates[button] && !Input::s_LastMouseStates[button];
-}
-
-bool Input::IsMouseButtonDown(MouseCode button)
-{
-    return Input::s_MouseStates[button];
-}
-
-bool Input::IsMouseButtonReleased(MouseCode button)
-{
-    return !Input::s_MouseStates[button] && Input::s_LastMouseStates[button];
-}
-
-bool Input::IsMouseButtonUp(MouseCode button)
-{
-    return !Input::s_MouseStates[button];
-}
-
-glm::vec2 Input::GetMousePosition()
-{
-    return Input::s_MousePosition;
-}
-
-glm::vec2 Input::GetMouseDelta()
-{
-    return Input::s_MousePosition - Input::s_LastMousePosition;
-}
+#include "engine/core/service_locator.h"
 
-float Input::GetMouseWheelMove()
+namespace Chained::Core
 {
-    return Input::s_CurrentMouseWheelDelta; 
-}
-} // namespace CHEngine
+	Input* Input::s_Instance = nullptr;
+
+	Input::Input()
+	{
+		s_Instance = this;
+	}
+
+	Input::~Input()
+	{
+		if (s_Instance == this)
+		{
+			s_Instance = nullptr;
+		}
+	}
+
+	void Input::Initialize()
+	{
+		ResetAll();
+	}
+
+	void Input::Shutdown()
+	{
+		ResetAll();
+	}
+
+	void Input::ResetAll()
+	{
+		if (!s_Instance)
+		{
+			return;
+		}
+		s_Instance->m_KeyStates.fill(false);
+		s_Instance->m_LastKeyStates.fill(false);
+		s_Instance->m_MouseStates.fill(false);
+		s_Instance->m_LastMouseStates.fill(false);
+		s_Instance->m_MousePosition = {0.0f, 0.0f};
+		s_Instance->m_LastMousePosition = {0.0f, 0.0f};
+		s_Instance->m_MouseWheelAccumulator = 0.0f;
+		s_Instance->m_CurrentMouseWheelDelta = 0.0f;
+		s_Instance->m_FirstMouseUpdate = true;
+	}
+
+	void Input::Update(Timestep ts)
+	{
+		if (!s_Instance)
+		{
+			return;
+		}
+		s_Instance->m_LastKeyStates = s_Instance->m_KeyStates;
+		s_Instance->m_LastMouseStates = s_Instance->m_MouseStates;
+		s_Instance->m_LastMousePosition = s_Instance->m_MousePosition;
+		s_Instance->m_CurrentMouseWheelDelta = s_Instance->m_MouseWheelAccumulator;
+		s_Instance->m_MouseWheelAccumulator = 0.0f;
+	}
+
+	bool Input::IsKeyPressed(KeyCode key)
+	{
+		if (!s_Instance)
+		{
+			return false;
+		}
+		auto code = static_cast<size_t>(key);
+		if (code >= s_Instance->m_KeyStates.size())
+		{
+			return false;
+		}
+		return s_Instance->m_KeyStates[code] && !s_Instance->m_LastKeyStates[code];
+	}
+
+	bool Input::IsKeyDown(KeyCode key)
+	{
+		if (!s_Instance)
+		{
+			return false;
+		}
+		auto code = static_cast<size_t>(key);
+		if (code >= s_Instance->m_KeyStates.size())
+		{
+			return false;
+		}
+		return s_Instance->m_KeyStates[code];
+	}
+
+	bool Input::IsKeyReleased(KeyCode key)
+	{
+		if (!s_Instance)
+		{
+			return false;
+		}
+		auto code = static_cast<size_t>(key);
+		if (code >= s_Instance->m_KeyStates.size())
+		{
+			return false;
+		}
+		return !s_Instance->m_KeyStates[code] && s_Instance->m_LastKeyStates[code];
+	}
+
+	bool Input::IsKeyUp(KeyCode key)
+	{
+		if (!s_Instance)
+		{
+			return true;
+		}
+		auto code = static_cast<size_t>(key);
+		if (code >= s_Instance->m_KeyStates.size())
+		{
+			return true;
+		}
+		return !s_Instance->m_KeyStates[code];
+	}
+
+	bool Input::IsMouseButtonPressed(MouseCode button)
+	{
+		if (!s_Instance)
+		{
+			return false;
+		}
+		auto code = static_cast<size_t>(button);
+		if (code >= s_Instance->m_MouseStates.size())
+		{
+			return false;
+		}
+		return s_Instance->m_MouseStates[code] && !s_Instance->m_LastMouseStates[code];
+	}
+
+	bool Input::IsMouseButtonDown(MouseCode button)
+	{
+		if (!s_Instance)
+		{
+			return false;
+		}
+		auto code = static_cast<size_t>(button);
+		if (code >= s_Instance->m_MouseStates.size())
+		{
+			return false;
+		}
+		return s_Instance->m_MouseStates[code];
+	}
+
+	bool Input::IsMouseButtonReleased(MouseCode button)
+	{
+		if (!s_Instance)
+		{
+			return false;
+		}
+		auto code = static_cast<size_t>(button);
+		if (code >= s_Instance->m_MouseStates.size())
+		{
+			return false;
+		}
+		return !s_Instance->m_MouseStates[code] && s_Instance->m_LastMouseStates[code];
+	}
+
+	bool Input::IsMouseButtonUp(MouseCode button)
+	{
+		if (!s_Instance)
+		{
+			return true;
+		}
+		auto code = static_cast<size_t>(button);
+		if (code >= s_Instance->m_MouseStates.size())
+		{
+			return true;
+		}
+		return !s_Instance->m_MouseStates[code];
+	}
+
+	glm::vec2 Input::GetMousePosition()
+	{
+		return s_Instance ? s_Instance->m_MousePosition : glm::vec2{0.0f, 0.0f};
+	}
+
+	glm::vec2 Input::GetMouseDelta()
+	{
+		if (!s_Instance)
+		{
+			return {0.0f, 0.0f};
+		}
+		if (s_Instance->m_FirstMouseUpdate)
+		{
+			return {0.0f, 0.0f};
+		}
+		return s_Instance->m_MousePosition - s_Instance->m_LastMousePosition;
+	}
+
+	float Input::GetMouseWheelMove()
+	{
+		return s_Instance ? s_Instance->m_CurrentMouseWheelDelta : 0.0f;
+	}
+
+	void Input::OnKey(KeyCode key, bool pressed)
+	{
+		if (!s_Instance)
+		{
+			return;
+		}
+		auto code = static_cast<size_t>(key);
+		if (code < s_Instance->m_KeyStates.size())
+		{
+			s_Instance->m_KeyStates[code] = pressed;
+		}
+	}
+
+	void Input::OnMouseButton(MouseCode button, bool pressed)
+	{
+		if (!s_Instance)
+		{
+			return;
+		}
+		auto code = static_cast<size_t>(button);
+		if (code < s_Instance->m_MouseStates.size())
+		{
+			s_Instance->m_MouseStates[code] = pressed;
+		}
+	}
+
+	void Input::OnMouseMove(float x, float y)
+	{
+		if (!s_Instance)
+		{
+			return;
+		}
+		if (s_Instance->m_FirstMouseUpdate)
+		{
+			s_Instance->m_LastMousePosition = {x, y};
+			s_Instance->m_FirstMouseUpdate = false;
+		}
+		s_Instance->m_MousePosition = {x, y};
+	}
+
+	void Input::OnMouseScroll(float xOffset, float yOffset)
+	{
+		if (!s_Instance)
+		{
+			return;
+		}
+		s_Instance->m_MouseWheelAccumulator += yOffset;
+	}
+
+} // namespace Chained::Core
diff --git a/engine/core/input.h b/engine/core/input.h
index 0596c3c6c..444481cc7 100644
--- a/engine/core/input.h
+++ b/engine/core/input.h
@@ -1,48 +1,62 @@
 #ifndef CH_INPUT_H
 #define CH_INPUT_H
 
-#include "engine/core/base.h"
+#include "engine/common/base.h"
+#include "engine/common/timestep.h"
+#include "engine/core/service.h"
 #include "key_codes.h"
 #include "mouse_codes.h"
+#include <array>
+#include <glm/vec2.hpp>
 
-namespace CHEngine
+namespace Chained::Core
 {
-
-class Input
-{
-public:
-    static void Update();
-    static void PollEvents();
-
-    static bool IsKeyPressed(KeyCode key);
-    static bool IsKeyDown(KeyCode key);
-    static bool IsKeyReleased(KeyCode key);
-    static bool IsKeyUp(KeyCode key);
-
-    static bool IsMouseButtonPressed(MouseCode button);
-    static bool IsMouseButtonDown(MouseCode button);
-    static bool IsMouseButtonReleased(MouseCode button);
-    static bool IsMouseButtonUp(MouseCode button);
-
-    static glm::vec2 GetMousePosition();
-    static glm::vec2 GetMouseDelta();
-    static float GetMouseWheelMove();
-
-    // Callback used by Window to update scroll
-    static void OnMouseScroll(float xOffset, float yOffset) { s_MouseWheelDelta = yOffset; }
-
-private:
-    static inline bool s_KeyStates[512] = { false };
-    static inline bool s_LastKeyStates[512] = { false };
-    static inline bool s_MouseStates[16] = { false };
-    static inline bool s_LastMouseStates[16] = { false };
-
-    static inline glm::vec2 s_MousePosition = { 0.0f, 0.0f };
-    static inline glm::vec2 s_LastMousePosition = { 0.0f, 0.0f };
-    static inline float s_MouseWheelDelta = 0.0f;
-    static inline float s_CurrentMouseWheelDelta = 0.0f;
-};
-
-} // namespace CHEngine
+	class CH_API Input : public Service
+	{
+	public:
+		Input();
+		~Input() override;
+
+		void Initialize() override;
+		void Shutdown() override;
+
+		// Static API — primary interface for engine-wide access
+		static void Update(Timestep ts);
+		static void ResetAll();
+
+		static bool IsKeyPressed(KeyCode key);
+		static bool IsKeyDown(KeyCode key);
+		static bool IsKeyReleased(KeyCode key);
+		static bool IsKeyUp(KeyCode key);
+
+		static bool IsMouseButtonPressed(MouseCode button);
+		static bool IsMouseButtonDown(MouseCode button);
+		static bool IsMouseButtonReleased(MouseCode button);
+		static bool IsMouseButtonUp(MouseCode button);
+
+		static glm::vec2 GetMousePosition();
+		static glm::vec2 GetMouseDelta();
+		static float GetMouseWheelMove();
+
+		static void OnKey(KeyCode key, bool pressed);
+		static void OnMouseButton(MouseCode button, bool pressed);
+		static void OnMouseMove(float x, float y);
+		static void OnMouseScroll(float xOffset, float yOffset);
+
+	private:
+		static Input* s_Instance;
+
+		std::array<bool, 512> m_KeyStates{};
+		std::array<bool, 512> m_LastKeyStates{};
+		std::array<bool, 16> m_MouseStates{};
+		std::array<bool, 16> m_LastMouseStates{};
+
+		glm::vec2 m_MousePosition{0.0f, 0.0f};
+		glm::vec2 m_LastMousePosition{0.0f, 0.0f};
+		float m_MouseWheelAccumulator = 0.0f;
+		float m_CurrentMouseWheelDelta = 0.0f;
+		bool m_FirstMouseUpdate = true;
+	};
+} // namespace Chained::Core
 
 #endif // CH_INPUT_H
diff --git a/engine/core/key_codes.h b/engine/core/key_codes.h
index c98ab4f41..d33676079 100644
--- a/engine/core/key_codes.h
+++ b/engine/core/key_codes.h
@@ -3,94 +3,86 @@
 
 #include <cstdint>
 
-namespace CHEngine
+namespace Chained
 {
-	using KeyCode = uint16_t;
-
-	namespace Key
+	enum class KeyCode : int32_t
 	{
-		enum : KeyCode
-		{
-			// Generic key codes (compatible with GLFW)
-			Null            = 0,        
-			// Alphanumeric keys
-			A               = 65,       // Key: A | a
-			B               = 66,       // Key: B | b
-			C               = 67,       // Key: C | c
-			D               = 68,       // Key: D | d
-			E               = 69,       // Key: E | e
-			F               = 70,       // Key: F | f
-			G               = 71,       // Key: G | g
-			H               = 72,       // Key: H | h
-			I               = 73,       // Key: I | i
-			J               = 74,       // Key: J | j
-			K               = 75,       // Key: K | k
-			L               = 76,       // Key: L | l
-			M               = 77,       // Key: M | m
-			N               = 78,       // Key: N | n
-			O               = 79,       // Key: O | o
-			P               = 80,       // Key: P | p
-			Q               = 81,       // Key: Q | q
-			R               = 82,       // Key: R | r
-			S               = 83,       // Key: S | s
-			T               = 84,       // Key: T | t
-			U               = 85,       // Key: U | u
-			V               = 86,       // Key: V | v
-			W               = 87,       // Key: W | w
-			X               = 88,       // Key: X | x
-			Y               = 89,       // Key: Y | y
-			Z               = 90,       // Key: Z | z
-			Space           = 32,       // Key: Space
-			Escape          = 256,      // Key: Esc
-			Enter           = 257,      // Key: Enter
-			Tab             = 258,      // Key: Tab
-			Backspace       = 259,      // Key: Backspace
-			Insert          = 260,      // Key: Ins
-			Delete          = 261,      // Key: Del
-			Right           = 262,      // Key: Cursor right
-			Left            = 263,      // Key: Cursor left
-			Down            = 264,      // Key: Cursor down
-			Up              = 265,      // Key: Cursor up
-			PageUp          = 266,      // Key: Page up
-			PageDown        = 267,      // Key: Page down
-			Home            = 268,      // Key: Home
-			End             = 269,      // Key: End
-			CapsLock        = 280,      // Key: Caps lock
-			ScrollLock      = 281,      // Key: Scroll lock
-			NumLock         = 282,      // Key: Num lock
-			PrintScreen     = 283,      // Key: Print screen
-			Pause           = 284,      // Key: Pause
-			F1              = 290,      // Key: F1
-			F2              = 291,      // Key: F2
-			F3              = 292,      // Key: F3
-			F4              = 293,      // Key: F4
-			F5              = 294,      // Key: F5
-			F6              = 295,      // Key: F6
-			F7              = 296,      // Key: F7
-			F8              = 297,      // Key: F8
-			F9              = 298,      // Key: F9
-			F10             = 299,      // Key: F10
-			F11             = 300,      // Key: F11
-			F12             = 301,      // Key: F12
-			LeftShift       = 340,      // Key: Shift left
-			LeftControl     = 341,      // Key: Control left
-			LeftAlt         = 342,      // Key: Alt left
-			RightShift      = 344,      // Key: Shift right
-			RightControl    = 345,      // Key: Control right
-			RightAlt        = 346,      // Key: Alt right
-			
-			D0              = 48,       // Key: 0
-			D1              = 49,       // Key: 1
-			D2              = 50,       // Key: 2
-			D3              = 51,       // Key: 3
-			D4              = 52,       // Key: 4
-			D5              = 53,       // Key: 5
-			D6              = 54,       // Key: 6
-			D7              = 55,       // Key: 7
-			D8              = 56,       // Key: 8
-			D9              = 57,       // Key: 9
-		};
-	}
+		Null = 0,
+		A = 1,
+		B = 2,
+		C = 3,
+		D = 4,
+		E = 5,
+		F = 6,
+		G = 7,
+		H = 8,
+		I = 9,
+		J = 10,
+		K = 11,
+		L = 12,
+		M = 13,
+		N = 14,
+		O = 15,
+		P = 16,
+		Q = 17,
+		R = 18,
+		S = 19,
+		T = 20,
+		U = 21,
+		V = 22,
+		W = 23,
+		X = 24,
+		Y = 25,
+		Z = 26,
+		Space = 27,
+		Escape = 28,
+		Enter = 29,
+		Tab = 30,
+		Backspace = 31,
+		Insert = 32,
+		Delete = 33,
+		Right = 34,
+		Left = 35,
+		Down = 36,
+		Up = 37,
+		PageUp = 38,
+		PageDown = 39,
+		Home = 40,
+		End = 41,
+		CapsLock = 42,
+		ScrollLock = 43,
+		NumLock = 44,
+		PrintScreen = 45,
+		Pause = 46,
+		F1 = 47,
+		F2 = 48,
+		F3 = 49,
+		F4 = 50,
+		F5 = 51,
+		F6 = 52,
+		F7 = 53,
+		F8 = 54,
+		F9 = 55,
+		F10 = 56,
+		F11 = 57,
+		F12 = 58,
+		LeftShift = 59,
+		LeftControl = 60,
+		LeftAlt = 61,
+		RightShift = 62,
+		RightControl = 63,
+		RightAlt = 64,
+		D0 = 65,
+		D1 = 66,
+		D2 = 67,
+		D3 = 68,
+		D4 = 69,
+		D5 = 70,
+		D6 = 71,
+		D7 = 72,
+		D8 = 73,
+		D9 = 74,
+	};
 }
 
 #endif // CH_KEY_CODES_H
diff --git a/engine/core/layer.h b/engine/core/layer.h
index b7c4f1a29..9eb69f8b5 100644
--- a/engine/core/layer.h
+++ b/engine/core/layer.h
@@ -1,66 +1,54 @@
 #ifndef CH_LAYER_H
 #define CH_LAYER_H
 
-#include "engine/core/base.h"
-#include "engine/core/events.h"
-#include "engine/core/timestep.h"
 #include <string>
+#include "engine/common/base.h"
+#include "engine/core/events/events.h"
+#include "engine/common/timestep.h"
 
-namespace CHEngine
+namespace Chained
 {
-// Base class for engine layers with lifecycle callbacks and an enable flag.
-class Layer
-{
-public:
-    Layer(const std::string& name = "Layer")
-        : m_DebugName(name)
-    {
-    }
-    virtual ~Layer() = default;
-
-    virtual void OnAttach()
-    {
-    }
-    virtual void OnDetach()
-    {
-    }
-
-    // Returns whether the layer is currently enabled.
-    bool IsEnabled() const
-    {
-        return m_Enabled;
-    }
-    // Enables or disables the layer without destroying it.
-    void SetEnabled(bool enabled)
-    {
-        m_Enabled = enabled;
-    }
-
-    virtual void OnUpdate(Timestep ts)
-    {
-    }
-    virtual void OnFixedUpdate(Timestep ts)
-    {
-    }
-    virtual void OnRender(Timestep ts)
-    {
-    }
-    virtual void OnImGuiRender()
-    {
-    }
-    virtual void OnEvent(Event& event)
-    {
-    }
-
-    const std::string& GetName() const
-    {
-        return m_DebugName;
-    }
 
-protected:
-    std::string m_DebugName;
-    bool m_Enabled = true;
-};
-} // namespace CHEngine
+	// Base class for engine layers with lifecycle callbacks.
+	class Layer
+	{
+	public:
+		Layer(const std::string& name = "Layer")
+			: m_DebugName(name)
+		{
+		}
+		virtual ~Layer() = default;
+
+		virtual void OnAttach()
+		{
+		}
+		virtual void OnDetach()
+		{
+		}
+		virtual void OnUpdate(Timestep ts)
+		{
+		}
+		virtual void OnFixedUpdate(Timestep ts)
+		{
+		}
+		virtual void OnRender(Timestep ts)
+		{
+		}
+		virtual void OnImGuiRender()
+		{
+		}
+		virtual void OnEvent(Event& event)
+		{
+		}
+
+		const std::string& GetName() const
+		{
+			return m_DebugName;
+		}
+
+	protected:
+		std::string m_DebugName;
+	};
+} // namespace Chained
 
 #endif // CH_LAYER_H
diff --git a/engine/core/layer_stack.cpp b/engine/core/layer_stack.cpp
index 407e12220..afd140a68 100644
--- a/engine/core/layer_stack.cpp
+++ b/engine/core/layer_stack.cpp
@@ -1,82 +1,34 @@
 #include "layer_stack.h"
-#include <algorithm>
 
-namespace CHEngine
-{
-LayerStack::~LayerStack()
-{
-    Shutdown();
-}
-
-void LayerStack::Shutdown()
-{
-    for (auto& layer : m_Layers)
-    {
-        if (layer)
-        {
-            layer->OnDetach();
-        }
-    }
-    m_Layers.clear();
-    m_LayerInsertIndex = 0;
-}
-
-void LayerStack::PushLayer(std::unique_ptr<Layer> layer)
-{
-    m_Layers.emplace(m_Layers.begin() + m_LayerInsertIndex, std::move(layer));
-    m_LayerInsertIndex++;
-}
-
-void LayerStack::PushOverlay(std::unique_ptr<Layer> overlay)
-{
-    m_Layers.emplace_back(std::move(overlay));
-}
-
-void LayerStack::PushLayer(Layer* layer)
-{
-    PushLayer(std::unique_ptr<Layer>(layer));
-}
-
-void LayerStack::PushOverlay(Layer* overlay)
-{
-    PushOverlay(std::unique_ptr<Layer>(overlay));
-}
-
-void LayerStack::PopLayer(Layer* layer)
-{
-    auto it = std::find_if(m_Layers.begin(), m_Layers.begin() + m_LayerInsertIndex,
-                           [layer](const std::unique_ptr<Layer>& candidate) {
-                               return candidate.get() == layer;
-                           });
-    if (it != m_Layers.begin() + m_LayerInsertIndex)
-    {
-        (*it)->OnDetach();
-        m_Layers.erase(it);
-        m_LayerInsertIndex--;
-    }
-}
-
-void LayerStack::PopOverlay(Layer* overlay)
-{
-    auto it = std::find_if(m_Layers.begin() + m_LayerInsertIndex, m_Layers.end(),
-                           [overlay](const std::unique_ptr<Layer>& candidate) {
-                               return candidate.get() == overlay;
-                           });
-    if (it != m_Layers.end())
-    {
-        (*it)->OnDetach();
-        m_Layers.erase(it);
-    }
-}
-
-std::vector<Layer*> LayerStack::GetLayerPointersSnapshot() const
-{
-    std::vector<Layer*> layers;
-    layers.reserve(m_Layers.size());
-    for (const auto& layer : m_Layers)
-    {
-        layers.emplace_back(layer.get());
-    }
-    return layers;
-}
-} // namespace CHEngine
+namespace Chained
+{
+	LayerStack::~LayerStack()
+	{
+		Shutdown();
+	}
+
+	void LayerStack::Shutdown()
+	{
+		for (auto& layer : m_Layers)
+		{
+			if (layer)
+			{
+				layer->OnDetach();
+			}
+		}
+		m_Layers.clear();
+		m_LayerInsertIndex = 0;
+	}
+
+	void LayerStack::PushLayer(std::unique_ptr<Layer> layer)
+	{
+		m_Layers.emplace(m_Layers.begin() + m_LayerInsertIndex, std::move(layer));
+		m_LayerInsertIndex++;
+	}
+
+	void LayerStack::PushOverlay(std::unique_ptr<Layer> overlay)
+	{
+		m_Layers.emplace_back(std::move(overlay));
+	}
+
+} // namespace Chained
diff --git a/engine/core/layer_stack.h b/engine/core/layer_stack.h
index 0e723d18d..ffbc4cb6d 100644
--- a/engine/core/layer_stack.h
+++ b/engine/core/layer_stack.h
@@ -5,69 +5,75 @@
 #include <memory>
 #include <vector>
 
-namespace CHEngine
+namespace Chained
 {
-class LayerStack
-{
-public:
-    using LayerStorage = std::vector<std::unique_ptr<Layer>>;
+	class LayerStack
+	{
+	public:
+		using LayerStorage = std::vector<std::unique_ptr<Layer>>;
 
-    LayerStack() = default;
-    ~LayerStack();
+		LayerStack() = default;
+		~LayerStack();
 
-    void Shutdown();
+		void Shutdown();
 
-    // Preferred ownership-aware API.
-    void PushLayer(std::unique_ptr<Layer> layer);
-    void PushOverlay(std::unique_ptr<Layer> overlay);
+		// Preferred ownership-aware API.
+		void PushLayer(std::unique_ptr<Layer> layer);
+		void PushOverlay(std::unique_ptr<Layer> overlay);
 
-    // Backward-compatible API; takes ownership of raw pointer.
-    void PushLayer(Layer* layer);
-    void PushOverlay(Layer* overlay);
-    void PopLayer(Layer* layer);
-    void PopOverlay(Layer* overlay);
+		bool HasLayer(const std::string& name) const
+		{
+			for (const auto& layer : m_Layers)
+			{
+				if (layer && layer->GetName() == name)
+				{
+					return true;
+				}
+			}
+			return false;
+		}
 
-    bool HasLayer(const std::string& name) const
-    {
-        for (const auto& layer : m_Layers)
-        {
-            if (layer && layer->GetName() == name)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
+	public:
+		LayerStorage::iterator begin()
+		{
+			return m_Layers.begin();
+		}
+		LayerStorage::iterator end()
+		{
+			return m_Layers.end();
+		}
+		LayerStorage::reverse_iterator rbegin()
+		{
+			return m_Layers.rbegin();
+		}
+		LayerStorage::reverse_iterator rend()
+		{
+			return m_Layers.rend();
+		}
 
-public:
-    LayerStorage::iterator begin()
-    {
-        return m_Layers.begin();
-    }
-    LayerStorage::iterator end()
-    {
-        return m_Layers.end();
-    }
-    LayerStorage::reverse_iterator rbegin()
-    {
-        return m_Layers.rbegin();
-    }
-    LayerStorage::reverse_iterator rend()
-    {
-        return m_Layers.rend();
-    }
+		LayerStorage& GetLayers()
+		{
+			return m_Layers;
+		}
+		const LayerStorage& GetLayers() const
+		{
+			return m_Layers;
+		}
 
-    LayerStorage& GetLayers()
-    {
-        return m_Layers;
-    }
+		size_t GetLayerCount() const
+		{
+			return m_Layers.size();
+		}
 
-    std::vector<Layer*> GetLayerPointersSnapshot() const;
+		Layer* GetLayerAt(size_t index) const
+		{
+			return index < m_Layers.size() ? m_Layers[index].get() : nullptr;
+		}
 
-private:
-    LayerStorage m_Layers;
-    unsigned int m_LayerInsertIndex = 0;
-};
-} // namespace CHEngine
+	private:
+		LayerStorage m_Layers;
+		unsigned int m_LayerInsertIndex = 0;
+	};
+} // namespace Chained
 
 #endif // CH_LAYER_STACK_H
diff --git a/engine/core/log.h b/engine/core/log.h
index 6a0dbf9c0..c5df0fbdf 100644
--- a/engine/core/log.h
+++ b/engine/core/log.h
@@ -1,150 +1,164 @@
 #ifndef CH_LOG_H
 #define CH_LOG_H
 
-#include <format>
+#include <spdlog/spdlog.h>
+#include <spdlog/fmt/ostr.h>
+#include <spdlog/sinks/callback_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+#include <chrono>
+#include <cstdio>
+#include <deque>
+#include <mutex>
 #include <string>
-#include <iostream>
+#include <vector>
 
-namespace CHEngine
+namespace Chained
 {
-enum class LogLevel
-{
-    LogTrace = 0,
-    LogInfo,
-    LogWarning,
-    LogError,
-    LogFatal,
-    LogNone
-};
-
-    using LogCallbackFn = void(*)(const char*, int);
-
-    class Log
-    {
-    public:
-        static void SetLogLevel(LogLevel level)
-        {
-            s_LogLevel = level;
-        }
-        static LogLevel GetLogLevel()
-        {
-            return s_LogLevel;
-        }
-
-        static void SetLogCallback(LogCallbackFn callback)
-        {
-            s_LogCallback = callback;
-        }
-
-        // Core logging functions
-        template <typename... Args> static void CoreTrace(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogTrace) LogMessage("[CORE] [TRACE] ", LogLevel::LogTrace, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void CoreInfo(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogInfo) LogMessage("[CORE] [INFO]  ", LogLevel::LogInfo, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void CoreWarn(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogWarning) LogMessage("[CORE] [WARN]  ", LogLevel::LogWarning, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void CoreError(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogError) LogMessage("[CORE] [ERROR] ", LogLevel::LogError, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void CoreFatal(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogFatal) LogMessage("[CORE] [FATAL] ", LogLevel::LogFatal, fmt, std::forward<Args>(args)...);
-        }
-
-        // Client logging functions
-        template <typename... Args> static void ClientTrace(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogTrace) LogMessage("[CLIENT] [TRACE] ", LogLevel::LogTrace, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void ClientInfo(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogInfo) LogMessage("[CLIENT] [INFO]  ", LogLevel::LogInfo, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void ClientWarn(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogWarning) LogMessage("[CLIENT] [WARN]  ", LogLevel::LogWarning, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void ClientError(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogError) LogMessage("[CLIENT] [ERROR] ", LogLevel::LogError, fmt, std::forward<Args>(args)...);
-        }
-
-        template <typename... Args> static void ClientFatal(std::format_string<Args...> fmt, Args&&... args)
-        {
-            if (s_LogLevel <= LogLevel::LogFatal) LogMessage("[CLIENT] [FATAL] ", LogLevel::LogFatal, fmt, std::forward<Args>(args)...);
-        }
-
-    private:
-        template <typename... Args>
-        static void LogMessage(const char* prefix, LogLevel level, std::format_string<Args...> fmt, Args&&... args)
-        {
-            std::string message = std::format(fmt, std::forward<Args>(args)...);
-            std::string fullMessage = std::string(prefix) + message;
-            
-            // Output to system console
-            std::cout << fullMessage << std::endl;
-            
-            // Runtime callback for Editor/UI integration
-            if (s_LogCallback)
-            {
-                s_LogCallback(fullMessage.c_str(), (int)level);
-            }
-        }
-
-    private:
-#ifdef CH_DEBUG
-        inline static LogLevel s_LogLevel = LogLevel::LogTrace;
-#else
-        inline static LogLevel s_LogLevel = LogLevel::LogInfo;
-#endif
-        inline static LogCallbackFn s_LogCallback = nullptr;
-    };
-} // namespace CHEngine
+	enum class LogLevel
+	{
+		LogTrace = spdlog::level::trace,
+		LogInfo = spdlog::level::info,
+		LogWarning = spdlog::level::warn,
+		LogError = spdlog::level::err,
+		LogFatal = spdlog::level::critical,
+		LogNone = spdlog::level::off
+	};
+
+	struct BufferedLogEntry
+	{
+		LogLevel level;
+		std::string message;
+		std::string timestamp;
+	};
+
+	using LogCallbackFn = void (*)(const char*, int);
+
+	class Log
+	{
+	public:
+		static void Init()
+		{
+			auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+			console_sink->set_pattern("%^[%H:%M:%S] %v%$");
+
+			auto callback_sink =
+				std::make_shared<spdlog::sinks::callback_sink_mt>([](const spdlog::details::log_msg& msg) {
+					std::string message(msg.payload.data(), msg.payload.size());
+
+					// Wall-clock HH:MM:SS for the buffered in-editor console. Deliberately
+					// snprintf, not std::format: std::format segfaulted inside libstdc++'s
+					// formatting machinery in Debug builds made by the MinGW-Builds GCC 15.2
+					// that GitHub runners preinstall (crash in _Formatting_scanner::_M_format_arg
+					// on the very first log message). duration_cast is also portable across
+					// system_clock tick periods — the old divisors assumed microseconds.
+					const long long secs =
+						std::chrono::duration_cast<std::chrono::seconds>(msg.time.time_since_epoch()).count();
+					char ts[32];
+					std::snprintf(ts, sizeof(ts), "[%02lld:%02lld:%02lld] ", (secs / 3600) % 24, (secs / 60) % 60,
+								  secs % 60);
+					std::string timestamp = ts;
+
+					std::lock_guard<std::mutex> lock(s_BufferMutex);
+					s_Buffer.push_back({static_cast<LogLevel>(msg.level), message, timestamp});
+					if (s_Buffer.size() > MAX_BUFFERED_MESSAGES)
+					{
+						s_Buffer.pop_front();
+					}
+
+					if (s_LogCallback)
+					{
+						s_LogCallback(message.c_str(), static_cast<int>(msg.level));
+					}
+				});
+
+			std::vector<spdlog::sink_ptr> sinks{console_sink, callback_sink};
+
+			s_CoreLogger = std::make_shared<spdlog::logger>("CORE", sinks.begin(), sinks.end());
+			s_CoreLogger->set_level(spdlog::level::trace);
+			// Flush only on warnings+ — flushing the console sink on every trace/info
+			// message forces a synchronous stdout flush each frame, which stalls the
+			// editor badly when per-frame logs are active. spdlog still flushes
+			// periodically on its own.
+			s_CoreLogger->flush_on(spdlog::level::warn);
+
+			s_ClientLogger = std::make_shared<spdlog::logger>("CLIENT", sinks.begin(), sinks.end());
+			s_ClientLogger->set_level(spdlog::level::trace);
+			s_ClientLogger->flush_on(spdlog::level::warn);
+		}
+
+		static void SetLogLevel(LogLevel level)
+		{
+			spdlog::set_level(static_cast<spdlog::level::level_enum>(level));
+		}
+
+		static void Shutdown()
+		{
+			s_CoreLogger.reset();
+			s_ClientLogger.reset();
+			spdlog::shutdown();
+		}
+
+		static void SetLogCallback(LogCallbackFn callback)
+		{
+			s_LogCallback = callback;
+		}
+
+		static std::vector<BufferedLogEntry> ConsumeBufferedMessages()
+		{
+			std::lock_guard<std::mutex> lock(s_BufferMutex);
+			std::vector<BufferedLogEntry> messages(std::make_move_iterator(s_Buffer.begin()),
+												   std::make_move_iterator(s_Buffer.end()));
+			s_Buffer.clear();
+			return messages;
+		}
+
+		inline static std::shared_ptr<spdlog::logger>& GetCoreLogger()
+		{
+			return s_CoreLogger;
+		}
+		inline static std::shared_ptr<spdlog::logger>& GetClientLogger()
+		{
+			return s_ClientLogger;
+		}
+
+	private:
+		inline static std::shared_ptr<spdlog::logger> s_CoreLogger;
+		inline static std::shared_ptr<spdlog::logger> s_ClientLogger;
+		inline static LogCallbackFn s_LogCallback = nullptr;
+		inline static std::deque<BufferedLogEntry> s_Buffer;
+		inline static std::mutex s_BufferMutex;
+		static constexpr size_t MAX_BUFFERED_MESSAGES = 10000;
+	};
+} // namespace Chained
+
+// Core logging macros
+#ifdef CH_ENABLE_LOGGING
+#define CH_CORE_TRACE(...) ::Chained::Log::GetCoreLogger()->trace(__VA_ARGS__)
+#define CH_CORE_INFO(...) ::Chained::Log::GetCoreLogger()->info(__VA_ARGS__)
+#define CH_CORE_WARN(...) ::Chained::Log::GetCoreLogger()->warn(__VA_ARGS__)
+#define CH_CORE_ERROR(...) ::Chained::Log::GetCoreLogger()->error(__VA_ARGS__)
+#define CH_CORE_FATAL(...) ::Chained::Log::GetCoreLogger()->critical(__VA_ARGS__)
 
+// Client logging macros
+#define CH_TRACE(...) ::Chained::Log::GetClientLogger()->trace(__VA_ARGS__)
+#define CH_INFO(...) ::Chained::Log::GetClientLogger()->info(__VA_ARGS__)
+#define CH_WARN(...) ::Chained::Log::GetClientLogger()->warn(__VA_ARGS__)
+#define CH_ERROR(...) ::Chained::Log::GetClientLogger()->error(__VA_ARGS__)
+#define CH_FATAL(...) ::Chained::Log::GetClientLogger()->critical(__VA_ARGS__)
+#else
 // Core logging macros
-#define CH_CORE_TRACE(...)  ::CHEngine::Log::CoreTrace(__VA_ARGS__)
-#define CH_CORE_INFO(...)   ::CHEngine::Log::CoreInfo(__VA_ARGS__)
-#define CH_CORE_WARN(...)   ::CHEngine::Log::CoreWarn(__VA_ARGS__)
-#define CH_CORE_ERROR(...)  ::CHEngine::Log::CoreError(__VA_ARGS__)
-#define CH_CORE_FATAL(...)  ::CHEngine::Log::CoreFatal(__VA_ARGS__)
-
-#define CH_CORE_TRACE_ONCE(...)                                                                                        \
-    { static bool warned = false; if (!warned) { CH_CORE_TRACE(__VA_ARGS__); warned = true; } }
-#define CH_CORE_INFO_ONCE(...)                                                                                         \
-    { static bool warned = false; if (!warned) { CH_CORE_INFO(__VA_ARGS__); warned = true; } }
-#define CH_CORE_WARN_ONCE(...)                                                                                         \
-    { static bool warned = false; if (!warned) { CH_CORE_WARN(__VA_ARGS__); warned = true; } }
-#define CH_CORE_ERROR_ONCE(...)                                                                                        \
-    { static bool warned = false; if (!warned) { CH_CORE_ERROR(__VA_ARGS__); warned = true; } }
+#define CH_CORE_TRACE(...)
+#define CH_CORE_INFO(...)
+#define CH_CORE_WARN(...)
+#define CH_CORE_ERROR(...)
+#define CH_CORE_FATAL(...)
 
 // Client logging macros
-#define CH_TRACE(...)  ::CHEngine::Log::ClientTrace(__VA_ARGS__)
-#define CH_INFO(...)   ::CHEngine::Log::ClientInfo(__VA_ARGS__)
-#define CH_WARN(...)   ::CHEngine::Log::ClientWarn(__VA_ARGS__)
-#define CH_ERROR(...)  ::CHEngine::Log::ClientError(__VA_ARGS__)
-#define CH_FATAL(...)  ::CHEngine::Log::ClientFatal(__VA_ARGS__)
-
-#define CH_TRACE_ONCE(...)                                                                                             \
-    { static bool warned = false; if (!warned) { CH_TRACE(__VA_ARGS__); warned = true; } }
-#define CH_INFO_ONCE(...)                                                                                              \
-    { static bool warned = false; if (!warned) { CH_INFO(__VA_ARGS__); warned = true; } }
-#define CH_WARN_ONCE(...)                                                                                              \
-    { static bool warned = false; if (!warned) { CH_WARN(__VA_ARGS__); warned = true; } }
-#define CH_ERROR_ONCE(...)                                                                                             \
-    { static bool warned = false; if (!warned) { CH_ERROR(__VA_ARGS__); warned = true; } }
+#define CH_TRACE(...)
+#define CH_INFO(...)
+#define CH_WARN(...)
+#define CH_ERROR(...)
+#define CH_FATAL(...)
+#endif
 
 #endif // CH_LOG_H
diff --git a/engine/core/mouse_codes.h b/engine/core/mouse_codes.h
index ed15dd660..6f3662e8f 100644
--- a/engine/core/mouse_codes.h
+++ b/engine/core/mouse_codes.h
@@ -3,24 +3,19 @@
 
 #include <cstdint>
 
-namespace CHEngine
+namespace Chained
 {
-	using MouseCode = uint16_t;
-
-	namespace Mouse
+	enum class MouseCode : int32_t
 	{
-		enum : MouseCode
-		{
-			// Standard Mouse Buttons (match GLFW/Standard)
-			ButtonLeft      = 0,       // Mouse button left
-			ButtonRight     = 1,       // Mouse button right
-			ButtonMiddle    = 2,       // Mouse button middle
-			ButtonSide      = 3,       // Mouse button side (for mice with 4+ buttons)
-			ButtonExtra     = 4,       // Mouse button extra (for mice with 5+ buttons)
-			ButtonForward   = 5,       // Mouse button forward (for mice with 6+ buttons)
-			ButtonBack      = 6,       // Mouse button back (for mice with 7+ buttons)
-		};
-	}
+		// Standard Mouse Buttons
+		ButtonLeft = 0,
+		ButtonRight = 1,
+		ButtonMiddle = 2,
+		ButtonSide = 3,
+		ButtonExtra = 4,
+		ButtonForward = 5,
+		ButtonBack = 6,
+	};
 }
 
 #endif // CH_MOUSE_CODES_H
diff --git a/engine/core/platform.cpp b/engine/core/platform.cpp
new file mode 100644
index 000000000..f0c91747b
--- /dev/null
+++ b/engine/core/platform.cpp
@@ -0,0 +1,42 @@
+#include "platform.h"
+#include <thread>
+
+#if CH_PLATFORM_WINDOWS
+#include <windows.h>
+#elif CH_PLATFORM_LINUX
+#include <unistd.h>
+#include <pthread.h>
+#endif
+
+namespace Chained
+{
+	std::filesystem::path Platform::GetExecutableDirectory()
+	{
+#if CH_PLATFORM_WINDOWS
+		wchar_t path[MAX_PATH];
+		GetModuleFileNameW(NULL, path, MAX_PATH);
+		return std::filesystem::path(path).parent_path();
+#elif CH_PLATFORM_LINUX
+		char path[1024];
+		ssize_t count = readlink("/proc/self/exe", path, sizeof(path));
+		return std::filesystem::path(std::string(path, (count > 0) ? count : 0)).parent_path();
+#else
+		return std::filesystem::current_path();
+#endif
+	}
+
+	float Platform::GetTime()
+	{
+		static auto s_StartTime = std::chrono::high_resolution_clock::now();
+		auto currentTime = std::chrono::high_resolution_clock::now();
+		std::chrono::duration<float> elapsed = currentTime - s_StartTime;
+		return elapsed.count();
+	}
+
+	void Platform::Sleep(uint32_t milliseconds)
+	{
+		std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
+	}
+
+	// Desktop dialog abstractions moved to engine_platform_utils
+} // namespace Chained
diff --git a/engine/core/platform.h b/engine/core/platform.h
new file mode 100644
index 000000000..322269eb1
--- /dev/null
+++ b/engine/core/platform.h
@@ -0,0 +1,24 @@
+#ifndef CH_PLATFORM_H
+#define CH_PLATFORM_H
+
+#include "engine/common/base.h"
+#include <filesystem>
+#include <string>
+#include <vector>
+#include <optional>
+
+namespace Chained
+{
+	class CH_API Platform
+	{
+	public:
+		// Returns the absolute path to the directory containing the current executable.
+		static std::filesystem::path GetExecutableDirectory();
+		// Returns the current system time in seconds.
+		static float GetTime();
+		// Sleeps the current thread for the specified milliseconds.
+		static void Sleep(uint32_t milliseconds);
+	};
+} // namespace Chained
+
+#endif // CH_PLATFORM_H
diff --git a/engine/core/platform_detection.h b/engine/core/platform_detection.h
deleted file mode 100644
index cd16c8c4e..000000000
--- a/engine/core/platform_detection.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CH_PLATFORM_DETECTION_H
-#define CH_PLATFORM_DETECTION_H
-
-// Platform detection using predefined macros
-#if defined(_WIN32)
-    #define CH_PLATFORM_WINDOWS 1
-    #define CH_PLATFORM_LINUX 0
-    #define CH_PLATFORM_MACOS 0
-    #define CH_PLATFORM_IOS 0
-    #define CH_PLATFORM_ANDROID 0
-    #ifndef _WIN64
-        #error "x86 Builds are not supported!"
-    #endif
-#elif defined(__APPLE__) || defined(__MACH__)
-    #include <TargetConditionals.h>
-    #define CH_PLATFORM_WINDOWS 0
-    #define CH_PLATFORM_LINUX 0
-    #define CH_PLATFORM_ANDROID 0
-    #if TARGET_IPHONE_SIMULATOR == 1
-        #error "IOS simulator is not supported!"
-    #elif TARGET_OS_IPHONE == 1
-        #define CH_PLATFORM_MACOS 0
-        #define CH_PLATFORM_IOS 1
-        #error "IOS is not supported!"
-    #elif TARGET_OS_MAC == 1
-        #define CH_PLATFORM_MACOS 1
-        #define CH_PLATFORM_IOS 0
-        #error "MacOS is not supported!"
-    #else
-        #error "Unknown Apple platform!"
-    #endif
-#elif defined(__ANDROID__)
-    #define CH_PLATFORM_WINDOWS 0
-    #define CH_PLATFORM_LINUX 1 // Android is Linux-based
-    #define CH_PLATFORM_MACOS 0
-    #define CH_PLATFORM_IOS 0
-    #define CH_PLATFORM_ANDROID 1
-    #error "Android is not supported!"
-#elif defined(__linux__)
-    #define CH_PLATFORM_WINDOWS 0
-    #define CH_PLATFORM_LINUX 1
-    #define CH_PLATFORM_MACOS 0
-    #define CH_PLATFORM_IOS 0
-    #define CH_PLATFORM_ANDROID 0
-#else
-    #error "Unknown platform!"
-#endif
-
-#endif // CH_PLATFORM_DETECTION_H
diff --git a/engine/core/profiler.cpp b/engine/core/profiler.cpp
deleted file mode 100644
index ab22df583..000000000
--- a/engine/core/profiler.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "profiler.h"
-#include <mutex>
-#include <thread>
-
-namespace CHEngine
-{
-std::mutex Profiler::s_Mutex;
-ProfilerStats Profiler::s_Stats;
-
-std::vector<ProfileResult> Profiler::s_LastFrameResults;
-
-void Profiler::BeginFrame()
-{
-    s_LastFrameResults = Instrumentor::Get().GetFrameResults();
-    Instrumentor::Get().ClearFrameResults();
-    ResetFrameStats();
-}
-
-void Profiler::EndFrame()
-{
-}
-
-void Profiler::UpdateStats(const ProfilerStats& stats)
-{
-    std::lock_guard<std::mutex> lock(s_Mutex);
-    s_Stats.DrawCalls += stats.DrawCalls;
-    s_Stats.PolyCount += stats.PolyCount;
-    s_Stats.MeshCount += stats.MeshCount;
-    s_Stats.TextureCount += stats.TextureCount;
-
-    if (stats.EntityCount > 0)
-    {
-        s_Stats.EntityCount = stats.EntityCount;
-    }
-
-    if (stats.ColliderCount > 0)
-    {
-        s_Stats.ColliderCount = stats.ColliderCount;
-    }
-}
-
-void Profiler::ResetFrameStats()
-{
-    s_Stats.DrawCalls = 0;
-    s_Stats.PolyCount = 0;
-    s_Stats.MeshCount = 0;
-    s_Stats.TextureCount = 0;
-}
-
-} // namespace CHEngine
diff --git a/engine/core/profiler.h b/engine/core/profiler.h
index 6ef8e3146..b412fa13a 100644
--- a/engine/core/profiler.h
+++ b/engine/core/profiler.h
@@ -11,203 +11,214 @@
 #include <unordered_map>
 #include <vector>
 
-#include "engine/core/base.h"
+#include "engine/common/base.h"
 
-namespace CHEngine
+namespace Chained
 {
-struct ProfileResult
-{
-    std::string Name;
-    long long Start;
-    long long End;
-    float DurationMS;
-    uint32_t ThreadID;
-};
-
-struct InstrumentationSession
-{
-    std::string Name;
-};
-
-class Instrumentor
-{
-public:
-    Instrumentor()
-        : m_CurrentSession(nullptr),
-          m_ProfileCount(0)
-    {
-    }
-
-    void BeginSession(const std::string& name, const std::string& filepath = "results.json")
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        m_OutputStream.open(filepath);
-        WriteHeader();
-        m_CurrentSession = new InstrumentationSession{name};
-    }
-
-    void EndSession()
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        WriteFooter();
-        m_OutputStream.close();
-        delete m_CurrentSession;
-        m_CurrentSession = nullptr;
-        m_ProfileCount = 0;
-    }
-
-    void WriteProfile(const ProfileResult& result)
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-
-        m_FrameResults.push_back(result);
-
-        if (m_OutputStream.is_open())
-        {
-            if (m_ProfileCount++ > 0)
-            {
-                m_OutputStream << ",";
-            }
-
-            std::string name = result.Name;
-            std::replace(name.begin(), name.end(), '"', '\'');
-
-            m_OutputStream << "{";
-            m_OutputStream << "\"cat\":\"function\",";
-            m_OutputStream << "\"dur\":" << (result.End - result.Start) << ',';
-            m_OutputStream << "\"name\":\"" << name << "\",";
-            m_OutputStream << "\"ph\":\"X\",";
-            m_OutputStream << "\"pid\":1,";
-            m_OutputStream << "\"tid\":" << result.ThreadID << ",";
-            m_OutputStream << "\"ts\":" << result.Start;
-            m_OutputStream << "}";
-
-            m_OutputStream.flush();
-        }
-    }
-
-    void ClearFrameResults()
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        m_FrameResults.clear();
-    }
-
-    const std::vector<ProfileResult>& GetFrameResults() const
-    {
-        return m_FrameResults;
-    }
-
-    void WriteHeader()
-    {
-        m_OutputStream << "{\"otherData\": {},\"traceEvents\":[";
-        m_OutputStream.flush();
-    }
-
-    void WriteFooter()
-    {
-        m_OutputStream << "]}";
-        m_OutputStream.flush();
-    }
-
-    static Instrumentor& Get()
-    {
-        static Instrumentor instance;
-        return instance;
-    }
-
-private:
-    InstrumentationSession* m_CurrentSession;
-    std::ofstream m_OutputStream;
-    int m_ProfileCount;
-    std::vector<ProfileResult> m_FrameResults;
-    std::mutex m_Mutex;
-};
-
-class InstrumentationTimer
-{
-public:
-    InstrumentationTimer(const char* name)
-        : m_Name(name),
-          m_Stopped(false)
-    {
-        m_StartTimepoint = std::chrono::high_resolution_clock::now();
-    }
-
-    ~InstrumentationTimer()
-    {
-        if (!m_Stopped)
-        {
-            Stop();
-        }
-    }
-
-    void Stop()
-    {
-        auto endTimepoint = std::chrono::high_resolution_clock::now();
-
-        long long start =
-            std::chrono::time_point_cast<std::chrono::microseconds>(m_StartTimepoint).time_since_epoch().count();
-        long long end =
-            std::chrono::time_point_cast<std::chrono::microseconds>(endTimepoint).time_since_epoch().count();
-
-        float durationMS = (float)(end - start) / 1000.0f;
-
-        uint32_t threadID = (uint32_t)std::hash<std::thread::id>{}(std::this_thread::get_id());
-        Instrumentor::Get().WriteProfile({m_Name, start, end, durationMS, threadID});
-
-        m_Stopped = true;
-    }
-
-private:
-    const char* m_Name;
-    std::chrono::time_point<std::chrono::high_resolution_clock> m_StartTimepoint;
-    bool m_Stopped;
-};
-
-struct ProfilerStats
-{
-    // Rendering
-    uint32_t DrawCalls = 0;
-    uint32_t PolyCount = 0;
-    uint32_t MeshCount = 0;
-    uint32_t TextureCount = 0;
-
-    // Scene
-    uint32_t EntityCount = 0;
-    uint32_t ColliderCount = 0;
-};
-
-class Profiler
-{
-public:
-    static void BeginFrame();
-    static void EndFrame();
-
-    static const ProfilerStats& GetStats()
-    {
-        return s_Stats;
-    }
-    static void UpdateStats(const ProfilerStats& stats);
-    static void ResetFrameStats();
-
-    static const std::vector<ProfileResult>& GetLastFrameResults()
-    {
-        return s_LastFrameResults;
-    }
-
-private:
-    static std::mutex s_Mutex;
-    static ProfilerStats s_Stats;
-    static std::vector<ProfileResult> s_LastFrameResults;
-};
-
-} // namespace CHEngine
-
-#define CH_PROFILE_BEGIN_SESSION(name, filepath) ::CHEngine::Instrumentor::Get().BeginSession(name, filepath)
-#define CH_PROFILE_END_SESSION() ::CHEngine::Instrumentor::Get().EndSession()
+	struct ProfileResult
+	{
+		std::string Name;
+		long long Start;
+		long long End;
+		float DurationMS;
+		uint32_t ThreadID;
+	};
+
+	struct InstrumentationSession
+	{
+		std::string Name;
+	};
+
+	struct ProfilerStats
+	{
+		// Rendering
+		uint32_t DrawCalls = 0;
+		uint32_t MeshCount = 0;
+		uint32_t TextureCount = 0;
+
+		// Scene
+		uint32_t EntityCount = 0;
+		uint32_t ColliderCount = 0;
+	};
+
+	class Instrumentor
+	{
+	public:
+		Instrumentor()
+			: m_ProfileCount(0)
+		{
+		}
+
+		void BeginSession(const std::string& name, const std::string& filepath = "results.json")
+		{
+			std::lock_guard<std::mutex> lock(m_Mutex);
+			m_OutputStream.open(filepath);
+			WriteHeader();
+			m_CurrentSession = std::make_unique<InstrumentationSession>(InstrumentationSession{name});
+		}
+
+		void EndSession()
+		{
+			std::lock_guard<std::mutex> lock(m_Mutex);
+			WriteFooter();
+			m_OutputStream.close();
+			m_CurrentSession.reset();
+			m_ProfileCount = 0;
+		}
+
+		void WriteProfile(const ProfileResult& result)
+		{
+			std::lock_guard<std::mutex> lock(m_Mutex);
+
+			m_FrameResults.push_back(result);
+
+			if (m_OutputStream.is_open())
+			{
+				if (m_ProfileCount++ > 0)
+				{
+					m_OutputStream << ",";
+				}
+
+				std::string name = result.Name;
+				std::replace(name.begin(), name.end(), '"', '\'');
+
+				m_OutputStream << "{";
+				m_OutputStream << "\"cat\":\"function\",";
+				m_OutputStream << "\"dur\":" << (result.End - result.Start) << ',';
+				m_OutputStream << "\"name\":\"" << name << "\",";
+				m_OutputStream << "\"ph\":\"X\",";
+				m_OutputStream << "\"pid\":1,";
+				m_OutputStream << "\"tid\":" << result.ThreadID << ",";
+				m_OutputStream << "\"ts\":" << result.Start;
+				m_OutputStream << "}";
+
+				m_OutputStream.flush();
+			}
+		}
+
+		void ClearFrameResults()
+		{
+			std::lock_guard<std::mutex> lock(m_Mutex);
+			m_FrameResults.clear();
+		}
+
+		const std::vector<ProfileResult>& GetFrameResults() const
+		{
+			return m_FrameResults;
+		}
+
+		// --- Frame-level stats (formerly Profiler) ---
+
+		void BeginFrame()
+		{
+			s_LastFrameResults = m_FrameResults;
+			ClearFrameResults();
+			s_Stats.DrawCalls = 0;
+			s_Stats.MeshCount = 0;
+			s_Stats.TextureCount = 0;
+		}
+
+		void UpdateStats(const ProfilerStats& stats)
+		{
+			s_Stats.DrawCalls += stats.DrawCalls;
+			s_Stats.MeshCount += stats.MeshCount;
+			s_Stats.TextureCount += stats.TextureCount;
+			if (stats.EntityCount > 0)
+			{
+				s_Stats.EntityCount = stats.EntityCount;
+			}
+			if (stats.ColliderCount > 0)
+			{
+				s_Stats.ColliderCount = stats.ColliderCount;
+			}
+		}
+
+		const ProfilerStats& GetStats() const
+		{
+			return s_Stats;
+		}
+		const std::vector<ProfileResult>& GetLastFrameResults() const
+		{
+			return s_LastFrameResults;
+		}
+
+		void WriteHeader()
+		{
+			m_OutputStream << "{\"otherData\": {},\"traceEvents\":[";
+			m_OutputStream.flush();
+		}
+
+		void WriteFooter()
+		{
+			m_OutputStream << "]}";
+			m_OutputStream.flush();
+		}
+
+		static Instrumentor& Get()
+		{
+			static Instrumentor instance;
+			return instance;
+		}
+
+	private:
+		std::unique_ptr<InstrumentationSession> m_CurrentSession;
+		std::ofstream m_OutputStream;
+		int m_ProfileCount;
+		std::vector<ProfileResult> m_FrameResults;
+		std::mutex m_Mutex;
+
+		ProfilerStats s_Stats{};
+		std::vector<ProfileResult> s_LastFrameResults;
+	};
+
+	class InstrumentationTimer
+	{
+	public:
+		InstrumentationTimer(const char* name)
+			: m_Name(name),
+			  m_Stopped(false)
+		{
+			m_StartTimepoint = std::chrono::high_resolution_clock::now();
+		}
+
+		~InstrumentationTimer()
+		{
+			if (!m_Stopped)
+			{
+				Stop();
+			}
+		}
+
+		void Stop()
+		{
+			auto endTimepoint = std::chrono::high_resolution_clock::now();
+
+			long long start =
+				std::chrono::time_point_cast<std::chrono::microseconds>(m_StartTimepoint).time_since_epoch().count();
+			long long end =
+				std::chrono::time_point_cast<std::chrono::microseconds>(endTimepoint).time_since_epoch().count();
+
+			float durationMS = (float)(end - start) / 1000.0f;
+
+			uint32_t threadID = (uint32_t)std::hash<std::thread::id>{}(std::this_thread::get_id());
+			Instrumentor::Get().WriteProfile({m_Name, start, end, durationMS, threadID});
+
+			m_Stopped = true;
+		}
+
+	private:
+		const char* m_Name;
+		std::chrono::time_point<std::chrono::high_resolution_clock> m_StartTimepoint;
+		bool m_Stopped;
+	};
+
+} // namespace Chained
+
+#define CH_PROFILE_BEGIN_SESSION(name, filepath) ::Chained::Instrumentor::Get().BeginSession(name, filepath)
+#define CH_PROFILE_END_SESSION() ::Chained::Instrumentor::Get().EndSession()
 #define CH_PROFILE_CONCAT_IMPL(x, y) x##y
 #define CH_PROFILE_CONCAT(x, y) CH_PROFILE_CONCAT_IMPL(x, y)
-#define CH_PROFILE_SCOPE(name) ::CHEngine::InstrumentationTimer CH_PROFILE_CONCAT(timer, __LINE__)(name)
+#define CH_PROFILE_SCOPE(name) ::Chained::InstrumentationTimer CH_PROFILE_CONCAT(timer, __LINE__)(name)
 #define CH_PROFILE_FUNCTION() CH_PROFILE_SCOPE(__FUNCTION__)
 
 #endif // CH_PROFILER_H
diff --git a/engine/core/project_launcher.cpp b/engine/core/project_launcher.cpp
deleted file mode 100644
index 4e9ade1cc..000000000
--- a/engine/core/project_launcher.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "project_launcher.h"
-#include "engine/scene/project.h"
-#include "engine/core/log.h"
-#include <filesystem>
-
-namespace CHEngine
-{
-LaunchDetails ProjectLauncher::PrepareRuntime(const ApplicationCommandLineArgs& args)
-{
-    LaunchDetails details;
-    details.Spec.CommandLineArgs = args;
-
-    std::string projectPath;
-    std::string appName = "Chained Runtime";
-    int startupWidth = 1280;
-    int startupHeight = 720;
-
-    // 1. Basic CLI Parsing (Priority: CLI > Config)
-    for (int i = 1; i < args.Count; ++i)
-    {
-        std::string arg = args.Args[i];
-        if ((arg == "--project" || arg == "-p") && i + 1 < args.Count)
-        {
-            projectPath = args.Args[++i];
-            // Remove quotes if present
-            if (projectPath.size() >= 2 && projectPath.front() == '"' && projectPath.back() == '"')
-                projectPath = projectPath.substr(1, projectPath.size() - 2);
-        }
-        else if (arg == "--name" && i + 1 < args.Count)
-        {
-            appName = args.Args[++i];
-        }
-        else if (arg == "--width" && i + 1 < args.Count)
-        {
-            startupWidth = std::stoi(args.Args[++i]);
-        }
-        else if (arg == "--height" && i + 1 < args.Count)
-        {
-            startupHeight = std::stoi(args.Args[++i]);
-        }
-        else if (i == 1 && arg[0] != '-')
-        {
-            projectPath = arg;
-        }
-    }
-
-    // 2. Discover Project File
-    std::filesystem::path projectFile = projectPath;
-    if (projectFile.empty())
-    {
-        std::filesystem::path exePath = std::filesystem::absolute(std::filesystem::path(args.Args[0]));
-        projectFile = Project::Discover(exePath.parent_path(), appName);
-    }
-
-    // 3. Load Project Config for fallback/defaults
-    if (!projectFile.empty())
-    {
-        if (auto project = Project::Load(projectFile))
-        {
-            const auto& config = project->GetConfig();
-            
-            // Apply config if not overridden by CLI
-            if (startupWidth == 1280 && startupHeight == 720)
-            {
-                startupWidth = config.Window.Width;
-                startupHeight = config.Window.Height;
-            }
-
-            if (appName == "Chained Runtime")
-            {
-                appName = config.Name;
-            }
-
-            details.Spec.VSync = config.Window.VSync;
-            details.Spec.Fullscreen = config.Runtime.Fullscreen;
-            details.Spec.Resizable = config.Window.Resizable;
-            details.Spec.AppIcon = config.IconPath;
-
-            details.ProjectPath = projectFile;
-            details.Success = true;
-        }
-    }
-
-    // 4. Finalize Specification
-    details.Spec.Name = appName;
-    details.Spec.WindowWidth = startupWidth;
-    details.Spec.WindowHeight = startupHeight;
-
-    return details;
-}
-
-LaunchDetails ProjectLauncher::PrepareEditor(const ApplicationCommandLineArgs& args)
-{
-    // Currently editor uses fixed defaults, but could be expanded here.
-    LaunchDetails details;
-    details.Spec.Name = "Chained Editor";
-    details.Spec.WindowWidth = 0; // 0 usually means maximized in engine
-    details.Spec.WindowHeight = 0;
-    details.Spec.CommandLineArgs = args;
-    details.Success = true;
-    return details;
-}
-} // namespace CHEngine
diff --git a/engine/core/project_launcher.h b/engine/core/project_launcher.h
deleted file mode 100644
index 76bc8bc00..000000000
--- a/engine/core/project_launcher.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef CH_PROJECT_LAUNCHER_H
-#define CH_PROJECT_LAUNCHER_H
-
-#include "engine/core/application.h"
-#include <filesystem>
-#include <string>
-
-namespace CHEngine
-{
-// Result of a project-aware launch preparation.
-struct LaunchDetails
-{
-    ApplicationSpecification Spec;
-    std::filesystem::path ProjectPath;
-    bool Success = false;
-};
-
-// Utility for automating the discovery and configuration of a project
-// before the Application is truly initialized.
-class ProjectLauncher
-{
-public:
-    // Prepares common initialization for a standalone runtime.
-    // Handles CLI arguments and project discovery.
-    static LaunchDetails PrepareRuntime(const ApplicationCommandLineArgs& args);
-
-    // Prepares initialization for the editor.
-    static LaunchDetails PrepareEditor(const ApplicationCommandLineArgs& args);
-};
-} // namespace CHEngine
-
-#endif // CH_PROJECT_LAUNCHER_H
diff --git a/engine/core/reflection.h b/engine/core/reflection.h
deleted file mode 100644
index 8823cd404..000000000
--- a/engine/core/reflection.h
+++ /dev/null
@@ -1,220 +0,0 @@
-#ifndef CH_REFLECTION_H
-#define CH_REFLECTION_H
-
-#include <vector>
-#include <string>
-#include "engine/core/base.h"
-#include "engine/core/assets/asset.h"
-#include <functional>
-#include <type_traits>
-
-#define CH_ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
-
-#include <variant>
-#include <type_traits>
-
-namespace CHEngine
-{
-    // Helper to detect std::variant
-    template <typename T> struct is_variant : std::false_type {};
-    template <typename... Args> struct is_variant<std::variant<Args...>> : std::true_type {};
-    template <typename T> inline constexpr bool is_variant_v = is_variant<T>::value;
-    enum class ReflectionMode
-    {
-        None = 0,
-        Serialize,
-        Deserialize,
-        UI
-    };
-
-    // Widget rendering hints for UI properties
-    struct PropertyMeta
-    {
-        enum class WidgetHint
-        {
-            Default,    // Auto-select based on type
-            Slider,     // Use slider instead of input
-            Input,      // Use text input
-            Checkbox,   // Force checkbox
-            ColorPicker, // Color picker
-            FilePicker, // File picker
-            Enum        // Enum dropdown
-        } Hint = WidgetHint::Default;
-
-        float MinValue = 0.0f;
-        float MaxValue = 0.0f;
-        float Speed = 0.1f;
-        std::string Tooltip;
-        bool ReadOnly = false;
-
-        // Convenience constructors
-        PropertyMeta() = default;
-        PropertyMeta(WidgetHint h) : Hint(h) {}
-        PropertyMeta(float min, float max, float spd = 0.1f)
-            : Hint(WidgetHint::Slider), MinValue(min), MaxValue(max), Speed(spd) {}
-
-        PropertyMeta& WithTooltip(const std::string& t) { Tooltip = t; return *this; }
-    };
-
-    // The "Properties" class is the primary interface for reflection.
-    // It is used by both Serializers (YAML) and Editor UI (ImGui).
-    template<typename T_Archive>
-    class Properties
-    {
-    public:
-        Properties(T_Archive& archive) : m_Archive(archive) {}
-
-        ReflectionMode GetMode() const { return m_Archive.GetReflectionMode(); }
-
-        bool Color(const char* name, CHEngine::Color& value)
-        {
-            return m_Archive.Property(name, value);
-        }
-
-        bool Handle(const char* name, uint64_t& value)
-        {
-            return m_Archive.Handle(name, value);
-        }
-
-        bool Handle(const char* name, CHEngine::UUID& value)
-        {
-            return m_Archive.Handle(name, (uint64_t&)value);
-        }
-
-        template<typename T>
-        bool Sequence(const char* name, std::vector<T>& values)
-        {
-            return m_Archive.Sequence(name, values);
-        }
-
-        template<typename T>
-        bool Nested(const char* name, T& value)
-        {
-            return m_Archive.Nested(name, value);
-        }
-
-        template<typename T>
-        bool Property(const char* name, T& value)
-        {
-            if constexpr (is_variant_v<T>)
-            {
-                return std::visit([&](auto&& v) {
-                    return m_Archive.Property(name, v);
-                }, value);
-            }
-            else
-            {
-                return m_Archive.Property(name, value);
-            }
-        }
-
-        template<typename T_Enum>
-        bool Enum(const char* name, T_Enum& value, const char** names, int count)
-        {
-            int temp = (int)value;
-            bool changed = m_Archive.Property(name, temp, names, count);
-            if (changed || m_Archive.GetReflectionMode() == ReflectionMode::Deserialize)
-            {
-                value = (T_Enum)temp;
-            }
-            return changed;
-        }
-
-        template<typename T_Enum>
-        bool Property(const char* name, T_Enum& value, const char** names, int count)
-        {
-            return Enum(name, value, names, count);
-        }
-
-        bool File(const char* name, std::string& value, const char* extensions = nullptr)
-        {
-            return m_Archive.File(name, value, extensions);
-        }
-
-        // --- Property methods with metadata ---
-        template<typename T>
-        bool Property(const char* name, T& value, const PropertyMeta& meta)
-        {
-            if constexpr (is_variant_v<T>)
-            {
-                return std::visit([&](auto&& v) {
-                    return m_Archive.Property(name, v, meta);
-                }, value);
-            }
-            else
-            {
-                return m_Archive.Property(name, value, meta);
-            }
-        }
-
-        template<typename T_Enum>
-        bool Enum(const char* name, T_Enum& value, const char** names, int count, const PropertyMeta& meta)
-        {
-            int temp = (int)value;
-            bool changed = m_Archive.Property(name, temp, names, count, meta);
-            if (changed || m_Archive.GetReflectionMode() == ReflectionMode::Deserialize)
-            {
-                value = (T_Enum)temp;
-            }
-            return changed;
-        }
-
-        bool File(const char* name, std::string& value, const char* extensions, const PropertyMeta& meta)
-        {
-            return m_Archive.File(name, value, extensions, meta);
-        }
-
-        bool Action(const char* label, std::function<void()> func)
-        {
-            return m_Archive.Action(label, func);
-        }
-
-        void Header(const char* label)
-        {
-            m_Archive.Header(label);
-        }
-
-        void Separator()
-        {
-            m_Archive.Separator();
-        }
-
-        bool BeginGroup(const char* label, bool defaultOpen = true)
-        {
-            return m_Archive.BeginGroup(label, defaultOpen);
-        }
-
-        void EndGroup()
-        {
-            m_Archive.EndGroup();
-        }
-
-        // Post-change hook
-        Properties& OnChange(std::function<void()> func)
-        {
-            if (m_Archive.HasChanged())
-            {
-                func();
-            }
-            return *this;
-        }
-
-        void SetChanged(bool changed) { m_Archive.SetChanged(changed); }
-        bool HasChanged() const { return m_Archive.HasChanged(); }
-        T_Archive& GetArchive() { return m_Archive; }
-
-    private:
-        T_Archive& m_Archive;
-    };
-
-    // --- Reflection Macros ---
-
-    #define CH_REFLECT_BEGIN(Type) \
-        static const char* GetStaticName() { return #Type; } \
-        template<typename T_Archive> \
-        void Reflect(::CHEngine::Properties<T_Archive>& props) {
-
-    #define CH_REFLECT_END() \
-        }
-}
-#endif // CH_REFLECTION_H
diff --git a/engine/core/service.h b/engine/core/service.h
new file mode 100644
index 000000000..a842c360b
--- /dev/null
+++ b/engine/core/service.h
@@ -0,0 +1,30 @@
+#ifndef CH_SERVICE_H
+#define CH_SERVICE_H
+
+#include "engine/common/base.h"
+
+namespace Chained
+{
+	class CH_API Service
+	{
+	public:
+		virtual ~Service() = default;
+		virtual void Initialize() = 0;
+		virtual void Shutdown() = 0;
+
+		bool IsEnabled() const
+		{
+			return m_Enabled;
+		}
+		void SetEnabled(bool enabled)
+		{
+			m_Enabled = enabled;
+		}
+
+	private:
+		bool m_Enabled = true;
+	};
+
+} // namespace Chained
+
+#endif
\ No newline at end of file
diff --git a/engine/core/service_locator.cpp b/engine/core/service_locator.cpp
new file mode 100644
index 000000000..8a9c693f1
--- /dev/null
+++ b/engine/core/service_locator.cpp
@@ -0,0 +1,32 @@
+#include "engine/core/service_locator.h"
+#include "engine/core/service_registry.h"
+
+namespace Chained
+{
+	ServiceRegistry& ServiceLocator::GetRegistry()
+	{
+		static ServiceRegistry registry;
+		return registry;
+	}
+
+	CH_API void ServiceLocator::Lock()
+	{
+		GetRegistry().Lock();
+	}
+
+	CH_API void ServiceLocator::InitializeModule()
+	{
+		GetRegistry().InitializeModules();
+	}
+
+	CH_API void ServiceLocator::Shutdown()
+	{
+		GetRegistry().Shutdown();
+	}
+
+	CH_API bool ServiceLocator::IsAvailable()
+	{
+		return GetRegistry().IsAvailable();
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/core/service_locator.h b/engine/core/service_locator.h
new file mode 100644
index 000000000..252d99f34
--- /dev/null
+++ b/engine/core/service_locator.h
@@ -0,0 +1,63 @@
+#ifndef CH_SERVICE_LOCATOR_H
+#define CH_SERVICE_LOCATOR_H
+
+#include "engine/core/service.h"
+#include "engine/core/service_registry.h"
+#include "engine/common/engine_assert.h"
+#include "engine/common/base.h"
+#include <filesystem>
+#include <memory>
+
+namespace Chained
+{
+	class CH_API ServiceLocator
+	{
+	public:
+		// Registers a service by its type. Takes ownership of the service.
+		// T must inherit from Service.
+		// On rejection (locked locator, duplicate registration) the service is destroyed
+		// by the unique_ptr — no leak, unlike the old raw-pointer overload.
+		template <typename T> static void Provide(std::unique_ptr<T> service);
+		template <typename T, typename Factory> static void Provide(Factory&& factory);
+
+		static void Lock();
+		static void InitializeModule();
+		static void Shutdown();
+		static bool IsAvailable();
+
+		template <typename T> static T* Get();
+		template <typename T> static T* TryGet();
+		template <typename T> static bool Has();
+
+	private:
+		static class ServiceRegistry& GetRegistry();
+	};
+
+	template <typename T> void ServiceLocator::Provide(std::unique_ptr<T> service)
+	{
+		GetRegistry().Provide(std::move(service));
+	}
+
+	template <typename T, typename Factory> void ServiceLocator::Provide(Factory&& factory)
+	{
+		GetRegistry().Provide<T>(factory());
+	}
+
+	template <typename T> T* ServiceLocator::Get()
+	{
+		return GetRegistry().Get<T>();
+	}
+
+	template <typename T> T* ServiceLocator::TryGet()
+	{
+		return GetRegistry().TryGet<T>();
+	}
+
+	template <typename T> bool ServiceLocator::Has()
+	{
+		return GetRegistry().Has<T>();
+	}
+
+} // namespace Chained
+
+#endif // CH_SERVICE_LOCATOR_H
\ No newline at end of file
diff --git a/engine/core/service_registry.cpp b/engine/core/service_registry.cpp
new file mode 100644
index 000000000..f8a655f33
--- /dev/null
+++ b/engine/core/service_registry.cpp
@@ -0,0 +1,8 @@
+// ServiceRegistry implementation is inline in the header.
+// This file exists only for CMake consistency.
+
+#include "engine/core/service_registry.h"
+
+namespace Chained
+{
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/core/service_registry.h b/engine/core/service_registry.h
new file mode 100644
index 000000000..579636469
--- /dev/null
+++ b/engine/core/service_registry.h
@@ -0,0 +1,199 @@
+#ifndef CH_SERVICE_REGISTRY_H
+#define CH_SERVICE_REGISTRY_H
+
+#include "engine/core/service.h"
+#include "engine/common/engine_assert.h"
+#include <shared_mutex>
+#include <type_traits>
+#include <typeindex>
+#include <unordered_map>
+#include <vector>
+#include <memory>
+
+namespace Chained
+{
+
+	class ServiceRegistry
+	{
+	public:
+		ServiceRegistry() = default;
+		~ServiceRegistry() = default;
+
+		ServiceRegistry(const ServiceRegistry&) = delete;
+		ServiceRegistry& operator=(const ServiceRegistry&) = delete;
+		ServiceRegistry(ServiceRegistry&&) = delete;
+		ServiceRegistry& operator=(ServiceRegistry&&) = delete;
+
+		template <typename T> void Provide(std::unique_ptr<T> service)
+		{
+			static_assert(std::is_class_v<T>, "ServiceRegistry: Provided type T must be a class or a struct!");
+			static_assert(std::is_base_of_v<Service, T>, "ServiceRegistry: Provided type T must inherit from Service!");
+			static_assert(std::has_virtual_destructor_v<Service>,
+						  "ServiceRegistry: Service must have a virtual destructor!");
+
+			std::unique_lock<std::shared_mutex> lock(m_Mutex);
+
+			if (m_IsLocked)
+			{
+				CH_CORE_ERROR("ServiceRegistry: Provide<{}> rejected — registry is locked.", typeid(T).name());
+				return;
+			}
+
+			if (m_Services.find(typeid(T)) != m_Services.end())
+			{
+				CH_CORE_ERROR("ServiceRegistry: Provide<{}> rejected — service already provided.", typeid(T).name());
+				return;
+			}
+
+			std::shared_ptr<T> typedService = std::move(service);
+			std::shared_ptr<Service> sharedService = std::static_pointer_cast<Service>(typedService);
+			m_Services[typeid(T)] = sharedService;
+			m_Order.push_back(sharedService);
+		}
+
+		template <typename T, typename Factory> void Provide(Factory&& factory)
+		{
+			Provide(std::unique_ptr<T>(factory()));
+		}
+
+		void Lock()
+		{
+			std::unique_lock<std::shared_mutex> lock(m_Mutex);
+			m_IsLocked = true;
+		}
+
+		void InitializeModules()
+		{
+			std::vector<std::shared_ptr<Service>> modules;
+			{
+				std::shared_lock<std::shared_mutex> lock(m_Mutex);
+				modules = m_Order;
+			}
+
+			for (auto& module : modules)
+			{
+				if (!module->IsEnabled())
+				{
+					continue;
+				}
+
+				try
+				{
+					module->Initialize();
+				} catch (const std::exception& e)
+				{
+					CH_CORE_ERROR("ServiceRegistry: Module initialization failed with exception: {}", e.what());
+					module->SetEnabled(false);
+				} catch (...)
+				{
+					CH_CORE_ERROR("ServiceRegistry: Module initialization failed with an unknown exception.");
+					module->SetEnabled(false);
+				}
+			}
+		}
+
+		void Shutdown()
+		{
+			std::vector<std::shared_ptr<Service>> modulesToShutdown;
+			{
+				std::unique_lock<std::shared_mutex> lock(m_Mutex);
+				m_IsLocked = false;
+				m_IsShuttingDown = true;
+				modulesToShutdown = m_Order;
+			}
+
+			for (auto it = modulesToShutdown.rbegin(); it != modulesToShutdown.rend(); ++it)
+			{
+				if ((*it)->IsEnabled())
+				{
+					(*it)->Shutdown();
+				}
+				(*it)->SetEnabled(false);
+			}
+
+			{
+				std::unique_lock<std::shared_mutex> lock(m_Mutex);
+				m_Services.clear();
+				m_Order.clear();
+				m_IsShuttingDown = false;
+			}
+		}
+
+		bool IsAvailable() const
+		{
+			std::shared_lock<std::shared_mutex> lock(m_Mutex);
+			return !m_Services.empty();
+		}
+
+		template <typename T> T* Get()
+		{
+			static_assert(std::is_base_of_v<Service, T>,
+						  "ServiceRegistry: Requested type T must inherit from Service!");
+
+			std::shared_lock<std::shared_mutex> lock(m_Mutex);
+			auto it = m_Services.find(typeid(T));
+
+			if (it != m_Services.end())
+			{
+				T* svc = std::static_pointer_cast<T>(it->second).get();
+				if (!svc->IsEnabled())
+				{
+					if (m_IsShuttingDown)
+					{
+						CH_CORE_ERROR("ServiceRegistry: Get<{}> during shutdown — service already shut down.",
+									  typeid(T).name());
+					}
+					else
+					{
+						CH_CORE_ASSERT(false,
+									   "ServiceRegistry: Requested service is disabled (initialization failed?)!");
+						CH_CORE_ERROR("ServiceRegistry: Get<{}> returning nullptr — service is disabled.",
+									  typeid(T).name());
+					}
+					return nullptr;
+				}
+				return svc;
+			}
+
+			CH_CORE_ASSERT(false, "ServiceRegistry: Requested service not found!");
+			return nullptr;
+		}
+
+		template <typename T> T* TryGet()
+		{
+			static_assert(std::is_base_of_v<Service, T>,
+						  "ServiceRegistry: Requested type T must inherit from Service!");
+
+			std::shared_lock<std::shared_mutex> lock(m_Mutex);
+			auto it = m_Services.find(typeid(T));
+
+			if (it != m_Services.end())
+			{
+				T* svc = std::static_pointer_cast<T>(it->second).get();
+				if (svc && svc->IsEnabled())
+				{
+					return svc;
+				}
+			}
+			return nullptr;
+		}
+
+		template <typename T> bool Has()
+		{
+			static_assert(std::is_base_of_v<Service, T>, "ServiceRegistry: Checked type T must inherit from Service!");
+
+			std::shared_lock<std::shared_mutex> lock(m_Mutex);
+			return m_Services.find(typeid(T)) != m_Services.end();
+		}
+
+	private:
+		mutable std::shared_mutex m_Mutex;
+		std::unordered_map<std::type_index, std::shared_ptr<Service>> m_Services;
+		std::vector<std::shared_ptr<Service>> m_Order;
+		bool m_IsLocked = false;
+		bool m_IsShuttingDown = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_SERVICE_REGISTRY_H
\ No newline at end of file
diff --git a/engine/core/thread_pool.cpp b/engine/core/thread_pool.cpp
deleted file mode 100644
index f4073fe7c..000000000
--- a/engine/core/thread_pool.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "thread_pool.h"
-#include "engine/core/log.h"
-
-namespace CHEngine
-{
-ThreadPool::ThreadPool()
-{
-    size_t threads = std::thread::hardware_concurrency();
-    if (threads == 0)
-    {
-        threads = 1;
-    }
-
-    // Leave headroom for the main thread and OS scheduling so asset work does not saturate the machine.
-    size_t workerCount = (threads > 1) ? (threads - 1) : 1;
-
-    CH_CORE_INFO("ThreadPool: Initializing with {} worker threads", workerCount);
-
-    for (size_t i = 0; i < workerCount; ++i)
-    {
-        m_Workers.emplace_back([this](std::stop_token st) { WorkerThread(st); });
-    }
-}
-
-ThreadPool::~ThreadPool()
-{
-    {
-        std::unique_lock<std::mutex> lock(m_QueueMutex);
-        m_Stop = true;
-    }
-    m_Condition.notify_all();
-    // jthreads will automatically join here
-}
-
-void ThreadPool::WorkerThread(std::stop_token stopToken)
-{
-    while (!stopToken.stop_requested())
-    {
-        std::function<void()> task;
-        {
-            std::unique_lock<std::mutex> lock(m_QueueMutex);
-            
-            // Wait until there's a task or the entire pool is stopping
-            m_Condition.wait(lock, stopToken, [this] { 
-                return m_Stop || !m_Tasks.empty(); 
-            });
-
-            if (m_Stop && m_Tasks.empty())
-                return;
-
-            if (m_Tasks.empty())
-                continue;
-
-            task = std::move(m_Tasks.front());
-            m_Tasks.pop();
-        }
-        
-        if (task)
-        {
-            try
-            {
-                task();
-            }
-            catch (const std::exception& e)
-            {
-                CH_CORE_ERROR("ThreadPool: Unhandled exception in queued task: {}", e.what());
-            }
-            catch (...)
-            {
-                CH_CORE_ERROR("ThreadPool: Unhandled unknown exception in queued task");
-            }
-        }
-    }
-}
-} // namespace CHEngine
diff --git a/engine/core/thread_pool.h b/engine/core/thread_pool.h
deleted file mode 100644
index ce14e3aa1..000000000
--- a/engine/core/thread_pool.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef CH_THREAD_POOL_H
-#define CH_THREAD_POOL_H
-
-#include <condition_variable>
-#include <functional>
-#include <future>
-#include <mutex>
-#include <queue>
-#include <thread>
-#include <vector>
-
-namespace CHEngine
-{
-// Modern C++20 thread pool for parallel task execution.
-class ThreadPool
-{
-public:
-    // Accesses the global thread pool instance.
-    static ThreadPool& Get()
-    {
-        static ThreadPool instance;
-        return instance;
-    }
-
-    // Deleted constructors for singleton
-    ThreadPool(const ThreadPool&) = delete;
-    ThreadPool& operator=(const ThreadPool&) = delete;
-
-    // Enqueues a task and returns a future for the result.
-    template <class F, class... Args>
-    auto Enqueue(F&& f, Args&&... args) -> std::future<typename std::invoke_result<F, Args...>::type>
-    {
-        using return_type = typename std::invoke_result<F, Args...>::type;
-
-        auto task = std::make_shared<std::packaged_task<return_type()>>(
-            std::bind(std::forward<F>(f), std::forward<Args>(args)...));
-
-        std::future<return_type> res = task->get_future();
-        {
-            std::unique_lock<std::mutex> lock(m_QueueMutex);
-            if (m_Stop)
-                throw std::runtime_error("Enqueue on stopped ThreadPool");
-
-            m_Tasks.emplace([task]() { (*task)(); });
-        }
-        m_Condition.notify_one();
-        return res;
-    }
-
-    // Queues a fire-and-forget task.
-    void QueueTask(std::function<void()> task)
-    {
-        {
-            std::unique_lock<std::mutex> lock(m_QueueMutex);
-            m_Tasks.emplace(std::move(task));
-        }
-        m_Condition.notify_one();
-    }
-
-private:
-    ThreadPool();
-    ~ThreadPool();
-
-    void WorkerThread(std::stop_token stopToken);
-
-private:
-   std::queue<std::function<void()>> m_Tasks;
-   std::mutex m_QueueMutex;
-   std::condition_variable_any m_Condition;
-   bool m_Stop = false;
-   std::vector<std::jthread> m_Workers;
-};
-} // namespace CHEngine
-
-#endif // CH_THREAD_POOL_H
diff --git a/engine/core/timestep.h b/engine/core/timestep.h
deleted file mode 100644
index f2e69d768..000000000
--- a/engine/core/timestep.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef CH_TIMESTEP_H
-#define CH_TIMESTEP_H
-
-namespace CHEngine
-{
-class Timestep
-{
-public:
-    Timestep(float time = 0.0f)
-        : m_Time(time)
-    {
-    }
-
-    operator float() const
-    {
-        return m_Time;
-    }
-
-    float GetSeconds() const
-    {
-        return m_Time;
-    }
-    float GetMilliseconds() const
-    {
-        return m_Time * 1000.0f;
-    }
-
-private:
-    float m_Time;
-};
-} // namespace CHEngine
-
-#endif // CH_TIMESTEP_H
diff --git a/engine/core/uuid.cpp b/engine/core/uuid.cpp
deleted file mode 100644
index 231826ba0..000000000
--- a/engine/core/uuid.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "uuid.h"
-#include <random>
-
-namespace CHEngine
-{
-static std::random_device s_RandomDevice;
-static std::mt19937_64 s_Engine(s_RandomDevice());
-static std::uniform_int_distribution<uint64_t> s_UniformDistribution;
-
-UUID::UUID()
-    : m_UUID(s_UniformDistribution(s_Engine))
-{
-}
-
-UUID::UUID(uint64_t uuid)
-    : m_UUID(uuid)
-{
-}
-
-UUID::UUID(const std::string& uuidStr)
-{
-    try
-    {
-        m_UUID = std::stoull(uuidStr);
-    }
-    catch (...)
-    {
-        m_UUID = 0;
-    }
-}
-
-std::string UUID::ToString() const
-{
-    return std::to_string(m_UUID);
-}
-} // namespace CHEngine
diff --git a/engine/core/uuid.h b/engine/core/uuid.h
deleted file mode 100644
index dc3f925ca..000000000
--- a/engine/core/uuid.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef CH_UUID_H
-#define CH_UUID_H
-
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <string>
-
-namespace CHEngine
-{
-class UUID
-{
-public:
-    UUID();
-    UUID(uint64_t uuid);
-    UUID(const std::string& uuidStr);
-    UUID(const UUID&) = default;
-
-    std::string ToString() const;
-
-    operator uint64_t() const
-    {
-        return m_UUID;
-    }
-
-private:
-    uint64_t m_UUID;
-};
-} // namespace CHEngine
-
-namespace std
-{
-template <> struct hash<CHEngine::UUID>
-{
-    std::size_t operator()(const CHEngine::UUID& uuid) const noexcept {
-        return std::hash<uint64_t>()((uint64_t)uuid);
-    }
-};
-} // namespace std
-
-#endif // CH_UUID_H
diff --git a/engine/core/window.h b/engine/core/window.h
index fc55d55d3..8f7dd5ced 100644
--- a/engine/core/window.h
+++ b/engine/core/window.h
@@ -1,69 +1,73 @@
 #ifndef CH_WINDOW_H
 #define CH_WINDOW_H
 
+#include "engine/core/events/events.h"
 #include <memory>
 #include <string>
-#include <GLFW/glfw3.h>
 
-namespace CHEngine
+namespace Chained
 {
-// Window creation parameters and UI/runtime integration flags.
-struct WindowProperties
-{
-    std::string Title;
-    int Width = 1280;
-    int Height = 720;
-    bool VSync = true;
-    bool Resizable = true;
-    bool Fullscreen = false;
-    int TargetFramesPerSecond = 60;
-    std::string IconPath = "";
+	enum class CursorMode
+	{
+		Normal = 0,
+		Hidden = 1,
+		Locked = 2
+	};
 
-    // UI / Docking
-    bool EnableViewports = true;
-    bool EnableDocking = true;
-    std::string ImGuiConfigurationPath = "imgui.ini";
+	// Window creation parameters.
+	struct WindowProperties
+	{
+		std::string Title = "Chained Engine";
+		int Width = 1280;
+		int Height = 720;
+		bool VSync = true;
+		bool Fullscreen = false;
+		int TargetFramesPerSecond = 60;
+		std::string IconPath;
+		int Samples = 0;
+		void* SharedContext = nullptr;
+	};
 
-    WindowProperties(const std::string& title = "Chained Engine", int width = 1280, int height = 720)
-        : Title(title),
-          Width(width),
-          Height(height)
-    {
-    }
-};
+	// Abstract native window interface used by the application and renderer.
+	class Window
+	{
+	public:
+		virtual ~Window() = default;
 
-// Abstract native window interface used by the application and renderer.
-class Window
-{
-public:
-    virtual ~Window() = default;
+		virtual void BeginFrame() = 0;
+		virtual void EndFrame() = 0;
 
-    virtual void BeginFrame() = 0;
-    virtual void EndFrame() = 0;
+		virtual bool ShouldClose() const = 0;
 
-    virtual bool ShouldClose() const = 0;
+		virtual int GetWidth() const = 0;
+		virtual int GetHeight() const = 0;
 
-    virtual int GetWidth() const = 0;
-    virtual int GetHeight() const = 0;
+		virtual void SetTitle(const std::string& title) = 0;
+		virtual void SetSize(int width, int height) = 0;
+		virtual void SetSizeDirect(int width, int height) = 0;
 
-    virtual void SetTitle(const std::string& title) = 0;
-    virtual void SetSize(int width, int height) = 0;
-    virtual void SetSizeDirect(int width, int height) = 0;
+		virtual void ToggleFullscreen() = 0;
+		virtual void SetFullscreen(bool enabled) = 0;
 
-    virtual void ToggleFullscreen() = 0;
-    virtual void SetFullscreen(bool enabled) = 0;
+		virtual void SetVSync(bool enabled) = 0;
+		// Toggles GL_MULTISAMPLE for the default framebuffer. Only has a visible effect if the window
+		// was created with WindowProperties::Samples > 0 - the sample count itself is fixed at creation
+		// time and cannot be changed at runtime without recreating the window.
+		virtual void SetAntialiasing(bool enabled) = 0;
+		virtual void SetTargetFramesPerSecond(int framesPerSecond) = 0;
+		virtual int GetTargetFramesPerSecond() const = 0;
+		virtual void SetWindowIcon(const std::string& path) = 0;
+		virtual void SetWindowIconFromMemory(const uint8_t* data, size_t size) = 0;
+		virtual void SetCursorMode(CursorMode mode) = 0;
+		virtual bool IsFocused() const = 0;
 
-    virtual void SetVSync(bool enabled) = 0;
-    virtual void SetAntialiasing(bool enabled) = 0;
-    virtual void SetTargetFramesPerSecond(int framesPerSecond) = 0;
-    virtual int GetTargetFramesPerSecond() const = 0;
-    virtual void SetWindowIcon(const std::string& path) = 0;
+		virtual void* GetNativeWindow() const = 0;
 
-    virtual void* GetNativeWindow() const = 0;
+		virtual void SetEventCallback(const EventCallbackFn& callback) = 0;
 
-    // Creates the platform-specific window implementation.
-    static std::unique_ptr<Window> Create(const WindowProperties& properties = WindowProperties());
-};
-} // namespace CHEngine
+		// Creates the platform-specific window implementation.
+		static std::unique_ptr<Window> Create(const WindowProperties& properties = WindowProperties());
+	};
+} // namespace Chained
 
 #endif // CH_WINDOW_H
diff --git a/engine/engine_pch.h b/engine/engine_pch.h
index ab54be608..3381a9ff9 100644
--- a/engine/engine_pch.h
+++ b/engine/engine_pch.h
@@ -1,68 +1,46 @@
 #ifndef ENGINE_PCH_H
 #define ENGINE_PCH_H
 
-// 1. Assertion setup (must be before any headers that might use them like GLM or EnTT)
+// 1. Assertion setup & Platform Detection
 #include <cassert>
 #include <cstdint>
-
-#define GLM_ENABLE_EXPERIMENTAL
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-
-// Fallback for assert if it's missing from <cassert> in this environment
-#ifndef assert
-    #ifdef _DEBUG
-        #define assert(condition) ((condition) ? (void)0 : __builtin_trap())
-    #else
-        #define assert(condition) ((void)0)
-    #endif
-#endif
-
-#ifdef _DEBUG
-    #define CH_ASSERT_IMPL(condition) assert(condition)
-#else
-    #define CH_ASSERT_IMPL(condition) ((void)0)
-#endif
-
-#ifndef ENTT_ASSERT
-    #define ENTT_ASSERT(condition, msg) CH_ASSERT_IMPL(condition)
-#endif
-#ifndef ENTT_ASSERT_CONSTEXPR
-    #define ENTT_ASSERT_CONSTEXPR(condition, msg) CH_ASSERT_IMPL(condition)
-#endif
-
-#ifndef GLM_ASSERT
-    #define GLM_ASSERT(x) CH_ASSERT_IMPL(x)
-#endif
-
-// 2. Standard Library
-#include "engine/core/ch_math.h"
+#include <chrono>
 #include <memory>
-#include <vector>
 #include <string>
-#include <unordered_map>
-#include <unordered_set>
+#include <vector>
 #include <algorithm>
 #include <functional>
 #include <filesystem>
 #include <fstream>
 #include <sstream>
+#include <unordered_map>
+#include <unordered_set>
+
+// GLM behavior macros (GLM_ENABLE_EXPERIMENTAL, GLM_FORCE_DEPTH_ZERO_TO_ONE)
+// are defined globally in the root CMakeLists.txt so that TUs compiled without
+// this PCH (NO_PCH modules) see the same GLM configuration.
 
-// 4. Platform specific
-#ifdef WIN32
-    #ifndef WIN32_LEAN_AND_MEAN
-        #define WIN32_LEAN_AND_MEAN
-    #endif
-    #ifndef NOMINMAX
-        #define NOMINMAX
-    #endif
+// 2. Platform specific
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#endif
+
+// 3. Core Engine Headers (Essential for all files)
+#include "engine/common/base.h"
+#include "engine/core/log.h"
+#include "engine/common/color.h"
 
-// 5. Vendor libraries
+// 4. Vendor libraries
 #include <entt/entt.hpp>
-#include <yaml-cpp/yaml.h>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/quaternion.hpp>
+#include <yaml-cpp/yaml.h>
 
 #endif // ENGINE_PCH_H
diff --git a/engine/graphics/CMakeLists.txt b/engine/graphics/CMakeLists.txt
index 28f0a583d..648a82d3d 100644
--- a/engine/graphics/CMakeLists.txt
+++ b/engine/graphics/CMakeLists.txt
@@ -1,108 +1,96 @@
-add_library(engine_graphics ${SUBMODULE_LIB_TYPE}
-        stb_impl.cpp
-    # Pipeline
-        pipeline/renderer.cpp
-        pipeline/renderer_types.cpp
-        pipeline/ui_renderer.cpp
-        pipeline/ui_widget_renderer.cpp
-        pipeline/ui_font_registry.cpp
-        pipeline/shader_library.cpp
-        pipeline/scene_renderer.cpp
-
-        pipeline/render_command.cpp
-        pipeline/texture_utility.cpp
-        texture_system.cpp
-        pipeline/geometry_generator.cpp
-        pipeline/renderer.h
-        pipeline/scene_renderer.h
-        pipeline/ui_renderer.h
-        pipeline/ui_widget_renderer.h
-        pipeline/ui_font_registry.h
-        pipeline/shader_library.h
-        pipeline/material.h
-        pipeline/frustum.h
-        pipeline/texture_utility.h
-        texture_system.h
-        pipeline/geometry_generator.h
-
-    # Assets
-        assets/shader_asset.cpp
-        assets/model_asset.cpp
-        assets/texture_asset.cpp
-        assets/font_asset.cpp
-        assets/shader_asset.h
-        assets/model_asset.h
-        assets/texture_asset.h
-        assets/font_asset.h
-        assets/environment.h
-
-    # Loaders
-        loaders/texture_loader.cpp
-        loaders/model_loader.cpp
-        loaders/assimp_importer.cpp
-        loaders/shader_loader.cpp
-        loaders/font_loader.cpp
-        loaders/environment_loader.cpp
-        loaders/texture_loader.h
-        loaders/model_loader.h
-        loaders/assimp_importer.h
-        loaders/shader_loader.h
-        loaders/font_loader.h
-        loaders/environment_loader.h
-
-    # API & Backend
-        api/renderer_api.cpp
-        api/buffer.cpp
-        api/buffer.h
-        api/vertex_array.cpp
-        api/vertex_array.h
-        api/texture.cpp
-        api/texture.h
-        api/framebuffer.cpp
-        api/framebuffer.h
-        api/renderer_api.h
-        api/model_data.h
-        api/shader.h
-        api/shader.cpp
-        api/opengl/opengl_renderer_api.cpp
-        api/opengl/opengl_renderer_api.h
-        api/opengl/opengl_buffer.cpp
-        api/opengl/opengl_buffer.h
-        api/opengl/opengl_vertex_array.cpp
-        api/opengl/opengl_vertex_array.h
-        api/opengl/opengl_texture.cpp
-        api/opengl/opengl_texture.h
-        api/opengl/opengl_framebuffer.cpp
-        api/opengl/opengl_framebuffer.h
-        api/opengl/opengl_shader.h
-        api/opengl/opengl_shader.cpp
+add_library(engine_graphics STATIC
+    camera_types.h
+    api/buffer.h
+    api/buffer.cpp
+    api/framebuffer.h
+    api/framebuffer.cpp
+    api/graphics_device.h
+    api/graphics_device.cpp
+    api/renderer_types.h
+    api/shader.h
+    api/shader.cpp
+    api/storage_buffer.h
+    api/storage_buffer.cpp
+    api/texture.h
+    api/texture.cpp
+    api/vertex_array.h
+    api/vertex_array.cpp
+    api/opengl/gl_buffer.h
+    api/opengl/gl_buffer.cpp
+    api/opengl/gl_device.h
+    api/opengl/gl_device.cpp
+    api/opengl/gl_framebuffer.h
+    api/opengl/gl_framebuffer.cpp
+    api/opengl/gl_shader_program.h
+    api/opengl/gl_shader_program.cpp
+    api/opengl/gl_storage_buffer.h
+    api/opengl/gl_storage_buffer.cpp
+    api/opengl/gl_texture.h
+    api/opengl/gl_texture.cpp
+    api/opengl/gl_uniform_buffer.h
+    api/opengl/gl_uniform_buffer.cpp
+    api/opengl/gl_vertex_array.h
+    api/opengl/gl_vertex_array.cpp
+    pipeline/debug_renderer.h
+    pipeline/debug_renderer.cpp
+    pipeline/frustum.h
+    pipeline/geometry_generator.h
+    pipeline/geometry_generator.cpp
+    pipeline/material.h
+    pipeline/renderer.h
+    pipeline/renderer.cpp
+    pipeline/renderer_data.h
+    pipeline/lighting_manager.h
+    pipeline/lighting_manager.cpp
+    pipeline/geometry_factory.h
+    pipeline/geometry_factory.cpp
+    pipeline/entity_collector.h
+    pipeline/entity_collector.cpp
+    pipeline/material_manager.h
+    pipeline/material_manager.cpp
+    pipeline/render_pass.h
+    pipeline/scene_renderer.h
+    pipeline/scene_renderer.cpp
+    pipeline/shader_storage.h
+    pipeline/shader_storage.cpp
+    pipeline/shader_uniform_utils.h
+    text_renderer.h
+    text_renderer.cpp
+    freetype_gl_atlas.h
+    freetype_gl_atlas.cpp
+    pipeline/passes/composite_pass.h
+    pipeline/passes/composite_pass.cpp
+    pipeline/passes/geometry_pass.h
+    pipeline/passes/geometry_pass.cpp
+    pipeline/passes/shadow_pass.h
+    pipeline/passes/shadow_pass.cpp
+    pipeline/passes/skybox_pass.h
+    pipeline/passes/skybox_pass.cpp
+    nametag_system.h
+    nametag_system.cpp
 )
 
-# Prevents multiple definition errors when using unity builds
-set_source_files_properties(stb_impl.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
-
 target_include_directories(engine_graphics PUBLIC
-    ${ENGINE_INCLUDE_DIRS}
-    ${assimp_SOURCE_DIR}/include
-    ${assimp_BINARY_DIR}/include
-    ${yaml-cpp_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/imgui
-    ${CMAKE_SOURCE_DIR}/include/imgui/backends
-    ${CMAKE_SOURCE_DIR}/include/entt/src
-    ${CMAKE_SOURCE_DIR}/include/stb
-    ${imguizmo_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
 )
 
-target_link_libraries(engine_graphics PUBLIC 
+target_link_libraries(engine_graphics PUBLIC
+    engine_scene_core
     engine_core
-    imguilib 
-    assimp::assimp 
+    engine_project
+    engine_assets
+    engine_network
     yaml-cpp
-    EnTT::EnTT
-    glfw
-    glad
+    engine_external_entt
+    glm
+    engine_external_stb
+    engine_external_imgui
+    engine_external_glad
+    assimp
+    engine_freetype_gl
 )
 
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(engine_graphics)
+if(TARGET engine_pch)
+    target_link_libraries(engine_graphics PRIVATE engine_pch)
 endif()
diff --git a/engine/graphics/api/buffer.cpp b/engine/graphics/api/buffer.cpp
index 78727fa35..0026246c7 100644
--- a/engine/graphics/api/buffer.cpp
+++ b/engine/graphics/api/buffer.cpp
@@ -1,38 +1,57 @@
 #include "engine/graphics/api/buffer.h"
-#include "engine/graphics/api/renderer_api.h"
-#include "opengl/opengl_buffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "opengl/gl_buffer.h"
+#include "opengl/gl_uniform_buffer.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-std::shared_ptr<VertexBuffer> VertexBuffer::Create(uint32_t size)
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLVertexBuffer>(size);
-    }
-    return nullptr;
-}
+	std::shared_ptr<VertexBuffer> VertexBuffer::Create(uint32_t size)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLVertexBuffer>(size);
+		}
+		return nullptr;
+	}
 
-std::shared_ptr<VertexBuffer> VertexBuffer::Create(const float* vertices, uint32_t size)
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLVertexBuffer>(vertices, size);
-    }
-    return nullptr;
-}
+	std::shared_ptr<VertexBuffer> VertexBuffer::Create(const float* vertices, uint32_t size)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLVertexBuffer>(vertices, size);
+		}
+		return nullptr;
+	}
 
-std::shared_ptr<IndexBuffer> IndexBuffer::Create(const uint32_t* indices, uint32_t count)
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLIndexBuffer>(indices, count);
-    }
-    return nullptr;
-}
+	std::shared_ptr<IndexBuffer> IndexBuffer::Create(const uint32_t* indices, uint32_t count)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLIndexBuffer>(indices, count);
+		}
+		return nullptr;
+	}
+
+	std::shared_ptr<UniformBuffer> UniformBuffer::Create(uint32_t size, uint32_t binding)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLUniformBuffer>(size, binding);
+		}
+		return nullptr;
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/engine/graphics/api/buffer.h b/engine/graphics/api/buffer.h
index 0612cf33a..e35685d2a 100644
--- a/engine/graphics/api/buffer.h
+++ b/engine/graphics/api/buffer.h
@@ -4,139 +4,213 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include "engine/core/ch_assert.h"
+#include <initializer_list>
+#include "engine/common/engine_assert.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-enum class ShaderDataType
-{
-    None = 0, Float, Float2, Float3, Float4, Mat3, Mat4, Int, Int2, Int3, Int4, Bool
-};
-
-static uint32_t ShaderDataTypeSize(ShaderDataType type)
-{
-    switch (type)
-    {
-        case ShaderDataType::Float:    return 4;
-        case ShaderDataType::Float2:   return 4 * 2;
-        case ShaderDataType::Float3:   return 4 * 3;
-        case ShaderDataType::Float4:   return 4 * 4;
-        case ShaderDataType::Mat3:     return 4 * 3 * 3;
-        case ShaderDataType::Mat4:     return 4 * 4 * 4;
-        case ShaderDataType::Int:      return 4;
-        case ShaderDataType::Int2:     return 4 * 2;
-        case ShaderDataType::Int3:     return 4 * 3;
-        case ShaderDataType::Int4:     return 4 * 4;
-        case ShaderDataType::Bool:     return 1;
-    }
-
-    CH_CORE_ASSERT(false, "Unknown ShaderDataType!");
-    return 0;
-}
-
-struct BufferElement
-{
-    std::string Name;
-    ShaderDataType Type;
-    uint32_t Size;
-    size_t Offset;
-    bool Normalized;
-
-    BufferElement() = default;
-
-    BufferElement(ShaderDataType type, const std::string& name, bool normalized = false)
-        : Name(name), Type(type), Size(ShaderDataTypeSize(type)), Offset(0), Normalized(normalized)
-    {
-    }
-
-    uint32_t GetComponentCount() const
-    {
-        switch (Type)
-        {
-            case ShaderDataType::Float:   return 1;
-            case ShaderDataType::Float2:  return 2;
-            case ShaderDataType::Float3:  return 3;
-            case ShaderDataType::Float4:  return 4;
-            case ShaderDataType::Mat3:    return 3; // 3* float3
-            case ShaderDataType::Mat4:    return 4; // 4* float4
-            case ShaderDataType::Int:     return 1;
-            case ShaderDataType::Int2:    return 2;
-            case ShaderDataType::Int3:    return 3;
-            case ShaderDataType::Int4:    return 4;
-            case ShaderDataType::Bool:    return 1;
-        }
-
-        CH_CORE_ASSERT(false, "Unknown ShaderDataType!");
-        return 0;
-    }
-};
-
-class BufferLayout
-{
-public:
-    BufferLayout() {}
-
-    BufferLayout(const std::initializer_list<BufferElement>& elements)
-        : m_Elements(elements)
-    {
-        CalculateOffsetsAndStride();
-    }
-
-    uint32_t GetStride() const { return m_Stride; }
-    const std::vector<BufferElement>& GetElements() const { return m_Elements; }
-
-    std::vector<BufferElement>::iterator begin() { return m_Elements.begin(); }
-    std::vector<BufferElement>::iterator end() { return m_Elements.end(); }
-    std::vector<BufferElement>::const_iterator begin() const { return m_Elements.begin(); }
-    std::vector<BufferElement>::const_iterator end() const { return m_Elements.end(); }
-private:
-    void CalculateOffsetsAndStride()
-    {
-        size_t offset = 0;
-        m_Stride = 0;
-        for (auto& element : m_Elements)
-        {
-            element.Offset = offset;
-            offset += element.Size;
-            m_Stride += element.Size;
-        }
-    }
-private:
-    std::vector<BufferElement> m_Elements;
-    uint32_t m_Stride = 0;
-};
-
-class VertexBuffer
-{
-public:
-    virtual ~VertexBuffer() = default;
-
-    virtual void Bind() const = 0;
-    virtual void Unbind() const = 0;
-
-    virtual void SetData(const void* data, uint32_t size) = 0;
-
-    virtual const BufferLayout& GetLayout() const = 0;
-    virtual void SetLayout(const BufferLayout& layout) = 0;
-
-    static std::shared_ptr<VertexBuffer> Create(uint32_t size);
-    static std::shared_ptr<VertexBuffer> Create(const float* vertices, uint32_t size);
-};
-
-class IndexBuffer
-{
-public:
-    virtual ~IndexBuffer() = default;
-
-    virtual void Bind() const = 0;
-    virtual void Unbind() const = 0;
-
-    virtual uint32_t GetCount() const = 0;
-
-    static std::shared_ptr<IndexBuffer> Create(const uint32_t* indices, uint32_t count);
-};
-
-} // namespace CHEngine
+	enum class VertexAttributeType
+	{
+		None = 0,
+		Float,
+		Float2,
+		Float3,
+		Float4,
+		Mat3,
+		Mat4,
+		Int,
+		Int2,
+		Int3,
+		Int4,
+		Bool
+	};
+
+	constexpr uint32_t VertexAttributeTypeSize(VertexAttributeType type)
+	{
+		switch (type)
+		{
+		case VertexAttributeType::Float:
+			return 4;
+		case VertexAttributeType::Float2:
+			return 4 * 2;
+		case VertexAttributeType::Float3:
+			return 4 * 3;
+		case VertexAttributeType::Float4:
+			return 4 * 4;
+		case VertexAttributeType::Mat3:
+			return 4 * 3 * 3;
+		case VertexAttributeType::Mat4:
+			return 4 * 4 * 4;
+		case VertexAttributeType::Int:
+			return 4;
+		case VertexAttributeType::Int2:
+			return 4 * 2;
+		case VertexAttributeType::Int3:
+			return 4 * 3;
+		case VertexAttributeType::Int4:
+			return 4 * 4;
+		case VertexAttributeType::Bool:
+			return 1;
+		}
+
+		CH_CORE_ASSERT(false, "Unknown VertexAttributeType!");
+		return 0;
+	}
+
+	struct BufferElement
+	{
+		std::string Name;
+		VertexAttributeType Type;
+		uint32_t Size;
+		size_t Offset;
+		bool Normalized;
+		bool Instanced;
+
+		BufferElement() = default;
+
+		BufferElement(VertexAttributeType type, const std::string& name, bool normalized = false,
+					  bool instanced = false)
+			: Name(name),
+			  Type(type),
+			  Size(VertexAttributeTypeSize(type)),
+			  Offset(0),
+			  Normalized(normalized),
+			  Instanced(instanced)
+		{
+		}
+
+		uint32_t GetComponentCount() const
+		{
+			switch (Type)
+			{
+			case VertexAttributeType::Float:
+				return 1;
+			case VertexAttributeType::Float2:
+				return 2;
+			case VertexAttributeType::Float3:
+				return 3;
+			case VertexAttributeType::Float4:
+				return 4;
+			case VertexAttributeType::Mat3:
+				return 3; // 3* float3
+			case VertexAttributeType::Mat4:
+				return 4; // 4* float4
+			case VertexAttributeType::Int:
+				return 1;
+			case VertexAttributeType::Int2:
+				return 2;
+			case VertexAttributeType::Int3:
+				return 3;
+			case VertexAttributeType::Int4:
+				return 4;
+			case VertexAttributeType::Bool:
+				return 1;
+			}
+
+			CH_CORE_ASSERT(false, "Unknown VertexAttributeType!");
+			return 0;
+		}
+	};
+
+	class BufferLayout
+	{
+	public:
+		BufferLayout()
+		{
+		}
+
+		BufferLayout(const std::initializer_list<BufferElement>& elements)
+			: m_Elements(elements)
+		{
+			CalculateOffsetsAndStride();
+		}
+
+		uint32_t GetStride() const
+		{
+			return m_Stride;
+		}
+		const std::vector<BufferElement>& GetElements() const
+		{
+			return m_Elements;
+		}
+
+		std::vector<BufferElement>::iterator begin()
+		{
+			return m_Elements.begin();
+		}
+		std::vector<BufferElement>::iterator end()
+		{
+			return m_Elements.end();
+		}
+		std::vector<BufferElement>::const_iterator begin() const
+		{
+			return m_Elements.begin();
+		}
+		std::vector<BufferElement>::const_iterator end() const
+		{
+			return m_Elements.end();
+		}
+
+	private:
+		void CalculateOffsetsAndStride()
+		{
+			size_t offset = 0;
+			m_Stride = 0;
+			for (auto& element : m_Elements)
+			{
+				element.Offset = offset;
+				offset += element.Size;
+				m_Stride += element.Size;
+			}
+		}
+
+	private:
+		std::vector<BufferElement> m_Elements;
+		uint32_t m_Stride = 0;
+	};
+
+	class VertexBuffer
+	{
+	public:
+		virtual ~VertexBuffer() = default;
+
+		virtual void Bind() const = 0;
+		virtual void Unbind() const = 0;
+
+		virtual void SetData(const void* data, uint32_t size) = 0;
+
+		virtual const BufferLayout& GetLayout() const = 0;
+		virtual void SetLayout(const BufferLayout& layout) = 0;
+
+		static std::shared_ptr<VertexBuffer> Create(uint32_t size);
+		static std::shared_ptr<VertexBuffer> Create(const float* vertices, uint32_t size);
+	};
+
+	class IndexBuffer
+	{
+	public:
+		virtual ~IndexBuffer() = default;
+
+		virtual void Bind() const = 0;
+		virtual void Unbind() const = 0;
+
+		virtual uint32_t GetCount() const = 0;
+
+		static std::shared_ptr<IndexBuffer> Create(const uint32_t* indices, uint32_t count);
+	};
+
+	class UniformBuffer
+	{
+	public:
+		virtual ~UniformBuffer() = default;
+
+		virtual void SetData(const void* data, uint32_t size, uint32_t offset = 0) = 0;
+		virtual void BindBase(uint32_t binding) = 0;
+
+		static std::shared_ptr<UniformBuffer> Create(uint32_t size, uint32_t binding);
+	};
+
+} // namespace Chained
 
 #endif // CH_BUFFER_H
diff --git a/engine/graphics/api/camera_types.h b/engine/graphics/api/camera_types.h
deleted file mode 100644
index 068e20a15..000000000
--- a/engine/graphics/api/camera_types.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CH_CAMERA_TYPES_H
-#define CH_CAMERA_TYPES_H
-
-#include <glm/glm.hpp>
-
-// Not working , but in the future , i guess i do 2D Renderer
-namespace CHEngine
-{
-struct Camera2D
-{
-    glm::vec2 Offset = {0.0f, 0.0f};
-    glm::vec2 Target = {0.0f, 0.0f};
-    float Rotation = 0.0f;
-    float Zoom = 1.0f;
-};
-// Goat camera
-struct Camera3D
-{
-    Camera3D() = default;
-
-    glm::vec3 Position = {0.0f, 0.0f, 0.0f};
-    glm::vec3 Target = {0.0f, 0.0f, 0.0f};
-    glm::vec3 Up = {0.0f, 1.0f, 0.0f};
-    float Fovy = 45.0f;
-    int Projection = 0; // 0 for Perspective, 1 for Orthographic
-};
-} // namespace CHEngine
-
-#endif // CH_CAMERA_TYPES_H
diff --git a/engine/graphics/api/framebuffer.cpp b/engine/graphics/api/framebuffer.cpp
index 378558159..2589a5b1b 100644
--- a/engine/graphics/api/framebuffer.cpp
+++ b/engine/graphics/api/framebuffer.cpp
@@ -1,17 +1,20 @@
 #include "engine/graphics/api/framebuffer.h"
-#include "engine/graphics/api/renderer_api.h"
-#include "opengl/opengl_framebuffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "opengl/gl_framebuffer.h"
 
-namespace CHEngine
+namespace Chained
 {
-std::shared_ptr<Framebuffer> Framebuffer::Create(const FramebufferSpecification& spec)
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLFramebuffer>(spec);
-    }
-    return nullptr;
-}
+	std::shared_ptr<Framebuffer> Framebuffer::Create(const FramebufferSpecification& spec)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLFramebuffer>(spec);
+		default:
+			return nullptr;
+		}
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/engine/graphics/api/framebuffer.h b/engine/graphics/api/framebuffer.h
index 0b1aa0ee8..4f53a1012 100644
--- a/engine/graphics/api/framebuffer.h
+++ b/engine/graphics/api/framebuffer.h
@@ -2,44 +2,58 @@
 #define CH_FRAMEBUFFER_H
 
 #include <memory>
-#include <vector>
+#include "engine/graphics/api/texture.h"
 
-namespace CHEngine
+namespace Chained
 {
-enum class FramebufferColorFormat
-{
-    RGBA8 = 0,
-    RGBA16F = 1,
-};
-
-struct FramebufferSpecification
-{
-    uint32_t Width, Height;
-    uint32_t Samples = 1;
-    bool SwapChainTarget = false;
-    FramebufferColorFormat ColorFormat = FramebufferColorFormat::RGBA8;
-};
-
-class Framebuffer
-{
-public:
-    virtual ~Framebuffer() = default;
-
-    virtual void Bind() = 0;
-    virtual void Unbind() = 0;
-
-    virtual void Resize(uint32_t width, uint32_t height) = 0;
-
-    virtual uint32_t GetColorAttachmentRendererID() const = 0;
-    virtual uint32_t GetDepthAttachmentRendererID() const = 0;
-
-    virtual const FramebufferSpecification& GetSpecification() const = 0;
-
-    virtual void* GetNativeFramebuffer() = 0;
-
-    static std::shared_ptr<Framebuffer> Create(const FramebufferSpecification& spec);
-};
-
-} // namespace CHEngine
+	enum class FramebufferColorFormat
+	{
+		RGBA8 = 0,
+		RGBA16F = 1,
+	};
+
+	struct FramebufferSpecification
+	{
+		uint32_t Width = 0;
+		uint32_t Height = 0;
+		uint32_t Samples = 1;
+		bool SwapChainTarget = false;
+		bool DepthOnly = false; // When true: creates a pure depth texture (no color attachment). Used for shadow maps.
+		FramebufferColorFormat ColorFormat = FramebufferColorFormat::RGBA8;
+	};
+
+	class Framebuffer
+	{
+	public:
+		virtual ~Framebuffer() = default;
+
+		virtual void Bind() = 0;
+		virtual void Unbind() = 0;
+
+		virtual void Resize(uint32_t width, uint32_t height) = 0;
+
+		// No-op when Specification.Samples <= 1. Otherwise blits the multisample color/depth
+		// attachments into an internal single-sample resolve target, which is what
+		// GetColorAttachmentRendererID()/GetDepthAttachmentRendererID() return - multisample
+		// textures can't be sampled with a plain sampler2D, so this must run once per frame
+		// after rendering into the framebuffer and before it's read as a texture elsewhere
+		// (e.g. by a composite/post-process pass or ImGui::Image).
+		virtual void Resolve() = 0;
+
+		virtual std::shared_ptr<Texture> GetColorAttachment() const = 0;
+		virtual uint32_t GetColorAttachmentRendererID() const = 0;
+		virtual std::shared_ptr<Texture> GetDepthAttachment() const = 0;
+		virtual uint32_t GetDepthAttachmentRendererID() const = 0;
+
+		virtual const FramebufferSpecification& GetSpecification() const = 0;
+
+		virtual void* GetNativeFramebuffer() = 0;
+
+		virtual bool IsValid() const = 0;
+
+		static std::shared_ptr<Framebuffer> Create(const FramebufferSpecification& spec);
+	};
+
+} // namespace Chained
 
 #endif // CH_FRAMEBUFFER_H
diff --git a/engine/graphics/api/graphics_device.cpp b/engine/graphics/api/graphics_device.cpp
new file mode 100644
index 000000000..e71ca0766
--- /dev/null
+++ b/engine/graphics/api/graphics_device.cpp
@@ -0,0 +1,59 @@
+#include "engine/graphics/api/graphics_device.h"
+#include "opengl/gl_device.h"
+#include <vector>
+#include <mutex>
+
+namespace Chained
+{
+
+	GraphicsDevice* GraphicsDevice::s_Instance = nullptr;
+	GraphicsDevice::API GraphicsDevice::s_API = GraphicsDevice::API::OpenGL;
+
+	static std::mutex s_DeletionMutex;
+	static std::vector<std::function<void()>> s_DeletionQueue;
+
+	void GraphicsDevice::EnqueueResourceDeletion(std::function<void()> deleter)
+	{
+		if (!deleter)
+		{
+			return;
+		}
+		std::lock_guard<std::mutex> lock(s_DeletionMutex);
+		s_DeletionQueue.push_back(std::move(deleter));
+	}
+
+	void GraphicsDevice::ProcessResourceDeletions()
+	{
+		std::vector<std::function<void()>> queueToProcess;
+		{
+			std::lock_guard<std::mutex> lock(s_DeletionMutex);
+			if (s_DeletionQueue.empty())
+			{
+				return;
+			}
+			queueToProcess.swap(s_DeletionQueue);
+		}
+
+		for (auto& deleter : queueToProcess)
+		{
+			if (deleter)
+			{
+				deleter();
+			}
+		}
+	}
+
+	std::unique_ptr<GraphicsDevice> GraphicsDevice::Create()
+	{
+		switch (s_API)
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_unique<GLDevice>();
+		default:
+			return nullptr;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/graphics_device.h b/engine/graphics/api/graphics_device.h
new file mode 100644
index 000000000..9b627e37a
--- /dev/null
+++ b/engine/graphics/api/graphics_device.h
@@ -0,0 +1,233 @@
+#ifndef CH_GRAPHICS_DEVICE_H
+#define CH_GRAPHICS_DEVICE_H
+
+#include "engine/common/color.h"
+#include "engine/common/engine_assert.h"
+#include <functional>
+#include <memory>
+
+namespace Chained
+{
+	class VertexArray;
+
+	class GraphicsDevice
+	{
+	public:
+		enum class DepthFunc
+		{
+			Never = 0,
+			Less,
+			Equal,
+			LEqual,
+			Greater,
+			NotEqual,
+			GEqual,
+			Always
+		};
+
+		enum class CullMode
+		{
+			None = 0,
+			Front,
+			Back,
+			FrontAndBack
+		};
+
+		enum class BlendFactor
+		{
+			Zero = 0,
+			One,
+			SrcColor,
+			OneMinusSrcColor,
+			DstColor,
+			OneMinusDstColor,
+			SrcAlpha,
+			OneMinusSrcAlpha,
+			DstAlpha,
+			OneMinusDstAlpha
+		};
+
+		enum class PolygonMode
+		{
+			Fill = 0,
+			Line,
+			Point
+		};
+
+		enum class API
+		{
+			None = 0,
+			OpenGL = 1,
+			Vulkan = 2
+		};
+
+	public:
+		virtual ~GraphicsDevice() = default;
+
+		virtual void Init() = 0;
+		virtual void Shutdown()
+		{
+		}
+		virtual void SetViewport(int x, int y, int width, int height) = 0;
+		virtual void GetViewport(int* x, int* y, int* width, int* height) const = 0;
+		virtual void SetClearColor(const Color& color) = 0;
+		virtual void Clear() = 0;
+		virtual void Clear(const Color& color)
+		{
+			SetClearColor(color);
+			Clear();
+		}
+
+		virtual void SetDepthFunc(DepthFunc func) = 0;
+		virtual void SetDepthTest(bool enabled) = 0;
+		virtual void SetDepthMask(bool enabled) = 0;
+		virtual void EnableDepthTest()
+		{
+			SetDepthTest(true);
+		}
+		virtual void DisableDepthTest()
+		{
+			SetDepthTest(false);
+		}
+		virtual void EnableDepthMask()
+		{
+			SetDepthMask(true);
+		}
+		virtual void DisableDepthMask()
+		{
+			SetDepthMask(false);
+		}
+
+		virtual void SetCullMode(CullMode mode) = 0;
+		virtual void SetBlendFunc(BlendFactor src, BlendFactor dst) = 0;
+		virtual void SetBlendEnabled(bool enabled) = 0;
+
+		virtual bool IsDepthTestEnabled() const = 0;
+		virtual bool IsDepthMaskEnabled() const = 0;
+		virtual bool IsBlendEnabled() const = 0;
+		virtual bool IsCullFaceEnabled() const = 0;
+		virtual PolygonMode GetPolygonMode() const = 0;
+
+		virtual void SetPolygonMode(PolygonMode mode) = 0;
+		virtual void SetPolygonOffset(bool enabled, float factor = 0.0f, float units = 0.0f) = 0;
+
+		virtual void SetLineWidth(float width) = 0;
+
+		// Framebuffer operations
+		virtual uint32_t GetFramebufferBinding() const = 0;
+		virtual void BindFramebuffer(uint32_t fbo) = 0;
+		virtual void ClearDepth() = 0;
+
+		virtual void DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount = 0) = 0;
+		virtual void DrawIndexedInstanced(const std::shared_ptr<VertexArray>& vertexArray, uint32_t instanceCount,
+										  uint32_t indexCount = 0) = 0;
+		virtual void DrawIndexedLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount = 0) = 0;
+		virtual void DrawLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t vertexCount) = 0;
+		virtual void DrawArrays(uint32_t vertexCount) = 0;
+		virtual void DrawArraysInstanced(uint32_t vertexCount, uint32_t instanceCount) = 0;
+
+		virtual void SetTexture(uint32_t slot, uint32_t textureId, bool isCubemap = false) = 0;
+
+		/// Enqueue a GPU resource deletion command safely from any thread.
+		/// The deletion will be executed on the main render thread where the GPU context is active.
+		static void EnqueueResourceDeletion(std::function<void()> deleter);
+
+		/// Process all pending GPU resource deletions (called on the main render thread).
+		static void ProcessResourceDeletions();
+
+		static GraphicsDevice& Get()
+		{
+			CH_ASSERT(s_Instance, "GraphicsDevice::Get() called before Set() or after Shutdown()!");
+			return *s_Instance;
+		}
+		static void Set(std::unique_ptr<GraphicsDevice> device)
+		{
+			s_Instance = device.release();
+		}
+		static API GetAPI()
+		{
+			return s_API;
+		}
+		static void SetAPI(API api)
+		{
+			s_API = api;
+		}
+		static std::unique_ptr<GraphicsDevice> Create();
+
+	private:
+		static GraphicsDevice* s_Instance;
+		static API s_API;
+	};
+
+	/// RAII guard that saves and restores GPU pipeline state (depth, blend, cull, polygon mode).
+	/// Construct before a render pass, destruct after to restore previous state.
+	class PipelineStateGuard
+	{
+	public:
+		PipelineStateGuard()
+			: m_DepthTest(GraphicsDevice::Get().IsDepthTestEnabled()),
+			  m_DepthMask(GraphicsDevice::Get().IsDepthMaskEnabled()),
+			  m_Blend(GraphicsDevice::Get().IsBlendEnabled()),
+			  m_Cull(GraphicsDevice::Get().IsCullFaceEnabled()),
+			  m_PolyMode(GraphicsDevice::Get().GetPolygonMode())
+		{
+		}
+
+		static PipelineStateGuard Capture()
+		{
+			return PipelineStateGuard();
+		}
+
+		~PipelineStateGuard()
+		{
+			GraphicsDevice::Get().SetDepthTest(m_DepthTest);
+			GraphicsDevice::Get().SetDepthMask(m_DepthMask);
+			GraphicsDevice::Get().SetBlendEnabled(m_Blend);
+			GraphicsDevice::Get().SetCullMode(m_Cull ? GraphicsDevice::CullMode::Back : GraphicsDevice::CullMode::None);
+			GraphicsDevice::Get().SetPolygonMode(m_PolyMode);
+		}
+
+		PipelineStateGuard(const PipelineStateGuard&) = delete;
+		PipelineStateGuard& operator=(const PipelineStateGuard&) = delete;
+
+		// Fluent builder methods for configuring state changes
+		PipelineStateGuard& WithDepthTest()
+		{
+			GraphicsDevice::Get().EnableDepthTest();
+			return *this;
+		}
+		PipelineStateGuard& WithoutDepthTest()
+		{
+			GraphicsDevice::Get().DisableDepthTest();
+			GraphicsDevice::Get().DisableDepthMask();
+			return *this;
+		}
+		PipelineStateGuard& WithBlend()
+		{
+			GraphicsDevice::Get().SetBlendEnabled(true);
+			GraphicsDevice::Get().SetBlendFunc(GraphicsDevice::BlendFactor::SrcAlpha,
+											   GraphicsDevice::BlendFactor::OneMinusSrcAlpha);
+			return *this;
+		}
+		PipelineStateGuard& WithCullNone()
+		{
+			GraphicsDevice::Get().SetCullMode(GraphicsDevice::CullMode::None);
+			return *this;
+		}
+		PipelineStateGuard& WithWireframeMode()
+		{
+			GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Line);
+			return *this;
+		}
+
+	private:
+		bool m_DepthTest;
+		bool m_DepthMask;
+		bool m_Blend;
+		bool m_Cull;
+		GraphicsDevice::PolygonMode m_PolyMode;
+	};
+
+} // namespace Chained
+
+#endif // CH_GRAPHICS_DEVICE_H
diff --git a/engine/graphics/api/model_data.h b/engine/graphics/api/model_data.h
deleted file mode 100644
index 709e2b931..000000000
--- a/engine/graphics/api/model_data.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef CH_MODEL_DATA_H
-#define CH_MODEL_DATA_H
-
-#include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <unordered_map>
-#include <string>
-#include <vector>
-
-namespace CHEngine
-{
-struct TransformData
-{
-    glm::vec3 translation;
-    glm::quat rotation;
-    glm::vec3 scale;
-};
-
-struct RawMesh
-{
-    std::vector<float> vertices;
-    std::vector<float> texcoords;
-    std::vector<float> normals;
-    std::vector<float> tangents;
-    std::vector<unsigned char> colors;
-    std::vector<uint32_t> indices;
-
-    // Skinning data
-    std::vector<unsigned char> joints; // 4 joints per vertex
-    std::vector<float> weights;        // 4 weights per vertex
-
-    int materialIndex = -1;
-};
-
-struct RawMaterial
-{
-    std::string albedoPath;
-    glm::vec4 albedoColor = { 1.0f, 1.0f, 1.0f, 1.0f };
-
-    std::string emissivePath;
-    glm::vec4 emissiveColor = { 0.0f, 0.0f, 0.0f, 1.0f };
-    float emissiveIntensity = 0.0f;
-
-    std::string normalPath;
-    std::string metallicRoughnessPath;
-    std::string occlusionPath;
-
-    float metalness = 0.0f;
-    float roughness = 0.5f;
-};
-
-struct EmbeddedTextureData
-{
-    std::vector<unsigned char> data;
-    int width = 0;
-    int height = 0;
-    int channels = 0;
-    bool isHDR = false;
-};
-
-// Track textures that are still loading
-struct PendingTexture
-{
-    int materialIndex;
-    std::string path;
-    int mapIndex; // MATERIAL_MAP_ALBEDO, MATERIAL_MAP_EMISSION, etc.
-};
-
-struct RawAnimation
-{
-    std::string name;
-    int frameCount;
-    int boneCount;
-    float frameRate = 30.0f; // FPS of the animation source asset
-    std::vector<TransformData> framePoses; // flattened [frameCount * boneCount]
-};
-
-struct MeshInstance
-{
-    int meshIndex;
-    glm::mat4 localTransform;
-};
-
-struct BoneInfoData
-{
-    char name[32];
-    int parent;
-};
-
-// CPU-side data for async loading (loaded in worker thread)
-struct PendingModelData
-{
-    std::string fullPath;
-    std::vector<RawMesh> meshes;
-    std::vector<RawMaterial> materials;
-    std::unordered_map<std::string, EmbeddedTextureData> embeddedTextures;
-
-    // Skeletal / Hierarchy data (Original data for animations only)
-    std::vector<BoneInfoData> bones;
-    std::vector<TransformData> bindPose;
-
-    // Flattened render data
-    std::vector<MeshInstance> instances;
-    
-    // Support for hierarchy (only for animation system/skeleton mapping)
-    std::vector<std::string> nodeNames;
-    int nodeCount = 0; // Added for convenience
-    std::vector<int> nodeParents;
-    std::vector<glm::mat4> nodeLocalTransforms;
-    std::vector<glm::mat4> globalBindPoses; 
-    std::vector<glm::mat4> offsetMatrices;  
-    
-    std::vector<RawAnimation> animations;
-    bool isValid = false;
-};
-} // namespace CHEngine
-
-#endif // CH_MODEL_DATA_H
diff --git a/engine/graphics/api/opengl/gl_buffer.cpp b/engine/graphics/api/opengl/gl_buffer.cpp
new file mode 100644
index 000000000..19e925999
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_buffer.cpp
@@ -0,0 +1,78 @@
+#include "gl_buffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include <glad/gl.h>
+
+namespace Chained
+{
+
+	// VertexBuffer ///////////////////////////////////////////////////////////
+
+	GLVertexBuffer::GLVertexBuffer(uint32_t size)
+	{
+		glGenBuffers(1, &m_RendererID);
+		glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
+		glBufferData(GL_ARRAY_BUFFER, size, nullptr, GL_DYNAMIC_DRAW);
+	}
+
+	GLVertexBuffer::GLVertexBuffer(const float* vertices, uint32_t size)
+	{
+		glGenBuffers(1, &m_RendererID);
+		glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
+		glBufferData(GL_ARRAY_BUFFER, size, vertices, GL_STATIC_DRAW);
+	}
+
+	GLVertexBuffer::~GLVertexBuffer()
+	{
+		if (m_RendererID)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteBuffers(1, &id); });
+		}
+	}
+
+	void GLVertexBuffer::Bind() const
+	{
+		glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
+	}
+
+	void GLVertexBuffer::Unbind() const
+	{
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+	}
+
+	void GLVertexBuffer::SetData(const void* data, uint32_t size)
+	{
+		glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
+		glBufferSubData(GL_ARRAY_BUFFER, 0, size, data);
+	}
+
+	// IndexBuffer ////////////////////////////////////////////////////////////
+
+	GLIndexBuffer::GLIndexBuffer(const uint32_t* indices, uint32_t count)
+		: m_Count(count)
+	{
+		glGenBuffers(1, &m_RendererID);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_RendererID);
+		glBufferData(GL_ELEMENT_ARRAY_BUFFER, count * sizeof(uint32_t), indices, GL_STATIC_DRAW);
+	}
+
+	GLIndexBuffer::~GLIndexBuffer()
+	{
+		if (m_RendererID)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteBuffers(1, &id); });
+		}
+	}
+
+	void GLIndexBuffer::Bind() const
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_RendererID);
+	}
+
+	void GLIndexBuffer::Unbind() const
+	{
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_buffer.h b/engine/graphics/api/opengl/gl_buffer.h
new file mode 100644
index 000000000..1e9be25ff
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_buffer.h
@@ -0,0 +1,56 @@
+#ifndef CH_OPENGL_BUFFER_H
+#define CH_OPENGL_BUFFER_H
+
+#include "engine/graphics/api/buffer.h"
+
+namespace Chained
+{
+
+	class GLVertexBuffer : public VertexBuffer
+	{
+	public:
+		GLVertexBuffer(uint32_t size);
+		GLVertexBuffer(const float* vertices, uint32_t size);
+		virtual ~GLVertexBuffer();
+
+		virtual void Bind() const override;
+		virtual void Unbind() const override;
+
+		virtual void SetData(const void* data, uint32_t size) override;
+
+		virtual const BufferLayout& GetLayout() const override
+		{
+			return m_Layout;
+		}
+		virtual void SetLayout(const BufferLayout& layout) override
+		{
+			m_Layout = layout;
+		}
+
+	private:
+		uint32_t m_RendererID = 0;
+		BufferLayout m_Layout;
+	};
+
+	class GLIndexBuffer : public IndexBuffer
+	{
+	public:
+		GLIndexBuffer(const uint32_t* indices, uint32_t count);
+		virtual ~GLIndexBuffer();
+
+		virtual void Bind() const override;
+		virtual void Unbind() const override;
+
+		virtual uint32_t GetCount() const override
+		{
+			return m_Count;
+		}
+
+	private:
+		uint32_t m_RendererID = 0;
+		uint32_t m_Count;
+	};
+
+} // namespace Chained
+
+#endif // CH_OPENGL_BUFFER_H
diff --git a/engine/graphics/api/opengl/gl_device.cpp b/engine/graphics/api/opengl/gl_device.cpp
new file mode 100644
index 000000000..c37469b43
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_device.cpp
@@ -0,0 +1,402 @@
+#include "gl_device.h"
+#include "engine/graphics/api/vertex_array.h"
+#include <glad/gl.h>
+
+namespace Chained
+{
+
+	void GLDevice::Init()
+	{
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_DEPTH_TEST);
+		glDepthMask(GL_TRUE);
+		glDepthFunc(GL_LEQUAL);
+#ifdef GLM_FORCE_DEPTH_ZERO_TO_ONE
+		if (glClipControl)
+		{
+			glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE);
+		}
+#endif
+		SetCullMode(CullMode::Back);
+		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+
+		// Sync the state cache with what we just set above via raw GL calls,
+		// so that IsBlendEnabled(), IsDepthTestEnabled(), etc. return correct
+		// values immediately after Init() without requiring a round-trip to GL.
+		m_StateCache.Blend = true;
+		m_StateCache.SrcBlend = BlendFactor::SrcAlpha;
+		m_StateCache.DstBlend = BlendFactor::OneMinusSrcAlpha;
+		m_StateCache.DepthTest = true;
+		m_StateCache.DepthMask = true;
+		m_StateCache.DepthFunction = DepthFunc::LEqual;
+		m_StateCache.PolyMode = PolygonMode::Fill;
+	}
+
+	void GLDevice::Shutdown()
+	{
+	}
+
+	void GLDevice::SetViewport(int x, int y, int width, int height)
+	{
+		glViewport(x, y, width, height);
+		m_StateCache.Viewport[0] = x;
+		m_StateCache.Viewport[1] = y;
+		m_StateCache.Viewport[2] = width;
+		m_StateCache.Viewport[3] = height;
+	}
+
+	void GLDevice::GetViewport(int* x, int* y, int* width, int* height) const
+	{
+		// Query GL directly rather than the state cache: Framebuffer::Bind() calls glViewport()
+		// without going through SetViewport(), so the cache can be stale. Mirrors how
+		// GetFramebufferBinding() reads the live GL state.
+		GLint vp[4] = {0, 0, 0, 0};
+		glGetIntegerv(GL_VIEWPORT, vp);
+		if (x)
+		{
+			*x = vp[0];
+		}
+		if (y)
+		{
+			*y = vp[1];
+		}
+		if (width)
+		{
+			*width = vp[2];
+		}
+		if (height)
+		{
+			*height = vp[3];
+		}
+	}
+
+	void GLDevice::SetClearColor(const Color& color)
+	{
+		m_ClearColor[0] = color.r / 255.0f;
+		m_ClearColor[1] = color.g / 255.0f;
+		m_ClearColor[2] = color.b / 255.0f;
+		m_ClearColor[3] = color.a / 255.0f;
+	}
+
+	void GLDevice::Clear()
+	{
+		glClearColor(m_ClearColor[0], m_ClearColor[1], m_ClearColor[2], m_ClearColor[3]);
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	}
+
+	void GLDevice::SetDepthFunc(DepthFunc func)
+	{
+		if (m_StateCache.DepthFunction == func)
+		{
+			return;
+		}
+
+		GLenum glFunc = GL_LESS;
+		switch (func)
+		{
+		case DepthFunc::Never:
+			glFunc = GL_NEVER;
+			break;
+		case DepthFunc::Less:
+			glFunc = GL_LESS;
+			break;
+		case DepthFunc::Equal:
+			glFunc = GL_EQUAL;
+			break;
+		case DepthFunc::LEqual:
+			glFunc = GL_LEQUAL;
+			break;
+		case DepthFunc::Greater:
+			glFunc = GL_GREATER;
+			break;
+		case DepthFunc::NotEqual:
+			glFunc = GL_NOTEQUAL;
+			break;
+		case DepthFunc::GEqual:
+			glFunc = GL_GEQUAL;
+			break;
+		case DepthFunc::Always:
+			glFunc = GL_ALWAYS;
+			break;
+		}
+		glDepthFunc(glFunc);
+		m_StateCache.DepthFunction = func;
+	}
+
+	void GLDevice::SetDepthTest(bool enabled)
+	{
+		if (m_StateCache.DepthTest == enabled)
+		{
+			return;
+		}
+
+		if (enabled)
+		{
+			glEnable(GL_DEPTH_TEST);
+		}
+		else
+		{
+			glDisable(GL_DEPTH_TEST);
+		}
+
+		m_StateCache.DepthTest = enabled;
+	}
+
+	void GLDevice::SetDepthMask(bool enabled)
+	{
+		if (m_StateCache.DepthMask == enabled)
+		{
+			return;
+		}
+
+		glDepthMask(enabled ? GL_TRUE : GL_FALSE);
+		m_StateCache.DepthMask = enabled;
+	}
+
+	void GLDevice::SetCullMode(CullMode mode)
+	{
+		if (m_StateCache.Cull == mode)
+		{
+			return;
+		}
+
+		if (mode == CullMode::None)
+		{
+			glDisable(GL_CULL_FACE);
+		}
+		else
+		{
+			glEnable(GL_CULL_FACE);
+			switch (mode)
+			{
+			case CullMode::Front:
+				glCullFace(GL_FRONT);
+				break;
+			case CullMode::Back:
+				glCullFace(GL_BACK);
+				break;
+			case CullMode::FrontAndBack:
+				glCullFace(GL_FRONT_AND_BACK);
+				break;
+			}
+		}
+		m_StateCache.Cull = mode;
+	}
+
+	void GLDevice::SetBlendEnabled(bool enabled)
+	{
+		if (m_StateCache.Blend == enabled)
+		{
+			return;
+		}
+
+		if (enabled)
+		{
+			glEnable(GL_BLEND);
+		}
+		else
+		{
+			glDisable(GL_BLEND);
+		}
+
+		m_StateCache.Blend = enabled;
+	}
+
+	void GLDevice::SetBlendFunc(BlendFactor src, BlendFactor dst)
+	{
+		if (m_StateCache.SrcBlend == src && m_StateCache.DstBlend == dst)
+		{
+			return;
+		}
+
+		auto toGL = [](BlendFactor factor) -> GLenum {
+			switch (factor)
+			{
+			case BlendFactor::Zero:
+				return GL_ZERO;
+			case BlendFactor::One:
+				return GL_ONE;
+			case BlendFactor::SrcColor:
+				return GL_SRC_COLOR;
+			case BlendFactor::OneMinusSrcColor:
+				return GL_ONE_MINUS_SRC_COLOR;
+			case BlendFactor::DstColor:
+				return GL_DST_COLOR;
+			case BlendFactor::OneMinusDstColor:
+				return GL_ONE_MINUS_DST_COLOR;
+			case BlendFactor::SrcAlpha:
+				return GL_SRC_ALPHA;
+			case BlendFactor::OneMinusSrcAlpha:
+				return GL_ONE_MINUS_SRC_ALPHA;
+			case BlendFactor::DstAlpha:
+				return GL_DST_ALPHA;
+			case BlendFactor::OneMinusDstAlpha:
+				return GL_ONE_MINUS_DST_ALPHA;
+			}
+			return GL_ONE;
+		};
+		glBlendFunc(toGL(src), toGL(dst));
+		m_StateCache.SrcBlend = src;
+		m_StateCache.DstBlend = dst;
+	}
+
+	void GLDevice::SetLineWidth(float width)
+	{
+		if (width < 1.0f)
+		{
+			width = 1.0f;
+		}
+		glLineWidth(width);
+	}
+
+	void GLDevice::DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount)
+	{
+		vertexArray->Bind();
+		auto ib = vertexArray->GetIndexBuffer();
+		if (!ib)
+		{
+			return;
+		}
+		uint32_t count = indexCount ? indexCount : ib->GetCount();
+		glDrawElements(GL_TRIANGLES, (GLsizei)count, GL_UNSIGNED_INT, nullptr);
+	}
+
+	void GLDevice::DrawIndexedLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount)
+	{
+		vertexArray->Bind();
+		auto ib = vertexArray->GetIndexBuffer();
+		if (!ib)
+		{
+			return;
+		}
+		uint32_t count = indexCount ? indexCount : ib->GetCount();
+		glDrawElements(GL_LINES, (GLsizei)count, GL_UNSIGNED_INT, nullptr);
+	}
+
+	void GLDevice::DrawLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t vertexCount)
+	{
+		vertexArray->Bind();
+		glDrawArrays(GL_LINES, 0, (GLsizei)vertexCount);
+	}
+
+	void GLDevice::SetPolygonMode(PolygonMode mode)
+	{
+		if (m_StateCache.PolyMode == mode)
+		{
+			return;
+		}
+
+		GLenum glMode = GL_FILL;
+		switch (mode)
+		{
+		case PolygonMode::Fill:
+			glMode = GL_FILL;
+			break;
+		case PolygonMode::Line:
+			glMode = GL_LINE;
+			break;
+		case PolygonMode::Point:
+			glMode = GL_POINT;
+			break;
+		}
+		glPolygonMode(GL_FRONT_AND_BACK, glMode);
+		m_StateCache.PolyMode = mode;
+	}
+
+	void GLDevice::SetPolygonOffset(bool enabled, float factor, float units)
+	{
+		if (enabled)
+		{
+			glEnable(GL_POLYGON_OFFSET_FILL);
+			glEnable(GL_POLYGON_OFFSET_LINE);
+			glEnable(GL_POLYGON_OFFSET_POINT);
+			glPolygonOffset(factor, units);
+		}
+		else
+		{
+			glDisable(GL_POLYGON_OFFSET_FILL);
+			glDisable(GL_POLYGON_OFFSET_LINE);
+			glDisable(GL_POLYGON_OFFSET_POINT);
+		}
+	}
+
+	void GLDevice::DrawArrays(uint32_t vertexCount)
+	{
+		glDrawArrays(GL_TRIANGLES, 0, (GLsizei)vertexCount);
+	}
+
+	void GLDevice::DrawIndexedInstanced(const std::shared_ptr<VertexArray>& vertexArray, uint32_t instanceCount,
+										uint32_t indexCount)
+	{
+		vertexArray->Bind();
+		auto ib = vertexArray->GetIndexBuffer();
+		if (!ib)
+		{
+			return;
+		}
+		uint32_t count = indexCount ? indexCount : ib->GetCount();
+		glDrawElementsInstanced(GL_TRIANGLES, (GLsizei)count, GL_UNSIGNED_INT, nullptr, (GLsizei)instanceCount);
+	}
+
+	void GLDevice::DrawArraysInstanced(uint32_t vertexCount, uint32_t instanceCount)
+	{
+		glDrawArraysInstanced(GL_TRIANGLES, 0, (GLsizei)vertexCount, (GLsizei)instanceCount);
+	}
+
+	void GLDevice::SetTexture(uint32_t slot, uint32_t textureId, bool isCubemap)
+	{
+		auto it = m_StateCache.BoundTextures.find(slot);
+		if (it != m_StateCache.BoundTextures.end() && it->second == textureId)
+		{
+			return;
+		}
+
+		glActiveTexture(GL_TEXTURE0 + slot);
+		glBindTexture(isCubemap ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D, textureId);
+		m_StateCache.BoundTextures[slot] = textureId;
+	}
+
+	bool GLDevice::IsDepthTestEnabled() const
+	{
+		return m_StateCache.DepthTest;
+	}
+
+	bool GLDevice::IsDepthMaskEnabled() const
+	{
+		return m_StateCache.DepthMask;
+	}
+
+	bool GLDevice::IsBlendEnabled() const
+	{
+		return m_StateCache.Blend;
+	}
+
+	bool GLDevice::IsCullFaceEnabled() const
+	{
+		return m_StateCache.Cull != CullMode::None;
+	}
+
+	GraphicsDevice::PolygonMode GLDevice::GetPolygonMode() const
+	{
+		return m_StateCache.PolyMode;
+	}
+
+	uint32_t GLDevice::GetFramebufferBinding() const
+	{
+		GLint fbo = 0;
+		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
+		return static_cast<uint32_t>(fbo);
+	}
+
+	void GLDevice::BindFramebuffer(uint32_t fbo)
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	}
+
+	void GLDevice::ClearDepth()
+	{
+		glClear(GL_DEPTH_BUFFER_BIT);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_device.h b/engine/graphics/api/opengl/gl_device.h
new file mode 100644
index 000000000..8ee92896e
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_device.h
@@ -0,0 +1,78 @@
+#ifndef CH_GL_DEVICE_H
+#define CH_GL_DEVICE_H
+
+#include "engine/graphics/api/graphics_device.h"
+#include <unordered_map>
+
+namespace Chained
+{
+
+	class GLDevice : public GraphicsDevice
+	{
+	public:
+		virtual void Init() override;
+		virtual void Shutdown() override;
+		virtual void SetViewport(int x, int y, int width, int height) override;
+		virtual void GetViewport(int* x, int* y, int* width, int* height) const override;
+		virtual void SetClearColor(const Color& color) override;
+		virtual void Clear() override;
+		virtual void SetDepthFunc(DepthFunc func) override;
+		virtual void SetDepthTest(bool enabled) override;
+		virtual void SetDepthMask(bool enabled) override;
+
+		virtual void SetCullMode(CullMode mode) override;
+		virtual void SetBlendFunc(BlendFactor src, BlendFactor dst) override;
+		virtual void SetBlendEnabled(bool enabled) override;
+
+		virtual bool IsDepthTestEnabled() const override;
+		virtual bool IsDepthMaskEnabled() const override;
+		virtual bool IsBlendEnabled() const override;
+		virtual bool IsCullFaceEnabled() const override;
+		virtual PolygonMode GetPolygonMode() const override;
+
+		virtual void SetPolygonMode(PolygonMode mode) override;
+		virtual void SetPolygonOffset(bool enabled, float factor = 0.0f, float units = 0.0f) override;
+
+		virtual void SetLineWidth(float width) override;
+
+		// Framebuffer operations
+		virtual uint32_t GetFramebufferBinding() const override;
+		virtual void BindFramebuffer(uint32_t fbo) override;
+		virtual void ClearDepth() override;
+
+		virtual void DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount = 0) override;
+		virtual void DrawIndexedInstanced(const std::shared_ptr<VertexArray>& vertexArray, uint32_t instanceCount,
+										  uint32_t indexCount = 0) override;
+		virtual void DrawIndexedLines(const std::shared_ptr<VertexArray>& vertexArray,
+									  uint32_t indexCount = 0) override;
+		virtual void DrawLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t vertexCount) override;
+		virtual void DrawArrays(uint32_t vertexCount) override;
+		virtual void DrawArraysInstanced(uint32_t vertexCount, uint32_t instanceCount) override;
+
+		virtual void SetTexture(uint32_t slot, uint32_t textureId, bool isCubemap = false) override;
+
+	private:
+		float m_ClearColor[4] = {0.1f, 0.1f, 0.1f, 1.0f};
+
+		struct RendererStateCache
+		{
+			uint32_t ActiveShader = 0;
+			std::unordered_map<uint32_t, uint32_t> BoundTextures; // Slot -> TextureID
+
+			bool DepthTest = false;
+			bool DepthMask = true;
+			bool Blend = false;
+			CullMode Cull = CullMode::None;
+			PolygonMode PolyMode = PolygonMode::Fill;
+
+			int Viewport[4] = {0, 0, 800, 600};
+
+			DepthFunc DepthFunction = DepthFunc::Less;
+			BlendFactor SrcBlend = BlendFactor::One;
+			BlendFactor DstBlend = BlendFactor::Zero;
+		} m_StateCache;
+	};
+
+} // namespace Chained
+
+#endif // CH_GL_DEVICE_H
diff --git a/engine/graphics/api/opengl/gl_framebuffer.cpp b/engine/graphics/api/opengl/gl_framebuffer.cpp
new file mode 100644
index 000000000..e2f996c90
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_framebuffer.cpp
@@ -0,0 +1,260 @@
+#include "gl_framebuffer.h"
+#include "engine/graphics/api/graphics_device.h"
+
+#include <glad/gl.h>
+
+namespace Chained
+{
+	GLFramebuffer::GLFramebuffer(const FramebufferSpecification& spec)
+		: m_Specification(spec)
+	{
+		Invalidate();
+	}
+
+	GLFramebuffer::~GLFramebuffer()
+	{
+		uint32_t fbo = m_RendererID;
+		uint32_t color = m_ColorAttachment;
+		uint32_t depth = m_DepthAttachment;
+		uint32_t resolveFbo = m_ResolveFBO;
+		uint32_t resolveColor = m_ResolveColorAttachment;
+		uint32_t resolveDepth = m_ResolveDepthAttachment;
+
+		GraphicsDevice::EnqueueResourceDeletion([fbo, color, depth, resolveFbo, resolveColor, resolveDepth]() {
+			if (fbo)
+			{
+				glDeleteFramebuffers(1, &fbo);
+			}
+			if (color)
+			{
+				glDeleteTextures(1, &color);
+			}
+			if (depth)
+			{
+				glDeleteTextures(1, &depth);
+			}
+			if (resolveFbo)
+			{
+				glDeleteFramebuffers(1, &resolveFbo);
+			}
+			if (resolveColor)
+			{
+				glDeleteTextures(1, &resolveColor);
+			}
+			if (resolveDepth)
+			{
+				glDeleteTextures(1, &resolveDepth);
+			}
+		});
+	}
+
+	void GLFramebuffer::Invalidate()
+	{
+		GLint previousFBO = 0;
+		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &previousFBO);
+
+		if (m_RendererID)
+		{
+			glDeleteFramebuffers(1, &m_RendererID);
+			glDeleteTextures(1, &m_ColorAttachment);
+			glDeleteTextures(1, &m_DepthAttachment);
+			m_RendererID = 0;
+			m_ColorAttachment = 0;
+			m_DepthAttachment = 0;
+		}
+		if (m_ResolveFBO)
+		{
+			glDeleteFramebuffers(1, &m_ResolveFBO);
+			glDeleteTextures(1, &m_ResolveColorAttachment);
+			glDeleteTextures(1, &m_ResolveDepthAttachment);
+			m_ResolveFBO = 0;
+			m_ResolveColorAttachment = 0;
+			m_ResolveDepthAttachment = 0;
+		}
+
+		m_IsComplete = false;
+
+		if (m_Specification.Width == 0 || m_Specification.Height == 0)
+		{
+			glBindFramebuffer(GL_FRAMEBUFFER, previousFBO);
+			return;
+		}
+
+		// DepthOnly (shadow map) framebuffers are never multisampled - sample-shadow lookups
+		// need a single-sample sampler2D/sampler2DShadow.
+		GLint maxSamples = 1;
+		glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
+		uint32_t clampedMsaaSampleCount =
+			m_Specification.DepthOnly ? 1 : std::min<uint32_t>(m_Specification.Samples, (uint32_t)maxSamples);
+		bool multisampled = clampedMsaaSampleCount > 1;
+
+		glGenFramebuffers(1, &m_RendererID);
+		glBindFramebuffer(GL_FRAMEBUFFER, m_RendererID);
+
+		GLenum internalFormat = GL_RGBA8;
+		GLenum dataType = GL_UNSIGNED_BYTE;
+		if (m_Specification.ColorFormat == FramebufferColorFormat::RGBA16F)
+		{
+			internalFormat = GL_RGBA16F;
+			dataType = GL_FLOAT;
+		}
+
+		if (m_Specification.DepthOnly)
+		{
+			// ── Depth-only path (shadow map) ────────────────────────────────
+			// No color attachment; depth is written to a sampable 2D texture.
+			glGenTextures(1, &m_DepthAttachment);
+			glBindTexture(GL_TEXTURE_2D, m_DepthAttachment);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, m_Specification.Width, m_Specification.Height, 0,
+						 GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+			// Clamp-to-border with depth=1 so fragments outside the light frustum are NOT in shadow.
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+			float border[] = {1.0f, 1.0f, 1.0f, 1.0f};
+			glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border);
+
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_DepthAttachment, 0);
+
+			// No color buffer
+			glDrawBuffer(GL_NONE);
+			glReadBuffer(GL_NONE);
+		}
+		else
+		{
+			if (multisampled)
+			{
+				// ── Multisample color + depth path ──────────────────────────
+				GLenum target = GL_TEXTURE_2D_MULTISAMPLE;
+
+				glGenTextures(1, &m_ColorAttachment);
+				glBindTexture(target, m_ColorAttachment);
+				glTexImage2DMultisample(target, clampedMsaaSampleCount, internalFormat, m_Specification.Width,
+										m_Specification.Height, GL_TRUE);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, m_ColorAttachment, 0);
+
+				glGenTextures(1, &m_DepthAttachment);
+				glBindTexture(target, m_DepthAttachment);
+				glTexImage2DMultisample(target, clampedMsaaSampleCount, GL_DEPTH24_STENCIL8, m_Specification.Width,
+										m_Specification.Height, GL_TRUE);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, target, m_DepthAttachment, 0);
+			}
+			else
+			{
+				// ── Standard color + depth path ─────────────────────────────────
+				// Color Attachment
+				glGenTextures(1, &m_ColorAttachment);
+				glBindTexture(GL_TEXTURE_2D, m_ColorAttachment);
+				glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, m_Specification.Width, m_Specification.Height, 0,
+							 GL_RGBA, dataType, nullptr);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_ColorAttachment, 0);
+
+				// Depth Attachment
+				glGenTextures(1, &m_DepthAttachment);
+				glBindTexture(GL_TEXTURE_2D, m_DepthAttachment);
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_Specification.Width, m_Specification.Height, 0,
+							 GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_DepthAttachment,
+									   0);
+			}
+		}
+
+		GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+		if (status != GL_FRAMEBUFFER_COMPLETE)
+		{
+			CH_CORE_ERROR("Framebuffer is incomplete! Status: 0x{0:X}, Width: {1}, Height: {2}", status,
+						  m_Specification.Width, m_Specification.Height);
+			// Do NOT assert here — a non-complete FBO should degrade gracefully, not crash the editor.
+		}
+		else
+		{
+			m_IsComplete = true;
+		}
+
+		// Multisample attachments can't be sampled with sampler2D - build a same-size single-sample
+		// resolve target that Resolve() blits into, so callers keep reading a plain 2D texture.
+		if (multisampled && m_IsComplete)
+		{
+			glGenFramebuffers(1, &m_ResolveFBO);
+			glBindFramebuffer(GL_FRAMEBUFFER, m_ResolveFBO);
+
+			glGenTextures(1, &m_ResolveColorAttachment);
+			glBindTexture(GL_TEXTURE_2D, m_ResolveColorAttachment);
+			glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, m_Specification.Width, m_Specification.Height, 0, GL_RGBA,
+						 dataType, nullptr);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_ResolveColorAttachment, 0);
+
+			glGenTextures(1, &m_ResolveDepthAttachment);
+			glBindTexture(GL_TEXTURE_2D, m_ResolveDepthAttachment);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_Specification.Width, m_Specification.Height, 0,
+						 GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_ResolveDepthAttachment,
+								   0);
+
+			GLenum resolveStatus = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+			if (resolveStatus != GL_FRAMEBUFFER_COMPLETE)
+			{
+				CH_CORE_ERROR("MSAA resolve framebuffer is incomplete! Status: 0x{0:X}", resolveStatus);
+			}
+		}
+
+		if (m_IsComplete)
+		{
+			m_ColorTexture =
+				Texture::WrapNative(m_Specification.Samples > 1 ? m_ResolveColorAttachment : m_ColorAttachment,
+									m_Specification.Width, m_Specification.Height);
+			m_DepthTexture =
+				Texture::WrapNative(m_Specification.Samples > 1 ? m_ResolveDepthAttachment : m_DepthAttachment,
+									m_Specification.Width, m_Specification.Height);
+		}
+
+		glBindFramebuffer(GL_FRAMEBUFFER, previousFBO);
+	}
+
+	void GLFramebuffer::Bind()
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, m_RendererID);
+		glViewport(0, 0, m_Specification.Width, m_Specification.Height);
+	}
+
+	void GLFramebuffer::Unbind()
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	}
+
+	void GLFramebuffer::Resolve()
+	{
+		if (m_Specification.Samples <= 1 || !m_ResolveFBO || !m_IsComplete)
+		{
+			return;
+		}
+
+		GLint previousFBO = 0;
+		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &previousFBO);
+
+		glBindFramebuffer(GL_READ_FRAMEBUFFER, m_RendererID);
+		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_ResolveFBO);
+		glBlitFramebuffer(0, 0, m_Specification.Width, m_Specification.Height, 0, 0, m_Specification.Width,
+						  m_Specification.Height, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,
+						  GL_NEAREST);
+
+		glBindFramebuffer(GL_FRAMEBUFFER, previousFBO);
+	}
+
+	void GLFramebuffer::Resize(uint32_t width, uint32_t height)
+	{
+		if (width == 0 || height == 0 || width > 8192 || height > 8192)
+		{
+			return;
+		}
+		m_Specification.Width = width;
+		m_Specification.Height = height;
+		Invalidate();
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_framebuffer.h b/engine/graphics/api/opengl/gl_framebuffer.h
new file mode 100644
index 000000000..f0c052820
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_framebuffer.h
@@ -0,0 +1,75 @@
+#ifndef CH_OPENGL_FRAMEBUFFER_H
+#define CH_OPENGL_FRAMEBUFFER_H
+
+#include "engine/graphics/api/framebuffer.h"
+
+namespace Chained
+{
+	class GLFramebuffer : public Framebuffer
+	{
+	public:
+		GLFramebuffer(const FramebufferSpecification& spec);
+		virtual ~GLFramebuffer();
+
+		void Invalidate();
+
+		virtual void Bind() override;
+		virtual void Unbind() override;
+
+		virtual void Resize(uint32_t width, uint32_t height) override;
+		virtual void Resolve() override;
+
+		virtual std::shared_ptr<Texture> GetColorAttachment() const override
+		{
+			return m_ColorTexture;
+		}
+		virtual uint32_t GetColorAttachmentRendererID() const override
+		{
+			return m_Specification.Samples > 1 ? m_ResolveColorAttachment : m_ColorAttachment;
+		}
+
+		virtual std::shared_ptr<Texture> GetDepthAttachment() const override
+		{
+			return m_DepthTexture;
+		}
+		virtual uint32_t GetDepthAttachmentRendererID() const override
+		{
+			return m_Specification.Samples > 1 ? m_ResolveDepthAttachment : m_DepthAttachment;
+		}
+
+		virtual const FramebufferSpecification& GetSpecification() const override
+		{
+			return m_Specification;
+		}
+
+		virtual void* GetNativeFramebuffer() override
+		{
+			return (void*)(uintptr_t)m_RendererID;
+		}
+
+		virtual bool IsValid() const override
+		{
+			return m_RendererID != 0 && m_IsComplete;
+		}
+
+	private:
+		uint32_t m_RendererID = 0;
+		uint32_t m_ColorAttachment = 0;
+		uint32_t m_DepthAttachment = 0;
+
+		// Only used when m_Specification.Samples > 1: a same-size single-sample FBO that
+		// Resolve() blits the multisample attachments into, so downstream code can keep
+		// sampling a plain sampler2D regardless of whether MSAA is on.
+		uint32_t m_ResolveFBO = 0;
+		uint32_t m_ResolveColorAttachment = 0;
+		uint32_t m_ResolveDepthAttachment = 0;
+
+		std::shared_ptr<Texture> m_ColorTexture;
+		std::shared_ptr<Texture> m_DepthTexture;
+
+		FramebufferSpecification m_Specification;
+		bool m_IsComplete = false;
+	};
+} // namespace Chained
+
+#endif // CH_OPENGL_FRAMEBUFFER_H
diff --git a/engine/graphics/api/opengl/gl_shader_program.cpp b/engine/graphics/api/opengl/gl_shader_program.cpp
new file mode 100644
index 000000000..b023cc56b
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_shader_program.cpp
@@ -0,0 +1,176 @@
+#include "gl_shader_program.h"
+#include "engine/graphics/api/graphics_device.h"
+
+#include <glad/gl.h>
+
+namespace Chained
+{
+
+	GLShaderProgram::GLShaderProgram(const std::string& vsSource, const std::string& fsSource)
+	{
+		auto compileShader = [](GLenum type, const char* source) -> uint32_t {
+			uint32_t shader = glCreateShader(type);
+			glShaderSource(shader, 1, &source, nullptr);
+			glCompileShader(shader);
+
+			int success;
+			glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
+			if (!success)
+			{
+				int maxLength = 0;
+				glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &maxLength);
+				std::vector<char> infoLog(maxLength);
+				glGetShaderInfoLog(shader, maxLength, &maxLength, &infoLog[0]);
+
+				CH_CORE_ERROR("[Shader] {} Compilation Error:\n{}", (type == GL_VERTEX_SHADER ? "Vertex" : "Fragment"),
+							  infoLog.data());
+
+				glDeleteShader(shader);
+				return 0;
+			}
+			return shader;
+		};
+
+		uint32_t vs = compileShader(GL_VERTEX_SHADER, vsSource.c_str());
+		uint32_t fs = compileShader(GL_FRAGMENT_SHADER, fsSource.c_str());
+
+		if (vs == 0 || fs == 0)
+		{
+			if (vs)
+			{
+				glDeleteShader(vs);
+			}
+			if (fs)
+			{
+				glDeleteShader(fs);
+			}
+			return;
+		}
+
+		m_RendererID = glCreateProgram();
+		glAttachShader(m_RendererID, vs);
+		glAttachShader(m_RendererID, fs);
+		glLinkProgram(m_RendererID);
+
+		int success;
+		glGetProgramiv(m_RendererID, GL_LINK_STATUS, &success);
+		if (!success)
+		{
+			int maxLength = 0;
+			glGetProgramiv(m_RendererID, GL_INFO_LOG_LENGTH, &maxLength);
+			std::vector<char> infoLog(maxLength);
+			glGetProgramInfoLog(m_RendererID, maxLength, &maxLength, &infoLog[0]);
+
+			CH_CORE_ERROR("[Shader] Linking Error:\n{}", infoLog.data());
+
+			glDeleteProgram(m_RendererID);
+			m_RendererID = 0;
+			return;
+		}
+
+		glDeleteShader(vs);
+		glDeleteShader(fs);
+	}
+
+	GLShaderProgram::~GLShaderProgram()
+	{
+		if (m_RendererID > 0)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteProgram(id); });
+		}
+	}
+
+	void GLShaderProgram::Bind() const
+	{
+		glUseProgram(m_RendererID);
+	}
+
+	void GLShaderProgram::Unbind() const
+	{
+		glUseProgram(0);
+	}
+
+	int GLShaderProgram::GetLocation(const std::string& name)
+	{
+		auto it = m_UniformCache.find(name);
+		if (it != m_UniformCache.end())
+		{
+			return it->second;
+		}
+
+		int location = glGetUniformLocation(m_RendererID, name.c_str());
+		m_UniformCache[name] = location;
+		return location;
+	}
+
+	void GLShaderProgram::SetFloat(const std::string& name, float value)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniform1f(m_RendererID, location, value);
+		}
+	}
+
+	void GLShaderProgram::SetInt(const std::string& name, int value)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniform1i(m_RendererID, location, value);
+		}
+	}
+
+	void GLShaderProgram::SetVec2(const std::string& name, const glm::vec2& value)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniform2fv(m_RendererID, location, 1, glm::value_ptr(value));
+		}
+	}
+
+	void GLShaderProgram::SetVec3(const std::string& name, const glm::vec3& value)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniform3fv(m_RendererID, location, 1, glm::value_ptr(value));
+		}
+	}
+
+	void GLShaderProgram::SetVec4(const std::string& name, const glm::vec4& value)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniform4fv(m_RendererID, location, 1, glm::value_ptr(value));
+		}
+	}
+
+	void GLShaderProgram::SetColor(const std::string& name, const Color& value)
+	{
+		glm::vec4 c(value.r / 255.0f, value.g / 255.0f, value.b / 255.0f, value.a / 255.0f);
+		SetVec4(name, c);
+	}
+
+	void GLShaderProgram::SetMatrix(const std::string& name, const glm::mat4& value)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniformMatrix4fv(m_RendererID, location, 1, GL_FALSE, glm::value_ptr(value));
+		}
+	}
+
+	void GLShaderProgram::SetMatrices(const std::string& name, const glm::mat4* values, int count)
+	{
+		int location = GetLocation(name);
+		if (location >= 0)
+		{
+			glProgramUniformMatrix4fv(m_RendererID, location, count, GL_FALSE, glm::value_ptr(values[0]));
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_shader_program.h b/engine/graphics/api/opengl/gl_shader_program.h
new file mode 100644
index 000000000..dc069d334
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_shader_program.h
@@ -0,0 +1,43 @@
+#ifndef CH_OPENGL_SHADER_H
+#define CH_OPENGL_SHADER_H
+
+#include "engine/graphics/api/shader.h"
+#include <unordered_map>
+
+namespace Chained
+{
+
+	class GLShaderProgram : public Shader
+	{
+	public:
+		GLShaderProgram(const std::string& vsSource, const std::string& fsSource);
+		virtual ~GLShaderProgram();
+
+		virtual void Bind() const override;
+		virtual void Unbind() const override;
+
+		virtual uint32_t GetNativeHandle() const override
+		{
+			return m_RendererID;
+		}
+
+		virtual void SetFloat(const std::string& name, float value) override;
+		virtual void SetInt(const std::string& name, int value) override;
+		virtual void SetVec2(const std::string& name, const glm::vec2& value) override;
+		virtual void SetVec3(const std::string& name, const glm::vec3& value) override;
+		virtual void SetVec4(const std::string& name, const glm::vec4& value) override;
+		virtual void SetColor(const std::string& name, const Color& value) override;
+		virtual void SetMatrix(const std::string& name, const glm::mat4& value) override;
+		virtual void SetMatrices(const std::string& name, const glm::mat4* values, int count) override;
+
+	private:
+		int GetLocation(const std::string& name);
+
+	private:
+		uint32_t m_RendererID = 0;
+		std::unordered_map<std::string, int> m_UniformCache;
+	};
+
+} // namespace Chained
+
+#endif // CH_OPENGL_SHADER_H
diff --git a/engine/graphics/api/opengl/gl_storage_buffer.cpp b/engine/graphics/api/opengl/gl_storage_buffer.cpp
new file mode 100644
index 000000000..d7cd16d75
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_storage_buffer.cpp
@@ -0,0 +1,35 @@
+#include "gl_storage_buffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include <glad/gl.h>
+
+namespace Chained
+{
+	GLStorageBuffer::GLStorageBuffer(uint32_t size)
+	{
+		glGenBuffers(1, &m_RendererID);
+		glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_RendererID);
+		glBufferData(GL_SHADER_STORAGE_BUFFER, size, nullptr, GL_DYNAMIC_DRAW);
+		glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+	}
+
+	GLStorageBuffer::~GLStorageBuffer()
+	{
+		if (m_RendererID)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteBuffers(1, &id); });
+		}
+	}
+
+	void GLStorageBuffer::BindBase(uint32_t slot) const
+	{
+		glBindBufferBase(GL_SHADER_STORAGE_BUFFER, slot, m_RendererID);
+	}
+
+	void GLStorageBuffer::SetData(const void* data, uint32_t size, uint32_t offset)
+	{
+		glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_RendererID);
+		glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, size, data);
+		glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+	}
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_storage_buffer.h b/engine/graphics/api/opengl/gl_storage_buffer.h
new file mode 100644
index 000000000..7a19e713e
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_storage_buffer.h
@@ -0,0 +1,22 @@
+#ifndef CH_OPENGL_STORAGE_BUFFER_H
+#define CH_OPENGL_STORAGE_BUFFER_H
+
+#include "engine/graphics/api/storage_buffer.h"
+
+namespace Chained
+{
+	class GLStorageBuffer : public StorageBuffer
+	{
+	public:
+		GLStorageBuffer(uint32_t size);
+		virtual ~GLStorageBuffer();
+
+		virtual void BindBase(uint32_t slot) const override;
+		virtual void SetData(const void* data, uint32_t size, uint32_t offset = 0) override;
+
+	private:
+		uint32_t m_RendererID = 0;
+	};
+} // namespace Chained
+
+#endif // CH_OPENGL_STORAGE_BUFFER_H
diff --git a/engine/graphics/api/opengl/gl_texture.cpp b/engine/graphics/api/opengl/gl_texture.cpp
new file mode 100644
index 000000000..588a4c7dd
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_texture.cpp
@@ -0,0 +1,234 @@
+#include "gl_texture.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "engine/core/log.h"
+#include <stb_image.h>
+
+namespace Chained
+{
+
+	static uint32_t CalculateMipLevels(uint32_t width, uint32_t height)
+	{
+		return static_cast<uint32_t>(1 + std::floor(std::log2(std::max(width, height))));
+	}
+
+	GLTexture::GLTexture(uint32_t width, uint32_t height, TextureFormat format)
+		: m_Width(width),
+		  m_Height(height),
+		  m_Format(format),
+		  m_Type(TextureType::Texture2D)
+	{
+		m_InternalFormat = GL_RGBA8;
+		m_DataFormat = GL_RGBA;
+
+		switch (format)
+		{
+		case TextureFormat::RGB8:
+			m_InternalFormat = GL_RGB8;
+			m_DataFormat = GL_RGB;
+			break;
+		case TextureFormat::RGBA8:
+			m_InternalFormat = GL_RGBA8;
+			m_DataFormat = GL_RGBA;
+			break;
+		case TextureFormat::RGB16F:
+			m_InternalFormat = GL_RGB16F;
+			m_DataFormat = GL_RGB;
+			break;
+		case TextureFormat::RGBA16F:
+			m_InternalFormat = GL_RGBA16F;
+			m_DataFormat = GL_RGBA;
+			break;
+		}
+
+		glGenTextures(1, &m_RendererID);
+		glBindTexture(GL_TEXTURE_2D, m_RendererID);
+
+		uint32_t mipLevels = CalculateMipLevels(m_Width, m_Height);
+		glTexStorage2D(GL_TEXTURE_2D, mipLevels, m_InternalFormat, m_Width, m_Height);
+
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+		m_IsReady = true;
+	}
+
+	GLTexture::GLTexture(uint32_t size, TextureFormat format)
+		: m_Width(size),
+		  m_Height(size),
+		  m_Format(format),
+		  m_Type(TextureType::Cubemap)
+	{
+		m_InternalFormat = GL_RGB16F;
+		m_DataFormat = GL_RGB;
+
+		switch (format)
+		{
+		case TextureFormat::RGB16F:
+			m_InternalFormat = GL_RGB16F;
+			m_DataFormat = GL_RGB;
+			break;
+		case TextureFormat::RGBA16F:
+			m_InternalFormat = GL_RGBA16F;
+			m_DataFormat = GL_RGBA;
+			break;
+		}
+
+		glGenTextures(1, &m_RendererID);
+		glBindTexture(GL_TEXTURE_CUBE_MAP, m_RendererID);
+
+		for (uint32_t i = 0; i < 6; ++i)
+		{
+			glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, m_InternalFormat, m_Width, m_Height, 0, m_DataFormat,
+						 GL_FLOAT, nullptr);
+		}
+
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+		m_IsReady = true;
+	}
+
+	GLTexture::GLTexture(uint32_t handle, uint32_t width, uint32_t height, TextureType type, bool ownsResource)
+		: m_RendererID(handle),
+		  m_Width(width),
+		  m_Height(height),
+		  m_Format(TextureFormat::RGBA8),
+		  m_Type(type),
+		  m_IsReady(true),
+		  m_OwnsResource(ownsResource)
+	{
+		m_InternalFormat = GL_RGBA8;
+		m_DataFormat = GL_RGBA;
+	}
+
+	GLTexture::~GLTexture()
+	{
+		if (m_OwnsResource && m_RendererID)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteTextures(1, &id); });
+		}
+	}
+
+	void GLTexture::SetData(void* data, uint32_t size)
+	{
+		GLenum dataType =
+			(m_Format == TextureFormat::RGB16F || m_Format == TextureFormat::RGBA16F) ? GL_FLOAT : GL_UNSIGNED_BYTE;
+
+		if (m_Type == TextureType::Cubemap)
+		{
+			// bpp = bytes per pixel: float formats use 4 bytes per component, byte formats use 1.
+			uint32_t bytesPerComponent =
+				(m_Format == TextureFormat::RGB16F || m_Format == TextureFormat::RGBA16F) ? sizeof(float) : 1;
+			uint32_t channels = (m_DataFormat == GL_RGBA) ? 4 : 3;
+			uint32_t faceSize = m_Width * m_Height * channels * bytesPerComponent;
+			uint8_t* ptr = static_cast<uint8_t*>(data);
+			glBindTexture(GL_TEXTURE_CUBE_MAP, m_RendererID);
+			for (uint32_t i = 0; i < 6; ++i)
+			{
+				glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, 0, 0, m_Width, m_Height, m_DataFormat, dataType,
+								ptr + i * faceSize);
+			}
+			glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
+		}
+		else
+		{
+			glBindTexture(GL_TEXTURE_2D, m_RendererID);
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_Width, m_Height, m_DataFormat, dataType, data);
+			glGenerateMipmap(GL_TEXTURE_2D);
+		}
+	}
+
+	void GLTexture::Bind(uint32_t slot) const
+	{
+		glActiveTexture(GL_TEXTURE0 + slot);
+		glBindTexture(m_Type == TextureType::Cubemap ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D, m_RendererID);
+	}
+
+	std::shared_ptr<Texture> Texture::CreateCubemapFromFiles(const std::string faces[6])
+	{
+		if (GraphicsDevice::GetAPI() != GraphicsDevice::API::OpenGL)
+		{
+			return nullptr;
+		}
+
+		uint32_t textureID = 0;
+		glGenTextures(1, &textureID);
+		glBindTexture(GL_TEXTURE_CUBE_MAP, textureID);
+
+		stbi_set_flip_vertically_on_load(false);
+
+		int width = 0, height = 0;
+		auto* assetManager = ServiceLocator::TryGet<AssetManager>();
+
+		for (uint32_t i = 0; i < 6; ++i)
+		{
+			std::string resolvedPath = faces[i];
+			if (assetManager && !resolvedPath.empty())
+			{
+				resolvedPath = assetManager->ResolvePath(resolvedPath);
+			}
+
+			int w = 0, h = 0, channels = 0;
+			unsigned char* data = nullptr;
+
+			if (!resolvedPath.empty())
+			{
+				if (assetManager && assetManager->IsPacked())
+				{
+					auto fileData = assetManager->ReadAssetData(faces[i]);
+					if (!fileData.empty())
+					{
+						data = stbi_load_from_memory(fileData.data(), (int)fileData.size(), &w, &h, &channels, 4);
+						channels = 4;
+					}
+				}
+				else
+				{
+					data = stbi_load(resolvedPath.c_str(), &w, &h, &channels, 4);
+					channels = 4;
+				}
+			}
+
+			if (data)
+			{
+				glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGBA8, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+				stbi_image_free(data);
+				if (width == 0)
+				{
+					width = w;
+					height = h;
+				}
+			}
+			else
+			{
+				CH_CORE_WARN("GLTexture: Cubemap face {} failed to load: {}", i, faces[i]);
+				uint32_t black = 0xFF000000;
+				glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+							 &black);
+				if (width == 0)
+				{
+					width = 1;
+					height = 1;
+				}
+			}
+		}
+
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+		glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
+
+		return std::make_shared<GLTexture>(textureID, (uint32_t)width, (uint32_t)height, TextureType::Cubemap, true);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_texture.h b/engine/graphics/api/opengl/gl_texture.h
new file mode 100644
index 000000000..27851dc9e
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_texture.h
@@ -0,0 +1,57 @@
+#ifndef CH_OPENGL_TEXTURE_H
+#define CH_OPENGL_TEXTURE_H
+
+#include "engine/graphics/api/texture.h"
+#include <glad/gl.h>
+
+namespace Chained
+{
+
+	class GLTexture : public Texture
+	{
+	public:
+		GLTexture(uint32_t width, uint32_t height, TextureFormat format);
+		GLTexture(uint32_t size, TextureFormat format); // Cubemap constructor
+		GLTexture(uint32_t handle, uint32_t width, uint32_t height, TextureType type = TextureType::Texture2D,
+				  bool ownsResource = false);
+		virtual ~GLTexture();
+
+		virtual uint32_t GetWidth() const override
+		{
+			return m_Width;
+		}
+		virtual uint32_t GetHeight() const override
+		{
+			return m_Height;
+		}
+		virtual uint32_t GetNativeHandle() const override
+		{
+			return m_RendererID;
+		}
+
+		virtual void SetData(void* data, uint32_t size) override;
+		virtual void Bind(uint32_t slot = 0) const override;
+
+		virtual bool IsReady() const override
+		{
+			return m_IsReady;
+		}
+		virtual TextureType GetType() const override
+		{
+			return m_Type;
+		}
+
+	private:
+		uint32_t m_RendererID = 0;
+		uint32_t m_Width, m_Height;
+		TextureFormat m_Format;
+		TextureType m_Type;
+		bool m_IsReady = false;
+		bool m_OwnsResource = true;
+
+		GLenum m_InternalFormat, m_DataFormat;
+	};
+
+} // namespace Chained
+
+#endif // CH_OPENGL_TEXTURE_H
diff --git a/engine/graphics/api/opengl/gl_uniform_buffer.cpp b/engine/graphics/api/opengl/gl_uniform_buffer.cpp
new file mode 100644
index 000000000..50fd958d9
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_uniform_buffer.cpp
@@ -0,0 +1,35 @@
+#include "gl_uniform_buffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include <glad/gl.h>
+
+namespace Chained
+{
+	GLUniformBuffer::GLUniformBuffer(uint32_t size, uint32_t binding)
+	{
+		glGenBuffers(1, &m_RendererID);
+		glBindBuffer(GL_UNIFORM_BUFFER, m_RendererID);
+		glBufferData(GL_UNIFORM_BUFFER, size, nullptr, GL_DYNAMIC_DRAW);
+		glBindBufferBase(GL_UNIFORM_BUFFER, binding, m_RendererID);
+		glBindBuffer(GL_UNIFORM_BUFFER, 0);
+	}
+
+	GLUniformBuffer::~GLUniformBuffer()
+	{
+		if (m_RendererID)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteBuffers(1, &id); });
+		}
+	}
+
+	void GLUniformBuffer::SetData(const void* data, uint32_t size, uint32_t offset)
+	{
+		glBindBuffer(GL_UNIFORM_BUFFER, m_RendererID);
+		glBufferSubData(GL_UNIFORM_BUFFER, offset, size, data);
+	}
+
+	void GLUniformBuffer::BindBase(uint32_t binding)
+	{
+		glBindBufferBase(GL_UNIFORM_BUFFER, binding, m_RendererID);
+	}
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_uniform_buffer.h b/engine/graphics/api/opengl/gl_uniform_buffer.h
new file mode 100644
index 000000000..ad908fe5f
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_uniform_buffer.h
@@ -0,0 +1,22 @@
+#ifndef CH_OPENGL_UNIFORM_BUFFER_H
+#define CH_OPENGL_UNIFORM_BUFFER_H
+
+#include "engine/graphics/api/buffer.h"
+
+namespace Chained
+{
+	class GLUniformBuffer : public UniformBuffer
+	{
+	public:
+		GLUniformBuffer(uint32_t size, uint32_t binding);
+		virtual ~GLUniformBuffer();
+
+		virtual void SetData(const void* data, uint32_t size, uint32_t offset = 0) override;
+		virtual void BindBase(uint32_t binding) override;
+
+	private:
+		uint32_t m_RendererID = 0;
+	};
+} // namespace Chained
+
+#endif // CH_OPENGL_UNIFORM_BUFFER_H
diff --git a/engine/graphics/api/opengl/gl_vertex_array.cpp b/engine/graphics/api/opengl/gl_vertex_array.cpp
new file mode 100644
index 000000000..fb8834ee2
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_vertex_array.cpp
@@ -0,0 +1,149 @@
+#include "gl_vertex_array.h"
+#include "engine/graphics/api/graphics_device.h"
+#include <glad/gl.h>
+
+namespace Chained
+{
+
+	static uint32_t VertexAttributeTypeToOpenGLBaseType(VertexAttributeType type)
+	{
+		switch (type)
+		{
+		case VertexAttributeType::Float:
+			return GL_FLOAT;
+		case VertexAttributeType::Float2:
+			return GL_FLOAT;
+		case VertexAttributeType::Float3:
+			return GL_FLOAT;
+		case VertexAttributeType::Float4:
+			return GL_FLOAT;
+		case VertexAttributeType::Mat3:
+			return GL_FLOAT;
+		case VertexAttributeType::Mat4:
+			return GL_FLOAT;
+		case VertexAttributeType::Int:
+			return GL_INT;
+		case VertexAttributeType::Int2:
+			return GL_INT;
+		case VertexAttributeType::Int3:
+			return GL_INT;
+		case VertexAttributeType::Int4:
+			return GL_INT;
+		case VertexAttributeType::Bool:
+			return GL_UNSIGNED_BYTE;
+		}
+
+		CH_CORE_ASSERT(false, "Unknown VertexAttributeType!");
+		return 0;
+	}
+
+	GLVertexArray::GLVertexArray()
+	{
+		glGenVertexArrays(1, &m_RendererID);
+	}
+
+	GLVertexArray::~GLVertexArray()
+	{
+		if (m_RendererID)
+		{
+			uint32_t id = m_RendererID;
+			GraphicsDevice::EnqueueResourceDeletion([id]() { glDeleteVertexArrays(1, &id); });
+		}
+	}
+
+	void GLVertexArray::Bind() const
+	{
+		glBindVertexArray(m_RendererID);
+	}
+
+	void GLVertexArray::Unbind() const
+	{
+		glBindVertexArray(0);
+	}
+
+	void GLVertexArray::AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertexBuffer)
+	{
+		CH_CORE_ASSERT(vertexBuffer->GetLayout().GetElements().size(), "Vertex Buffer has no layout!");
+
+		glBindVertexArray(m_RendererID);
+		vertexBuffer->Bind();
+
+		const auto& layout = vertexBuffer->GetLayout();
+		for (const auto& element : layout)
+		{
+			uint32_t count = element.GetComponentCount();
+			VertexAttributeType type = element.Type;
+
+			if (type == VertexAttributeType::Mat4)
+			{
+				for (uint32_t i = 0; i < 4; i++)
+				{
+					uint32_t index = m_AttributeIndex++;
+					glEnableVertexAttribArray(index);
+					glVertexAttribPointer(index, 4, VertexAttributeTypeToOpenGLBaseType(type),
+										  element.Normalized ? GL_TRUE : GL_FALSE, layout.GetStride(),
+										  (const void*)(element.Offset + sizeof(glm::vec4) * i));
+
+					if (element.Instanced)
+					{
+						glVertexAttribDivisor(index, 1);
+					}
+				}
+			}
+			else if (type == VertexAttributeType::Mat3)
+			{
+				for (uint32_t i = 0; i < 3; i++)
+				{
+					uint32_t index = m_AttributeIndex++;
+					glEnableVertexAttribArray(index);
+					glVertexAttribPointer(index, 3, VertexAttributeTypeToOpenGLBaseType(type),
+										  element.Normalized ? GL_TRUE : GL_FALSE, layout.GetStride(),
+										  (const void*)(element.Offset + sizeof(glm::vec3) * i));
+
+					if (element.Instanced)
+					{
+						glVertexAttribDivisor(index, 1);
+					}
+				}
+			}
+			else if (type == VertexAttributeType::Int || type == VertexAttributeType::Int2 ||
+					 type == VertexAttributeType::Int3 || type == VertexAttributeType::Int4 ||
+					 type == VertexAttributeType::Bool)
+			{
+				uint32_t index = m_AttributeIndex++;
+				glEnableVertexAttribArray(index);
+				glVertexAttribIPointer(index, count, VertexAttributeTypeToOpenGLBaseType(type), layout.GetStride(),
+									   (const void*)element.Offset);
+
+				if (element.Instanced)
+				{
+					glVertexAttribDivisor(index, 1);
+				}
+			}
+			else
+			{
+				uint32_t index = m_AttributeIndex++;
+				glEnableVertexAttribArray(index);
+				glVertexAttribPointer(index, count, VertexAttributeTypeToOpenGLBaseType(type),
+									  element.Normalized ? GL_TRUE : GL_FALSE, layout.GetStride(),
+									  (const void*)element.Offset);
+
+				if (element.Instanced)
+				{
+					glVertexAttribDivisor(index, 1);
+				}
+			}
+		}
+
+		m_VertexBuffers.push_back(vertexBuffer);
+	}
+
+	void GLVertexArray::SetIndexBuffer(const std::shared_ptr<IndexBuffer>& indexBuffer)
+	{
+		glBindVertexArray(m_RendererID);
+		indexBuffer->Bind();
+
+		m_IndexBuffer = indexBuffer;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/opengl/gl_vertex_array.h b/engine/graphics/api/opengl/gl_vertex_array.h
new file mode 100644
index 000000000..4f54b0804
--- /dev/null
+++ b/engine/graphics/api/opengl/gl_vertex_array.h
@@ -0,0 +1,39 @@
+#ifndef CH_OPENGL_VERTEX_ARRAY_H
+#define CH_OPENGL_VERTEX_ARRAY_H
+
+#include "engine/graphics/api/vertex_array.h"
+
+namespace Chained
+{
+
+	class GLVertexArray : public VertexArray
+	{
+	public:
+		GLVertexArray();
+		virtual ~GLVertexArray();
+
+		virtual void Bind() const override;
+		virtual void Unbind() const override;
+
+		virtual void AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertexBuffer) override;
+		virtual void SetIndexBuffer(const std::shared_ptr<IndexBuffer>& indexBuffer) override;
+
+		virtual const std::vector<std::shared_ptr<VertexBuffer>>& GetVertexBuffers() const override
+		{
+			return m_VertexBuffers;
+		}
+		virtual const std::shared_ptr<IndexBuffer>& GetIndexBuffer() const override
+		{
+			return m_IndexBuffer;
+		}
+
+	private:
+		uint32_t m_RendererID;
+		uint32_t m_AttributeIndex = 0;
+		std::vector<std::shared_ptr<VertexBuffer>> m_VertexBuffers;
+		std::shared_ptr<IndexBuffer> m_IndexBuffer;
+	};
+
+} // namespace Chained
+
+#endif // CH_OPENGL_VERTEX_ARRAY_H
diff --git a/engine/graphics/api/opengl/opengl_buffer.cpp b/engine/graphics/api/opengl/opengl_buffer.cpp
deleted file mode 100644
index 661bf674e..000000000
--- a/engine/graphics/api/opengl/opengl_buffer.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "opengl_buffer.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-
-// VertexBuffer ///////////////////////////////////////////////////////////
-
-OpenGLVertexBuffer::OpenGLVertexBuffer(uint32_t size)
-{
-    glGenBuffers(1, &m_RendererID);
-    glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
-    glBufferData(GL_ARRAY_BUFFER, size, nullptr, GL_DYNAMIC_DRAW);
-}
-
-OpenGLVertexBuffer::OpenGLVertexBuffer(const float* vertices, uint32_t size)
-{
-    glGenBuffers(1, &m_RendererID);
-    glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
-    glBufferData(GL_ARRAY_BUFFER, size, vertices, GL_STATIC_DRAW);
-}
-
-OpenGLVertexBuffer::~OpenGLVertexBuffer()
-{
-    glDeleteBuffers(1, &m_RendererID);
-}
-
-void OpenGLVertexBuffer::Bind() const
-{
-    glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
-}
-
-void OpenGLVertexBuffer::Unbind() const
-{
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-}
-
-void OpenGLVertexBuffer::SetData(const void* data, uint32_t size)
-{
-    glBindBuffer(GL_ARRAY_BUFFER, m_RendererID);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, size, data);
-}
-
-// IndexBuffer ////////////////////////////////////////////////////////////
-
-OpenGLIndexBuffer::OpenGLIndexBuffer(const uint32_t* indices, uint32_t count)
-    : m_Count(count)
-{
-    glGenBuffers(1, &m_RendererID);
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_RendererID);
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, count * sizeof(uint32_t), indices, GL_STATIC_DRAW);
-}
-
-OpenGLIndexBuffer::~OpenGLIndexBuffer()
-{
-    glDeleteBuffers(1, &m_RendererID);
-}
-
-void OpenGLIndexBuffer::Bind() const
-{
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_RendererID);
-}
-
-void OpenGLIndexBuffer::Unbind() const
-{
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/api/opengl/opengl_buffer.h b/engine/graphics/api/opengl/opengl_buffer.h
deleted file mode 100644
index 3f90f2ef5..000000000
--- a/engine/graphics/api/opengl/opengl_buffer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef CH_OPENGL_BUFFER_H
-#define CH_OPENGL_BUFFER_H
-
-#include "engine/graphics/api/buffer.h"
-
-namespace CHEngine
-{
-
-class OpenGLVertexBuffer : public VertexBuffer
-{
-public:
-    OpenGLVertexBuffer(uint32_t size);
-    OpenGLVertexBuffer(const float* vertices, uint32_t size);
-    virtual ~OpenGLVertexBuffer();
-
-    virtual void Bind() const override;
-    virtual void Unbind() const override;
-
-    virtual void SetData(const void* data, uint32_t size) override;
-
-    virtual const BufferLayout& GetLayout() const override { return m_Layout; }
-    virtual void SetLayout(const BufferLayout& layout) override { m_Layout = layout; }
-
-private:
-    uint32_t m_RendererID;
-    BufferLayout m_Layout;
-};
-
-class OpenGLIndexBuffer : public IndexBuffer
-{
-public:
-    OpenGLIndexBuffer(const uint32_t* indices, uint32_t count);
-    virtual ~OpenGLIndexBuffer();
-
-    virtual void Bind() const override;
-    virtual void Unbind() const override;
-
-    virtual uint32_t GetCount() const override { return m_Count; }
-
-private:
-    uint32_t m_RendererID;
-    uint32_t m_Count;
-};
-
-} // namespace CHEngine
-
-#endif // CH_OPENGL_BUFFER_H
diff --git a/engine/graphics/api/opengl/opengl_framebuffer.cpp b/engine/graphics/api/opengl/opengl_framebuffer.cpp
deleted file mode 100644
index bcad15d65..000000000
--- a/engine/graphics/api/opengl/opengl_framebuffer.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "opengl_framebuffer.h"
-#include "engine/core/ch_assert.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-OpenGLFramebuffer::OpenGLFramebuffer(const FramebufferSpecification& spec)
-    : m_Specification(spec)
-{
-    Invalidate();
-}
-
-OpenGLFramebuffer::~OpenGLFramebuffer()
-{
-    glDeleteFramebuffers(1, &m_RendererID);
-    glDeleteTextures(1, &m_ColorAttachment);
-    glDeleteTextures(1, &m_DepthAttachment);
-}
-
-void OpenGLFramebuffer::Invalidate()
-{
-    if (m_RendererID)
-    {
-        glDeleteFramebuffers(1, &m_RendererID);
-        glDeleteTextures(1, &m_ColorAttachment);
-        glDeleteTextures(1, &m_DepthAttachment);
-    }
-
-    glGenFramebuffers(1, &m_RendererID);
-    glBindFramebuffer(GL_FRAMEBUFFER, m_RendererID);
-
-    // Color Attachment
-    glGenTextures(1, &m_ColorAttachment);
-    glBindTexture(GL_TEXTURE_2D, m_ColorAttachment);
-    GLenum internalFormat = GL_RGBA8;
-    GLenum dataType = GL_UNSIGNED_BYTE;
-    if (m_Specification.ColorFormat == FramebufferColorFormat::RGBA16F)
-    {
-        internalFormat = GL_RGBA16F;
-        dataType = GL_FLOAT;
-    }
-
-    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, m_Specification.Width, m_Specification.Height, 0, GL_RGBA,
-                 dataType, nullptr);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_ColorAttachment, 0);
-
-    // Depth Attachment
-    glGenTextures(1, &m_DepthAttachment);
-    glBindTexture(GL_TEXTURE_2D, m_DepthAttachment);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_Specification.Width, m_Specification.Height, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_DepthAttachment, 0);
-
-    CH_CORE_ASSERT(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Framebuffer is incomplete!");
-
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
-}
-
-void OpenGLFramebuffer::Bind()
-{
-    glBindFramebuffer(GL_FRAMEBUFFER, m_RendererID);
-    glViewport(0, 0, m_Specification.Width, m_Specification.Height);
-}
-
-void OpenGLFramebuffer::Unbind()
-{
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
-}
-
-void OpenGLFramebuffer::Resize(uint32_t width, uint32_t height)
-{
-    m_Specification.Width = width;
-    m_Specification.Height = height;
-    Invalidate();
-}
-
-}
diff --git a/engine/graphics/api/opengl/opengl_framebuffer.h b/engine/graphics/api/opengl/opengl_framebuffer.h
deleted file mode 100644
index 44f251c83..000000000
--- a/engine/graphics/api/opengl/opengl_framebuffer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef CH_OPENGL_FRAMEBUFFER_H
-#define CH_OPENGL_FRAMEBUFFER_H
-
-#include "engine/graphics/api/framebuffer.h"
-
-namespace CHEngine
-{
-class OpenGLFramebuffer : public Framebuffer
-{
-public:
-    OpenGLFramebuffer(const FramebufferSpecification& spec);
-    virtual ~OpenGLFramebuffer();
-
-    void Invalidate();
-
-    virtual void Bind() override;
-    virtual void Unbind() override;
-
-    virtual void Resize(uint32_t width, uint32_t height) override;
-
-    virtual uint32_t GetColorAttachmentRendererID() const override { return m_ColorAttachment; }
-    virtual uint32_t GetDepthAttachmentRendererID() const override { return m_DepthAttachment; }
-
-    virtual const FramebufferSpecification& GetSpecification() const override { return m_Specification; }
-
-    virtual void* GetNativeFramebuffer() override { return (void*)(uintptr_t)m_RendererID; }
-
-private:
-    uint32_t m_RendererID = 0;
-    uint32_t m_ColorAttachment = 0;
-    uint32_t m_DepthAttachment = 0;
-    FramebufferSpecification m_Specification;
-};
-}
-
-#endif // CH_OPENGL_FRAMEBUFFER_H
diff --git a/engine/graphics/api/opengl/opengl_renderer_api.cpp b/engine/graphics/api/opengl/opengl_renderer_api.cpp
deleted file mode 100644
index 15ca36e6c..000000000
--- a/engine/graphics/api/opengl/opengl_renderer_api.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "opengl_renderer_api.h"
-#include "engine/graphics/api/vertex_array.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-
-void OpenGLRendererAPI::Init()
-{
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_LINE_SMOOTH);
-}
-
-void OpenGLRendererAPI::SetViewport(int x, int y, int width, int height)
-{
-    glViewport(x, y, width, height);
-}
-
-void OpenGLRendererAPI::SetClearColor(const Color& color)
-{
-    m_ClearColor[0] = color.r / 255.0f;
-    m_ClearColor[1] = color.g / 255.0f;
-    m_ClearColor[2] = color.b / 255.0f;
-    m_ClearColor[3] = color.a / 255.0f;
-}
-
-void OpenGLRendererAPI::Clear()
-{
-    glClearColor(m_ClearColor[0], m_ClearColor[1], m_ClearColor[2], m_ClearColor[3]);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-void OpenGLRendererAPI::SetDepthFunc(DepthFunc func)
-{
-    GLenum glFunc = GL_LESS;
-    switch (func)
-    {
-        case DepthFunc::Never:    glFunc = GL_NEVER; break;
-        case DepthFunc::Less:     glFunc = GL_LESS; break;
-        case DepthFunc::Equal:    glFunc = GL_EQUAL; break;
-        case DepthFunc::LEqual:   glFunc = GL_LEQUAL; break;
-        case DepthFunc::Greater:  glFunc = GL_GREATER; break;
-        case DepthFunc::NotEqual: glFunc = GL_NOTEQUAL; break;
-        case DepthFunc::GEqual:   glFunc = GL_GEQUAL; break;
-        case DepthFunc::Always:   glFunc = GL_ALWAYS; break;
-    }
-    glDepthFunc(glFunc);
-}
-
-void OpenGLRendererAPI::SetDepthTest(bool enabled)
-{
-    if (enabled) glEnable(GL_DEPTH_TEST);
-    else glDisable(GL_DEPTH_TEST);
-}
-
-void OpenGLRendererAPI::SetDepthMask(bool enabled)
-{
-    glDepthMask(enabled ? GL_TRUE : GL_FALSE);
-}
-
-void OpenGLRendererAPI::SetCullMode(CullMode mode)
-{
-    if (mode == CullMode::None)
-    {
-        glDisable(GL_CULL_FACE);
-    }
-    else
-    {
-        glEnable(GL_CULL_FACE);
-        switch (mode)
-        {
-            case CullMode::Front:        glCullFace(GL_FRONT); break;
-            case CullMode::Back:         glCullFace(GL_BACK); break;
-            case CullMode::FrontAndBack: glCullFace(GL_FRONT_AND_BACK); break;
-        }
-    }
-}
-
-void OpenGLRendererAPI::SetBlendMode(bool enabled)
-{
-    if (enabled) glEnable(GL_BLEND);
-    else glDisable(GL_BLEND);
-}
-
-void OpenGLRendererAPI::SetBlendFunc(BlendFactor src, BlendFactor dst)
-{
-    auto toGL = [](BlendFactor factor) -> GLenum {
-        switch (factor)
-        {
-            case BlendFactor::Zero:           return GL_ZERO;
-            case BlendFactor::One:            return GL_ONE;
-            case BlendFactor::SrcColor:       return GL_SRC_COLOR;
-            case BlendFactor::OneMinusSrcColor: return GL_ONE_MINUS_SRC_COLOR;
-            case BlendFactor::DstColor:       return GL_DST_COLOR;
-            case BlendFactor::OneMinusDstColor: return GL_ONE_MINUS_DST_COLOR;
-            case BlendFactor::SrcAlpha:       return GL_SRC_ALPHA;
-            case BlendFactor::OneMinusSrcAlpha: return GL_ONE_MINUS_SRC_ALPHA;
-            case BlendFactor::DstAlpha:       return GL_DST_ALPHA;
-            case BlendFactor::OneMinusDstAlpha: return GL_ONE_MINUS_DST_ALPHA;
-        }
-        return GL_ONE;
-    };
-    glBlendFunc(toGL(src), toGL(dst));
-}
-
-void OpenGLRendererAPI::SetLineWidth(float width)
-{
-    glLineWidth(width);
-}
-
-void OpenGLRendererAPI::DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount)
-{
-    uint32_t count = indexCount ? indexCount : vertexArray->GetIndexBuffer()->GetCount();
-    glDrawElements(GL_TRIANGLES, (GLsizei)count, GL_UNSIGNED_INT, nullptr);
-}
-
-void OpenGLRendererAPI::DrawLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t vertexCount)
-{
-    glDrawArrays(GL_LINES, 0, (GLsizei)vertexCount);
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/api/opengl/opengl_renderer_api.h b/engine/graphics/api/opengl/opengl_renderer_api.h
deleted file mode 100644
index 9f70068a9..000000000
--- a/engine/graphics/api/opengl/opengl_renderer_api.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CH_OPENGL_RENDERER_API_H
-#define CH_OPENGL_RENDERER_API_H
-
-#include "engine/graphics/api/renderer_api.h"
-
-namespace CHEngine
-{
-
-class OpenGLRendererAPI : public RendererAPI
-{
-public:
-    virtual void Init() override;
-    virtual void SetViewport(int x, int y, int width, int height) override;
-    virtual void SetClearColor(const Color& color) override;
-    virtual void Clear() override;
-    virtual void SetDepthFunc(DepthFunc func) override;
-    virtual void SetDepthTest(bool enabled) override;
-    virtual void SetDepthMask(bool enabled) override;
-    
-    virtual void SetCullMode(CullMode mode) override;
-    virtual void SetBlendMode(bool enabled) override;
-    virtual void SetBlendFunc(BlendFactor src, BlendFactor dst) override;
-
-    virtual void SetLineWidth(float width) override;
-
-    virtual void DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount = 0) override;
-    virtual void DrawLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t vertexCount) override;
-
-private:
-    float m_ClearColor[4] = { 0.1f, 0.1f, 0.1f, 1.0f };
-};
-
-} // namespace CHEngine
-
-#endif // CH_OPENGL_RENDERER_API_H
diff --git a/engine/graphics/api/opengl/opengl_shader.cpp b/engine/graphics/api/opengl/opengl_shader.cpp
deleted file mode 100644
index 98939e40b..000000000
--- a/engine/graphics/api/opengl/opengl_shader.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "opengl_shader.h"
-#include "engine/core/log.h"
-#include <glad/gl.h>
-#include <glm/gtc/type_ptr.hpp>
-
-namespace CHEngine {
-
-OpenGLShader::OpenGLShader(const std::string& vsSource, const std::string& fsSource)
-{
-    auto compileShader = [](GLenum type, const char* source) -> uint32_t {
-        uint32_t shader = glCreateShader(type);
-        glShaderSource(shader, 1, &source, nullptr);
-        glCompileShader(shader);
-
-        int success;
-        glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
-        if (!success)
-        {
-            char infoLog[512];
-            glGetShaderInfoLog(shader, 512, nullptr, infoLog);
-            CH_CORE_ERROR("Shader Compilation Error: {}", infoLog);
-            return 0;
-        }
-        return shader;
-    };
-
-    uint32_t vs = compileShader(GL_VERTEX_SHADER, vsSource.c_str());
-    uint32_t fs = compileShader(GL_FRAGMENT_SHADER, fsSource.c_str());
-
-    if (vs == 0 || fs == 0) return;
-
-    m_RendererID = glCreateProgram();
-    glAttachShader(m_RendererID, vs);
-    glAttachShader(m_RendererID, fs);
-    glLinkProgram(m_RendererID);
-
-    int success;
-    glGetProgramiv(m_RendererID, GL_LINK_STATUS, &success);
-    if (!success)
-    {
-        char infoLog[512];
-        glGetProgramInfoLog(m_RendererID, 512, nullptr, infoLog);
-        CH_CORE_ERROR("Shader Linking Error: {}", infoLog);
-        m_RendererID = 0;
-        return;
-    }
-
-    glDeleteShader(vs);
-    glDeleteShader(fs);
-}
-
-OpenGLShader::~OpenGLShader()
-{
-    if (m_RendererID > 0)
-    {
-        glDeleteProgram(m_RendererID);
-    }
-}
-
-void OpenGLShader::Bind() const
-{
-    glUseProgram(m_RendererID);
-}
-
-void OpenGLShader::Unbind() const
-{
-    glUseProgram(0);
-}
-
-int OpenGLShader::GetLocation(const std::string& name)
-{
-    auto it = m_UniformCache.find(name);
-    if (it != m_UniformCache.end())
-        return it->second;
-
-    int location = glGetUniformLocation(m_RendererID, name.c_str());
-    m_UniformCache[name] = location;
-    return location;
-}
-
-void OpenGLShader::SetFloat(const std::string& name, float value)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniform1f(m_RendererID, location, value);
-}
-
-void OpenGLShader::SetInt(const std::string& name, int value)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniform1i(m_RendererID, location, value);
-}
-
-void OpenGLShader::SetVec2(const std::string& name, const glm::vec2& value)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniform2fv(m_RendererID, location, 1, glm::value_ptr(value));
-}
-
-void OpenGLShader::SetVec3(const std::string& name, const glm::vec3& value)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniform3fv(m_RendererID, location, 1, glm::value_ptr(value));
-}
-
-void OpenGLShader::SetVec4(const std::string& name, const glm::vec4& value)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniform4fv(m_RendererID, location, 1, glm::value_ptr(value));
-}
-
-void OpenGLShader::SetColor(const std::string& name, const Color& value)
-{
-    glm::vec4 c(value.r / 255.0f, value.g / 255.0f, value.b / 255.0f, value.a / 255.0f);
-    SetVec4(name, c);
-}
-
-void OpenGLShader::SetMatrix(const std::string& name, const glm::mat4& value)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniformMatrix4fv(m_RendererID, location, 1, GL_FALSE, glm::value_ptr(value));
-}
-
-void OpenGLShader::SetMatrices(const std::string& name, const glm::mat4* values, int count)
-{
-    int location = GetLocation(name);
-    if (location >= 0) glProgramUniformMatrix4fv(m_RendererID, location, count, GL_FALSE, glm::value_ptr(values[0]));
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/api/opengl/opengl_shader.h b/engine/graphics/api/opengl/opengl_shader.h
deleted file mode 100644
index 2376f7b1a..000000000
--- a/engine/graphics/api/opengl/opengl_shader.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CH_OPENGL_SHADER_H
-#define CH_OPENGL_SHADER_H
-
-#include "engine/graphics/api/shader.h"
-#include <unordered_map>
-
-namespace CHEngine {
-
-class OpenGLShader : public Shader
-{
-public:
-    OpenGLShader(const std::string& vsSource, const std::string& fsSource);
-    virtual ~OpenGLShader();
-
-    virtual void Bind() const override;
-    virtual void Unbind() const override;
-
-    virtual uint32_t GetRendererID() const override { return m_RendererID; }
-
-    virtual void SetFloat(const std::string& name, float value) override;
-    virtual void SetInt(const std::string& name, int value) override;
-    virtual void SetVec2(const std::string& name, const glm::vec2& value) override;
-    virtual void SetVec3(const std::string& name, const glm::vec3& value) override;
-    virtual void SetVec4(const std::string& name, const glm::vec4& value) override;
-    virtual void SetColor(const std::string& name, const Color& value) override;
-    virtual void SetMatrix(const std::string& name, const glm::mat4& value) override;
-    virtual void SetMatrices(const std::string& name, const glm::mat4* values, int count) override;
-
-private:
-    int GetLocation(const std::string& name);
-
-private:
-    uint32_t m_RendererID = 0;
-    std::unordered_map<std::string, int> m_UniformCache;
-};
-
-} // namespace CHEngine
-
-#endif // CH_OPENGL_SHADER_H
diff --git a/engine/graphics/api/opengl/opengl_texture.cpp b/engine/graphics/api/opengl/opengl_texture.cpp
deleted file mode 100644
index a5b31ca4a..000000000
--- a/engine/graphics/api/opengl/opengl_texture.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "opengl_texture.h"
-#include <stb_image.h>
-
-namespace CHEngine
-{
-
-OpenGLTexture::OpenGLTexture(uint32_t width, uint32_t height, TextureFormat format)
-    : m_Width(width), m_Height(height), m_Format(format), m_Type(TextureType::Texture2D)
-{
-    m_InternalFormat = GL_RGBA8;
-    m_DataFormat = GL_RGBA;
-
-    switch (format)
-    {
-        case TextureFormat::RGB8:    m_InternalFormat = GL_RGB8;    m_DataFormat = GL_RGB; break;
-        case TextureFormat::RGBA8:   m_InternalFormat = GL_RGBA8;   m_DataFormat = GL_RGBA; break;
-        case TextureFormat::RGB16F:  m_InternalFormat = GL_RGB16F;  m_DataFormat = GL_RGB; break;
-        case TextureFormat::RGBA16F: m_InternalFormat = GL_RGBA16F; m_DataFormat = GL_RGBA; break;
-    }
-
-    glGenTextures(1, &m_RendererID);
-    glBindTexture(GL_TEXTURE_2D, m_RendererID);
-
-    glTexStorage2D(GL_TEXTURE_2D, 1, m_InternalFormat, m_Width, m_Height);
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    
-    m_IsReady = true;
-}
-
-OpenGLTexture::OpenGLTexture(uint32_t size, TextureFormat format)
-    : m_Width(size), m_Height(size), m_Format(format), m_Type(TextureType::Cubemap)
-{
-    m_InternalFormat = GL_RGB16F;
-    m_DataFormat = GL_RGB;
-
-    switch (format)
-    {
-        case TextureFormat::RGB16F:  m_InternalFormat = GL_RGB16F;  m_DataFormat = GL_RGB; break;
-        case TextureFormat::RGBA16F: m_InternalFormat = GL_RGBA16F; m_DataFormat = GL_RGBA; break;
-    }
-
-    glGenTextures(1, &m_RendererID);
-    glBindTexture(GL_TEXTURE_CUBE_MAP, m_RendererID);
-
-    for (uint32_t i = 0; i < 6; ++i)
-    {
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, m_InternalFormat, m_Width, m_Height, 0, m_DataFormat, GL_FLOAT, nullptr);
-    }
-
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-    m_IsReady = true;
-}
-
-OpenGLTexture::~OpenGLTexture()
-{
-    glDeleteTextures(1, &m_RendererID);
-}
-
-void OpenGLTexture::SetData(void* data, uint32_t size)
-{
-    GLenum dataType = (m_Format == TextureFormat::RGB16F || m_Format == TextureFormat::RGBA16F) ? GL_FLOAT : GL_UNSIGNED_BYTE;
-    uint32_t bpp = m_DataFormat == GL_RGBA ? 4 : 3;
-    (void)size;
-    glBindTexture(GL_TEXTURE_2D, m_RendererID);
-    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_Width, m_Height, m_DataFormat, dataType, data);
-}
-
-void OpenGLTexture::Bind(uint32_t slot) const
-{
-    glActiveTexture(GL_TEXTURE0 + slot);
-    glBindTexture(m_Type == TextureType::Cubemap ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D, m_RendererID);
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/api/opengl/opengl_texture.h b/engine/graphics/api/opengl/opengl_texture.h
deleted file mode 100644
index ff9e9a2a7..000000000
--- a/engine/graphics/api/opengl/opengl_texture.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CH_OPENGL_TEXTURE_H
-#define CH_OPENGL_TEXTURE_H
-
-#include "engine/graphics/api/texture.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-
-class OpenGLTexture : public Texture
-{
-public:
-    OpenGLTexture(uint32_t width, uint32_t height, TextureFormat format);
-    OpenGLTexture(uint32_t size, TextureFormat format); // Cubemap constructor
-    virtual ~OpenGLTexture();
-
-    virtual uint32_t GetWidth() const override { return m_Width; }
-    virtual uint32_t GetHeight() const override { return m_Height; }
-    virtual uint32_t GetRendererID() const override { return m_RendererID; }
-
-    virtual void SetData(void* data, uint32_t size) override;
-    virtual void Bind(uint32_t slot = 0) const override;
-    
-    virtual bool IsReady() const override { return m_IsReady; }
-    virtual TextureType GetType() const override { return m_Type; }
-
-private:
-    uint32_t m_RendererID = 0;
-    uint32_t m_Width, m_Height;
-    TextureFormat m_Format;
-    TextureType m_Type;
-    bool m_IsReady = false;
-
-    GLenum m_InternalFormat, m_DataFormat;
-};
-
-} // namespace CHEngine
-
-#endif // CH_OPENGL_TEXTURE_H
diff --git a/engine/graphics/api/opengl/opengl_vertex_array.cpp b/engine/graphics/api/opengl/opengl_vertex_array.cpp
deleted file mode 100644
index b75ac04db..000000000
--- a/engine/graphics/api/opengl/opengl_vertex_array.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "opengl_vertex_array.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-
-static uint32_t ShaderDataTypeToOpenGLBaseType(ShaderDataType type)
-{
-    switch (type)
-    {
-        case ShaderDataType::Float:    return GL_FLOAT;
-        case ShaderDataType::Float2:   return GL_FLOAT;
-        case ShaderDataType::Float3:   return GL_FLOAT;
-        case ShaderDataType::Float4:   return GL_FLOAT;
-        case ShaderDataType::Mat3:     return GL_FLOAT;
-        case ShaderDataType::Mat4:     return GL_FLOAT;
-        case ShaderDataType::Int:      return GL_INT;
-        case ShaderDataType::Int2:     return GL_INT;
-        case ShaderDataType::Int3:     return GL_INT;
-        case ShaderDataType::Int4:     return GL_INT;
-        case ShaderDataType::Bool:     return GL_UNSIGNED_BYTE;
-    }
-
-    CH_CORE_ASSERT(false, "Unknown ShaderDataType!");
-    return 0;
-}
-
-OpenGLVertexArray::OpenGLVertexArray()
-{
-    glGenVertexArrays(1, &m_RendererID);
-}
-
-OpenGLVertexArray::~OpenGLVertexArray()
-{
-    glDeleteVertexArrays(1, &m_RendererID);
-}
-
-void OpenGLVertexArray::Bind() const
-{
-    glBindVertexArray(m_RendererID);
-}
-
-void OpenGLVertexArray::Unbind() const
-{
-    glBindVertexArray(0);
-}
-
-void OpenGLVertexArray::AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertexBuffer)
-{
-    CH_CORE_ASSERT(vertexBuffer->GetLayout().GetElements().size(), "Vertex Buffer has no layout!");
-
-    glBindVertexArray(m_RendererID);
-    vertexBuffer->Bind();
-
-    const auto& layout = vertexBuffer->GetLayout();
-    for (const auto& element : layout)
-    {
-        uint32_t index = m_AttributeIndex++;
-        glEnableVertexAttribArray(index);
-        
-        ShaderDataType type = element.Type;
-        if (type == ShaderDataType::Int || type == ShaderDataType::Int2 || type == ShaderDataType::Int3 || type == ShaderDataType::Int4)
-        {
-            glVertexAttribIPointer(index,
-                element.GetComponentCount(),
-                ShaderDataTypeToOpenGLBaseType(type),
-                layout.GetStride(),
-                (const void*)element.Offset);
-        }
-        else
-        {
-            glVertexAttribPointer(index,
-                element.GetComponentCount(),
-                ShaderDataTypeToOpenGLBaseType(type),
-                element.Normalized ? GL_TRUE : GL_FALSE,
-                layout.GetStride(),
-                (const void*)element.Offset);
-        }
-    }
-
-    m_VertexBuffers.push_back(vertexBuffer);
-}
-
-void OpenGLVertexArray::SetIndexBuffer(const std::shared_ptr<IndexBuffer>& indexBuffer)
-{
-    glBindVertexArray(m_RendererID);
-    indexBuffer->Bind();
-
-    m_IndexBuffer = indexBuffer;
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/api/opengl/opengl_vertex_array.h b/engine/graphics/api/opengl/opengl_vertex_array.h
deleted file mode 100644
index 079f385e1..000000000
--- a/engine/graphics/api/opengl/opengl_vertex_array.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef CH_OPENGL_VERTEX_ARRAY_H
-#define CH_OPENGL_VERTEX_ARRAY_H
-
-#include "engine/graphics/api/vertex_array.h"
-
-namespace CHEngine
-{
-
-class OpenGLVertexArray : public VertexArray
-{
-public:
-    OpenGLVertexArray();
-    virtual ~OpenGLVertexArray();
-
-    virtual void Bind() const override;
-    virtual void Unbind() const override;
-
-    virtual void AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertexBuffer) override;
-    virtual void SetIndexBuffer(const std::shared_ptr<IndexBuffer>& indexBuffer) override;
-
-    virtual const std::vector<std::shared_ptr<VertexBuffer>>& GetVertexBuffers() const override { return m_VertexBuffers; }
-    virtual const std::shared_ptr<IndexBuffer>& GetIndexBuffer() const override { return m_IndexBuffer; }
-
-private:
-    uint32_t m_RendererID;
-    uint32_t m_AttributeIndex = 0;
-    std::vector<std::shared_ptr<VertexBuffer>> m_VertexBuffers;
-    std::shared_ptr<IndexBuffer> m_IndexBuffer;
-};
-
-} // namespace CHEngine
-
-#endif // CH_OPENGL_VERTEX_ARRAY_H
diff --git a/engine/graphics/api/renderer_api.cpp b/engine/graphics/api/renderer_api.cpp
deleted file mode 100644
index 9e1297dd3..000000000
--- a/engine/graphics/api/renderer_api.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "engine/graphics/api/renderer_api.h"
-#include "opengl/opengl_renderer_api.h"
-
-namespace CHEngine
-{
-
-RendererAPI::API RendererAPI::s_API = RendererAPI::API::OpenGL;
-
-std::unique_ptr<RendererAPI> RendererAPI::Create()
-{
-    switch (s_API)
-    {
-    case RendererAPI::API::None:
-        return nullptr;
-    case RendererAPI::API::OpenGL:
-        return std::make_unique<OpenGLRendererAPI>();
-    default:
-        return nullptr;
-    }
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/api/renderer_api.h b/engine/graphics/api/renderer_api.h
deleted file mode 100644
index 5ce285b73..000000000
--- a/engine/graphics/api/renderer_api.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef CH_RENDERER_API_H
-#define CH_RENDERER_API_H
-
-#include "engine/core/ch_math.h"
-#include <memory>
-
-namespace CHEngine
-{
-class VertexArray;
-
-class RendererAPI
-{
-public:
-    enum class DepthFunc
-    {
-        Never = 0, Less, Equal, LEqual, Greater, NotEqual, GEqual, Always
-    };
-
-    enum class CullMode
-    {
-        None = 0, Front, Back, FrontAndBack
-    };
-
-    enum class BlendFactor
-    {
-        Zero = 0, One, SrcColor, OneMinusSrcColor, DstColor, OneMinusDstColor, 
-        SrcAlpha, OneMinusSrcAlpha, DstAlpha, OneMinusDstAlpha
-    };
-
-    enum class API
-    {
-        None = 0,
-        OpenGL = 1,
-        // Maybe soon
-        Vulkan = 2
-    };
-
-public:
-    virtual ~RendererAPI() = default;
-
-    virtual void Init() = 0;
-    virtual void SetViewport(int x, int y, int width, int height) = 0;
-    virtual void SetClearColor(const Color& color) = 0;
-    virtual void Clear() = 0;
-    
-    virtual void SetDepthFunc(DepthFunc func) = 0;
-    virtual void SetDepthTest(bool enabled) = 0;
-    virtual void SetDepthMask(bool enabled) = 0;
-    
-    virtual void SetCullMode(CullMode mode) = 0;
-    virtual void SetBlendMode(bool enabled) = 0;
-    virtual void SetBlendFunc(BlendFactor src, BlendFactor dst) = 0;
-
-    virtual void SetLineWidth(float width) = 0;
-
-    virtual void DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount = 0) = 0;
-    virtual void DrawLines(const std::shared_ptr<VertexArray>& vertexArray, uint32_t vertexCount) = 0;
-
-    static API GetAPI() { return s_API; }
-    static std::unique_ptr<RendererAPI> Create();
-
-private:
-    static API s_API;
-};
-
-} // namespace CHEngine
-
-#endif // CH_RENDERER_API_H
diff --git a/engine/graphics/api/renderer_types.h b/engine/graphics/api/renderer_types.h
new file mode 100644
index 000000000..82445b421
--- /dev/null
+++ b/engine/graphics/api/renderer_types.h
@@ -0,0 +1,109 @@
+#ifndef CH_RENDERER_TYPES_H
+#define CH_RENDERER_TYPES_H
+
+#include "engine/common/color.h"
+#include "engine/graphics/api/vertex_array.h"
+#include "engine/reflection/reflection_rfl.h"
+#include "engine/graphics/api/texture.h"
+#include <cstring>
+#include <glm/glm.hpp>
+#include <memory>
+#include <string>
+#include <vector>
+#include <variant>
+
+namespace Chained
+{
+
+	enum class ShaderUniformType : int
+	{
+		Float = 0,
+		Vec2,
+		Vec3,
+		Vec4,
+		Color
+	};
+
+	struct ShaderUniform
+	{
+		std::string Name;
+		std::variant<float, glm::vec2, glm::vec3, glm::vec4, Color> Value = 0.0f;
+
+		static const char* GetStaticName()
+		{
+			return "ShaderUniform";
+		}
+
+		struct UI
+		{
+			UIMeta Name = {.Tooltip = "The uniform variable name defined inside the GLSL shader"};
+			UIMeta Value = {.Tooltip = "The modern variant value matching the uniform's data type"};
+		};
+	};
+	CH_MARK_RFL(ShaderUniform);
+
+	struct Material
+	{
+		glm::vec4 AlbedoColor = {1.0f, 1.0f, 1.0f, 1.0f};
+		glm::vec4 EmissiveColor = {0.0f, 0.0f, 0.0f, 1.0f};
+		float EmissiveIntensity = 0.0f;
+		float Metalness = 0.0f;
+		float Roughness = 0.5f;
+
+		std::shared_ptr<Texture> AlbedoMap;
+		std::shared_ptr<Texture> NormalMap;
+		std::shared_ptr<Texture> MetallicRoughnessMap;
+		std::shared_ptr<Texture> EmissiveMap;
+		std::shared_ptr<Texture> OcclusionMap;
+
+		std::string AlbedoPath;
+		std::string NormalPath;
+		std::string MetallicRoughnessPath;
+		std::string EmissivePath;
+		std::string OcclusionPath;
+
+		uint32_t ShaderID = 0;
+		bool Transparent = false;
+		float Alpha = 1.0f;
+		std::string Name;
+
+		static const char* GetStaticName()
+		{
+			return "Material";
+		}
+
+		struct UI
+		{
+			UIMeta AlbedoColor = {.Tooltip = "Base diffuse surface color"};
+			UIMeta EmissiveColor = {.Tooltip = "Color emitted by the material surface"};
+			UIMeta EmissiveIntensity = {.Tooltip = "Brightness multiplier for the emissive color"};
+			UIMeta Metalness = {.Tooltip = "How close the surface reflects like a metal (0.0 to 1.0)"};
+			UIMeta Roughness = {.Tooltip = "Microfacet roughness from smooth/glossy to diffuse (0.0 to 1.0)"};
+			UIMeta Transparent = {.Tooltip = "Enables alpha blending layers for this material"};
+			UIMeta Alpha = {.Tooltip = "Global opacity multiplier"};
+		};
+	};
+	CH_MARK_RFL(Material);
+
+	struct Mesh
+	{
+		std::shared_ptr<VertexArray> VAO;
+		uint32_t VertexCount = 0;
+		uint32_t TriangleCount = 0;
+		int MaterialIndex = 0;
+		bool HasSkinning = false;
+
+		glm::vec3 MinBounds = {0.0f, 0.0f, 0.0f};
+		glm::vec3 MaxBounds = {0.0f, 0.0f, 0.0f};
+	};
+
+	struct Model
+	{
+		std::vector<Mesh> Meshes;
+		std::vector<Material> Materials;
+		glm::mat4 Transform = glm::mat4(1.0f);
+	};
+
+} // namespace Chained
+
+#endif // CH_RENDERER_TYPES_H
diff --git a/engine/graphics/api/shader.cpp b/engine/graphics/api/shader.cpp
index 2db1f99d2..12f7e2fca 100644
--- a/engine/graphics/api/shader.cpp
+++ b/engine/graphics/api/shader.cpp
@@ -1,19 +1,23 @@
 #include "shader.h"
-#include "renderer_api.h"
-#include "engine/graphics/api/opengl/opengl_shader.h"
-#include "engine/core/ch_assert.h"
+#include "graphics_device.h"
+#include "engine/graphics/api/opengl/gl_shader_program.h"
+#include "engine/common/engine_assert.h"
 
-namespace CHEngine {
-
-std::shared_ptr<Shader> Shader::Create(const std::string& vsSource, const std::string& fsSource)
+namespace Chained
 {
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    CH_CORE_ASSERT(false, "RendererAPI::None is currently not supported!"); return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLShader>(vsSource, fsSource);
-    }
-    CH_CORE_ASSERT(false, "Unknown RendererAPI!");
-    return nullptr;
-}
 
-} // namespace CHEngine
+	std::shared_ptr<Shader> Shader::Create(const std::string& vsSource, const std::string& fsSource)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			CH_CORE_ASSERT(false, "GraphicsDevice::None is currently not supported!");
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLShaderProgram>(vsSource, fsSource);
+		}
+		CH_CORE_ASSERT(false, "Unknown GraphicsDevice!");
+		return nullptr;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/api/shader.h b/engine/graphics/api/shader.h
index f2c319afe..814564c15 100644
--- a/engine/graphics/api/shader.h
+++ b/engine/graphics/api/shader.h
@@ -1,36 +1,36 @@
 #ifndef CH_SHADER_H
 #define CH_SHADER_H
-#include "engine/core/ch_math.h"
+#include "engine/common/color.h"
 #include <glm/glm.hpp>
 #include <memory>
 #include <string>
 
-namespace CHEngine
+namespace Chained
 {
 
-// Abstract GPU shader interface used by backends and higher-level render code.
-class Shader
-{
-public:
-    virtual ~Shader() = default;
+	// Abstract GPU shader interface used by backends and higher-level render code.
+	class Shader
+	{
+	public:
+		virtual ~Shader() = default;
 
-    virtual void Bind() const = 0;
-    virtual void Unbind() const = 0;
+		virtual void Bind() const = 0;
+		virtual void Unbind() const = 0;
 
-    virtual uint32_t GetRendererID() const = 0;
+		virtual uint32_t GetNativeHandle() const = 0;
 
-    virtual void SetFloat(const std::string& name, float value) = 0;
-    virtual void SetInt(const std::string& name, int value) = 0;
-    virtual void SetVec2(const std::string& name, const glm::vec2& value) = 0;
-    virtual void SetVec3(const std::string& name, const glm::vec3& value) = 0;
-    virtual void SetVec4(const std::string& name, const glm::vec4& value) = 0;
-    virtual void SetColor(const std::string& name, const Color& value) = 0;
-    virtual void SetMatrix(const std::string& name, const glm::mat4& value) = 0;
-    virtual void SetMatrices(const std::string& name, const glm::mat4* values, int count) = 0;
+		virtual void SetFloat(const std::string& name, float value) = 0;
+		virtual void SetInt(const std::string& name, int value) = 0;
+		virtual void SetVec2(const std::string& name, const glm::vec2& value) = 0;
+		virtual void SetVec3(const std::string& name, const glm::vec3& value) = 0;
+		virtual void SetVec4(const std::string& name, const glm::vec4& value) = 0;
+		virtual void SetColor(const std::string& name, const Color& value) = 0;
+		virtual void SetMatrix(const std::string& name, const glm::mat4& value) = 0;
+		virtual void SetMatrices(const std::string& name, const glm::mat4* values, int count) = 0;
 
-    // Builds a shader from vertex and fragment source.
-    static std::shared_ptr<Shader> Create(const std::string& vsSource, const std::string& fsSource);
-};
+		// Builds a shader from vertex and fragment source.
+		static std::shared_ptr<Shader> Create(const std::string& vsSource, const std::string& fsSource);
+	};
 
-} // namespace CHEngine
+} // namespace Chained
 #endif
diff --git a/engine/graphics/api/storage_buffer.cpp b/engine/graphics/api/storage_buffer.cpp
new file mode 100644
index 000000000..ad05b6284
--- /dev/null
+++ b/engine/graphics/api/storage_buffer.cpp
@@ -0,0 +1,19 @@
+#include "engine/graphics/api/storage_buffer.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "opengl/gl_storage_buffer.h"
+
+namespace Chained
+{
+	std::shared_ptr<StorageBuffer> StorageBuffer::Create(uint32_t size)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLStorageBuffer>(size);
+		default:
+			return nullptr;
+		}
+	}
+} // namespace Chained
diff --git a/engine/graphics/api/storage_buffer.h b/engine/graphics/api/storage_buffer.h
new file mode 100644
index 000000000..f47317aa6
--- /dev/null
+++ b/engine/graphics/api/storage_buffer.h
@@ -0,0 +1,21 @@
+#ifndef CH_STORAGE_BUFFER_H
+#define CH_STORAGE_BUFFER_H
+
+#include <memory>
+#include <cstdint>
+
+namespace Chained
+{
+	class StorageBuffer
+	{
+	public:
+		virtual ~StorageBuffer() = default;
+
+		virtual void BindBase(uint32_t slot) const = 0;
+		virtual void SetData(const void* data, uint32_t size, uint32_t offset = 0) = 0;
+
+		static std::shared_ptr<StorageBuffer> Create(uint32_t size);
+	};
+} // namespace Chained
+
+#endif // CH_STORAGE_BUFFER_H
diff --git a/engine/graphics/api/texture.cpp b/engine/graphics/api/texture.cpp
index 3048dea8c..9a10a585c 100644
--- a/engine/graphics/api/texture.cpp
+++ b/engine/graphics/api/texture.cpp
@@ -1,35 +1,56 @@
-#include "texture.h"
-#include "engine/graphics/api/renderer_api.h"
-#include "engine/graphics/api/opengl/opengl_texture.h"
-#include "engine/graphics/texture_system.h"
+#include "engine/graphics/api/texture.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/api/opengl/gl_texture.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/service_locator.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-std::shared_ptr<Texture> Texture::Create(uint32_t width, uint32_t height, TextureFormat format)
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLTexture>(width, height, format);
-    }
-    return nullptr;
-}
+	std::shared_ptr<Texture> Texture::Create(uint32_t width, uint32_t height, TextureFormat format)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLTexture>(width, height, format);
+		}
+		return nullptr;
+	}
 
-std::shared_ptr<Texture> Texture::CreateCubemap(uint32_t size, TextureFormat format)
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLTexture>(size, format);
-    }
-    return nullptr;
-}
+	std::shared_ptr<Texture> Texture::CreateCubemap(uint32_t size, TextureFormat format)
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLTexture>(size, format);
+		}
+		return nullptr;
+	}
 
-std::shared_ptr<Texture> Texture::CreateFromFile(const std::string& path)
-{
-    auto handle = TextureSystem::Get().LoadTexture(path);
-    return TextureSystem::Get().GetTexture(handle);
-}
+	std::shared_ptr<Texture> Texture::CreateFromFile(const std::string& path)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			return nullptr;
+		}
+
+		auto texAsset = am->Get<TextureAsset>(path);
+		if (texAsset && texAsset->GetTexture())
+		{
+			return texAsset->GetTexture();
+		}
+		return nullptr;
+	}
+
+	std::shared_ptr<Texture> Texture::WrapNative(uint32_t handle, uint32_t width, uint32_t height, TextureType type)
+	{
+		return std::make_shared<GLTexture>(handle, width, height, type);
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/engine/graphics/api/texture.h b/engine/graphics/api/texture.h
index a76a33300..d5743db43 100644
--- a/engine/graphics/api/texture.h
+++ b/engine/graphics/api/texture.h
@@ -5,47 +5,51 @@
 #include <memory>
 #include <cstdint>
 
-namespace CHEngine
+namespace Chained
 {
-enum class TextureFormat
-{
-    None = 0,
-    RGB8,
-    RGBA8,
-    RGB16F,
-    RGBA16F,
-    Depth24Stencil8
-};
-
-enum class TextureType
-{
-    Texture2D = 0,
-    Cubemap
-};
-
-class Texture
-{
-public:
-    virtual ~Texture() = default;
-
-    virtual uint32_t GetWidth() const = 0;
-    virtual uint32_t GetHeight() const = 0;
-    virtual uint32_t GetRendererID() const = 0;
-    
-    virtual void SetData(void* data, uint32_t size) = 0;
-    virtual void Bind(uint32_t slot = 0) const = 0;
-    
-    virtual bool IsReady() const = 0;
-    virtual TextureType GetType() const = 0;
-
-    // GPU resource factory
-    static std::shared_ptr<Texture> Create(uint32_t width, uint32_t height, TextureFormat format = TextureFormat::RGBA8);
-    static std::shared_ptr<Texture> CreateCubemap(uint32_t size, TextureFormat format = TextureFormat::RGBA16F);
-    
-    // Asset loading (Hazel-style)
-    static std::shared_ptr<Texture> CreateFromFile(const std::string& path);
-};
-
-} // namespace CHEngine
+	enum class TextureFormat
+	{
+		None = 0,
+		RGB8,
+		RGBA8,
+		RGB16F,
+		RGBA16F,
+		Depth24Stencil8
+	};
+
+	enum class TextureType
+	{
+		Texture2D = 0,
+		Cubemap
+	};
+
+	class Texture
+	{
+	public:
+		virtual ~Texture() = default;
+
+		virtual uint32_t GetWidth() const = 0;
+		virtual uint32_t GetHeight() const = 0;
+		virtual uint32_t GetNativeHandle() const = 0;
+
+		virtual void SetData(void* data, uint32_t size) = 0;
+		virtual void Bind(uint32_t slot = 0) const = 0;
+
+		virtual bool IsReady() const = 0;
+		virtual TextureType GetType() const = 0;
+
+		// GPU resource factory
+		static std::shared_ptr<Texture> Create(uint32_t width, uint32_t height,
+											   TextureFormat format = TextureFormat::RGBA8);
+		static std::shared_ptr<Texture> CreateCubemap(uint32_t size, TextureFormat format = TextureFormat::RGBA16F);
+		static std::shared_ptr<Texture> CreateCubemapFromFiles(const std::string faces[6]);
+		static std::shared_ptr<Texture> WrapNative(uint32_t handle, uint32_t width, uint32_t height,
+												   TextureType type = TextureType::Texture2D);
+
+		// Asset loading (Hazel-style)
+		static std::shared_ptr<Texture> CreateFromFile(const std::string& path);
+	};
+
+} // namespace Chained
 
 #endif // CH_TEXTURE_H
diff --git a/engine/graphics/api/vertex_array.cpp b/engine/graphics/api/vertex_array.cpp
index 59ee9a4e8..33aad7c4b 100644
--- a/engine/graphics/api/vertex_array.cpp
+++ b/engine/graphics/api/vertex_array.cpp
@@ -1,18 +1,21 @@
 #include "engine/graphics/api/vertex_array.h"
-#include "engine/graphics/api/renderer_api.h"
-#include "opengl/opengl_vertex_array.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "opengl/gl_vertex_array.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-std::shared_ptr<VertexArray> VertexArray::Create()
-{
-    switch (RendererAPI::GetAPI())
-    {
-        case RendererAPI::API::None:    return nullptr;
-        case RendererAPI::API::OpenGL:  return std::make_shared<OpenGLVertexArray>();
-    }
-    return nullptr;
-}
+	std::shared_ptr<VertexArray> VertexArray::Create()
+	{
+		switch (GraphicsDevice::GetAPI())
+		{
+		case GraphicsDevice::API::None:
+			return nullptr;
+		case GraphicsDevice::API::OpenGL:
+			return std::make_shared<GLVertexArray>();
+		default:
+			return nullptr;
+		}
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/engine/graphics/api/vertex_array.h b/engine/graphics/api/vertex_array.h
index 1ef593e79..f0d43b0f4 100644
--- a/engine/graphics/api/vertex_array.h
+++ b/engine/graphics/api/vertex_array.h
@@ -5,26 +5,26 @@
 #include <memory>
 #include <vector>
 
-namespace CHEngine
+namespace Chained
 {
 
-class VertexArray
-{
-public:
-    virtual ~VertexArray() = default;
+	class VertexArray
+	{
+	public:
+		virtual ~VertexArray() = default;
 
-    virtual void Bind() const = 0;
-    virtual void Unbind() const = 0;
+		virtual void Bind() const = 0;
+		virtual void Unbind() const = 0;
 
-    virtual void AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertexBuffer) = 0;
-    virtual void SetIndexBuffer(const std::shared_ptr<IndexBuffer>& indexBuffer) = 0;
+		virtual void AddVertexBuffer(const std::shared_ptr<VertexBuffer>& vertexBuffer) = 0;
+		virtual void SetIndexBuffer(const std::shared_ptr<IndexBuffer>& indexBuffer) = 0;
 
-    virtual const std::vector<std::shared_ptr<VertexBuffer>>& GetVertexBuffers() const = 0;
-    virtual const std::shared_ptr<IndexBuffer>& GetIndexBuffer() const = 0;
+		virtual const std::vector<std::shared_ptr<VertexBuffer>>& GetVertexBuffers() const = 0;
+		virtual const std::shared_ptr<IndexBuffer>& GetIndexBuffer() const = 0;
 
-    static std::shared_ptr<VertexArray> Create();
-};
+		static std::shared_ptr<VertexArray> Create();
+	};
 
-} // namespace CHEngine
+} // namespace Chained
 
 #endif // CH_VERTEX_ARRAY_H
diff --git a/engine/graphics/assets/environment.h b/engine/graphics/assets/environment.h
deleted file mode 100644
index c6e2455e0..000000000
--- a/engine/graphics/assets/environment.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef CH_ENVIRONMENT_H
-#define CH_ENVIRONMENT_H
-
-#include "engine/core/assets/asset.h"
-#include <glm/glm.hpp>
-#include <string>
-
-namespace CHEngine
-{
-
-struct SkyboxSettings
-{
-    std::string TexturePath;
-    int Mode = 0; // 0: Equirectangular, 1: Cross (Horizontal), 2: Cubemap (GPU)
-    float Exposure = 1.0f;
-    float Brightness = 0.0f;
-    float Contrast = 1.0f;
-};
-
-struct FogSettings
-{
-    bool Enabled = false;
-    int Mode = 0; // 0: Linear, 1: Exp, 2: Exp2
-    Color FogColor = {158, 148, 148, 255};
-    float Density = 0.001f;
-    float Start = 10.0f;
-    float End = 5000.0f;
-};
-
-struct LightingSettings
-{
-    glm::vec3 Direction = {-1.0f, -1.0f, -1.0f};
-    Color LightColor = {255, 255, 255, 255}; // WHITE
-    float Ambient = 0.3f;
-    float Exposure = 1.0f;
-    float Gamma = 2.2f;
-};
-
-struct EnvironmentSettings
-{
-    LightingSettings Lighting;
-    SkyboxSettings Skybox;
-    FogSettings Fog;
-};
-
-class EnvironmentAsset : public Asset
-{
-public:
-    EnvironmentAsset()
-        : Asset(GetStaticType())
-    {
-    }
-    virtual ~EnvironmentAsset() = default;
-
-    static AssetType GetStaticType()
-    {
-        return AssetType::Environment;
-    }
-
-    void OnLoaded() override
-    {
-    }
-
-    const EnvironmentSettings& GetSettings() const
-    {
-        return m_Settings;
-    }
-    EnvironmentSettings& GetSettings()
-    {
-        return m_Settings;
-    }
-    void SetSettings(const EnvironmentSettings& settings)
-    {
-        m_Settings = settings;
-    }
-
-private:
-    EnvironmentSettings m_Settings;
-};
-
-} // namespace CHEngine
-
-#endif // CH_ENVIRONMENT_H
diff --git a/engine/graphics/assets/font_asset.cpp b/engine/graphics/assets/font_asset.cpp
deleted file mode 100644
index f306bf83f..000000000
--- a/engine/graphics/assets/font_asset.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "engine/graphics/assets/font_asset.h"
-#include "engine/core/assets/asset_manager.h"
-
-namespace CHEngine
-{
-    NativeFont FontAsset::CreateFromFile(const std::string& path)
-    {
-        auto asset = AssetManager::Get().Get<FontAsset>(path);
-        if (asset && asset->GetState() == AssetState::Ready)
-        {
-            return asset->GetFont();
-        }
-        return NativeFont{};
-    }
-}
diff --git a/engine/graphics/assets/font_asset.h b/engine/graphics/assets/font_asset.h
deleted file mode 100644
index 440c7cf2b..000000000
--- a/engine/graphics/assets/font_asset.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef CH_FONT_ASSET_H
-#define CH_FONT_ASSET_H
-
-#include "engine/core/assets/asset.h"
-// #include <string>
-#include <cstdint>
-#include <memory>
-
-namespace CHEngine
-{
-struct NativeFontChar
-{
-    float x0, y0, x1, y1; // Texture coordinates
-    float xoff, yoff, xadvance;
-};
-
-struct NativeFont
-{
-    uint32_t textureId = 0;
-    int atlasWidth = 0;
-    int atlasHeight = 0;
-    NativeFontChar chars[128]; // ASCII for now
-    float fontSize = 32.0f;
-};
-
-class FontAsset : public Asset
-{
-public:
-    FontAsset()
-        : Asset(GetStaticType())
-    {
-    }
-    virtual ~FontAsset() = default;
-
-    static AssetType GetStaticType()
-    {
-        return AssetType::Font;
-    }
-
-    void OnLoaded() override {}
-
-    const NativeFont& GetFont() const { return m_Font; }
-    void SetFont(const NativeFont& font) { m_Font = font; }
-
-    // Hazel-style asset loading
-    static NativeFont CreateFromFile(const std::string& path);
-
-private:
-    NativeFont m_Font = {0};
-};
-} // namespace CHEngine
-
-#endif // CH_FONT_ASSET_H
diff --git a/engine/graphics/assets/model_asset.cpp b/engine/graphics/assets/model_asset.cpp
deleted file mode 100644
index 764721af3..000000000
--- a/engine/graphics/assets/model_asset.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/log.h"
-#include "engine/core/profiler.h"
-// #include "engine/graphics/assets/shader_asset.h"
-#include "engine/graphics/assets/texture_asset.h"
-// #include "engine/graphics/importers/mesh_importer.h"
-#include "engine/scene/project.h"
-// #include <algorithm>
-#include <cstring>
-// #include <filesystem>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/quaternion.hpp>
-
-namespace CHEngine
-{
-std::string ModelAsset::GetAnimationName(int index) const
-{
-    return (index >= 0 && index < (int)m_Animations.size()) ? m_Animations[index].name : "";
-}
-
-std::vector<glm::mat4> ModelAsset::GetBoneMatrices(int animationIndex, int frame) const
-{
-    if (animationIndex < 0 || animationIndex >= m_Animations.size()) return {};
-    const auto& anim = m_Animations[animationIndex];
-    if (frame < 0 || frame >= anim.frameCount) return {};
-
-    int boneCount = anim.boneCount;
-    if (boneCount == 0) return {};
-
-    std::vector<glm::mat4> globalTransforms(boneCount);
-    std::vector<glm::mat4> finalMatrices;
-    finalMatrices.reserve(boneCount);
-
-    for (int boneIndex = 0; boneIndex < boneCount; ++boneIndex)
-    {
-        const auto& pose = anim.framePoses[frame * boneCount + boneIndex];
-        
-        glm::mat4 local = glm::translate(glm::mat4(1.0f), pose.translation) *
-                          glm::mat4_cast(pose.rotation) *
-                          glm::scale(glm::mat4(1.0f), pose.scale);
-
-        if (m_NodeParents[boneIndex] == -1)
-            globalTransforms[boneIndex] = local;
-        else
-            globalTransforms[boneIndex] = globalTransforms[m_NodeParents[boneIndex]] * local;
-
-        glm::mat4 offset = (boneIndex < (int)m_OffsetMatrices.size()) ? m_OffsetMatrices[boneIndex] : glm::mat4(1.0f);
-        finalMatrices.push_back(globalTransforms[boneIndex] * offset);
-    }
-
-    return finalMatrices;
-}
-
-
-void ModelAsset::OnLoaded()
-{
-    CH_PROFILE_FUNCTION();
-
-    if (!m_HasPendingData || !m_PendingData.isValid)
-    {
-        return;
-    }
-
-    CH_CORE_INFO("ModelAsset: Uploading model to GPU: '{}' ({} meshes, {} materials)", GetPath(),
-                 static_cast<uint32_t>(m_PendingData.meshes.size()),
-                 static_cast<uint32_t>(m_PendingData.materials.size()));
-
-    Model newModel;
-    newModel.Materials.resize(m_PendingData.materials.empty() ? 1 : m_PendingData.materials.size());
-    m_EmbeddedTextures.clear();
-
-    auto project = Project::GetActive();
-
-    auto loadTex = [&](int matIdx, const std::string& path, int mapIndex) {
-        if (path.empty())
-        {
-            return;
-        }
-
-        if (path.front() == '*')
-        {
-            auto embeddedIt = m_PendingData.embeddedTextures.find(path);
-            if (embeddedIt == m_PendingData.embeddedTextures.end())
-            {
-                return;
-            }
-
-            const EmbeddedTextureData& embedded = embeddedIt->second;
-            if (embedded.data.empty() || embedded.width <= 0 || embedded.height <= 0 || embedded.isHDR)
-            {
-                return;
-            }
-
-            auto texture = Texture::Create((uint32_t)embedded.width, (uint32_t)embedded.height, TextureFormat::RGBA8);
-            if (!texture)
-            {
-                return;
-            }
-
-            texture->SetData((void*)embedded.data.data(), 0);
-            m_EmbeddedTextures.push_back(texture);
-
-            uint32_t texId = texture->GetRendererID();
-            switch (mapIndex)
-            {
-            case 0:
-                newModel.Materials[matIdx].AlbedoMap = texId;
-                break;
-            case 1:
-                newModel.Materials[matIdx].EmissiveMap = texId;
-                break;
-            case 2:
-                newModel.Materials[matIdx].NormalMap = texId;
-                break;
-            case 3:
-                newModel.Materials[matIdx].MetallicRoughnessMap = texId;
-                break;
-            case 4:
-                newModel.Materials[matIdx].EmissiveMap = texId;
-                break;
-            case 5:
-                newModel.Materials[matIdx].OcclusionMap = texId;
-                break;
-            }
-            return;
-        }
-
-        if (!project)
-        {
-            return;
-        }
-
-        auto tex = AssetManager::Get().Get<TextureAsset>(path);
-        if (!tex)
-        {
-            return;
-        }
-
-        uint32_t texId = 0;
-        if (tex->IsReady())
-        {
-            texId = tex->GetTexture()->GetRendererID();
-        }
-        else
-        {
-            // Optional: fallback texture ID here
-            texId = 0; 
-        }
-        switch (mapIndex)
-        {
-        case 0:
-            newModel.Materials[matIdx].AlbedoMap = texId;
-            break;
-        case 1:
-            newModel.Materials[matIdx].EmissiveMap = texId;
-            break;
-        case 2:
-            newModel.Materials[matIdx].NormalMap = texId;
-            break;
-        case 3:
-            newModel.Materials[matIdx].MetallicRoughnessMap = texId;
-            break;
-        case 4:
-            newModel.Materials[matIdx].EmissiveMap = texId;
-            break;
-        case 5:
-            newModel.Materials[matIdx].OcclusionMap = texId;
-            break;
-        }
-    };
-
-    for (int materialIndex = 0; materialIndex < (int)newModel.Materials.size(); ++materialIndex)
-    {
-        if (!m_PendingData.materials.empty())
-        {
-            const auto& rawMaterial = m_PendingData.materials[materialIndex];
-            newModel.Materials[materialIndex].AlbedoColor = rawMaterial.albedoColor;
-            newModel.Materials[materialIndex].EmissiveColor = rawMaterial.emissiveColor;
-            newModel.Materials[materialIndex].EmissiveIntensity = rawMaterial.emissiveIntensity;
-            newModel.Materials[materialIndex].Metalness = rawMaterial.metalness;
-            newModel.Materials[materialIndex].Roughness = rawMaterial.roughness;
-
-            loadTex(materialIndex, rawMaterial.albedoPath, 0);
-            newModel.Materials[materialIndex].AlbedoPath = rawMaterial.albedoPath;
-            
-            loadTex(materialIndex, rawMaterial.normalPath, 2);
-            newModel.Materials[materialIndex].NormalPath = rawMaterial.normalPath;
-            
-            loadTex(materialIndex, rawMaterial.occlusionPath, 5);
-            newModel.Materials[materialIndex].OcclusionPath = rawMaterial.occlusionPath;
-            
-            loadTex(materialIndex, rawMaterial.emissivePath, 4);
-            newModel.Materials[materialIndex].EmissivePath = rawMaterial.emissivePath;
-            
-            loadTex(materialIndex, rawMaterial.metallicRoughnessPath, 3);
-            newModel.Materials[materialIndex].MetallicRoughnessPath = rawMaterial.metallicRoughnessPath;
-        }
-    }
-
-    for (int meshIndex = 0; meshIndex < (int)m_PendingData.meshes.size(); ++meshIndex)
-    {
-        const auto& rawMesh = m_PendingData.meshes[meshIndex];
-        Mesh mesh;
-        mesh.VertexCount = (uint32_t)rawMesh.vertices.size() / 3;
-        mesh.TriangleCount = (uint32_t)rawMesh.indices.size() / 3;
-        mesh.MaterialIndex = (rawMesh.materialIndex >= 0 && rawMesh.materialIndex < (int)newModel.Materials.size())
-                                 ? rawMesh.materialIndex
-                                 : 0;
-
-        if (mesh.VertexCount > 0)
-        {
-            mesh.VAO = VertexArray::Create();
-
-            auto vboPos =
-                VertexBuffer::Create(rawMesh.vertices.data(), (uint32_t)rawMesh.vertices.size() * sizeof(float));
-            vboPos->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-            mesh.VAO->AddVertexBuffer(vboPos);
-
-            if (!rawMesh.texcoords.empty())
-            {
-                auto vboTex =
-                    VertexBuffer::Create(rawMesh.texcoords.data(), (uint32_t)rawMesh.texcoords.size() * sizeof(float));
-                vboTex->SetLayout({{ShaderDataType::Float2, "a_TexCoord"}});
-                mesh.VAO->AddVertexBuffer(vboTex);
-            }
-
-            if (!rawMesh.normals.empty())
-            {
-                auto vboNorm =
-                    VertexBuffer::Create(rawMesh.normals.data(), (uint32_t)rawMesh.normals.size() * sizeof(float));
-                vboNorm->SetLayout({{ShaderDataType::Float3, "a_Normal"}});
-                mesh.VAO->AddVertexBuffer(vboNorm);
-            }
-
-            if (!rawMesh.joints.empty())
-            {
-                // Convert unsigned char joints to int32_t for ShaderDataType::Int4 (GL_INT) compatibility
-                std::vector<int32_t> jointsInt;
-                jointsInt.reserve(rawMesh.joints.size());
-                for (auto jointId : rawMesh.joints) jointsInt.push_back(static_cast<int32_t>(jointId));
-                
-                auto vboJoints = VertexBuffer::Create((float*)jointsInt.data(),
-                                                      (uint32_t)jointsInt.size() * sizeof(int32_t));
-                vboJoints->SetLayout({{ShaderDataType::Int4, "a_JointIDs"}});
-                mesh.VAO->AddVertexBuffer(vboJoints);
-            }
-
-            if (!rawMesh.weights.empty())
-            {
-                auto vboWeights = VertexBuffer::Create(rawMesh.weights.data(),
-                                                       (uint32_t)rawMesh.weights.size() * sizeof(float));
-                vboWeights->SetLayout({{ShaderDataType::Float4, "a_Weights"}});
-                mesh.VAO->AddVertexBuffer(vboWeights);
-            }
-
-            if (!rawMesh.indices.empty())
-            {
-                auto ibo = IndexBuffer::Create(rawMesh.indices.data(), (uint32_t)rawMesh.indices.size());
-                mesh.VAO->SetIndexBuffer(ibo);
-            }
-
-            mesh.MinBounds = {FLT_MAX, FLT_MAX, FLT_MAX};
-            mesh.MaxBounds = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
-            for (size_t vertexOffset = 0; vertexOffset < rawMesh.vertices.size(); vertexOffset += 3)
-            {
-                mesh.MinBounds =
-                    glm::min(mesh.MinBounds, {rawMesh.vertices[vertexOffset], rawMesh.vertices[vertexOffset + 1], rawMesh.vertices[vertexOffset + 2]});
-                mesh.MaxBounds =
-                    glm::max(mesh.MaxBounds, {rawMesh.vertices[vertexOffset], rawMesh.vertices[vertexOffset + 1], rawMesh.vertices[vertexOffset + 2]});
-            }
-        }
-        newModel.Meshes.push_back(mesh);
-    }
-
-    BoundingBox totalBox = {{FLT_MAX, FLT_MAX, FLT_MAX}, {-FLT_MAX, -FLT_MAX, -FLT_MAX}};
-    bool anyMesh = false;
-    for (const auto& inst : m_PendingData.instances)
-    {
-        if (inst.meshIndex < 0 || inst.meshIndex >= (int)newModel.Meshes.size())
-        {
-            continue;
-        }
-        const Mesh& mesh = newModel.Meshes[inst.meshIndex];
-
-        glm::vec3 corners[8] = {{mesh.MinBounds.x, mesh.MinBounds.y, mesh.MinBounds.z},
-                                {mesh.MaxBounds.x, mesh.MinBounds.y, mesh.MinBounds.z},
-                                {mesh.MinBounds.x, mesh.MaxBounds.y, mesh.MinBounds.z},
-                                {mesh.MaxBounds.x, mesh.MaxBounds.y, mesh.MinBounds.z},
-                                {mesh.MinBounds.x, mesh.MinBounds.y, mesh.MaxBounds.z},
-                                {mesh.MaxBounds.x, mesh.MinBounds.y, mesh.MaxBounds.z},
-                                {mesh.MinBounds.x, mesh.MaxBounds.y, mesh.MaxBounds.z},
-                                {mesh.MaxBounds.x, mesh.MaxBounds.y, mesh.MaxBounds.z}};
-
-        for (int cornerIndex = 0; cornerIndex < 8; ++cornerIndex)
-        {
-            glm::vec4 transformed = inst.localTransform * glm::vec4(corners[cornerIndex], 1.0f);
-            totalBox.Min = glm::min(totalBox.Min, glm::vec3(transformed));
-            totalBox.Max = glm::max(totalBox.Max, glm::vec3(transformed));
-        }
-        anyMesh = true;
-    }
-    if (!anyMesh)
-    {
-        totalBox = {{0, 0, 0}, {0, 0, 0}};
-    }
-
-    m_Model = std::move(newModel);
-    m_Materials = m_Model.Materials;
-    m_BoundingBox = totalBox;
-    m_RawMeshes = std::move(m_PendingData.meshes);
-    m_Animations = std::move(m_PendingData.animations);
-    m_Instances = std::move(m_PendingData.instances);
-    m_OffsetMatrices = std::move(m_PendingData.offsetMatrices);
-    m_NodeNames = std::move(m_PendingData.nodeNames);
-    m_NodeParents = std::move(m_PendingData.nodeParents);
-
-    m_PendingData = PendingModelData();
-    m_HasPendingData = false;
-    SetState(AssetState::Ready);
-}
-
-uint32_t ModelAsset::GetEmbeddedTextureID(const std::string& path) const
-{
-    // Embedded textures have paths like "*0", "*1", etc.
-    if (path.empty() || path.front() != '*')
-    {
-        return 0;
-    }
-    try
-    {
-        size_t index = std::stoul(path.substr(1));
-        if (index < m_EmbeddedTextures.size() && m_EmbeddedTextures[index])
-        {
-            return m_EmbeddedTextures[index]->GetRendererID();
-        }
-    }
-    catch (...)
-    {
-    }
-    return 0;
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/assets/model_asset.h b/engine/graphics/assets/model_asset.h
deleted file mode 100644
index 3351450c9..000000000
--- a/engine/graphics/assets/model_asset.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef CH_MODEL_ASSET_H
-#define CH_MODEL_ASSET_H
-
-#include "engine/core/assets/asset.h"
-#include "engine/core/base.h"
-#include "engine/graphics/api/model_data.h"
-#include "engine/graphics/pipeline/renderer_types.h"
-#include <future>
-// #include <mutex>
-#include <string>
-#include <vector>
-
-namespace CHEngine
-{
-class Texture;
-
-class ModelAsset : public Asset
-{
-public:
-    ModelAsset()
-        : Asset(GetStaticType())
-    {
-    }
-    virtual ~ModelAsset() = default;
-
-    static AssetType GetStaticType()
-    {
-        return AssetType::Model;
-    }
-
-    void OnLoaded() override;
-
-    const Model& GetModel() const
-    {
-        return m_Model;
-    }
-    const std::vector<RawAnimation>& GetAnimations() const
-    {
-        return m_Animations;
-    }
-    const std::vector<MeshInstance>& GetInstances() const
-    {
-        return m_Instances;
-    }
-    const BoundingBox& GetBoundingBox() const
-    {
-        return m_BoundingBox;
-    }
-
-    const std::vector<RawMesh>& GetRawMeshes() const
-    {
-        return m_RawMeshes;
-    }
-
-    // Helpers
-    int GetAnimationCount() const
-    {
-        return (int)m_Animations.size();
-    }
-    void SetPendingData(PendingModelData&& data)
-    {
-        m_PendingData = std::move(data);
-        m_HasPendingData = true;
-    }
-    PendingModelData& GetPendingData()
-    {
-        return m_PendingData;
-    }
-    bool HasPendingData() const
-    {
-        return m_HasPendingData;
-    }
-
-    void SetModel(const Model& model)
-    {
-        m_Model = model;
-    }
-    void SetAnimations(const std::vector<RawAnimation>& animations)
-    {
-        m_Animations = animations;
-    }
-    void SetInstances(const std::vector<MeshInstance>& instances)
-    {
-        m_Instances = instances;
-    }
-    void SetBoundingBox(const BoundingBox& bbox)
-    {
-        m_BoundingBox = bbox;
-    }
-    void SetRawMeshes(const std::vector<RawMesh>& meshes)
-    {
-        m_RawMeshes = meshes;
-    }
-    void SetOffsetMatrices(const std::vector<glm::mat4>& matrices)
-    {
-        m_OffsetMatrices = matrices;
-    }
-    void SetNodeNames(const std::vector<std::string>& names)
-    {
-        m_NodeNames = names;
-    }
-    void SetNodeParents(const std::vector<int>& parents)
-    {
-        m_NodeParents = parents;
-    }
-    std::string GetAnimationName(int index) const;
-    std::vector<glm::mat4> GetBoneMatrices(int animationIndex, int frame) const;
-
-    const std::vector<Material>& GetMaterials() const
-    {
-        return m_Materials;
-    }
-
-    // Get renderer ID for embedded texture (e.g., "*0", "*1").
-    // Returns 0 if the texture is not found or path is not an embedded texture marker.
-    uint32_t GetEmbeddedTextureID(const std::string& path) const;
-
-private:
-    Model m_Model;
-    std::vector<RawMesh> m_RawMeshes;
-    std::vector<RawAnimation> m_Animations;
-    std::vector<MeshInstance> m_Instances;
-    std::vector<Material> m_Materials;
-    BoundingBox m_BoundingBox = {{0, 0, 0}, {0, 0, 0}};
-
-    // Skeleton data
-    std::vector<glm::mat4> m_OffsetMatrices;
-    std::vector<std::string> m_NodeNames;
-    std::vector<int> m_NodeParents;
-
-    // Loading data
-    PendingModelData m_PendingData;
-    std::vector<std::shared_ptr<Texture>> m_EmbeddedTextures;
-    bool m_HasPendingData = false;
-};
-} // namespace CHEngine
-
-#endif // CH_MODEL_ASSET_H
diff --git a/engine/graphics/assets/shader_asset.cpp b/engine/graphics/assets/shader_asset.cpp
deleted file mode 100644
index 6e582817d..000000000
--- a/engine/graphics/assets/shader_asset.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "engine/graphics/assets/shader_asset.h"
-
-namespace CHEngine
-{
-    // Implementation is now mostly in the header or handled by ShaderImporter
-}
diff --git a/engine/graphics/assets/shader_asset.h b/engine/graphics/assets/shader_asset.h
deleted file mode 100644
index 995be8aa3..000000000
--- a/engine/graphics/assets/shader_asset.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef CH_SHADER_ASSET_H
-#define CH_SHADER_ASSET_H
-
-#include "engine/core/assets/asset.h"
-#include "engine/graphics/api/shader.h"
-#include <memory>
-
-namespace CHEngine
-{
-
-class ShaderAsset : public Asset
-{
-public:
-    ShaderAsset()
-        : Asset(GetStaticType())
-    {
-    }
-    virtual ~ShaderAsset() = default;
-
-    static AssetType GetStaticType()
-    {
-        return AssetType::Shader;
-    }
-
-    void OnLoaded() override {} // Shaders are usually loaded synchronously on GPU
-
-    std::shared_ptr<Shader> GetShader() const { return m_Shader; }
-    void SetShader(const std::shared_ptr<Shader>& shader) { m_Shader = shader; }
-
-private:
-    std::shared_ptr<Shader> m_Shader;
-};
-
-} // namespace CHEngine
-
-#endif // CH_SHADER_ASSET_H
diff --git a/engine/graphics/assets/texture_asset.cpp b/engine/graphics/assets/texture_asset.cpp
deleted file mode 100644
index 510ec1c2c..000000000
--- a/engine/graphics/assets/texture_asset.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "engine/graphics/assets/texture_asset.h"
-#include "engine/core/log.h"
-#include "engine/core/profiler.h"
-#include "engine/scene/project.h"
-#include <filesystem>
-#include <algorithm>
-#include <stb_image.h>
-
-namespace CHEngine
-{
-
-uint32_t TextureAsset::GetWidth() const
-{
-    if (m_Texture) return m_Texture->GetWidth();
-    return m_PendingImage.width;
-}
-
-uint32_t TextureAsset::GetHeight() const
-{
-    if (m_Texture) return m_Texture->GetHeight();
-    return m_PendingImage.height;
-}
-
-void TextureAsset::OnLoaded()
-{
-    CH_PROFILE_FUNCTION();
-
-    if (GetState() == AssetState::Ready || GetState() == AssetState::Failed)
-    {
-        return;
-    }
-
-    if (m_HasPendingImage && m_PendingImage.data != nullptr)
-    {
-        TextureFormat format = TextureFormat::RGBA8;
-        if (m_IsHDR)
-        {
-            format = (m_PendingImage.channels == 3) ? TextureFormat::RGB16F : TextureFormat::RGBA16F;
-        }
-        else
-        {
-            format = (m_PendingImage.channels == 3) ? TextureFormat::RGB8 : TextureFormat::RGBA8;
-        }
-
-        if (m_IsCubemap)
-        {
-            m_Texture = Texture::CreateCubemap(m_PendingImage.width, format);
-        }
-        else
-        {
-            m_Texture = Texture::Create(m_PendingImage.width, m_PendingImage.height, format);
-            if (m_Texture)
-            {
-                m_Texture->SetData(m_PendingImage.data, 0); 
-            }
-        }
-
-        if (m_PendingImage.data != nullptr)
-        {
-            stbi_image_free(m_PendingImage.data);
-            m_PendingImage.data = nullptr;
-        }
-        m_HasPendingImage = false;
-
-        SetState(AssetState::Ready);
-    }
-}
-
-void TextureAsset::Unload()
-{
-    m_Texture.reset();
-    if (m_PendingImage.data != nullptr)
-    {
-        stbi_image_free(m_PendingImage.data);
-        m_PendingImage.data = nullptr;
-    }
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/assets/texture_asset.h b/engine/graphics/assets/texture_asset.h
deleted file mode 100644
index b36886b62..000000000
--- a/engine/graphics/assets/texture_asset.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef CH_TEXTURE_ASSET_H
-#define CH_TEXTURE_ASSET_H
-
-#include "engine/core/assets/asset.h"
-#include "engine/graphics/api/texture.h"
-#include <memory>
-// #include <string>
-#include <cstdint>
-
-namespace CHEngine
-{
-
-struct RawImage
-{
-    void* data = nullptr;
-    int width = 0;
-    int height = 0;
-    int mipmaps = 0;
-    int format = 0;
-    int channels = 0;
-    bool isHDR = false;
-};
-
-class TextureAsset : public Asset
-{
-public:
-    TextureAsset()
-        : Asset(GetStaticType())
-    {
-    }
-    virtual ~TextureAsset() = default;
-
-    static AssetType GetStaticType()
-    {
-        return AssetType::Texture;
-    }
-
-    void OnLoaded() override;
-
-    std::shared_ptr<Texture> GetTexture() const { return m_Texture; }
-    uint32_t GetWidth() const;
-    uint32_t GetHeight() const;
-
-    bool IsCubemap() const { return m_IsCubemap; }
-    bool IsHDR() const { return m_IsHDR; }
-
-    void SetPendingImage(const RawImage& image) { m_PendingImage = image; m_HasPendingImage = true; }
-    void SetIsCubemap(bool isCubemap) { m_IsCubemap = isCubemap; }
-    void SetIsHDR(bool isHDR) { m_IsHDR = isHDR; }
-
-    void Unload();
-
-private:
-    std::shared_ptr<Texture> m_Texture;
-    RawImage m_PendingImage = {0};
-    bool m_HasPendingImage = false;
-    bool m_IsCubemap = false;
-    bool m_IsHDR = false;
-};
-
-} // namespace CHEngine
-
-#endif // CH_TEXTURE_ASSET_H
diff --git a/engine/graphics/camera_types.h b/engine/graphics/camera_types.h
new file mode 100644
index 000000000..2bc9fd6b4
--- /dev/null
+++ b/engine/graphics/camera_types.h
@@ -0,0 +1,47 @@
+#ifndef CH_CAMERA_TYPES_H
+#define CH_CAMERA_TYPES_H
+
+#include <glm/glm.hpp>
+
+namespace Chained
+{
+
+	enum class ProjectionType : int
+	{
+		Perspective = 0,
+		Orthographic = 1
+	};
+
+	struct Camera2D
+	{
+		glm::vec2 Position = {0.0f, 0.0f};
+		float Rotation = 0.0f;
+		float Zoom = 1.0f;
+		float NearClip = -1.0f;
+		float FarClip = 1.0f;
+
+		glm::mat4 ViewMatrix = glm::mat4(1.0f);
+		glm::mat4 ProjectionMatrix = glm::mat4(1.0f);
+	};
+
+	struct Camera3D
+	{
+		Camera3D() = default;
+
+		glm::vec3 Position = {0.0f, 0.0f, 0.0f};
+		glm::vec3 Target = {0.0f, 0.0f, 0.0f};
+		glm::vec3 Up = {0.0f, 1.0f, 0.0f};
+
+		ProjectionType Projection = ProjectionType::Perspective;
+		float FovDegrees = 45.0f;
+		float OrthographicSize = 10.0f;
+		float NearClip = 0.01f;
+		float FarClip = 1000.0f;
+
+		glm::mat4 ProjectionMatrix = glm::mat4(1.0f);
+		glm::mat4 ViewMatrix = glm::mat4(1.0f);
+	};
+
+} // namespace Chained
+
+#endif // CH_CAMERA_TYPES_H
diff --git a/engine/graphics/freetype_gl_atlas.cpp b/engine/graphics/freetype_gl_atlas.cpp
new file mode 100644
index 000000000..a6fd473f9
--- /dev/null
+++ b/engine/graphics/freetype_gl_atlas.cpp
@@ -0,0 +1,193 @@
+#include "engine/graphics/freetype_gl_atlas.h"
+
+namespace Chained
+{
+	FreeTypeGLAtlas::~FreeTypeGLAtlas()
+	{
+		Shutdown();
+	}
+
+	// ── helpers ──────────────────────────────────────────────────────────────
+	static std::string CodepointToUTF8(uint32_t cp)
+	{
+		std::string s;
+		if (cp < 0x80)
+		{
+			s += static_cast<char>(cp);
+		}
+		else if (cp < 0x800)
+		{
+			s += static_cast<char>(0xC0 | (cp >> 6));
+			s += static_cast<char>(0x80 | (cp & 0x3F));
+		}
+		else if (cp < 0x10000)
+		{
+			s += static_cast<char>(0xE0 | (cp >> 12));
+			s += static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+			s += static_cast<char>(0x80 | (cp & 0x3F));
+		}
+		else
+		{
+			s += static_cast<char>(0xF0 | (cp >> 18));
+			s += static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
+			s += static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+			s += static_cast<char>(0x80 | (cp & 0x3F));
+		}
+		return s;
+	}
+
+	// ── init ─────────────────────────────────────────────────────────────────
+	bool FreeTypeGLAtlas::Init(const std::string& path, float ptSize, uint32_t atlasW, uint32_t atlasH)
+	{
+		Shutdown();
+		m_AtlasWidth = atlasW;
+		m_AtlasHeight = atlasH;
+		m_PtSize = ptSize;
+
+		m_Atlas = ftgl::texture_atlas_new(atlasW, atlasH, 1); // depth 1 = alpha only
+		if (!m_Atlas)
+		{
+			CH_CORE_ERROR("FreeTypeGLAtlas: texture_atlas_new failed ({}x{})", atlasW, atlasH);
+			return false;
+		}
+
+		m_Font = ftgl::texture_font_new_from_file(m_Atlas, ptSize, path.c_str());
+		if (!m_Font)
+		{
+			CH_CORE_ERROR("FreeTypeGLAtlas: texture_font_new_from_file failed '{}'", path);
+			return false;
+		}
+		m_Font->hinting = 1;
+		m_Font->kerning = 1;
+
+		// Preload ASCII (32–127) and Cyrillic (0x0400–0x04FF)
+		PreloadRange(32, 96);
+		PreloadRange(0x0400, 256);
+
+		CH_CORE_INFO("FreeTypeGLAtlas: loaded '{}' pt={} atlas={}x{}", path, ptSize, atlasW, atlasH);
+		return true;
+	}
+
+	bool FreeTypeGLAtlas::InitFromMemory(const void* data, size_t dataSize, float ptSize, uint32_t atlasW,
+										 uint32_t atlasH)
+	{
+		Shutdown();
+		m_AtlasWidth = atlasW;
+		m_AtlasHeight = atlasH;
+		m_PtSize = ptSize;
+
+		m_Atlas = ftgl::texture_atlas_new(atlasW, atlasH, 1);
+		if (!m_Atlas)
+		{
+			CH_CORE_ERROR("FreeTypeGLAtlas: texture_atlas_new failed ({}x{})", atlasW, atlasH);
+			return false;
+		}
+
+		m_Font = ftgl::texture_font_new_from_memory(m_Atlas, ptSize, data, dataSize);
+		if (!m_Font)
+		{
+			CH_CORE_ERROR("FreeTypeGLAtlas: texture_font_new_from_memory failed");
+			return false;
+		}
+		m_Font->hinting = 1;
+		m_Font->kerning = 1;
+
+		PreloadRange(32, 96);
+		PreloadRange(0x0400, 256);
+
+		CH_CORE_INFO("FreeTypeGLAtlas: loaded from memory pt={} atlas={}x{}", ptSize, atlasW, atlasH);
+		return true;
+	}
+
+	void FreeTypeGLAtlas::Shutdown()
+	{
+		if (m_Font)
+		{
+			ftgl::texture_font_delete(m_Font);
+			m_Font = nullptr;
+		}
+		if (m_Atlas)
+		{
+			ftgl::texture_atlas_delete(m_Atlas);
+			m_Atlas = nullptr;
+		}
+		m_FtLibrary = nullptr;
+		m_Glyphs.clear();
+	}
+
+	// ── glyph access ─────────────────────────────────────────────────────────
+	const AtlasGlyphMetrics* FreeTypeGLAtlas::GetGlyph(uint32_t codepoint)
+	{
+		if (!m_Font)
+		{
+			return nullptr;
+		}
+		auto it = m_Glyphs.find(codepoint);
+		if (it != m_Glyphs.end())
+		{
+			return &it->second;
+		}
+		CacheGlyph(codepoint);
+		auto it2 = m_Glyphs.find(codepoint);
+		return (it2 != m_Glyphs.end()) ? &it2->second : nullptr;
+	}
+
+	void FreeTypeGLAtlas::CacheGlyph(uint32_t codepoint)
+	{
+		std::string utf8 = CodepointToUTF8(codepoint);
+		// texture_font_get_glyph renders + packs if not already present
+		ftgl::texture_glyph_t* g = ftgl::texture_font_get_glyph(m_Font, utf8.c_str());
+		if (!g)
+		{
+			return;
+		}
+		AtlasGlyphMetrics m;
+		m.codepoint = codepoint;
+		m.width = static_cast<uint32_t>(g->width);
+		m.height = static_cast<uint32_t>(g->height);
+		m.offsetX = g->offset_x;
+		m.offsetY = g->offset_y;
+		m.advanceX = g->advance_x;
+		m.s0 = g->s0;
+		m.t0 = g->t0;
+		m.s1 = g->s1;
+		m.t1 = g->t1;
+		m_Glyphs[codepoint] = m;
+	}
+
+	void FreeTypeGLAtlas::PreloadRange(uint32_t first, uint32_t count)
+	{
+		if (!m_Font)
+		{
+			return;
+		}
+		for (uint32_t i = 0; i < count; ++i)
+		{
+			uint32_t cp = first + i;
+			std::string utf8 = CodepointToUTF8(cp);
+			ftgl::texture_glyph_t* g = ftgl::texture_font_get_glyph(m_Font, utf8.c_str());
+			if (!g)
+			{
+				continue;
+			}
+			AtlasGlyphMetrics m;
+			m.codepoint = cp;
+			m.width = static_cast<uint32_t>(g->width);
+			m.height = static_cast<uint32_t>(g->height);
+			m.offsetX = g->offset_x;
+			m.offsetY = g->offset_y;
+			m.advanceX = g->advance_x;
+			m.s0 = g->s0;
+			m.t0 = g->t0;
+			m.s1 = g->s1;
+			m.t1 = g->t1;
+			m_Glyphs[cp] = m;
+		}
+	}
+
+	const uint8_t* FreeTypeGLAtlas::GetAlphaData() const
+	{
+		return m_Atlas ? m_Atlas->data : nullptr;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/freetype_gl_atlas.h b/engine/graphics/freetype_gl_atlas.h
new file mode 100644
index 000000000..48a824489
--- /dev/null
+++ b/engine/graphics/freetype_gl_atlas.h
@@ -0,0 +1,99 @@
+#ifndef CH_FREETYPE_GL_ATLAS_H
+#define CH_FREETYPE_GL_ATLAS_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include "texture-atlas.h"
+#include "texture-font.h"
+
+namespace Chained
+{
+	struct AtlasGlyphMetrics
+	{
+		uint32_t codepoint = 0;
+		uint32_t width = 0;
+		uint32_t height = 0;
+		int offsetX = 0;
+		int offsetY = 0;
+		float advanceX = 0.0f;
+		// UV coordinates into the atlas (normalized 0..1)
+		float s0 = 0.0f, t0 = 0.0f;
+		float s1 = 0.0f, t1 = 0.0f;
+	};
+
+	class FreeTypeGLAtlas
+	{
+	public:
+		FreeTypeGLAtlas() = default;
+		~FreeTypeGLAtlas();
+		FreeTypeGLAtlas(const FreeTypeGLAtlas&) = delete;
+		FreeTypeGLAtlas& operator=(const FreeTypeGLAtlas&) = delete;
+
+		/// Initialise from a .ttf / .otf file on disk.
+		/// @param path        Path to the font file (passed to FreeType).
+		/// @param ptSize      Font size in points.
+		/// @param atlasWidth  Atlas texture width in pixels (power of two recommended).
+		/// @param atlasHeight Atlas texture height in pixels.
+		/// @return true on success.
+		bool Init(const std::string& path, float ptSize, uint32_t atlasWidth = 1024, uint32_t atlasHeight = 1024);
+
+		/// Initialise from font data already loaded in memory.
+		bool InitFromMemory(const void* data, size_t dataSize, float ptSize, uint32_t atlasWidth = 1024,
+							uint32_t atlasHeight = 1024);
+
+		void Shutdown();
+
+		/// Get or create a glyph.  Returns nullptr on failure.
+		const AtlasGlyphMetrics* GetGlyph(uint32_t codepoint);
+
+		/// Ensure every glyph in the given range is loaded (batch prefetch).
+		void PreloadRange(uint32_t firstCodepoint, uint32_t count);
+
+		/// Read-only access to the raw alpha atlas (1 byte per pixel).
+		const uint8_t* GetAlphaData() const;
+		uint32_t GetAtlasWidth() const
+		{
+			return m_AtlasWidth;
+		}
+		uint32_t GetAtlasHeight() const
+		{
+			return m_AtlasHeight;
+		}
+
+		/// Raw freetype-gl pointers (for callers that need them directly).
+		ftgl::texture_atlas_t* GetAtlas() const
+		{
+			return m_Atlas;
+		}
+		ftgl::texture_font_t* GetFont() const
+		{
+			return m_Font;
+		}
+
+		/// Access the cached glyph metrics (populated by GetGlyph / PreloadRange).
+		const std::unordered_map<uint32_t, AtlasGlyphMetrics>& GetCachedGlyphs() const
+		{
+			return m_Glyphs;
+		}
+
+	private:
+		void CacheGlyph(uint32_t codepoint);
+
+		ftgl::texture_atlas_t* m_Atlas = nullptr;
+		ftgl::texture_font_t* m_Font = nullptr;
+		FT_Library m_FtLibrary = nullptr;
+
+		uint32_t m_AtlasWidth = 0;
+		uint32_t m_AtlasHeight = 0;
+		float m_PtSize = 0.0f;
+
+		// codepoint -> metrics cache (owned by us, separate from freetype-gl's vector)
+		std::unordered_map<uint32_t, AtlasGlyphMetrics> m_Glyphs;
+	};
+
+} // namespace Chained
+
+#endif // CH_FREETYPE_GL_ATLAS_H
diff --git a/engine/graphics/loaders/assimp_importer.cpp b/engine/graphics/loaders/assimp_importer.cpp
deleted file mode 100644
index c16eb1dc3..000000000
--- a/engine/graphics/loaders/assimp_importer.cpp
+++ /dev/null
@@ -1,750 +0,0 @@
-#include "engine/graphics/loaders/assimp_importer.h"
-#include "engine/core/log.h"
-#include "engine/core/profiler.h"
-#include <algorithm>
-#include <assimp/Importer.hpp>
-#include <assimp/postprocess.h>
-#include <assimp/scene.h>
-#include <atomic>
-#include <cmath>
-#include <cstring>
-#include <fstream>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <stb_image.h>
-#include <thread>
-#include <unordered_map>
-
-namespace CHEngine
-{
-template <typename Fn> static void ParallelFor(uint32_t count, Fn&& fn)
-{
-    if (count <= 1)
-    {
-        for (uint32_t i = 0; i < count; ++i)
-        {
-            fn(i);
-        }
-        return;
-    }
-
-    unsigned int hw = std::thread::hardware_concurrency();
-    if (hw == 0)
-    {
-        hw = 1;
-    }
-
-    const uint32_t workers = std::min<uint32_t>(count, hw);
-    if (workers <= 1)
-    {
-        for (uint32_t i = 0; i < count; ++i)
-        {
-            fn(i);
-        }
-        return;
-    }
-
-    std::atomic<uint32_t> next{0};
-    std::vector<std::thread> threads;
-    threads.reserve(workers);
-
-    for (uint32_t t = 0; t < workers; ++t)
-    {
-        threads.emplace_back([&]() {
-            while (true)
-            {
-                const uint32_t idx = next.fetch_add(1, std::memory_order_relaxed);
-                if (idx >= count)
-                {
-                    break;
-                }
-                fn(idx);
-            }
-        });
-    }
-
-    for (auto& thread : threads)
-    {
-        thread.join();
-    }
-}
-
-static bool IsSupportedAssimpExtension(const std::string& ext)
-{
-    return ext == ".gltf" || ext == ".glb" || ext == ".obj";
-}
-
-static bool DecodeEmbeddedTexture(const aiTexture* texture, EmbeddedTextureData& out)
-{
-    if (!texture)
-    {
-        return false;
-    }
-
-    if (texture->mHeight == 0)
-    {
-        const unsigned char* bytes = reinterpret_cast<const unsigned char*>(texture->pcData);
-        int byteCount = (int)texture->mWidth;
-        if (stbi_is_hdr_from_memory(bytes, byteCount))
-        {
-            CH_CORE_WARN("Assimp embedded HDR texture is not supported by the current texture pipeline. Skipping.");
-            return false;
-        }
-
-        int width = 0;
-        int height = 0;
-        int channels = 0;
-        unsigned char* decoded = stbi_load_from_memory(bytes, byteCount, &width, &height, &channels, 4);
-        if (!decoded)
-        {
-            return false;
-        }
-
-        out.width = width;
-        out.height = height;
-        out.channels = 4;
-        out.isHDR = false;
-        out.data.resize((size_t)width * (size_t)height * 4);
-        std::memcpy(out.data.data(), decoded, out.data.size());
-        stbi_image_free(decoded);
-        return true;
-    }
-
-    out.width = (int)texture->mWidth;
-    out.height = (int)texture->mHeight;
-    out.channels = 4;
-    out.isHDR = false;
-    out.data.resize((size_t)out.width * (size_t)out.height * 4);
-    std::memcpy(out.data.data(), texture->pcData, out.data.size());
-    return true;
-}
-
-// --- Minimalist Conversion Helpers ---
-static glm::mat4 ToMat4(const aiMatrix4x4& m)
-{
-    // Assimp stores matrices in row-major memory.
-    // glm::make_mat4 reads 16 floats and treats them as 4 columns (column-major).
-    // If we don't transpose, we get the transpose of the intended matrix (translation in the last row).
-    // Thus, we must transpose to get the logical matrix into GLM's column-major memory.
-    return glm::transpose(glm::make_mat4(&m.a1));
-}
-
-static glm::vec3 ToVec3(const aiVector3D& v)
-{
-    return {v.x, v.y, v.z};
-}
-static glm::vec2 ToVec2(const aiVector3D& v)
-{
-    return {v.x, v.y};
-}
-static glm::quat ToQuat(const aiQuaternion& q)
-{
-    return {q.w, q.x, q.y, q.z};
-}
-static glm::vec4 ToColor(const aiColor4D& c)
-{
-    return {c.r, c.g, c.b, c.a};
-}
-
-PendingModelData AssimpImporter::Import(const std::filesystem::path& path, int samplingFPS)
-{
-    CH_PROFILE_FUNCTION();
-
-    PendingModelData data{};
-    try
-    {
-        Assimp::Importer importer;
-        std::string exts;
-        importer.GetExtensionList(exts);
-        CH_CORE_INFO("AssimpImporter: Supported extensions: {0}", exts);
-
-        CH_CORE_INFO("AssimpImporter: Attempting to import '{0}'", path.string());
-
-        // Match flags and properties from the develop branch for consistency
-        importer.SetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, aiPrimitiveType_POINT | aiPrimitiveType_LINE);
-        importer.SetPropertyInteger(AI_CONFIG_PP_SLM_VERTEX_LIMIT, 65535);
-
-        std::string ext = path.extension().string();
-        std::transform(ext.begin(), ext.end(), ext.begin(), [](unsigned char c) { return (char)std::tolower(c); });
-        if (!IsSupportedAssimpExtension(ext))
-        {
-            CH_CORE_ERROR(
-                "Assimp Model Load Failed: {} | Error: unsupported format '{}'. Supported formats: glTF/GLB, OBJ",
-                path.filename().string(), ext);
-            return data;
-        }
-
-        unsigned int flags = aiProcess_Triangulate | aiProcess_GenSmoothNormals | aiProcess_LimitBoneWeights |
-                             aiProcess_JoinIdenticalVertices | aiProcess_SortByPType | aiProcess_CalcTangentSpace |
-                             aiProcess_SplitLargeMeshes | aiProcess_ImproveCacheLocality |
-                             aiProcess_ValidateDataStructure | aiProcess_FindInvalidData;
-
-        // GLTF/GLB already stores UVs with the correct top-left origin for OpenGL sampling.
-        // Adding aiProcess_FlipUVs would flip them a SECOND time → upside-down textures.
-        // Only apply it for formats that need it (OBJ, FBX, etc.).
-        if (ext != ".gltf" && ext != ".glb")
-        {
-            flags |= aiProcess_FlipUVs;
-        }
-
-        const aiScene* scene = nullptr;
-
-        CH_CORE_INFO("AssimpImporter: Invoking ReadFile for '{0}'", path.string());
-        try
-        {
-            scene = importer.ReadFile(path.string(), flags);
-        } catch (const std::exception& e)
-        {
-            CH_CORE_WARN("AssimpImporter: ReadFile threw for '{0}': {1}. Trying memory loading as fallback...",
-                         path.string(), e.what());
-        } catch (...)
-        {
-            CH_CORE_WARN("AssimpImporter: ReadFile threw for '{0}' with an unknown exception. Trying memory loading as "
-                         "fallback...",
-                         path.string());
-        }
-
-        if (!scene || !scene->mRootNode)
-        {
-            CH_CORE_WARN("AssimpImporter: ReadFile failed for '{0}': {1}. Trying memory loading as fallback...",
-                         path.string(), importer.GetErrorString());
-
-            // "Robust-Light" Loading Strategy: Read to memory with padding to avoid corruption issues
-            std::ifstream file(path, std::ios::binary | std::ios::ate);
-            if (file.is_open())
-            {
-                std::streamsize size = file.tellg();
-                if (size > 0)
-                {
-                    file.seekg(0);
-                    std::vector<char> buffer(static_cast<size_t>(size) + 1024, 0);
-                    file.read(buffer.data(), size);
-                    try
-                    {
-                        scene = importer.ReadFileFromMemory(buffer.data(), static_cast<size_t>(size), flags,
-                                                            path.extension().string().c_str());
-                    } catch (const std::exception& e)
-                    {
-                        CH_CORE_ERROR("AssimpImporter: ReadFileFromMemory threw for '{0}': {1}", path.string(),
-                                      e.what());
-                        return data;
-                    } catch (...)
-                    {
-                        CH_CORE_ERROR("AssimpImporter: ReadFileFromMemory threw for '{0}' with an unknown exception",
-                                      path.string());
-                        return data;
-                    }
-                }
-            }
-        }
-
-        if (!scene)
-        {
-            CH_CORE_ERROR("Assimp Model Load Failed: {} | Error: {}", path.filename().string(),
-                          importer.GetErrorString());
-            return data;
-        }
-
-        if (!scene->mRootNode)
-        {
-            CH_CORE_ERROR("Assimp Model Load Failed: {} | Error: scene has no root node", path.filename().string());
-            return data;
-        }
-
-        // --- 1. Process Hierarchy & Bind Poses ---
-        std::filesystem::path modelDir = path.parent_path();
-
-        {
-            CH_PROFILE_SCOPE("AssimpImporter::ProcessHierarchy");
-            std::function<void(aiNode*, int)> processNode = [&](aiNode* node, int parentIdx) -> void {
-                if (!node)
-                {
-                    return;
-                }
-
-                int currentIdx = (int)data.nodeNames.size();
-                data.nodeNames.push_back(node->mName.C_Str());
-                data.nodeParents.push_back(parentIdx);
-
-                glm::mat4 local = ToMat4(node->mTransformation);
-                data.nodeLocalTransforms.push_back(local);
-                data.globalBindPoses.push_back((parentIdx == -1) ? local : data.globalBindPoses[parentIdx] * local);
-
-                for (unsigned int i = 0; i < node->mNumMeshes; ++i)
-                {
-                    unsigned int meshIndex = node->mMeshes[i];
-                    if (meshIndex < scene->mNumMeshes)
-                    {
-                        data.instances.push_back({(int)meshIndex, data.globalBindPoses[currentIdx]});
-                    }
-                }
-
-                for (unsigned int i = 0; i < node->mNumChildren; ++i)
-                {
-                    processNode(node->mChildren[i], currentIdx);
-                }
-            };
-            processNode(scene->mRootNode, -1);
-        }
-        data.nodeCount = (int)data.nodeNames.size();
-
-        std::unordered_map<std::string, int> nameToIndex;
-        nameToIndex.reserve(data.nodeNames.size());
-        for (int i = 0; i < (int)data.nodeNames.size(); ++i)
-        {
-            nameToIndex[data.nodeNames[i]] = i;
-        }
-
-        // --- 2. Process Meshes ---
-        data.meshes.resize(scene->mNumMeshes);
-        std::vector<std::vector<std::pair<int, glm::mat4>>> meshOffsetWrites(scene->mNumMeshes);
-
-        {
-            CH_PROFILE_SCOPE("AssimpImporter::ProcessMeshes");
-            ParallelFor(scene->mNumMeshes, [&](uint32_t m) {
-                aiMesh* am = scene->mMeshes[m];
-                RawMesh rm;
-                rm.materialIndex = am->mMaterialIndex;
-
-                rm.vertices.reserve((size_t)am->mNumVertices * 3);
-                if (am->mTextureCoords[0])
-                {
-                    rm.texcoords.reserve((size_t)am->mNumVertices * 2);
-                }
-                if (am->mNormals)
-                {
-                    rm.normals.reserve((size_t)am->mNumVertices * 3);
-                }
-                rm.indices.reserve((size_t)am->mNumFaces * 3);
-
-                for (unsigned int v = 0; v < am->mNumVertices; ++v)
-                {
-                    rm.vertices.insert(rm.vertices.end(), {am->mVertices[v].x, am->mVertices[v].y, am->mVertices[v].z});
-                    if (am->mTextureCoords[0])
-                    {
-                        rm.texcoords.insert(rm.texcoords.end(),
-                                            {am->mTextureCoords[0][v].x, am->mTextureCoords[0][v].y});
-                    }
-                    if (am->mNormals)
-                    {
-                        rm.normals.insert(rm.normals.end(), {am->mNormals[v].x, am->mNormals[v].y, am->mNormals[v].z});
-                    }
-                }
-
-                for (unsigned int f = 0; f < am->mNumFaces; ++f)
-                {
-                    const aiFace& face = am->mFaces[f];
-                    if (face.mNumIndices != 3)
-                    {
-                        continue;
-                    }
-
-                    rm.indices.insert(rm.indices.end(), {face.mIndices[0], face.mIndices[1], face.mIndices[2]});
-                }
-
-                // Bones & Weights
-                if (am->mNumBones > 0)
-                {
-                    rm.joints.resize((size_t)am->mNumVertices * 4, 0);
-                    rm.weights.resize((size_t)am->mNumVertices * 4, 0.0f);
-                    std::vector<int> jointCounts(am->mNumVertices, 0);
-                    auto& offsetWrites = meshOffsetWrites[m];
-                    offsetWrites.reserve(am->mNumBones);
-
-                    for (unsigned int b = 0; b < am->mNumBones; ++b)
-                    {
-                        aiBone* bone = am->mBones[b];
-                        auto boneIt = nameToIndex.find(bone->mName.C_Str());
-                        if (boneIt == nameToIndex.end())
-                        {
-                            continue;
-                        }
-
-                        const int boneIdx = boneIt->second;
-                        offsetWrites.emplace_back(boneIdx, ToMat4(bone->mOffsetMatrix));
-
-                        for (unsigned int w = 0; w < bone->mNumWeights; ++w)
-                        {
-                            const int vIdx = bone->mWeights[w].mVertexId;
-                            if (vIdx < 0 || vIdx >= (int)am->mNumVertices)
-                            {
-                                continue;
-                            }
-
-                            if (jointCounts[vIdx] < 4)
-                            {
-                                const int slot = vIdx * 4 + jointCounts[vIdx]++;
-                                rm.joints[slot] = (unsigned char)boneIdx;
-                                rm.weights[slot] = bone->mWeights[w].mWeight;
-                            }
-                        }
-                    }
-                }
-
-                data.meshes[m] = std::move(rm);
-            });
-        }
-
-        data.offsetMatrices.assign(data.nodeNames.size(), glm::mat4(1.0f));
-        for (const auto& meshOffsets : meshOffsetWrites)
-        {
-            for (const auto& [boneIdx, offset] : meshOffsets)
-            {
-                if (boneIdx >= 0 && boneIdx < (int)data.offsetMatrices.size())
-                {
-                    data.offsetMatrices[boneIdx] = offset;
-                }
-            }
-        }
-
-        // --- 3. Process Materials ---
-        {
-            CH_PROFILE_SCOPE("AssimpImporter::ProcessMaterials");
-            data.materials.resize(scene->mNumMaterials);
-            for (unsigned int i = 0; i < scene->mNumMaterials; ++i)
-            {
-                aiMaterial* am = scene->mMaterials[i];
-                RawMaterial& rm = data.materials[i];
-
-                aiColor4D col(1.0f, 1.0f, 1.0f, 1.0f);
-                bool colorFound = false;
-                if (aiGetMaterialColor(am, AI_MATKEY_BASE_COLOR, &col) == AI_SUCCESS)
-                {
-                    rm.albedoColor = ToColor(col);
-                    colorFound = true;
-                }
-                else if (aiGetMaterialColor(am, AI_MATKEY_COLOR_DIFFUSE, &col) == AI_SUCCESS)
-                {
-                    rm.albedoColor = ToColor(col);
-                    colorFound = true;
-                }
-
-                // Safety fallback for transparency: if alpha is exactly 0 but we found a color, default it to 1.0
-                // unless opacity key explicitly says otherwise.
-                if (colorFound && rm.albedoColor.a < 0.001f)
-                {
-                    rm.albedoColor.a = 1.0f;
-                }
-
-                float opacity = 1.0f;
-                if (aiGetMaterialFloat(am, AI_MATKEY_OPACITY, &opacity) == AI_SUCCESS)
-                {
-                    rm.albedoColor.a *= opacity;
-                }
-
-                if (aiGetMaterialColor(am, AI_MATKEY_COLOR_EMISSIVE, &col) == AI_SUCCESS)
-                {
-                    rm.emissiveColor = ToColor(col);
-                }
-
-                aiGetMaterialFloat(am, AI_MATKEY_EMISSIVE_INTENSITY, &rm.emissiveIntensity);
-                aiGetMaterialFloat(am, AI_MATKEY_METALLIC_FACTOR, &rm.metalness);
-                aiGetMaterialFloat(am, AI_MATKEY_ROUGHNESS_FACTOR, &rm.roughness);
-
-                auto resolvePath = [&](const std::string& texPath) -> std::string {
-                    if (texPath.empty())
-                    {
-                        return "";
-                    }
-
-                    // 1. Try absolute / relative to CWD
-                    if (std::filesystem::exists(texPath))
-                    {
-                        return texPath;
-                    }
-
-                    // 2. Try relative to model directory
-                    std::filesystem::path p1 = modelDir / texPath;
-                    if (std::filesystem::exists(p1))
-                    {
-                        return p1.string();
-                    }
-
-                    // 3. Try filename only in model directory
-                    std::string filename = std::filesystem::path(texPath).filename().string();
-                    std::filesystem::path p2 = modelDir / filename;
-                    if (std::filesystem::exists(p2))
-                    {
-                        return p2.string();
-                    }
-
-                    // 4. Try in a 'textures' subfolder
-                    std::filesystem::path p3 = modelDir / "textures" / filename;
-                    if (std::filesystem::exists(p3))
-                    {
-                        return p3.string();
-                    }
-
-                    return texPath; // Fallback to original
-                };
-
-                auto getTex = [&](aiTextureType type) -> std::string {
-                    aiString str;
-                    if (am->GetTexture(type, 0, &str) == AI_SUCCESS)
-                    {
-                        return resolvePath(str.C_Str());
-                    }
-                    return "";
-                };
-                rm.albedoPath = getTex(aiTextureType_DIFFUSE);
-                if (rm.albedoPath.empty())
-                {
-                    rm.albedoPath = getTex(aiTextureType_BASE_COLOR); // GLTF often uses this
-                }
-                rm.normalPath = getTex(aiTextureType_NORMALS);
-                rm.metallicRoughnessPath = getTex(aiTextureType_METALNESS);
-                if (rm.metallicRoughnessPath.empty())
-                {
-                    rm.metallicRoughnessPath = getTex(aiTextureType_UNKNOWN); // GLTF MR is often here
-                }
-            }
-        }
-
-        // --- 4. Decode Embedded Textures ---
-        {
-            CH_PROFILE_SCOPE("AssimpImporter::DecodeEmbeddedTextures");
-            for (unsigned int i = 0; i < scene->mNumTextures; ++i)
-            {
-                const aiTexture* texture = scene->mTextures[i];
-                if (!texture)
-                {
-                    continue;
-                }
-
-                EmbeddedTextureData embedded;
-                if (!DecodeEmbeddedTexture(texture, embedded))
-                {
-                    continue;
-                }
-
-                data.embeddedTextures.emplace("*" + std::to_string(i), std::move(embedded));
-            }
-        }
-
-        // --- 5. Process Animations ---
-        {
-            CH_PROFILE_SCOPE("AssimpImporter::ProcessAnimations");
-            data.animations.resize(scene->mNumAnimations);
-            for (unsigned int a = 0; a < scene->mNumAnimations; ++a)
-            {
-                aiAnimation* anim = scene->mAnimations[a];
-                RawAnimation& ra = data.animations[a];
-                ra.name = anim->mName.C_Str();
-                if (ra.name.empty())
-                {
-                    ra.name = "Anim_" + std::to_string(a);
-                }
-                const double ticksPerSecond =
-                    (anim->mTicksPerSecond > 0.0) ? anim->mTicksPerSecond : (double)std::max(1, samplingFPS);
-                ra.frameRate = (float)std::max(1, samplingFPS);
-
-                // If duration is 0, try to infer from keys
-                double durationTicks = anim->mDuration;
-                if (durationTicks == 0.0)
-                {
-                    for (unsigned int c = 0; c < anim->mNumChannels; ++c)
-                    {
-                        if (anim->mChannels[c]->mNumPositionKeys > 0)
-                        {
-                            durationTicks = std::max(
-                                durationTicks,
-                                anim->mChannels[c]->mPositionKeys[anim->mChannels[c]->mNumPositionKeys - 1].mTime);
-                        }
-                        if (anim->mChannels[c]->mNumRotationKeys > 0)
-                        {
-                            durationTicks = std::max(
-                                durationTicks,
-                                anim->mChannels[c]->mRotationKeys[anim->mChannels[c]->mNumRotationKeys - 1].mTime);
-                        }
-                        if (anim->mChannels[c]->mNumScalingKeys > 0)
-                        {
-                            durationTicks = std::max(
-                                durationTicks,
-                                anim->mChannels[c]->mScalingKeys[anim->mChannels[c]->mNumScalingKeys - 1].mTime);
-                        }
-                    }
-                }
-
-                const double durationSeconds = (ticksPerSecond > 0.0) ? (durationTicks / ticksPerSecond) : 0.0;
-                ra.frameCount = std::max(1, (int)std::ceil(durationSeconds * (double)ra.frameRate) + 1);
-                ra.boneCount = (int)data.nodeNames.size();
-                ra.framePoses.resize(ra.frameCount * ra.boneCount);
-                const double ticksPerFrame = ticksPerSecond / (double)ra.frameRate;
-
-                // Pre-calculate bind poses (decomposed node transforms)
-                std::vector<TransformData> bindPoses(ra.boneCount);
-                for (int b = 0; b < ra.boneCount; ++b)
-                {
-                    // Initialize with local node transform if no animation exists
-                    aiNode* node = scene->mRootNode->FindNode(data.nodeNames[b].c_str());
-                    if (node)
-                    {
-                        aiVector3D p, s;
-                        aiQuaternion r;
-                        node->mTransformation.Decompose(s, r, p);
-                        bindPoses[b] = {ToVec3(p), ToQuat(r), ToVec3(s)};
-                    }
-                    else
-                    {
-                        bindPoses[b] = {glm::vec3(0), glm::quat(1, 0, 0, 0), glm::vec3(1)};
-                    }
-                }
-
-                // Init all frames to bind pose
-                for (int f = 0; f < ra.frameCount; ++f)
-                {
-                    for (int b = 0; b < ra.boneCount; ++b)
-                    {
-                        ra.framePoses[f * ra.boneCount + b] = bindPoses[b];
-                    }
-                }
-
-                // Fill with channel data
-                for (unsigned int c = 0; c < anim->mNumChannels; ++c)
-                {
-                    aiNodeAnim* channel = anim->mChannels[c];
-                    auto boneIt = nameToIndex.find(channel->mNodeName.C_Str());
-                    if (boneIt == nameToIndex.end())
-                    {
-                        continue;
-                    }
-                    const int boneIdx = boneIt->second;
-
-                    for (int f = 0; f < ra.frameCount; ++f)
-                    {
-                        double time = (double)f * ticksPerFrame;
-
-                        // Position
-                        glm::vec3 pos = bindPoses[boneIdx].translation;
-                        if (channel->mNumPositionKeys > 0)
-                        {
-                            if (channel->mNumPositionKeys == 1)
-                            {
-                                pos = ToVec3(channel->mPositionKeys[0].mValue);
-                            }
-                            else
-                            {
-                                unsigned int p1 = 0, p2 = 0;
-                                for (unsigned int k = 0; k < channel->mNumPositionKeys - 1; ++k)
-                                {
-                                    if (time < channel->mPositionKeys[k + 1].mTime)
-                                    {
-                                        p1 = k;
-                                        p2 = k + 1;
-                                        break;
-                                    }
-                                    p1 = k;
-                                    p2 = k + 1;
-                                }
-                                if (time >= channel->mPositionKeys[channel->mNumPositionKeys - 1].mTime)
-                                {
-                                    pos = ToVec3(channel->mPositionKeys[channel->mNumPositionKeys - 1].mValue);
-                                }
-                                else
-                                {
-                                    double dt = channel->mPositionKeys[p2].mTime - channel->mPositionKeys[p1].mTime;
-                                    float factor =
-                                        (dt > 0.0) ? (float)((time - channel->mPositionKeys[p1].mTime) / dt) : 0.0f;
-                                    pos = glm::mix(ToVec3(channel->mPositionKeys[p1].mValue),
-                                                   ToVec3(channel->mPositionKeys[p2].mValue), factor);
-                                }
-                            }
-                        }
-
-                        // Rotation
-                        glm::quat rot = bindPoses[boneIdx].rotation;
-                        if (channel->mNumRotationKeys > 0)
-                        {
-                            if (channel->mNumRotationKeys == 1)
-                            {
-                                rot = ToQuat(channel->mRotationKeys[0].mValue);
-                            }
-                            else
-                            {
-                                unsigned int r1 = 0, r2 = 0;
-                                for (unsigned int k = 0; k < channel->mNumRotationKeys - 1; ++k)
-                                {
-                                    if (time < channel->mRotationKeys[k + 1].mTime)
-                                    {
-                                        r1 = k;
-                                        r2 = k + 1;
-                                        break;
-                                    }
-                                    r1 = k;
-                                    r2 = k + 1;
-                                }
-                                if (time >= channel->mRotationKeys[channel->mNumRotationKeys - 1].mTime)
-                                {
-                                    rot = ToQuat(channel->mRotationKeys[channel->mNumRotationKeys - 1].mValue);
-                                }
-                                else
-                                {
-                                    double dt = channel->mRotationKeys[r2].mTime - channel->mRotationKeys[r1].mTime;
-                                    float factor =
-                                        (dt > 0.0) ? (float)((time - channel->mRotationKeys[r1].mTime) / dt) : 0.0f;
-                                    aiQuaternion interpolated;
-                                    aiQuaternion::Interpolate(interpolated, channel->mRotationKeys[r1].mValue,
-                                                              channel->mRotationKeys[r2].mValue, factor);
-                                    rot = ToQuat(interpolated);
-                                }
-                            }
-                        }
-
-                        // Scale
-                        glm::vec3 scale = bindPoses[boneIdx].scale;
-                        if (channel->mNumScalingKeys > 0)
-                        {
-                            if (channel->mNumScalingKeys == 1)
-                            {
-                                scale = ToVec3(channel->mScalingKeys[0].mValue);
-                            }
-                            else
-                            {
-                                unsigned int s1 = 0, s2 = 0;
-                                for (unsigned int k = 0; k < channel->mNumScalingKeys - 1; ++k)
-                                {
-                                    if (time < channel->mScalingKeys[k + 1].mTime)
-                                    {
-                                        s1 = k;
-                                        s2 = k + 1;
-                                        break;
-                                    }
-                                    s1 = k;
-                                    s2 = k + 1;
-                                }
-                                if (time >= channel->mScalingKeys[channel->mNumScalingKeys - 1].mTime)
-                                {
-                                    scale = ToVec3(channel->mScalingKeys[channel->mNumScalingKeys - 1].mValue);
-                                }
-                                else
-                                {
-                                    double dt = channel->mScalingKeys[s2].mTime - channel->mScalingKeys[s1].mTime;
-                                    float factor =
-                                        (dt > 0.0) ? (float)((time - channel->mScalingKeys[s1].mTime) / dt) : 0.0f;
-                                    scale = glm::mix(ToVec3(channel->mScalingKeys[s1].mValue),
-                                                     ToVec3(channel->mScalingKeys[s2].mValue), factor);
-                                }
-                            }
-                        }
-
-                        ra.framePoses[f * ra.boneCount + boneIdx] = {pos, rot, scale};
-                    }
-                }
-                CH_CORE_INFO("AssimpImporter: Loaded animation '{}' ({} frames, {} fps)", ra.name, ra.frameCount,
-                             ra.frameRate);
-            }
-        }
-
-        data.isValid = true;
-        return data;
-    } catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("AssimpImporter: Unhandled exception importing '{}': {}", path.string(), e.what());
-        return data;
-    } catch (...)
-    {
-        CH_CORE_ERROR("AssimpImporter: Unhandled unknown exception importing '{}'", path.string());
-        return data;
-    }
-}
-} // namespace CHEngine
diff --git a/engine/graphics/loaders/assimp_importer.h b/engine/graphics/loaders/assimp_importer.h
deleted file mode 100644
index 8dd07270e..000000000
--- a/engine/graphics/loaders/assimp_importer.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef CH_ASSIMP_IMPORTER_H
-#define CH_ASSIMP_IMPORTER_H
-
-#include "engine/graphics/loaders/model_loader.h"
-#include <filesystem>
-
-namespace CHEngine
-{
-    class AssimpImporter
-    {
-    public:
-        static PendingModelData Import(const std::filesystem::path& path, int samplingFPS);
-    };
-}
-#endif
diff --git a/engine/graphics/loaders/environment_loader.cpp b/engine/graphics/loaders/environment_loader.cpp
deleted file mode 100644
index 297da502b..000000000
--- a/engine/graphics/loaders/environment_loader.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "engine/graphics/loaders/environment_loader.h"
-#include "engine/core/log.h"
-#include "engine/scene/yaml.h"
-#include "yaml-cpp/yaml.h"
-#include <filesystem>
-#include <fstream>
-
-namespace CHEngine
-{
-    std::shared_ptr<Asset> EnvironmentLoader::Create()
-    {
-        return std::make_shared<EnvironmentAsset>();
-    }
-
-    bool EnvironmentLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
-    {
-        std::filesystem::path fullPath(resolvedPath);
-        std::ifstream stream(fullPath);
-        if (!stream.is_open())
-        {
-            CH_CORE_ERROR("EnvironmentLoader: Failed to open environment file: {0}", resolvedPath);
-            if (outError)
-            {
-                *outError = "EnvironmentLoader: failed to open environment file '" + resolvedPath + "'";
-            }
-            return false;
-        }
-
-        auto envAsset = std::static_pointer_cast<EnvironmentAsset>(asset);
-
-        try
-        {
-            YAML::Node data = YAML::Load(stream);
-            if (!data["Environment"])
-            {
-                if (outError)
-                {
-                    *outError = "EnvironmentLoader: missing Environment node in '" + resolvedPath + "'";
-                }
-                return false;
-            }
-
-            auto envNode = data["Environment"];
-            EnvironmentSettings settings;
-
-            // New format: Lighting section
-            if (envNode["Lighting"])
-            {
-                auto lighting = envNode["Lighting"];
-                if (lighting["Direction"])
-                {
-                    settings.Lighting.Direction = lighting["Direction"].as<glm::vec3>();
-                }
-                if (lighting["LightColor"])
-                {
-                    settings.Lighting.LightColor = lighting["LightColor"].as<CHEngine::Color>();
-                }
-                if (lighting["Ambient"])
-                {
-                    settings.Lighting.Ambient = lighting["Ambient"].as<float>();
-                }
-                if (lighting["Exposure"])
-                {
-                    settings.Lighting.Exposure = lighting["Exposure"].as<float>();
-                }
-                if (lighting["Gamma"])
-                {
-                    settings.Lighting.Gamma = lighting["Gamma"].as<float>();
-                }
-            }
-            else
-            {
-                // Backward compat: old flat field names
-                if (envNode["LightDirection"])
-                {
-                    settings.Lighting.Direction = envNode["LightDirection"].as<glm::vec3>();
-                }
-                if (envNode["LightColor"])
-                {
-                    settings.Lighting.LightColor = envNode["LightColor"].as<CHEngine::Color>();
-                }
-                if (envNode["AmbientIntensity"])
-                {
-                    settings.Lighting.Ambient = envNode["AmbientIntensity"].as<float>();
-                }
-            }
-
-            auto skyboxNode = envNode["Skybox"];
-            if (skyboxNode)
-            {
-                settings.Skybox.TexturePath = skyboxNode["TexturePath"].as<std::string>();
-                if (skyboxNode["Mode"]) settings.Skybox.Mode = skyboxNode["Mode"].as<int>();
-                if (skyboxNode["Exposure"]) settings.Skybox.Exposure = skyboxNode["Exposure"].as<float>();
-                if (skyboxNode["Brightness"]) settings.Skybox.Brightness = skyboxNode["Brightness"].as<float>();
-                if (skyboxNode["Contrast"]) settings.Skybox.Contrast = skyboxNode["Contrast"].as<float>();
-            }
-
-            auto fogNode = envNode["Fog"];
-            if (fogNode)
-            {
-                settings.Fog.Enabled = fogNode["Enabled"].as<bool>();
-                settings.Fog.FogColor = fogNode["Color"].as<CHEngine::Color>();
-                settings.Fog.Density = fogNode["Density"].as<float>();
-                settings.Fog.Start = fogNode["Start"].as<float>();
-                settings.Fog.End = fogNode["End"].as<float>();
-            }
-
-            envAsset->SetSettings(settings);
-            return true;
-        } catch (const std::exception& e)
-        {
-            CH_CORE_ERROR("EnvironmentLoader: Failed to parse environment file {0}: {1}", resolvedPath, e.what());
-            if (outError)
-            {
-                *outError = std::string("EnvironmentLoader: failed to parse '") + resolvedPath + "': " + e.what();
-            }
-            return false;
-        }
-        catch (...)
-        {
-            CH_CORE_ERROR("EnvironmentLoader: Failed to parse environment file {0} with an unknown exception", resolvedPath);
-            if (outError)
-            {
-                *outError = std::string("EnvironmentLoader: failed to parse '") + resolvedPath + "' with an unknown exception";
-            }
-            return false;
-        }
-    }
-} // namespace CHEngine
diff --git a/engine/graphics/loaders/environment_loader.h b/engine/graphics/loaders/environment_loader.h
deleted file mode 100644
index 6410dbec4..000000000
--- a/engine/graphics/loaders/environment_loader.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CH_ENVIRONMENT_LOADER_H
-#define CH_ENVIRONMENT_LOADER_H
-
-#include "engine/core/assets/asset_loader.h"
-#include "engine/graphics/assets/environment.h"
-#include <memory>
-#include <string>
-
-namespace CHEngine
-{
-class EnvironmentLoader : public IAssetLoader
-{
-public:
-    std::shared_ptr<Asset> Create() override;
-        bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) override;
-    bool IsAsync() const override { return true; }
-};
-} // namespace CHEngine
-
-#endif // CH_ENVIRONMENT_LOADER_H
diff --git a/engine/graphics/loaders/font_loader.cpp b/engine/graphics/loaders/font_loader.cpp
deleted file mode 100644
index 879a1dbb9..000000000
--- a/engine/graphics/loaders/font_loader.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#define STB_TRUETYPE_IMPLEMENTATION
-#include <stb_truetype.h>
-#include "engine/graphics/loaders/font_loader.h"
-#include "engine/core/log.h"
-#include <fstream>
-#include <vector>
-#include <glad/gl.h>
-#include <filesystem>
-
-namespace CHEngine
-{
-    std::shared_ptr<Asset> FontLoader::Create()
-    {
-        return std::make_shared<FontAsset>();
-    }
-
-    bool FontLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
-    {
-        if (resolvedPath.empty())
-        {
-            if (outError)
-            {
-                *outError = "FontLoader: empty path";
-            }
-            return false;
-        }
-
-        std::filesystem::path fullPath(resolvedPath);
-        if (!std::filesystem::exists(fullPath))
-        {
-            CH_CORE_ERROR("FontLoader: File not found: {}", resolvedPath);
-            if (outError)
-            {
-                *outError = "FontLoader: file not found '" + resolvedPath + "'";
-            }
-            return false;
-        }
-
-        // Read file into buffer
-        std::ifstream file(resolvedPath, std::ios::binary | std::ios::ate);
-        if (!file.is_open())
-        {
-            if (outError)
-            {
-                *outError = "FontLoader: failed to open font file '" + resolvedPath + "'";
-            }
-            return false;
-        }
-        
-        std::streamsize size = file.tellg();
-        file.seekg(0, std::ios::beg);
-        std::vector<unsigned char> buffer(size);
-        if (!file.read((char*)buffer.data(), size)) {
-            CH_CORE_ERROR("FontLoader: Failed to read font file: {}", resolvedPath);
-            if (outError)
-            {
-                *outError = "FontLoader: failed to read font file '" + resolvedPath + "'";
-            }
-            return false;
-        }
-
-        auto fontAsset = std::static_pointer_cast<FontAsset>(asset);
-        
-        NativeFont font;
-        font.fontSize = 32.0f;
-        font.atlasWidth = 512;
-        font.atlasHeight = 512;
-
-        std::vector<unsigned char> pixels(font.atlasWidth * font.atlasHeight);
-        stbtt_bakedchar chardata[128]; 
-        
-        stbtt_BakeFontBitmap(buffer.data(), 0, font.fontSize, pixels.data(), font.atlasWidth, font.atlasHeight, 32, 128, chardata);
-
-        // Convert to GL texture
-        // Note: This must be done on the main thread if OnLoaded is called from Update.
-        // But Load() is called on background thread if IsAsync() is true.
-        // FontLoader::IsAsync() returns false, which is good.
-        glGenTextures(1, &font.textureId);
-        glBindTexture(GL_TEXTURE_2D, font.textureId);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, font.atlasWidth, font.atlasHeight, 0, GL_RED, GL_UNSIGNED_BYTE, pixels.data());
-        
-        GLint swizzleMask[] = {GL_ONE, GL_ONE, GL_ONE, GL_RED};
-        glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-        
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-        for (int i = 0; i < 128; i++)
-        {
-            font.chars[i].x0 = (float)chardata[i].x0 / (float)font.atlasWidth;
-            font.chars[i].y0 = (float)chardata[i].y0 / (float)font.atlasHeight;
-            font.chars[i].x1 = (float)chardata[i].x1 / (float)font.atlasWidth;
-            font.chars[i].y1 = (float)chardata[i].y1 / (float)font.atlasHeight;
-            font.chars[i].xoff = chardata[i].xoff;
-            font.chars[i].yoff = chardata[i].yoff;
-            font.chars[i].xadvance = chardata[i].xadvance;
-        }
-
-        fontAsset->SetFont(font);
-        CH_CORE_INFO("FontLoader: Imported font atlas for {} (ID={})", resolvedPath, font.textureId);
-
-        return true;
-    }
-} // namespace CHEngine
diff --git a/engine/graphics/loaders/font_loader.h b/engine/graphics/loaders/font_loader.h
deleted file mode 100644
index e607e9629..000000000
--- a/engine/graphics/loaders/font_loader.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CH_FONT_LOADER_H
-#define CH_FONT_LOADER_H
-
-#include "engine/core/assets/asset_loader.h"
-#include "engine/graphics/assets/font_asset.h"
-#include <memory>
-#include <string>
-
-namespace CHEngine
-{
-class FontLoader : public IAssetLoader
-{
-public:
-    std::shared_ptr<Asset> Create() override;
-        bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) override;
-    bool IsAsync() const override { return false; }
-};
-} // namespace CHEngine
-
-#endif // CH_FONT_LOADER_H
diff --git a/engine/graphics/loaders/model_loader.cpp b/engine/graphics/loaders/model_loader.cpp
deleted file mode 100644
index c4c2713a3..000000000
--- a/engine/graphics/loaders/model_loader.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "engine/graphics/loaders/model_loader.h"
-#include "engine/graphics/loaders/assimp_importer.h"
-
-namespace CHEngine
-{
-std::shared_ptr<Asset> ModelLoader::Create()
-{
-    return std::make_shared<ModelAsset>();
-}
-
-bool ModelLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
-{
-    auto modelAsset = std::static_pointer_cast<ModelAsset>(asset);
-
-    // Handle procedural models
-    if (resolvedPath.starts_with(":"))
-    {
-        // Placeholder: GenerateProceduralModel was removed from ModelLoader in favor of AssimpImporter
-        // If you need it, move it to AssimpImporter or keep a simplified version here
-        if (outError)
-        {
-            *outError = "ModelLoader: procedural model paths are not supported: " + resolvedPath;
-        }
-        return false;
-    }
-
-    auto pendingData = LoadMeshDataFromDisk(resolvedPath);
-    if (pendingData.isValid)
-    {
-        modelAsset->SetPendingData(std::move(pendingData));
-        return true;
-    }
-    if (outError)
-    {
-        *outError = "ModelLoader: failed to import model data from '" + resolvedPath + "'";
-    }
-    return false;
-}
-
-PendingModelData ModelLoader::LoadMeshDataFromDisk(const std::filesystem::path& path, int samplingFPS)
-{
-    return AssimpImporter::Import(path, samplingFPS);
-}
-
-Model ModelLoader::GenerateProceduralModel(const std::string& type, const ProceduralParameters& params)
-{
-    Model model;
-    RawMesh raw;
-
-    if (type == ":cube:")
-    {
-        float w = params.Dimensions.x * 0.5f;
-        float h = params.Dimensions.y * 0.5f;
-        float d = params.Dimensions.z * 0.5f;
-
-        raw.vertices = {
-            -w,-h, d,  w,-h, d,  w, h, d, -w, h, d,
-            -w,-h,-d, -w, h,-d,  w, h,-d,  w,-h,-d,
-            -w, h,-d, -w, h, d,  w, h, d,  w, h,-d,
-            -w,-h,-d,  w,-h,-d,  w,-h, d, -w,-h, d,
-             w,-h,-d,  w, h,-d,  w, h, d,  w,-h, d,
-            -w,-h,-d, -w,-h, d, -w, h, d, -w, h,-d
-        };
-
-        raw.normals = {
-             0, 0, 1,   0, 0, 1,   0, 0, 1,   0, 0, 1,
-             0, 0,-1,   0, 0,-1,   0, 0,-1,   0, 0,-1,
-             0, 1, 0,   0, 1, 0,   0, 1, 0,   0, 1, 0,
-             0,-1, 0,   0,-1, 0,   0,-1, 0,   0,-1, 0,
-             1, 0, 0,   1, 0, 0,   1, 0, 0,   1, 0, 0,
-            -1, 0, 0,  -1, 0, 0,  -1, 0, 0,  -1, 0, 0
-        };
-        
-        std::vector<uint32_t> indices;
-        for(int i=0; i<6; i++) {
-            indices.push_back(i*4+0); indices.push_back(i*4+1); indices.push_back(i*4+2);
-            indices.push_back(i*4+0); indices.push_back(i*4+2); indices.push_back(i*4+3);
-        }
-
-        Mesh mesh;
-        mesh.MaterialIndex = 0;
-        mesh.VertexCount = (uint32_t)(raw.vertices.size() / 3);
-        mesh.TriangleCount = (uint32_t)(indices.size() / 3);
-        
-        mesh.VAO = VertexArray::Create();
-        auto vb = VertexBuffer::Create(raw.vertices.data(), (uint32_t)(raw.vertices.size() * sizeof(float)));
-        vb->SetLayout({
-            { ShaderDataType::Float3, "a_Position" }
-        });
-        mesh.VAO->AddVertexBuffer(vb);
-
-        auto ib = IndexBuffer::Create(indices.data(), (uint32_t)indices.size());
-        mesh.VAO->SetIndexBuffer(ib);
-
-        model.Meshes.push_back(mesh);
-        model.Materials.push_back(Material{});
-    }
-
-    return model;
-}
-} // namespace CHEngine
diff --git a/engine/graphics/loaders/model_loader.h b/engine/graphics/loaders/model_loader.h
deleted file mode 100644
index c5e6e8b12..000000000
--- a/engine/graphics/loaders/model_loader.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef CH_MODEL_LOADER_H
-#define CH_MODEL_LOADER_H
-
-#include "engine/core/assets/asset_loader.h"
-#include "engine/graphics/assets/model_asset.h"
-#include <memory>
-#include <string>
-#include <vector>
-#include <filesystem>
-
-namespace CHEngine
-{
-struct ProceduralParameters
-{
-    float Radius = 0.5f;
-    float InnerRadius = 0.2f;
-    float Height = 1.0f;
-    int Slices = 16;
-    int Stacks = 16;
-    glm::vec3 Dimensions = {1.0f, 1.0f, 1.0f};
-};
-
-class ModelLoader : public IAssetLoader
-{
-public:
-    std::shared_ptr<Asset> Create() override;
-        bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) override;
-    bool IsAsync() const override { return true; }
-
-    static Model GenerateProceduralModel(const std::string& type, const ProceduralParameters& params = ProceduralParameters());
-
-private:
-    static PendingModelData LoadMeshDataFromDisk(const std::filesystem::path& path, int samplingFPS = 30);
-};
-} // namespace CHEngine
-
-#endif // CH_MODEL_LOADER_H
diff --git a/engine/graphics/loaders/shader_loader.cpp b/engine/graphics/loaders/shader_loader.cpp
deleted file mode 100644
index bbef1578b..000000000
--- a/engine/graphics/loaders/shader_loader.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#include "engine/graphics/loaders/shader_loader.h"
-#include "engine/core/log.h"
-#include <algorithm>
-#include <filesystem>
-#include <fstream>
-#include <regex>
-#include <sstream>
-#include <yaml-cpp/yaml.h>
-#include <engine/graphics/assets/shader_asset.h>
-
-namespace CHEngine
-{
-    std::shared_ptr<Asset> ShaderLoader::Create()
-    {
-        return std::make_shared<ShaderAsset>();
-    }
-
-    bool ShaderLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
-    {
-        auto shaderAsset = std::static_pointer_cast<ShaderAsset>(asset);
-        auto shader = LoadShaderFromPath(resolvedPath);
-        if (shader)
-        {
-            shaderAsset->SetShader(shader);
-            return true;
-        }
-        if (outError)
-        {
-            *outError = "ShaderLoader: failed to load shader from '" + resolvedPath + "'";
-        }
-        return false;
-    }
-
-    std::shared_ptr<Shader> ShaderLoader::LoadShaderFromPath(const std::string& path)
-    {
-        std::filesystem::path absolutePath(path);
-        if (!std::filesystem::exists(absolutePath))
-        {
-            return nullptr;
-        }
-
-        std::string ext = absolutePath.extension().string();
-        std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
-
-        if (ext == ".chshader")
-        {
-            try
-            {
-                YAML::Node config = YAML::LoadFile(absolutePath.string());
-                std::string vsRel = config["VertexShader"].as<std::string>();
-                std::string fsRel = config["FragmentShader"].as<std::string>();
-
-                std::filesystem::path basePath = absolutePath.parent_path();
-                std::string vsPath = (basePath / vsRel).string();
-                std::string fsPath = (basePath / fsRel).string();
-
-                return LoadShaderFromPaths(vsPath, fsPath);
-            } catch (...)
-            {
-                return nullptr;
-            }
-        }
-        else if (ext == ".vs" || ext == ".vert" || ext == ".glsl")
-        {
-            std::filesystem::path fsPath = absolutePath;
-            fsPath.replace_extension(".fs");
-            if (!std::filesystem::exists(fsPath))
-            {
-                fsPath.replace_extension(".frag");
-            }
-            if (std::filesystem::exists(fsPath))
-            {
-                return LoadShaderFromPaths(absolutePath.string(), fsPath.string());
-            }
-        }
-        return nullptr;
-    }
-
-    std::shared_ptr<Shader> ShaderLoader::LoadShaderFromPaths(const std::string& vsPath, const std::string& fsPath)
-    {
-        std::vector<std::string> vsIncl, fsIncl;
-        std::string vsSource = ProcessShaderSource(vsPath, vsIncl);
-        std::string fsSource = ProcessShaderSource(fsPath, fsIncl);
-
-        return Shader::Create(vsSource.c_str(), fsSource.c_str());
-    }
-
-    std::string ShaderLoader::ProcessShaderSource(const std::string& path, std::vector<std::string>& includedFiles)
-    {
-        std::filesystem::path fullPath = std::filesystem::absolute(path);
-
-        for (const auto& included : includedFiles)
-        {
-            if (included == fullPath.string())
-            {
-                return "";
-            }
-        }
-        includedFiles.push_back(fullPath.string());
-
-        if (!std::filesystem::exists(fullPath))
-        {
-            CH_CORE_ERROR("ShaderPreprocessor: File not found: {}", path);
-            return "";
-        }
-
-        std::ifstream file(fullPath);
-        if (!file.is_open())
-        {
-            return "";
-        }
-
-        std::stringstream ss;
-        std::string line;
-        std::regex includeRegex(R"(^\s*#include\s+["<](.*)[">])");
-        std::smatch match;
-
-        while (std::getline(file, line))
-        {
-            if (std::regex_search(line, match, includeRegex))
-            {
-                std::string includeFile = match[1].str();
-                std::filesystem::path includePath = fullPath.parent_path() / includeFile;
-                ss << ProcessShaderSource(includePath.string(), includedFiles) << "\n";
-            }
-            else
-            {
-                ss << line << "\n";
-            }
-        }
-
-        return ss.str();
-    }
-} // namespace CHEngine
diff --git a/engine/graphics/loaders/shader_loader.h b/engine/graphics/loaders/shader_loader.h
deleted file mode 100644
index 7e70754f8..000000000
--- a/engine/graphics/loaders/shader_loader.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef CH_SHADER_LOADER_H
-#define CH_SHADER_LOADER_H
-
-#include "engine/core/assets/asset_loader.h"
-#include "engine/graphics/assets/shader_asset.h"
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace CHEngine
-{
-
-class ShaderLoader : public IAssetLoader
-{
-public:
-    std::shared_ptr<Asset> Create() override;
-        bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) override;
-    bool IsAsync() const override { return false; }
-
-private:
-    std::shared_ptr<Shader> LoadShaderFromPath(const std::string& path);
-    std::shared_ptr<Shader> LoadShaderFromPaths(const std::string& vsPath, const std::string& fsPath);
-    std::string ProcessShaderSource(const std::string& path, std::vector<std::string>& includedFiles);
-};
-} // namespace CHEngine
-
-#endif // CH_SHADER_LOADER_H
diff --git a/engine/graphics/loaders/texture_loader.cpp b/engine/graphics/loaders/texture_loader.cpp
deleted file mode 100644
index e8221ca7e..000000000
--- a/engine/graphics/loaders/texture_loader.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "engine/graphics/loaders/texture_loader.h"
-#include "engine/core/log.h"
-
-#include "stb_image.h"
-#include <filesystem>
-#include <algorithm>
-
-namespace CHEngine
-{
-    std::shared_ptr<Asset> TextureLoader::Create()
-    {
-        return std::make_shared<TextureAsset>();
-    }
-
-    bool TextureLoader::Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError)
-    {
-        auto texAsset = std::static_pointer_cast<TextureAsset>(asset);
-
-        if (resolvedPath.empty())
-        {
-            if (outError)
-            {
-                *outError = "TextureLoader: empty path";
-            }
-            return false;
-        }
-        
-        std::string ext = std::filesystem::path(resolvedPath).extension().string();
-        std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
-        
-        // Handle HDR khusus (procedural or direct load on main thread can be handled here if needed)
-        // For now, we follow the logic from the previous Importer
-        
-        int width, height, channels;
-
-        bool isHDR = stbi_is_hdr(resolvedPath.c_str());
-        stbi_set_flip_vertically_on_load(!isHDR);
-
-        void* data = nullptr;
-
-        if (isHDR)
-        {
-            data = stbi_loadf(resolvedPath.c_str(), &width, &height, &channels, 0);
-        }
-        else
-        {
-            data = stbi_load(resolvedPath.c_str(), &width, &height, &channels, 4);
-            channels = 4;
-        }
-
-        if (data == nullptr)
-        {
-            const char* reason = stbi_failure_reason();
-            CH_CORE_ERROR("TextureLoader: Failed to load image {}. Reason: {}", resolvedPath, reason ? reason : "Unknown");
-            if (outError)
-            {
-                *outError = "TextureLoader: failed to load image '" + resolvedPath + "'. Reason: " + (reason ? reason : "Unknown");
-            }
-            return false;
-        }
-
-        texAsset->SetIsHDR(isHDR);
-
-        RawImage rawImage;
-        rawImage.data = data;
-        rawImage.width = width;
-        rawImage.height = height;
-        rawImage.channels = channels;
-        rawImage.isHDR = isHDR;
-        rawImage.format = isHDR ? 11 : 7; // Matching previous constants
-        rawImage.mipmaps = 1;
-
-        texAsset->SetPendingImage(rawImage);
-        return true;
-    }
-} // namespace CHEngine
diff --git a/engine/graphics/loaders/texture_loader.h b/engine/graphics/loaders/texture_loader.h
deleted file mode 100644
index ea356bc96..000000000
--- a/engine/graphics/loaders/texture_loader.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CH_TEXTURE_LOADER_H
-#define CH_TEXTURE_LOADER_H
-
-#include "engine/core/assets/asset_loader.h"
-#include "engine/graphics/assets/texture_asset.h"
-#include <memory>
-#include <string>
-
-namespace CHEngine
-{
-class TextureLoader : public IAssetLoader
-{
-public:
-    std::shared_ptr<Asset> Create() override;
-        bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) override;
-    bool IsAsync() const override { return true; }
-};
-} // namespace CHEngine
-
-#endif // CH_TEXTURE_LOADER_H
diff --git a/engine/graphics/nametag_system.cpp b/engine/graphics/nametag_system.cpp
new file mode 100644
index 000000000..4b3371e2e
--- /dev/null
+++ b/engine/graphics/nametag_system.cpp
@@ -0,0 +1,282 @@
+#include "nametag_system.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/graphics/pipeline/renderer_data.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/api/vertex_array.h"
+#include "engine/graphics/api/buffer.h"
+#include "engine/graphics/text_renderer.h"
+#include "engine/assets/types/font_asset.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/networking/network_service.h"
+#include "engine/scene/components/gameplay/network_identity_component.h"
+#include "engine/scene/components/core/transform_component.h"
+#include "engine/scene/scene.h"
+
+namespace Chained
+{
+	namespace NametagSystem
+	{
+
+		static TextRenderer s_TextRenderer;
+		static std::shared_ptr<VertexArray> s_QuadVAO;
+		static std::shared_ptr<VertexBuffer> s_DynVBO;
+		static bool s_Initialized = false;
+
+		static constexpr int kMaxGlyphs = 256;
+		static constexpr int kVertsPerGlyph = 4;
+		static constexpr int kIndicesPerGlyph = 6;
+
+		struct GlyphVertex
+		{
+			float x, y;
+			float u, v;
+		};
+
+		static void EnsureInitialized()
+		{
+			if (s_Initialized)
+			{
+				return;
+			}
+
+			s_TextRenderer.Init();
+
+			// Pre-allocate a dynamic VBO large enough for up to kMaxGlyphs
+			uint32_t vboSize = kMaxGlyphs * kVertsPerGlyph * static_cast<uint32_t>(sizeof(GlyphVertex));
+			s_DynVBO = VertexBuffer::Create(vboSize);
+			s_DynVBO->SetLayout(
+				{{VertexAttributeType::Float2, "a_Position"}, {VertexAttributeType::Float2, "a_TexCoords"}});
+
+			s_QuadVAO = VertexArray::Create();
+			s_QuadVAO->AddVertexBuffer(s_DynVBO);
+
+			// Index buffer for up to kMaxGlyphs quads
+			std::vector<uint32_t> indices;
+			indices.reserve(kMaxGlyphs * kIndicesPerGlyph);
+			for (int i = 0; i < kMaxGlyphs; ++i)
+			{
+				uint32_t base = i * kVertsPerGlyph;
+				indices.push_back(base + 0);
+				indices.push_back(base + 1);
+				indices.push_back(base + 2);
+				indices.push_back(base + 2);
+				indices.push_back(base + 3);
+				indices.push_back(base + 0);
+			}
+			auto ibo = IndexBuffer::Create(indices.data(), static_cast<uint32_t>(indices.size()));
+			s_QuadVAO->SetIndexBuffer(ibo);
+
+			s_Initialized = true;
+		}
+
+		void DrawNametags(entt::registry& registry, const Camera3D& camera)
+		{
+			auto* renderer = ServiceLocator::TryGet<Renderer>();
+			if (!renderer)
+			{
+				return;
+			}
+
+			auto* net = ServiceLocator::TryGet<Network>();
+			if (!net || net->GetRole() == Role::Offline)
+			{
+				return;
+			}
+
+			EnsureInitialized();
+
+			auto& shaderStorage = renderer->GetShaderLibrary();
+			auto shaderAsset =
+				shaderStorage.LoadOrGet("Nametag", "engine/resources/shaders/materials/nametag.chshader");
+			if (!shaderAsset || !shaderAsset->IsReady())
+			{
+				return;
+			}
+			auto shader = shaderAsset->GetShader();
+			if (!shader)
+			{
+				return;
+			}
+
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			if (!am)
+			{
+				return;
+			}
+
+			auto fontAsset = am->Get<FontAsset>("font/lato/lato-regular.ttf");
+			if (!fontAsset || !fontAsset->IsReady())
+			{
+				return;
+			}
+			const auto& font = fontAsset->GetFont();
+			if (!font.textureAtlas)
+			{
+				return;
+			}
+
+			const auto& players = net->GetPlayerList();
+			uint64_t localID = net->GetLocalNetworkID();
+
+			auto view = registry.view<NetworkIdentityComponent, TransformComponent>();
+
+			shader->Bind();
+			shader->SetMatrix("projection", camera.ProjectionMatrix);
+			shader->SetMatrix("view", camera.ViewMatrix);
+			shader->SetFloat("useBackground", 0.0f);
+			shader->SetVec4("backgroundColor", glm::vec4(0.0f, 0.0f, 0.0f, 0.7f));
+			shader->SetVec2("size", glm::vec2(1.0f, 1.0f));
+
+			// Bind atlas texture once for all nametags
+			GraphicsDevice::Get().SetTexture(0, font.textureAtlas->GetNativeHandle());
+			shader->SetInt("textTexture", 0);
+
+			PipelineStateGuard stateGuard;
+			stateGuard.WithoutDepthTest().WithBlend().WithCullNone();
+
+			constexpr float nametagScale = 0.007f; // world units per pixel (approx. 0.35m height)
+
+			for (auto entity : view)
+			{
+				if (!registry.valid(entity))
+				{
+					continue;
+				}
+
+				const auto& netId = view.get<NetworkIdentityComponent>(entity);
+				if (netId.NetworkID == localID)
+				{
+					continue;
+				}
+
+				const auto& tc = view.get<TransformComponent>(entity);
+
+				std::string name;
+				bool isHost = false;
+
+				for (const auto& p : players)
+				{
+					if (p.NetworkID == netId.NetworkID)
+					{
+						name = p.Name;
+						isHost = (p.IsHost != 0);
+						break;
+					}
+				}
+				if (name.empty())
+				{
+					name = "Player " + std::to_string(netId.NetworkID);
+				}
+
+				std::string label = name;
+
+				// Layout glyphs
+				auto quads = s_TextRenderer.LayoutGlyphs(label, font, 48.0f);
+				if (quads.empty())
+				{
+					continue;
+				}
+
+				// Clamp to kMaxGlyphs
+				if (static_cast<int>(quads.size()) > kMaxGlyphs)
+				{
+					quads.resize(kMaxGlyphs);
+				}
+
+				// Measure tight bounding box for exact centering
+				float minX = 1e9f, maxX = -1e9f;
+				float minY = 1e9f, maxY = -1e9f;
+				for (const auto& q : quads)
+				{
+					if (q.x < minX)
+					{
+						minX = q.x;
+					}
+					if (q.x + q.w > maxX)
+					{
+						maxX = q.x + q.w;
+					}
+					if (q.y < minY)
+					{
+						minY = q.y;
+					}
+					if (q.y + q.h > maxY)
+					{
+						maxY = q.y + q.h;
+					}
+				}
+
+				float centerX = (minX + maxX) * 0.5f;
+				float centerY = (minY + maxY) * 0.5f;
+
+				// Position above avatar head in world space
+				glm::vec3 worldPos = tc.Translation;
+				if (tc.WorldTransform != glm::mat4(1.0f) && tc.WorldTransform != glm::mat4(0.0f))
+				{
+					worldPos = glm::vec3(tc.WorldTransform[3]);
+				}
+
+				// Distance-compensated scaling: scales with distance so names remain legible from far away
+				float distToCamera = glm::length(worldPos - camera.Position);
+				float distanceScaleFactor = glm::clamp(distToCamera / 8.0f, 1.0f, 6.0f);
+				float currentScale = nametagScale * distanceScaleFactor;
+
+				float heightOffset = 2.2f + (distanceScaleFactor - 1.0f) * 0.35f;
+				glm::vec3 pos = worldPos + glm::vec3(0.0f, heightOffset, 0.0f);
+
+				// Build vertex data centered at origin in View Space (+Y is UP, -Y is DOWN)
+				std::vector<GlyphVertex> verts;
+				verts.reserve(quads.size() * kVertsPerGlyph);
+
+				for (const auto& q : quads)
+				{
+					float lx = (q.x - centerX) * currentScale;
+					float rx = (q.x + q.w - centerX) * currentScale;
+					float topY = -(q.y - centerY) * currentScale;
+					float botY = -(q.y + q.h - centerY) * currentScale;
+
+					verts.push_back({lx, topY, q.s0, q.t0}); // TL
+					verts.push_back({rx, topY, q.s1, q.t0}); // TR
+					verts.push_back({rx, botY, q.s1, q.t1}); // BR
+					verts.push_back({lx, botY, q.s0, q.t1}); // BL
+				}
+
+				if (verts.empty())
+				{
+					continue;
+				}
+
+				// Upload glyph vertices to dynamic VBO
+				s_DynVBO->SetData(verts.data(), static_cast<uint32_t>(verts.size() * sizeof(GlyphVertex)));
+
+				shader->SetVec3("modelPosition", pos);
+
+				bool isLocal = (netId.NetworkID == localID);
+				shader->SetVec4("textColor", isLocal ? glm::vec4(1.0f, 0.86f, 0.0f, 1.0f)
+													 : (isHost ? glm::vec4(0.4f, 0.8f, 1.0f, 1.0f)
+															   : glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)));
+
+				uint32_t idxCount = static_cast<uint32_t>(quads.size() * kIndicesPerGlyph);
+				s_QuadVAO->Bind();
+				GraphicsDevice::Get().DrawIndexed(s_QuadVAO, idxCount);
+				s_QuadVAO->Unbind();
+			}
+
+			shader->Unbind();
+		}
+
+		void Shutdown()
+		{
+			if (!s_Initialized)
+			{
+				return;
+			}
+			s_TextRenderer.Shutdown();
+			s_DynVBO.reset();
+			s_QuadVAO.reset();
+			s_Initialized = false;
+		}
+
+	} // namespace NametagSystem
+} // namespace Chained
diff --git a/engine/graphics/nametag_system.h b/engine/graphics/nametag_system.h
new file mode 100644
index 000000000..8c06c5fe0
--- /dev/null
+++ b/engine/graphics/nametag_system.h
@@ -0,0 +1,15 @@
+#ifndef CH_NAMETAG_SYSTEM_H
+#define CH_NAMETAG_SYSTEM_H
+
+#include "engine/graphics/camera_types.h"
+#include <entt/entt.hpp>
+
+namespace Chained
+{
+	namespace NametagSystem
+	{
+		void DrawNametags(entt::registry& registry, const Camera3D& camera);
+		void Shutdown();
+	} // namespace NametagSystem
+} // namespace Chained
+#endif
diff --git a/engine/graphics/pipeline/debug_renderer.cpp b/engine/graphics/pipeline/debug_renderer.cpp
new file mode 100644
index 000000000..135afa122
--- /dev/null
+++ b/engine/graphics/pipeline/debug_renderer.cpp
@@ -0,0 +1,372 @@
+#include "engine/graphics/pipeline/debug_renderer.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/shader_asset.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/pipeline/geometry_generator.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	void DebugRenderer::Initialize()
+	{
+		m_Resources.UnitCubeModel = std::make_unique<Model>();
+		m_Resources.UnitCubeModel->Meshes.push_back(GeometryGenerator::GenerateUnitCube());
+
+		m_Resources.UnitSphereModel = std::make_unique<Model>();
+		m_Resources.UnitSphereModel->Meshes.push_back(GeometryGenerator::GenerateSphere(1.0f, 32, 32));
+
+		m_Resources.UnitCapsuleModel = std::make_unique<Model>();
+		m_Resources.UnitCapsuleModel->Meshes.push_back(GeometryGenerator::GenerateCapsule(1.0f, 2.0f, 32, 32));
+
+		m_Resources.WireCubeModel = std::make_unique<Model>();
+		m_Resources.WireCubeModel->Meshes.push_back(GeometryGenerator::GenerateWireCube());
+	}
+
+	void DebugRenderer::Shutdown()
+	{
+	}
+
+	void DebugRenderer::DrawLine(const glm::vec3& start, const glm::vec3& end, const glm::vec4& color)
+	{
+		m_Lines.Vertices.push_back({start, color});
+		m_Lines.Vertices.push_back({end, color});
+	}
+
+	void DebugRenderer::Flush(Renderer& renderer)
+	{
+		if (m_Lines.Vertices.empty())
+		{
+			return;
+		}
+
+		const auto& frame = renderer.GetFrame();
+
+		auto debugShader = renderer.GetShaderLibrary().LoadOrGet("ColliderDebug");
+		if (!debugShader || !debugShader->GetShader())
+		{
+			m_Lines.Vertices.clear();
+			return;
+		}
+
+		auto shader = debugShader->GetShader();
+		shader->Bind();
+
+		glm::mat4 vp = frame.Proj * frame.View;
+		shader->SetMatrix("u_ViewProj", vp);
+		shader->SetMatrix("u_Transform", glm::mat4(1.0f));
+		shader->SetVec4("u_Color", glm::vec4(1.0f));
+
+		uint32_t dataSize = (uint32_t)(m_Lines.Vertices.size() * sizeof(LineVertex));
+
+		if (!m_Lines.VBO || m_Lines.VBOSize < dataSize)
+		{
+			m_Lines.VBOSize = std::max(dataSize, (uint32_t)(1024 * sizeof(LineVertex)));
+			m_Lines.VBO = VertexBuffer::Create(m_Lines.VBOSize);
+			m_Lines.VBO->SetLayout(
+				{{VertexAttributeType::Float3, "vertexPosition"}, {VertexAttributeType::Float4, "vertexColor"}});
+			m_Lines.VAO = VertexArray::Create();
+			m_Lines.VAO->AddVertexBuffer(m_Lines.VBO);
+		}
+
+		m_Lines.VBO->SetData(m_Lines.Vertices.data(), dataSize);
+		GraphicsDevice::Get().DrawLines(m_Lines.VAO, (uint32_t)m_Lines.Vertices.size());
+		m_Lines.Vertices.clear();
+	}
+
+	void DebugRenderer::DrawMeshWire(const Mesh& mesh, const glm::vec4& color, const glm::mat4& transform,
+									 Renderer& renderer, bool useWireframe)
+	{
+		const auto& frame = renderer.GetFrame();
+		auto debugShader = renderer.GetShaderLibrary().LoadOrGet("ColliderDebug");
+		if (!debugShader || !debugShader->GetShader())
+		{
+			return;
+		}
+
+		auto shader = debugShader->GetShader();
+		shader->Bind();
+
+		glm::mat4 vp = frame.Proj * frame.View;
+		shader->SetMatrix("u_ViewProj", vp);
+		shader->SetMatrix("u_Transform", transform);
+
+		glm::vec4 finalColor = color;
+		if (!useWireframe)
+		{
+			finalColor.a *= 0.35f;
+		}
+		shader->SetVec4("u_Color", finalColor);
+
+		if (mesh.VAO)
+		{
+			auto guard = PipelineStateGuard::Capture();
+			guard.WithBlend();
+			GraphicsDevice::Get().SetBlendEnabled(true);
+			GraphicsDevice::Get().SetBlendFunc(GraphicsDevice::BlendFactor::SrcAlpha,
+											   GraphicsDevice::BlendFactor::OneMinusSrcAlpha);
+
+			if (useWireframe)
+			{
+				GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Line);
+			}
+			else
+			{
+				GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Fill);
+			}
+
+			if (mesh.TriangleCount > 0)
+			{
+				GraphicsDevice::Get().DrawIndexed(mesh.VAO, mesh.TriangleCount * 3);
+			}
+			else if (mesh.VAO->GetIndexBuffer() != nullptr)
+			{
+				GraphicsDevice::Get().DrawIndexedLines(mesh.VAO, mesh.VAO->GetIndexBuffer()->GetCount());
+			}
+			else
+			{
+				GraphicsDevice::Get().DrawLines(mesh.VAO, mesh.VertexCount);
+			}
+		}
+	}
+
+	void DebugRenderer::DrawCubeWires(const glm::mat4& transform, const glm::vec3& size, const glm::vec4& color,
+									  Renderer& renderer, bool useWireframe)
+	{
+		glm::mat4 model = transform * glm::scale(glm::mat4(1.0f), size);
+		if (useWireframe && m_Resources.WireCubeModel && !m_Resources.WireCubeModel->Meshes.empty())
+		{
+			DrawMeshWire(m_Resources.WireCubeModel->Meshes[0], color, model, renderer, true);
+		}
+		else if (m_Resources.UnitCubeModel && !m_Resources.UnitCubeModel->Meshes.empty())
+		{
+			DrawMeshWire(m_Resources.UnitCubeModel->Meshes[0], color, model, renderer, useWireframe);
+		}
+	}
+
+	void DebugRenderer::DrawCapsuleWires(const glm::mat4& transform, float radius, float height, const glm::vec4& color,
+										 Renderer& renderer, bool useWireframe)
+	{
+		if (!m_Resources.UnitCapsuleModel)
+		{
+			return;
+		}
+		glm::mat4 model = transform * glm::scale(glm::mat4(1.0f), glm::vec3(radius, height, radius));
+		for (auto& mesh : m_Resources.UnitCapsuleModel->Meshes)
+		{
+			DrawMeshWire(mesh, color, model, renderer, useWireframe);
+		}
+	}
+
+	void DebugRenderer::DrawSphereWires(const glm::mat4& transform, float radius, const glm::vec4& color,
+										Renderer& renderer, bool useWireframe)
+	{
+		if (!m_Resources.UnitSphereModel)
+		{
+			return;
+		}
+		glm::mat4 model = transform * glm::scale(glm::mat4(1.0f), glm::vec3(radius));
+		for (auto& mesh : m_Resources.UnitSphereModel->Meshes)
+		{
+			DrawMeshWire(mesh, color, model, renderer, useWireframe);
+		}
+	}
+
+	void DebugRenderer::DrawInfiniteGrid(const Camera3D& camera, const GridSettings& grid, Renderer& renderer)
+	{
+		const auto& frame = renderer.GetFrame();
+		(void)frame;
+
+		auto shaderAsset = renderer.GetShaderLibrary().LoadOrGet("Grid");
+		if (!shaderAsset || !shaderAsset->GetShader())
+		{
+			return;
+		}
+
+		auto guard = PipelineStateGuard::Capture();
+		GraphicsDevice::Get().SetCullMode(GraphicsDevice::CullMode::None);
+		GraphicsDevice::Get().EnableDepthTest();
+		GraphicsDevice::Get().SetDepthFunc(GraphicsDevice::DepthFunc::LEqual);
+		GraphicsDevice::Get().SetBlendEnabled(true);
+		GraphicsDevice::Get().SetBlendFunc(GraphicsDevice::BlendFactor::SrcAlpha,
+										   GraphicsDevice::BlendFactor::OneMinusSrcAlpha);
+
+		shaderAsset->GetShader()->Bind();
+
+		glm::vec3 planePos = {camera.Position.x, -0.005f, camera.Position.z};
+		glm::mat4 model = glm::translate(glm::mat4(1.0f), planePos);
+		model = glm::scale(model, glm::vec3(grid.PlaneSize, 1.0f, grid.PlaneSize));
+
+		shaderAsset->GetShader()->SetMatrix("u_ViewProjection", frame.Proj * frame.View);
+		shaderAsset->GetShader()->SetMatrix("u_Model", model);
+		shaderAsset->GetShader()->SetVec3("u_CameraPos", camera.Position);
+		shaderAsset->GetShader()->SetVec4("u_GridColor", grid.Color);
+		shaderAsset->GetShader()->SetFloat("u_GridSize", grid.Spacing);
+		shaderAsset->GetShader()->SetFloat("u_SecondarySpacing", grid.SecondarySpacing);
+		shaderAsset->GetShader()->SetFloat("u_FadeStart", grid.FadeStart);
+		shaderAsset->GetShader()->SetFloat("u_FadeEnd", grid.FadeEnd);
+
+		if (!m_GridPlaneVAO)
+		{
+			float vertices[] = {
+				-0.5f, 0.0f, -0.5f, 0.5f, 0.0f, -0.5f, 0.5f, 0.0f, 0.5f, -0.5f, 0.0f, 0.5f,
+			};
+			uint32_t indices[] = {0, 1, 2, 2, 3, 0};
+
+			auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+			vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"}});
+
+			m_GridPlaneVAO = VertexArray::Create();
+			m_GridPlaneVAO->AddVertexBuffer(vbo);
+			auto ibo = IndexBuffer::Create(indices, 6);
+			m_GridPlaneVAO->SetIndexBuffer(ibo);
+		}
+
+		GraphicsDevice::Get().DrawIndexed(m_GridPlaneVAO, 6);
+	}
+
+	void DebugRenderer::RenderDebug(entt::registry& registry, const SceneSettings& settings, const Camera3D& camera,
+									const SceneRenderOptions& options, Renderer& renderer)
+	{
+		if (!options.ShowDebugColliders && !options.ShowDebugCollisionModelBox && !options.ShowDebugSpawnZones &&
+			!options.DrawGrid)
+		{
+			return;
+		}
+
+		auto guard = PipelineStateGuard::Capture();
+		guard.WithDepthTest().WithBlend().WithWireframeMode();
+
+		GraphicsDevice::Get().DisableDepthTest();
+		GraphicsDevice::Get().SetBlendEnabled(true);
+		GraphicsDevice::Get().SetBlendFunc(GraphicsDevice::BlendFactor::SrcAlpha,
+										   GraphicsDevice::BlendFactor::OneMinusSrcAlpha);
+		GraphicsDevice::Get().SetPolygonOffset(false, 0.0f, 0.0f);
+
+		if (options.SetCollisionWireframeMode == 1)
+		{
+			GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Line);
+		}
+		else
+		{
+			GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Fill);
+		}
+
+		if (options.ShowDebugColliders)
+		{
+			DrawColliderDebug(registry, options, renderer);
+		}
+
+		if (options.DrawGrid)
+		{
+			DrawInfiniteGrid(camera, settings.Grid, renderer);
+		}
+
+		Flush(renderer);
+	}
+
+	void DebugRenderer::DrawColliderDebug(entt::registry& registry, const SceneRenderOptions& options,
+										  Renderer& renderer)
+	{
+		int mode = options.SetCollisionWireframeMode;
+		bool drawSolid = (mode == 1 || mode == 2);
+		bool drawWire = (mode == 0 || mode == 2);
+
+		auto drawPass = [&](bool isWireframe) {
+			auto view = registry.view<TransformComponent, ColliderComponent>();
+			for (auto entity : view)
+			{
+				auto [transform, collider] = view.get<TransformComponent, ColliderComponent>(entity);
+				if (!collider.Enabled)
+				{
+					continue;
+				}
+
+				glm::vec4 color =
+					collider.IsColliding ? glm::vec4(1.0f, 0.0f, 0.0f, 0.6f) : glm::vec4(0.0f, 1.0f, 0.0f, 0.6f);
+				if (isWireframe)
+				{
+					color.a = 1.0f;
+				}
+
+				if (collider.Type == ColliderType::Box || collider.Type == ColliderType::Sphere ||
+					collider.Type == ColliderType::Capsule)
+				{
+					glm::vec3 entityScale(glm::length(glm::vec3(transform.WorldTransform[0])),
+										  glm::length(glm::vec3(transform.WorldTransform[1])),
+										  glm::length(glm::vec3(transform.WorldTransform[2])));
+
+					glm::mat4 rotTrans = transform.WorldTransform;
+					if (entityScale.x > 0.0001f)
+					{
+						rotTrans[0] = glm::vec4(glm::vec3(rotTrans[0]) / entityScale.x, 0.0f);
+					}
+					if (entityScale.y > 0.0001f)
+					{
+						rotTrans[1] = glm::vec4(glm::vec3(rotTrans[1]) / entityScale.y, 0.0f);
+					}
+					if (entityScale.z > 0.0001f)
+					{
+						rotTrans[2] = glm::vec4(glm::vec3(rotTrans[2]) / entityScale.z, 0.0f);
+					}
+
+					glm::mat4 baseTransform = rotTrans * glm::translate(glm::mat4(1.0f), collider.Offset);
+
+					if (collider.Type == ColliderType::Box)
+					{
+						DrawCubeWires(baseTransform, collider.Size * entityScale, color, renderer, isWireframe);
+					}
+					else if (collider.Type == ColliderType::Sphere)
+					{
+						float maxScale = glm::max(entityScale.x, glm::max(entityScale.y, entityScale.z));
+						DrawSphereWires(baseTransform, collider.Radius * maxScale, color, renderer, isWireframe);
+					}
+					else if (collider.Type == ColliderType::Capsule)
+					{
+						float radiusScale = glm::max(entityScale.x, entityScale.z);
+						DrawCapsuleWires(baseTransform, collider.Radius * radiusScale, collider.Height * entityScale.y,
+										 color, renderer, isWireframe);
+					}
+				}
+				else if (collider.Type == ColliderType::Mesh && !collider.ModelPath.empty())
+				{
+					auto* am = ServiceLocator::TryGet<AssetManager>();
+					auto modelAsset = am ? am->Get<ModelAsset>(collider.ModelPath) : nullptr;
+					if (modelAsset && modelAsset->IsReady())
+					{
+						glm::mat4 meshTrans =
+							transform.WorldTransform * glm::translate(glm::mat4(1.0f), collider.Offset);
+						const auto& model = modelAsset->GetModel();
+						for (const auto& inst : modelAsset->GetInstances())
+						{
+							glm::mat4 finalMat = meshTrans * inst.localTransform;
+							if (inst.meshIndex >= 0 && inst.meshIndex < model.Meshes.size())
+							{
+								DrawMeshWire(model.Meshes[inst.meshIndex], color, finalMat, renderer, isWireframe);
+							}
+						}
+					}
+				}
+			}
+		};
+
+		if (drawSolid)
+		{
+			GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Fill);
+			drawPass(false);
+		}
+
+		if (drawWire)
+		{
+			GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Line);
+			drawPass(true);
+		}
+
+		GraphicsDevice::Get().SetPolygonMode(GraphicsDevice::PolygonMode::Fill);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/debug_renderer.h b/engine/graphics/pipeline/debug_renderer.h
new file mode 100644
index 000000000..02839cc28
--- /dev/null
+++ b/engine/graphics/pipeline/debug_renderer.h
@@ -0,0 +1,81 @@
+#ifndef CH_DEBUG_RENDERER_H
+#define CH_DEBUG_RENDERER_H
+
+#include "engine/graphics/camera_types.h"
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/scene/scene_settings.h"
+#include "engine/graphics/pipeline/scene_renderer_types.h"
+#include "engine/core/service.h"
+#include "engine/graphics/api/buffer.h"
+#include "engine/graphics/api/vertex_array.h"
+#include <entt/entt.hpp>
+#include <glm/glm.hpp>
+#include <vector>
+#include <memory>
+
+namespace Chained
+{
+
+	class Renderer;
+
+	struct LineVertex
+	{
+		glm::vec3 Position;
+		glm::vec4 Color;
+	};
+
+	struct LineState
+	{
+		std::shared_ptr<class VertexBuffer> VBO;
+		std::shared_ptr<VertexArray> VAO;
+		std::vector<LineVertex> Vertices;
+		uint32_t VBOSize = 0;
+	};
+
+	struct StaticResources
+	{
+		std::unique_ptr<Model> UnitCubeModel;
+		std::unique_ptr<Model> UnitSphereModel;
+		std::unique_ptr<Model> UnitCapsuleModel;
+		std::unique_ptr<Model> WireCubeModel;
+	};
+
+	class CH_API DebugRenderer : public Service
+	{
+	public:
+		DebugRenderer() = default;
+		virtual ~DebugRenderer() override = default;
+
+		void DrawLine(const glm::vec3& start, const glm::vec3& end, const glm::vec4& color);
+		void Flush(Renderer& renderer);
+		void DrawMeshWire(const Mesh& mesh, const glm::vec4& color, const glm::mat4& transform, Renderer& renderer,
+						  bool useWireframe = true);
+		void DrawCubeWires(const glm::mat4& transform, const glm::vec3& size, const glm::vec4& color,
+						   Renderer& renderer, bool useWireframe = true);
+		void DrawCapsuleWires(const glm::mat4& transform, float radius, float height, const glm::vec4& color,
+							  Renderer& renderer, bool useWireframe = true);
+		void DrawSphereWires(const glm::mat4& transform, float radius, const glm::vec4& color, Renderer& renderer,
+							 bool useWireframe = true);
+		void DrawInfiniteGrid(const Camera3D& camera, const GridSettings& grid, Renderer& renderer);
+
+		// High-level debug overlay: sets up pipeline state, draws colliders + grid, flushes lines.
+		void RenderDebug(entt::registry& registry, const SceneSettings& settings, const Camera3D& camera,
+						 const SceneRenderOptions& options, Renderer& renderer);
+
+		// Draws wireframe/solid collider shapes for all ColliderComponent entities.
+		void DrawColliderDebug(entt::registry& registry, const SceneRenderOptions& options, Renderer& renderer);
+
+	protected:
+		virtual void Initialize() override;
+		virtual void Shutdown() override;
+
+	private:
+		LineState m_Lines;
+		StaticResources m_Resources;
+		std::shared_ptr<VertexArray> m_GridPlaneVAO;
+	};
+
+} // namespace Chained
+
+#endif // CH_DEBUG_RENDERER_H
diff --git a/engine/graphics/pipeline/entity_collector.cpp b/engine/graphics/pipeline/entity_collector.cpp
new file mode 100644
index 000000000..1cf8496f8
--- /dev/null
+++ b/engine/graphics/pipeline/entity_collector.cpp
@@ -0,0 +1,233 @@
+#include "entity_collector.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/material_asset.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/types/shader_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+#include <cmath>
+
+#include <glm/gtx/matrix_decompose.hpp>
+
+namespace Chained
+{
+
+	static glm::mat4 InterpolateBoneMatrices(const glm::mat4& a, const glm::mat4& b, float t)
+	{
+		glm::vec3 scaleA, translationA, skewA;
+		glm::quat rotationA;
+		glm::vec4 perspectiveA;
+		glm::decompose(a, scaleA, rotationA, translationA, skewA, perspectiveA);
+
+		glm::vec3 scaleB, translationB, skewB;
+		glm::quat rotationB;
+		glm::vec4 perspectiveB;
+		glm::decompose(b, scaleB, rotationB, translationB, skewB, perspectiveB);
+
+		glm::vec3 translation = glm::mix(translationA, translationB, t);
+		glm::quat rotation = glm::slerp(rotationA, rotationB, t);
+		glm::vec3 scale = glm::mix(scaleA, scaleB, t);
+
+		return glm::translate(glm::mat4(1.0f), translation) * glm::mat4_cast(rotation) *
+			   glm::scale(glm::mat4(1.0f), scale);
+	}
+
+	EntityCollector::EntityCollector(MaterialManager& materialManager)
+		: m_MaterialManager(materialManager)
+	{
+	}
+
+	void EntityCollector::Clear()
+	{
+		m_OpaqueQueue.clear();
+		m_TransparentQueue.clear();
+	}
+
+	void EntityCollector::Collect(entt::registry& registry, const Frustum& frustum, const glm::vec3& cameraPos)
+	{
+		Clear();
+
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+
+		auto meshView = registry.view<TransformComponent, ModelComponent>();
+		for (auto entity : meshView)
+		{
+			auto [transform, mesh] = meshView.get<TransformComponent, ModelComponent>(entity);
+			if (mesh.ModelPath.empty())
+			{
+				continue;
+			}
+
+			auto modelAsset = assets->Get<ModelAsset>(mesh.ModelPath);
+			if (!modelAsset || modelAsset->GetState() != AssetState::Ready)
+			{
+				continue;
+			}
+
+			EnqueueModelAsset(registry, entity, modelAsset.get(), transform.WorldTransform, frustum, cameraPos);
+		}
+	}
+
+	bool EntityCollector::EnqueueModelAsset(entt::registry& registry, entt::entity entity, ModelAsset* modelAsset,
+											const glm::mat4& worldTransform, const Frustum& frustum,
+											const glm::vec3& cameraPos)
+	{
+		BoundingBox bbox = modelAsset->GetBoundingBox();
+
+		if (registry.all_of<AnimationComponent>(entity))
+		{
+			glm::vec3 center = (bbox.Max + bbox.Min) * 0.5f;
+			glm::vec3 size = (bbox.Max - bbox.Min) * 2.0f;
+			bbox.Min = center - size * 0.5f;
+			bbox.Max = center + size * 0.5f;
+		}
+
+		glm::vec3 localCenter = (bbox.Max + bbox.Min) * 0.5f;
+		glm::vec3 localExtents = (bbox.Max - bbox.Min) * 0.5f;
+
+		glm::vec3 worldCenter = glm::vec3(worldTransform * glm::vec4(localCenter, 1.0f));
+		glm::vec3 worldExtents = {
+			std::abs(worldTransform[0][0]) * localExtents.x + std::abs(worldTransform[1][0]) * localExtents.y +
+				std::abs(worldTransform[2][0]) * localExtents.z,
+			std::abs(worldTransform[0][1]) * localExtents.x + std::abs(worldTransform[1][1]) * localExtents.y +
+				std::abs(worldTransform[2][1]) * localExtents.z,
+			std::abs(worldTransform[0][2]) * localExtents.x + std::abs(worldTransform[1][2]) * localExtents.y +
+				std::abs(worldTransform[2][2]) * localExtents.z,
+		};
+		if (!IsBoxVisible(frustum, worldCenter, worldExtents))
+		{
+			return false;
+		}
+
+		std::shared_ptr<ShaderAsset> shaderOver;
+		std::vector<ShaderUniform> uniforms;
+		if (registry.all_of<ShaderComponent>(entity))
+		{
+			auto& sc = registry.get<ShaderComponent>(entity);
+			if (sc.Enabled && !sc.ShaderPath.empty())
+			{
+				if (auto* am = ServiceLocator::TryGet<AssetManager>())
+				{
+					shaderOver = am->Get<ShaderAsset>(sc.ShaderPath);
+				}
+				uniforms = sc.Uniforms;
+			}
+		}
+
+		std::vector<Material> materials = modelAsset->GetMaterials();
+		if (registry.all_of<ModelComponent>(entity))
+		{
+			auto& modelComponent = registry.get<ModelComponent>(entity);
+			if (auto* materialAssets = ServiceLocator::TryGet<AssetManager>())
+			{
+				std::filesystem::path modelPath(modelComponent.ModelPath);
+				std::string modelName = modelPath.stem().string();
+				std::filesystem::path modelDir = modelPath.parent_path();
+
+				for (size_t i = 0; i < materials.size(); ++i)
+				{
+					std::string matPath;
+					if (i < modelComponent.MaterialPaths.size() && !modelComponent.MaterialPaths[i].empty())
+					{
+						matPath = modelComponent.MaterialPaths[i];
+					}
+					else if (!modelComponent.ModelPath.empty())
+					{
+						std::string autoName = modelName + "_material_" + std::to_string(i) + ".chmat";
+						std::string autoRel = (modelDir / autoName).generic_string();
+						if (materialAssets->FileExists(autoRel))
+						{
+							matPath = autoRel;
+						}
+					}
+
+					if (!matPath.empty())
+					{
+						auto materialAsset = materialAssets->Get<MaterialAsset>(matPath);
+						if (materialAsset && materialAsset->IsReady())
+						{
+							materials[i] = materialAsset->GetMaterial();
+						}
+					}
+				}
+			}
+		}
+
+		RenderItem item;
+		item.Asset = modelAsset;
+		item.Transform = worldTransform;
+		item.Materials = materials;
+		item.ShaderOverride = shaderOver ? shaderOver->GetShader().get() : nullptr;
+		item.CustomUniforms = uniforms;
+
+		if (registry.all_of<AnimationComponent>(entity))
+		{
+			auto& anim = registry.get<AnimationComponent>(entity);
+			if (anim.CurrentAnimationIndex >= 0)
+			{
+				if (anim.Blending && anim.TargetAnimationIndex >= 0)
+				{
+					float alpha = (anim.BlendDuration > 0.0f)
+									  ? glm::clamp(anim.BlendTimer / anim.BlendDuration, 0.0f, 1.0f)
+									  : 1.0f;
+					auto matricesA = modelAsset->GetBoneMatrices(anim.CurrentAnimationIndex, anim.CurrentFrame);
+					auto matricesB = modelAsset->GetBoneMatrices(anim.TargetAnimationIndex, anim.TargetFrame);
+
+					if (!matricesA.empty() && !matricesB.empty())
+					{
+						size_t count = glm::min(matricesA.size(), matricesB.size());
+						item.BoneMatrices.resize(count);
+						for (size_t i = 0; i < count; ++i)
+						{
+							item.BoneMatrices[i] = InterpolateBoneMatrices(matricesA[i], matricesB[i], alpha);
+						}
+					}
+					else if (!matricesA.empty())
+					{
+						item.BoneMatrices = std::move(matricesA);
+					}
+					else
+					{
+						item.BoneMatrices = std::move(matricesB);
+					}
+				}
+				else
+				{
+					item.BoneMatrices = modelAsset->GetBoneMatrices(anim.CurrentAnimationIndex, anim.CurrentFrame);
+				}
+			}
+		}
+
+		bool hasOpaque = false;
+		bool hasTransparent = false;
+		const auto& model = modelAsset->GetModel();
+		for (int i = 0; i < (int)model.Meshes.size(); ++i)
+		{
+			Material mat = m_MaterialManager.Resolve(i, model, materials, modelAsset);
+			if (mat.Transparent || mat.AlbedoColor.a < 0.99f)
+			{
+				hasTransparent = true;
+			}
+			else
+			{
+				hasOpaque = true;
+			}
+		}
+
+		glm::vec3 worldPos = glm::vec3(worldTransform[3]);
+		item.Distance = glm::length(cameraPos - worldPos);
+
+		if (hasTransparent)
+		{
+			m_TransparentQueue.push_back(item);
+		}
+		if (hasOpaque)
+		{
+			m_OpaqueQueue.push_back(std::move(item));
+		}
+		return hasOpaque || hasTransparent;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/entity_collector.h b/engine/graphics/pipeline/entity_collector.h
new file mode 100644
index 000000000..e8dfa8ce5
--- /dev/null
+++ b/engine/graphics/pipeline/entity_collector.h
@@ -0,0 +1,48 @@
+#ifndef CH_ENTITY_COLLECTOR_H
+#define CH_ENTITY_COLLECTOR_H
+
+#include "engine/graphics/pipeline/scene_renderer_types.h"
+#include "engine/graphics/pipeline/frustum.h"
+#include "engine/graphics/pipeline/material_manager.h"
+#include <entt/entt.hpp>
+#include <vector>
+#include <glm/glm.hpp>
+
+namespace Chained
+{
+
+	class Renderer;
+
+	/// @brief Collects visible entities from the scene, frustum-culls them,
+	/// resolves materials, and splits into opaque/transparent render queues.
+	/// Extracted from SceneRenderer to separate entity gathering from draw dispatch.
+	class CH_API EntityCollector
+	{
+	public:
+		explicit EntityCollector(MaterialManager& materialManager);
+		~EntityCollector() = default;
+
+		void Collect(entt::registry& registry, const Frustum& frustum, const glm::vec3& cameraPos);
+		void Clear();
+
+		std::vector<RenderItem>& GetOpaqueQueue()
+		{
+			return m_OpaqueQueue;
+		}
+		std::vector<RenderItem>& GetTransparentQueue()
+		{
+			return m_TransparentQueue;
+		}
+
+	private:
+		bool EnqueueModelAsset(entt::registry& registry, entt::entity entity, ModelAsset* modelAsset,
+							   const glm::mat4& worldTransform, const Frustum& frustum, const glm::vec3& cameraPos);
+
+		MaterialManager& m_MaterialManager;
+		std::vector<RenderItem> m_OpaqueQueue;
+		std::vector<RenderItem> m_TransparentQueue;
+	};
+
+} // namespace Chained
+
+#endif // CH_ENTITY_COLLECTOR_H
diff --git a/engine/graphics/pipeline/frustum.h b/engine/graphics/pipeline/frustum.h
index 6f623a055..04ebc85fd 100644
--- a/engine/graphics/pipeline/frustum.h
+++ b/engine/graphics/pipeline/frustum.h
@@ -2,85 +2,65 @@
 #define CH_FRUSTUM_H
 
 #include <glm/glm.hpp>
-#include <array>
-#include <cmath>
 
-namespace CHEngine
+namespace Chained
 {
-struct Frustum
-{
-    static constexpr size_t PlaneCount = 6;
-
-    enum PlaneIndex : size_t { Left = 0, Right, Bottom, Top, Near, Far };
-
-    // Planes: x, y, z = normal, w = distance from origin
-    std::array<glm::vec4, PlaneCount> Planes;
-
-    // Extracts planes from the view-projection matrix.
-    // GLM uses column-major storage/access.
-    void Extract(const glm::mat4& mat)
-    {
-        // Gribb-Hartmann plane extraction for column-major matrix
-        Planes[Left]   = { mat[0][3] + mat[0][0], mat[1][3] + mat[1][0], mat[2][3] + mat[2][0], mat[3][3] + mat[3][0] };
-        Planes[Right]  = { mat[0][3] - mat[0][0], mat[1][3] - mat[1][0], mat[2][3] - mat[2][0], mat[3][3] - mat[3][0] };
-        Planes[Bottom] = { mat[0][3] + mat[0][1], mat[1][3] + mat[1][1], mat[2][3] + mat[2][1], mat[3][3] + mat[3][1] };
-        Planes[Top]    = { mat[0][3] - mat[0][1], mat[1][3] - mat[1][1], mat[2][3] - mat[2][1], mat[3][3] - mat[3][1] };
-        Planes[Near]   = { mat[0][3] + mat[0][2], mat[1][3] + mat[1][2], mat[2][3] + mat[2][2], mat[3][3] + mat[3][2] };
-        Planes[Far]    = { mat[0][3] - mat[0][2], mat[1][3] - mat[1][2], mat[2][3] - mat[2][2], mat[3][3] - mat[3][2] };
-
-        // Normalize planes for accurate sphere testing
-        for (auto& p : Planes)
-        {
-            float length = std::sqrt(p.x * p.x + p.y * p.y + p.z * p.z);
-            if (length > 0) p /= length;
-        }
-    }
-
-    // Fast AABB check using center and extents.
-    bool IsBoxVisible(const glm::vec3& center, const glm::vec3& extents) const
-    {
-        for (const auto& p : Planes)
-        {
-            // Projection of extents onto plane normal
-            float r = extents.x * std::abs(p.x) + extents.y * std::abs(p.y) + extents.z * std::abs(p.z);
-            // Distance from box center to plane
-            float d = p.x * center.x + p.y * center.y + p.z * center.z + p.w;
-
-            if (d < -r) return false;
-        }
-        return true;
-    }
-
-    // Optimized AABB check with transform.
-    bool IsBoxVisible(const struct BoundingBox& box, const glm::mat4& transform) const
-    {
-        // 1. Find local center and extents
-        glm::vec3 localCenter = { (box.Max.x + box.Min.x) * 0.5f, (box.Max.y + box.Min.y) * 0.5f, (box.Max.z + box.Min.z) * 0.5f };
-        glm::vec3 localExtents = { (box.Max.x - box.Min.x) * 0.5f, (box.Max.y - box.Min.y) * 0.5f, (box.Max.z - box.Min.z) * 0.5f };
+	// Frustum plane: xyz = normal (normalized), w = distance from origin.
+	// Point is inside if dot(normal, point) + w >= 0.
+	struct Frustum
+	{
+		glm::vec4 Left, Right, Bottom, Top, Near, Far;
+	};
 
-        // 2. Transform center to world space
-        glm::vec4 worldCenter4 = transform * glm::vec4(localCenter, 1.0f);
-        glm::vec3 worldCenter = glm::vec3(worldCenter4);
+	inline glm::vec4 NormalizePlane(const glm::vec4& p)
+	{
+		float len = glm::length(glm::vec3(p));
+		// If length is 0 (shouldn't happen with valid VP matrix), avoid division by zero
+		if (len < 0.0001f)
+		{
+			return p;
+		}
+		return p / len;
+	}
 
-        // 3. Calculate new extents in world space (taking rotation and scale into account)
-        glm::vec3 worldExtents = {
-            std::abs(transform[0][0]) * localExtents.x + std::abs(transform[1][0]) * localExtents.y + std::abs(transform[2][0]) * localExtents.z,
-            std::abs(transform[0][1]) * localExtents.x + std::abs(transform[1][1]) * localExtents.y + std::abs(transform[2][1]) * localExtents.z,
-            std::abs(transform[0][2]) * localExtents.x + std::abs(transform[1][2]) * localExtents.y + std::abs(transform[2][2]) * localExtents.z
-        };
+	inline Frustum FromMatrix(const glm::mat4& vp)
+	{
+		Frustum f;
+		f.Left = NormalizePlane(
+			glm::vec4{vp[0][3] + vp[0][0], vp[1][3] + vp[1][0], vp[2][3] + vp[2][0], vp[3][3] + vp[3][0]});
+		f.Right = NormalizePlane(
+			glm::vec4{vp[0][3] - vp[0][0], vp[1][3] - vp[1][0], vp[2][3] - vp[2][0], vp[3][3] - vp[3][0]});
+		f.Bottom = NormalizePlane(
+			glm::vec4{vp[0][3] + vp[0][1], vp[1][3] + vp[1][1], vp[2][3] + vp[2][1], vp[3][3] + vp[3][1]});
+		f.Top = NormalizePlane(
+			glm::vec4{vp[0][3] - vp[0][1], vp[1][3] - vp[1][1], vp[2][3] - vp[2][1], vp[3][3] - vp[3][1]});
+#ifdef GLM_FORCE_DEPTH_ZERO_TO_ONE
+		f.Near = NormalizePlane(glm::vec4{vp[0][2], vp[1][2], vp[2][2], vp[3][2]});
+#else
+		f.Near = NormalizePlane(
+			glm::vec4{vp[0][3] + vp[0][2], vp[1][3] + vp[1][2], vp[2][3] + vp[2][2], vp[3][3] + vp[3][2]});
+#endif
+		f.Far = NormalizePlane(
+			glm::vec4{vp[0][3] - vp[0][2], vp[1][3] - vp[1][2], vp[2][3] - vp[2][2], vp[3][3] - vp[3][2]});
+		return f;
+	}
 
-        return IsBoxVisible(worldCenter, worldExtents);
-    }
+	inline bool IsSphereVisible(const Frustum& frustum, const glm::vec3& center, float radius)
+	{
+		auto outside = [&](const glm::vec4& p) { return glm::dot(glm::vec3(p), center) + p.w < -radius; };
+		return !outside(frustum.Left) && !outside(frustum.Right) && !outside(frustum.Bottom) && !outside(frustum.Top) &&
+			   !outside(frustum.Near) && !outside(frustum.Far);
+	}
 
-    bool IsSphereVisible(const glm::vec3& center, float radius) const
-    {
-        for (const auto& p : Planes)
-        {
-            if (p.x * center.x + p.y * center.y + p.z * center.z + p.w < -radius) return false;
-        }
-        return true;
-    }
-};
-} // namespace CHEngine
+	inline bool IsBoxVisible(const Frustum& frustum, const glm::vec3& center, const glm::vec3& extents)
+	{
+		auto outside = [&](const glm::vec4& p) {
+			float r = glm::dot(glm::abs(glm::vec3(p)), extents);
+			return glm::dot(glm::vec3(p), center) + p.w < -r;
+		};
+		return !outside(frustum.Left) && !outside(frustum.Right) && !outside(frustum.Bottom) && !outside(frustum.Top) &&
+			   !outside(frustum.Near) && !outside(frustum.Far);
+	}
+} // namespace Chained
 
-#endif
\ No newline at end of file
+#endif // CH_FRUSTUM_H
\ No newline at end of file
diff --git a/engine/graphics/pipeline/geometry_factory.cpp b/engine/graphics/pipeline/geometry_factory.cpp
new file mode 100644
index 000000000..b2ef14cd1
--- /dev/null
+++ b/engine/graphics/pipeline/geometry_factory.cpp
@@ -0,0 +1,52 @@
+#include "engine/graphics/pipeline/geometry_factory.h"
+#include "engine/graphics/api/vertex_array.h"
+#include "engine/graphics/api/buffer.h"
+
+namespace Chained
+{
+
+	void GeometryFactory::Initialize()
+	{
+		// Fullscreen quad — position (vec3) + UV (vec2), used by post-processing
+		{
+			float vertices[] = {-1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f,  -1.0f, 0.0f, 1.0f, 0.0f,
+								1.0f,  1.0f,  0.0f, 1.0f, 1.0f, -1.0f, 1.0f,  0.0f, 0.0f, 1.0f};
+			uint32_t indices[] = {0, 1, 2, 2, 3, 0};
+
+			m_FullscreenQuadVAO = VertexArray::Create();
+			auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+			vbo->SetLayout(
+				{{VertexAttributeType::Float3, "vertexPosition"}, {VertexAttributeType::Float2, "vertexTexCoord"}});
+			m_FullscreenQuadVAO->AddVertexBuffer(vbo);
+			auto ibo = IndexBuffer::Create(indices, 6);
+			m_FullscreenQuadVAO->SetIndexBuffer(ibo);
+		}
+
+		// Billboard / Sprite quad — position (vec3) + UV (vec2) + normal (vec3)
+		{
+			float vertices[] = {
+				// x,     y,     z,     u,    v,    nx,   ny,   nz
+				-0.5f, -0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.5f,	 -0.5f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f,
+				0.5f,  0.5f,  0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, -0.5f, 0.5f,	0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f,
+			};
+			uint32_t indices[] = {0, 1, 2, 2, 3, 0};
+
+			auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+			vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"},
+							{VertexAttributeType::Float2, "a_TexCoord"},
+							{VertexAttributeType::Float3, "a_Normal"}});
+
+			m_QuadVAO = VertexArray::Create();
+			m_QuadVAO->AddVertexBuffer(vbo);
+			auto ibo = IndexBuffer::Create(indices, 6);
+			m_QuadVAO->SetIndexBuffer(ibo);
+		}
+	}
+
+	void GeometryFactory::Shutdown()
+	{
+		m_FullscreenQuadVAO.reset();
+		m_QuadVAO.reset();
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/geometry_factory.h b/engine/graphics/pipeline/geometry_factory.h
new file mode 100644
index 000000000..d521349d0
--- /dev/null
+++ b/engine/graphics/pipeline/geometry_factory.h
@@ -0,0 +1,50 @@
+#ifndef CH_GEOMETRY_FACTORY_H
+#define CH_GEOMETRY_FACTORY_H
+
+#include "engine/common/base.h"
+#include "engine/graphics/api/vertex_array.h"
+#include <memory>
+
+namespace Chained
+{
+
+	/// @brief Owns shared GPU geometry used across the rendering pipeline.
+	/// Centralizes creation and lifecycle of common quads (fullscreen, billboard/sprite)
+	/// so that Renderer doesn't need to manage them inline.
+	class CH_API GeometryFactory
+	{
+	public:
+		GeometryFactory() = default;
+		~GeometryFactory() = default;
+
+		/// @brief Create the fullscreen quad and billboard/sprite quad VAOs.
+		void Initialize();
+
+		/// @brief Release all GPU resources.
+		void Shutdown();
+
+		/// @brief Fullscreen quad covering the entire screen (position + UV only).
+		std::shared_ptr<VertexArray>& GetFullscreenQuad()
+		{
+			return m_FullscreenQuadVAO;
+		}
+
+		/// @brief Centered unit quad with position + UV + normal (used by Billboard and Sprite).
+		std::shared_ptr<VertexArray>& GetQuad()
+		{
+			return m_QuadVAO;
+		}
+
+		bool HasQuad() const
+		{
+			return m_QuadVAO != nullptr;
+		}
+
+	private:
+		std::shared_ptr<VertexArray> m_FullscreenQuadVAO;
+		std::shared_ptr<VertexArray> m_QuadVAO;
+	};
+
+} // namespace Chained
+
+#endif // CH_GEOMETRY_FACTORY_H
diff --git a/engine/graphics/pipeline/geometry_generator.cpp b/engine/graphics/pipeline/geometry_generator.cpp
index 23080496a..be3f9ace3 100644
--- a/engine/graphics/pipeline/geometry_generator.cpp
+++ b/engine/graphics/pipeline/geometry_generator.cpp
@@ -1,233 +1,835 @@
 #include "geometry_generator.h"
 #include <vector>
+#include <cmath>
+#include <algorithm>
+#include <limits>
 #include <glm/glm.hpp>
 #include <glm/gtc/constants.hpp>
 
-namespace CHEngine
+namespace Chained
 {
-    Mesh GeometryGenerator::GenerateUnitCube()
-    {
-        float vertices[] = {
-            -0.5f,  0.5f, -0.5f,
-            -0.5f, -0.5f, -0.5f,
-             0.5f, -0.5f, -0.5f,
-             0.5f, -0.5f, -0.5f,
-             0.5f,  0.5f, -0.5f,
-            -0.5f,  0.5f, -0.5f,
-
-            -0.5f, -0.5f,  0.5f,
-            -0.5f, -0.5f, -0.5f,
-            -0.5f,  0.5f, -0.5f,
-            -0.5f,  0.5f,  0.5f,
-            -0.5f,  0.5f,  0.5f,
-            -0.5f, -0.5f,  0.5f,
-
-             0.5f, -0.5f, -0.5f,
-             0.5f, -0.5f,  0.5f,
-             0.5f,  0.5f,  0.5f,
-             0.5f,  0.5f,  0.5f,
-             0.5f,  0.5f, -0.5f,
-             0.5f, -0.5f, -0.5f,
-
-            -0.5f, -0.5f,  0.5f,
-            -0.5f,  0.5f,  0.5f,
-             0.5f,  0.5f,  0.5f,
-             0.5f,  0.5f,  0.5f,
-             0.5f, -0.5f,  0.5f,
-            -0.5f, -0.5f,  0.5f,
-
-            -0.5f,  0.5f, -0.5f,
-             0.5f,  0.5f, -0.5f,
-             0.5f,  0.5f,  0.5f,
-             0.5f,  0.5f,  0.5f,
-            -0.5f,  0.5f,  0.5f,
-            -0.5f,  0.5f, -0.5f,
-
-            -0.5f, -0.5f, -0.5f,
-            -0.5f, -0.5f,  0.5f,
-             0.5f, -0.5f, -0.5f,
-             0.5f, -0.5f, -0.5f,
-            -0.5f, -0.5f,  0.5f,
-             0.5f, -0.5f,  0.5f
-        };
-
-        auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
-        vbo->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-        auto vao = VertexArray::Create();
-        vao->AddVertexBuffer(vbo);
-        
-        uint32_t indices[36];
-        for (uint32_t index = 0; index < 36; ++index) indices[index] = index;
-        auto ebo = IndexBuffer::Create(indices, 36);
-        vao->SetIndexBuffer(ebo);
-
-        Mesh mesh;
-        mesh.VAO = vao;
-        mesh.VertexCount = 36;
-        mesh.TriangleCount = 12;
-        return mesh;
-    }
-
-    Mesh GeometryGenerator::GenerateWireCube()
-    {
-        // 8 unique corner vertices of a unit cube [-0.5, 0.5]
-        float vertices[] = {
-            -0.5f, -0.5f, -0.5f,  // 0: left  bottom back
-             0.5f, -0.5f, -0.5f,  // 1: right bottom back
-             0.5f,  0.5f, -0.5f,  // 2: right top    back
-            -0.5f,  0.5f, -0.5f,  // 3: left  top    back
-            -0.5f, -0.5f,  0.5f,  // 4: left  bottom front
-             0.5f, -0.5f,  0.5f,  // 5: right bottom front
-             0.5f,  0.5f,  0.5f,  // 6: right top    front
-            -0.5f,  0.5f,  0.5f   // 7: left  top    front
-        };
-
-        // 12 edges × 2 indices = 24 indices for GL_LINES
-        uint32_t indices[] = {
-            // Back face edges
-            0, 1,  1, 2,  2, 3,  3, 0,
-            // Front face edges
-            4, 5,  5, 6,  6, 7,  7, 4,
-            // Connecting edges
-            0, 4,  1, 5,  2, 6,  3, 7
-        };
-
-        auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
-        vbo->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-        auto vao = VertexArray::Create();
-        vao->AddVertexBuffer(vbo);
-        auto ebo = IndexBuffer::Create(indices, 24);
-        vao->SetIndexBuffer(ebo);
-
-        Mesh mesh;
-        mesh.VAO = vao;
-        mesh.VertexCount = 8;
-        mesh.TriangleCount = 0; // Lines, not triangles
-        return mesh;
-    }
-
-    Mesh GeometryGenerator::GenerateSphere(float radius, int slices, int stacks)
-    {
-        std::vector<float> vertices;
-        std::vector<uint32_t> indices;
-
-        for (int stackIndex = 0; stackIndex <= stacks; ++stackIndex) {
-            float stackFraction = (float)stackIndex / (float)stacks;
-            float polarAngle = stackFraction * glm::pi<float>();
-
-            for (int sliceIndex = 0; sliceIndex <= slices; ++sliceIndex) {
-                float sliceFraction = (float)sliceIndex / (float)slices;
-                float azimuthAngle = sliceFraction * 2.0f * glm::pi<float>();
-
-                float positionX = std::cos(azimuthAngle) * std::sin(polarAngle);
-                float positionY = std::cos(polarAngle);
-                float positionZ = std::sin(azimuthAngle) * std::sin(polarAngle);
-
-                vertices.push_back(positionX * radius);
-                vertices.push_back(positionY * radius);
-                vertices.push_back(positionZ * radius);
-            }
-        }
-
-        for (int stackIndex = 0; stackIndex < stacks; ++stackIndex) {
-            for (int sliceIndex = 0; sliceIndex < slices; ++sliceIndex) {
-                indices.push_back((stackIndex + 1) * (slices + 1) + sliceIndex);
-                indices.push_back(stackIndex * (slices + 1) + sliceIndex);
-                indices.push_back(stackIndex * (slices + 1) + sliceIndex + 1);
-                indices.push_back((stackIndex + 1) * (slices + 1) + sliceIndex);
-                indices.push_back(stackIndex * (slices + 1) + sliceIndex + 1);
-                indices.push_back((stackIndex + 1) * (slices + 1) + (sliceIndex + 1));
-            }
-        }
-
-        auto vbo = VertexBuffer::Create(vertices.data(), (uint32_t)vertices.size() * sizeof(float));
-        vbo->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-        auto vao = VertexArray::Create();
-        vao->AddVertexBuffer(vbo);
-        auto ebo = IndexBuffer::Create(indices.data(), (uint32_t)indices.size());
-        vao->SetIndexBuffer(ebo);
-
-        Mesh mesh;
-        mesh.VAO = vao;
-        mesh.VertexCount = (uint32_t)vertices.size() / 3;
-        mesh.TriangleCount = (uint32_t)indices.size() / 3;
-        return mesh;
-    }
-
-    Mesh GeometryGenerator::GenerateGrid(int slices, float spacing)
-    {
-        std::vector<float> vertices;
-        for (int lineIndex = -slices; lineIndex <= slices; ++lineIndex)
-        {
-            vertices.push_back((float)lineIndex * spacing); vertices.push_back(0); vertices.push_back((float)-slices * spacing);
-            vertices.push_back((float)lineIndex * spacing); vertices.push_back(0); vertices.push_back((float)slices * spacing);
-
-            vertices.push_back((float)-slices * spacing); vertices.push_back(0); vertices.push_back((float)lineIndex * spacing);
-            vertices.push_back((float)slices * spacing); vertices.push_back(0); vertices.push_back((float)lineIndex * spacing);
-        }
-
-        auto vbo = VertexBuffer::Create(vertices.data(), (uint32_t)vertices.size() * sizeof(float));
-        vbo->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-        auto vao = VertexArray::Create();
-        vao->AddVertexBuffer(vbo);
-
-        Mesh mesh;
-        mesh.VAO = vao;
-        mesh.VertexCount = (uint32_t)vertices.size() / 3;
-        mesh.TriangleCount = 0; // Grid is lines
-        return mesh;
-    }
-
-    Mesh GeometryGenerator::GenerateQuad(float size)
-    {
-        float vertices[] = {
-            -size, 0.0f, -size,
-             size, 0.0f, -size,
-             size, 0.0f,  size,
-            -size, 0.0f,  size
-        };
-
-        auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
-        vbo->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-        auto vao = VertexArray::Create();
-        vao->AddVertexBuffer(vbo);
-
-        Mesh mesh;
-        mesh.VAO = vao;
-        mesh.VertexCount = 4;
-        mesh.TriangleCount = 2;
-        return mesh;
-    }
-
-    Mesh GeometryGenerator::GenerateCube(const glm::vec3 &dimensions)
-    {
-        float halfWidth = dimensions.x * 0.5f;
-        float halfHeight = dimensions.y * 0.5f;
-        float halfDepth = dimensions.z * 0.5f;
-
-        float vertices[] = {
-            -halfWidth,-halfHeight, halfDepth,  halfWidth,-halfHeight, halfDepth,  halfWidth, halfHeight, halfDepth, -halfWidth, halfHeight, halfDepth,
-            -halfWidth,-halfHeight,-halfDepth, -halfWidth, halfHeight,-halfDepth,  halfWidth, halfHeight,-halfDepth,  halfWidth,-halfHeight,-halfDepth,
-            -halfWidth, halfHeight,-halfDepth, -halfWidth, halfHeight, halfDepth,  halfWidth, halfHeight, halfDepth,  halfWidth, halfHeight,-halfDepth,
-            -halfWidth,-halfHeight,-halfDepth,  halfWidth,-halfHeight,-halfDepth,  halfWidth,-halfHeight, halfDepth, -halfWidth,-halfHeight, halfDepth,
-             halfWidth,-halfHeight,-halfDepth,  halfWidth, halfHeight,-halfDepth,  halfWidth, halfHeight, halfDepth,  halfWidth,-halfHeight, halfDepth,
-            -halfWidth,-halfHeight,-halfDepth, -halfWidth,-halfHeight, halfDepth, -halfWidth, halfHeight, halfDepth, -halfWidth, halfHeight,-halfDepth
-        };
-
-        auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
-        vbo->SetLayout({{ShaderDataType::Float3, "a_Position"}});
-        auto vao = VertexArray::Create();
-        vao->AddVertexBuffer(vbo);
-        
-        uint32_t indices[36];
-        for (uint32_t index = 0; index < 36; ++index) indices[index] = index;
-        auto ebo = IndexBuffer::Create(indices, 36);
-        vao->SetIndexBuffer(ebo);
-
-        Mesh mesh;
-        mesh.VAO = vao;
-        mesh.VertexCount = 36;
-        mesh.TriangleCount = 12;
-        return mesh;
-    }
-}
+	Mesh GeometryGenerator::GenerateUnitCube()
+	{
+		float vertices[] = {-0.5f, 0.5f,  -0.5f, -0.5f, -0.5f, -0.5f, 0.5f,	 -0.5f, -0.5f,
+							0.5f,  -0.5f, -0.5f, 0.5f,	0.5f,  -0.5f, -0.5f, 0.5f,	-0.5f,
+
+							-0.5f, -0.5f, 0.5f,	 -0.5f, -0.5f, -0.5f, -0.5f, 0.5f,	-0.5f,
+							-0.5f, 0.5f,  0.5f,	 -0.5f, 0.5f,  0.5f,  -0.5f, -0.5f, 0.5f,
+
+							0.5f,  -0.5f, -0.5f, 0.5f,	-0.5f, 0.5f,  0.5f,	 0.5f,	0.5f,
+							0.5f,  0.5f,  0.5f,	 0.5f,	0.5f,  -0.5f, 0.5f,	 -0.5f, -0.5f,
+
+							-0.5f, -0.5f, 0.5f,	 -0.5f, 0.5f,  0.5f,  0.5f,	 0.5f,	0.5f,
+							0.5f,  0.5f,  0.5f,	 0.5f,	-0.5f, 0.5f,  -0.5f, -0.5f, 0.5f,
+
+							-0.5f, 0.5f,  -0.5f, 0.5f,	0.5f,  -0.5f, 0.5f,	 0.5f,	0.5f,
+							0.5f,  0.5f,  0.5f,	 -0.5f, 0.5f,  0.5f,  -0.5f, 0.5f,	-0.5f,
+
+							-0.5f, -0.5f, -0.5f, -0.5f, -0.5f, 0.5f,  0.5f,	 -0.5f, -0.5f,
+							0.5f,  -0.5f, -0.5f, -0.5f, -0.5f, 0.5f,  0.5f,	 -0.5f, 0.5f};
+
+		auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+
+		uint32_t indices[36];
+		for (uint32_t index = 0; index < 36; ++index)
+		{
+			indices[index] = index;
+		}
+		auto ebo = IndexBuffer::Create(indices, 36);
+		vao->SetIndexBuffer(ebo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = 36;
+		mesh.TriangleCount = 12;
+		return mesh;
+	}
+
+	Mesh GeometryGenerator::GenerateWireCube()
+	{
+		// 8 unique corner vertices of a unit cube [-0.5, 0.5]
+		float vertices[] = {
+			-0.5f, -0.5f, -0.5f, // 0: left  bottom back
+			0.5f,  -0.5f, -0.5f, // 1: right bottom back
+			0.5f,  0.5f,  -0.5f, // 2: right top    back
+			-0.5f, 0.5f,  -0.5f, // 3: left  top    back
+			-0.5f, -0.5f, 0.5f,	 // 4: left  bottom front
+			0.5f,  -0.5f, 0.5f,	 // 5: right bottom front
+			0.5f,  0.5f,  0.5f,	 // 6: right top    front
+			-0.5f, 0.5f,  0.5f	 // 7: left  top    front
+		};
+
+		// 12 edges × 2 indices = 24 indices for GL_LINES
+		uint32_t indices[] = {// Back face edges
+							  0, 1, 1, 2, 2, 3, 3, 0,
+							  // Front face edges
+							  4, 5, 5, 6, 6, 7, 7, 4,
+							  // Connecting edges
+							  0, 4, 1, 5, 2, 6, 3, 7};
+
+		auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+		auto ebo = IndexBuffer::Create(indices, 24);
+		vao->SetIndexBuffer(ebo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = 8;
+		mesh.TriangleCount = 0; // Lines, not triangles
+		return mesh;
+	}
+
+	Mesh GeometryGenerator::GenerateSphere(float radius, int slices, int stacks)
+	{
+		std::vector<float> vertices;
+		std::vector<uint32_t> indices;
+
+		for (int stackIndex = 0; stackIndex <= stacks; ++stackIndex)
+		{
+			float stackFraction = (float)stackIndex / (float)stacks;
+			float polarAngle = stackFraction * glm::pi<float>();
+
+			for (int sliceIndex = 0; sliceIndex <= slices; ++sliceIndex)
+			{
+				float sliceFraction = (float)sliceIndex / (float)slices;
+				float azimuthAngle = sliceFraction * 2.0f * glm::pi<float>();
+
+				float nx = std::cos(azimuthAngle) * std::sin(polarAngle);
+				float ny = std::cos(polarAngle);
+				float nz = std::sin(azimuthAngle) * std::sin(polarAngle);
+
+				// Position
+				vertices.push_back(nx * radius);
+				vertices.push_back(ny * radius);
+				vertices.push_back(nz * radius);
+				// TexCoord
+				vertices.push_back(sliceFraction);
+				vertices.push_back(1.0f - stackFraction);
+				// Normal
+				vertices.push_back(nx);
+				vertices.push_back(ny);
+				vertices.push_back(nz);
+			}
+		}
+
+		for (int stackIndex = 0; stackIndex < stacks; ++stackIndex)
+		{
+			for (int sliceIndex = 0; sliceIndex < slices; ++sliceIndex)
+			{
+				indices.push_back((stackIndex + 1) * (slices + 1) + sliceIndex);
+				indices.push_back(stackIndex * (slices + 1) + sliceIndex);
+				indices.push_back(stackIndex * (slices + 1) + sliceIndex + 1);
+				indices.push_back((stackIndex + 1) * (slices + 1) + sliceIndex);
+				indices.push_back(stackIndex * (slices + 1) + sliceIndex + 1);
+				indices.push_back((stackIndex + 1) * (slices + 1) + (sliceIndex + 1));
+			}
+		}
+
+		auto vbo = VertexBuffer::Create(vertices.data(), (uint32_t)vertices.size() * sizeof(float));
+		// Pos(3) + Tex(2) + Normal(3) = 8 floats per vertex
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"},
+						{VertexAttributeType::Float2, "a_TexCoord"},
+						{VertexAttributeType::Float3, "a_Normal"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+		auto ebo = IndexBuffer::Create(indices.data(), (uint32_t)indices.size());
+		vao->SetIndexBuffer(ebo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = (uint32_t)vertices.size() / 8;
+		mesh.TriangleCount = (uint32_t)indices.size() / 3;
+		return mesh;
+	}
+
+	Mesh GeometryGenerator::GenerateGrid(int slices, float spacing)
+	{
+		std::vector<float> vertices;
+		for (int lineIndex = -slices; lineIndex <= slices; ++lineIndex)
+		{
+			vertices.push_back((float)lineIndex * spacing);
+			vertices.push_back(0);
+			vertices.push_back((float)-slices * spacing);
+			vertices.push_back((float)lineIndex * spacing);
+			vertices.push_back(0);
+			vertices.push_back((float)slices * spacing);
+
+			vertices.push_back((float)-slices * spacing);
+			vertices.push_back(0);
+			vertices.push_back((float)lineIndex * spacing);
+			vertices.push_back((float)slices * spacing);
+			vertices.push_back(0);
+			vertices.push_back((float)lineIndex * spacing);
+		}
+
+		auto vbo = VertexBuffer::Create(vertices.data(), (uint32_t)vertices.size() * sizeof(float));
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = (uint32_t)vertices.size() / 3;
+		mesh.TriangleCount = 0; // Grid is lines
+		return mesh;
+	}
+
+	Mesh GeometryGenerator::GenerateQuad(float size)
+	{
+		// Pos(3), Tex(2), Normal(3)
+		float vertices[] = {-size, 0.0f, -size, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, size, 0.0f, -size,
+							1.0f,  0.0f, 0.0f,	1.0f, 0.0f, size, 0.0f, size, 1.0f, 1.0f, 0.0f,
+							1.0f,  0.0f, -size, 0.0f, size, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f};
+
+		auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"},
+						{VertexAttributeType::Float2, "a_TexCoord"},
+						{VertexAttributeType::Float3, "a_Normal"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+		// TriangleCount = 2 below makes DrawMesh take the DrawIndexed path, so the VAO MUST
+		// carry an index buffer — without it glDrawElements reads from a null EBO and crashes.
+		uint32_t indices[] = {0, 1, 2, 2, 3, 0};
+		auto ebo = IndexBuffer::Create(indices, 6);
+		vao->SetIndexBuffer(ebo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = 4;
+		mesh.TriangleCount = 2;
+		return mesh;
+	}
+
+	Mesh GeometryGenerator::GenerateCube(const glm::vec3& dimensions)
+	{
+		float w = dimensions.x * 0.5f;
+		float h = dimensions.y * 0.5f;
+		float d = dimensions.z * 0.5f;
+
+		// Front, Back, Top, Bottom, Right, Left faces
+		// 8 floats per vertex: Pos(3), Tex(2), Normal(3)
+		float vertices[] = {// Front
+							-w, -h, d, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, w, -h, d, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, w, h, d,
+							1.0f, 1.0f, 0.0f, 0.0f, 1.0f, -w, h, d, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f,
+							// Back
+							w, -h, -d, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, -w, -h, -d, 1.0f, 0.0f, 0.0f, 0.0f, -1.0f, -w, h,
+							-d, 1.0f, 1.0f, 0.0f, 0.0f, -1.0f, w, h, -d, 0.0f, 1.0f, 0.0f, 0.0f, -1.0f,
+							// Top
+							-w, h, d, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, w, h, d, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, w, h, -d,
+							1.0f, 1.0f, 0.0f, 1.0f, 0.0f, -w, h, -d, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f,
+							// Bottom
+							-w, -h, -d, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, w, -h, -d, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, w, -h,
+							d, 1.0f, 1.0f, 0.0f, -1.0f, 0.0f, -w, -h, d, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f,
+							// Right
+							w, -h, d, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, w, -h, -d, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, w, h, -d,
+							1.0f, 1.0f, 1.0f, 0.0f, 0.0f, w, h, d, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f,
+							// Left
+							-w, -h, -d, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, -w, -h, d, 1.0f, 0.0f, -1.0f, 0.0f, 0.0f, -w, h,
+							d, 1.0f, 1.0f, -1.0f, 0.0f, 0.0f, -w, h, -d, 0.0f, 1.0f, -1.0f, 0.0f, 0.0f};
+
+		uint32_t indices[] = {0,  1,  2,  2,  3,  0,  4,  5,  6,  6,  7,  4,  8,  9,  10, 10, 11, 8,
+							  12, 13, 14, 14, 15, 12, 16, 17, 18, 18, 19, 16, 20, 21, 22, 22, 23, 20};
+
+		auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"},
+						{VertexAttributeType::Float2, "a_TexCoord"},
+						{VertexAttributeType::Float3, "a_Normal"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+		auto ebo = IndexBuffer::Create(indices, 36);
+		vao->SetIndexBuffer(ebo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = 24;
+		mesh.TriangleCount = 12;
+		return mesh;
+	}
+
+	Mesh GeometryGenerator::GenerateCapsule(float radius, float height, int slices, int stacks)
+	{
+		std::vector<float> vertices;
+		std::vector<uint32_t> indices;
+
+		// A capsule is a cylinder with two hemispheres.
+		// Height provided by user is total height.
+		// Cylinder height = height - 2 * radius.
+		float cylinderHeight = std::max(0.0f, height - 2.0f * radius);
+		float halfCylinderHeight = cylinderHeight * 0.5f;
+
+		// Generate vertices
+		for (int stackIndex = 0; stackIndex <= stacks; ++stackIndex)
+		{
+			float stackFraction = (float)stackIndex / (float)stacks;
+			float polarAngle = stackFraction * glm::pi<float>();
+
+			// Offset Y based on which hemisphere or cylinder part we are in
+			float yOffset = 0.0f;
+			if (stackFraction < 0.5f)
+			{
+				yOffset = halfCylinderHeight;
+			}
+			else
+			{
+				yOffset = -halfCylinderHeight;
+			}
+
+			for (int sliceIndex = 0; sliceIndex <= slices; ++sliceIndex)
+			{
+				float sliceFraction = (float)sliceIndex / (float)slices;
+				float azimuthAngle = sliceFraction * 2.0f * glm::pi<float>();
+
+				float x = std::cos(azimuthAngle) * std::sin(polarAngle);
+				float y = std::cos(polarAngle);
+				float z = std::sin(azimuthAngle) * std::sin(polarAngle);
+
+				vertices.push_back(x * radius);
+				vertices.push_back(y * radius + yOffset);
+				vertices.push_back(z * radius);
+			}
+		}
+
+		// Generate indices
+		for (int stackIndex = 0; stackIndex < stacks; ++stackIndex)
+		{
+			for (int sliceIndex = 0; sliceIndex < slices; ++sliceIndex)
+			{
+				indices.push_back((stackIndex + 1) * (slices + 1) + sliceIndex);
+				indices.push_back(stackIndex * (slices + 1) + sliceIndex);
+				indices.push_back(stackIndex * (slices + 1) + sliceIndex + 1);
+				indices.push_back((stackIndex + 1) * (slices + 1) + sliceIndex);
+				indices.push_back(stackIndex * (slices + 1) + sliceIndex + 1);
+				indices.push_back((stackIndex + 1) * (slices + 1) + (sliceIndex + 1));
+			}
+		}
+
+		auto vbo = VertexBuffer::Create(vertices.data(), (uint32_t)vertices.size() * sizeof(float));
+		vbo->SetLayout({{VertexAttributeType::Float3, "a_Position"}});
+		auto vao = VertexArray::Create();
+		vao->AddVertexBuffer(vbo);
+		auto ebo = IndexBuffer::Create(indices.data(), (uint32_t)indices.size());
+		vao->SetIndexBuffer(ebo);
+
+		Mesh mesh;
+		mesh.VAO = vao;
+		mesh.VertexCount = (uint32_t)vertices.size() / 3;
+		mesh.TriangleCount = (uint32_t)indices.size() / 3;
+		return mesh;
+	}
+
+	namespace
+	{
+		// Builds a MeshData (de-interleaved arrays, no VAO) for a box of the given dimensions.
+		// Matches the interleaved layout of GenerateCube: 24 verts, per-face normals + texcoords.
+		MeshData BuildCube(const glm::vec3& dimensions)
+		{
+			float w = dimensions.x * 0.5f;
+			float h = dimensions.y * 0.5f;
+			float d = dimensions.z * 0.5f;
+
+			struct V
+			{
+				glm::vec3 p, n;
+				glm::vec2 t;
+			};
+			const V verts[] = {
+				// Front (+Z)
+				{{-w, -h, d}, {0, 0, 1}, {0, 0}},
+				{{w, -h, d}, {0, 0, 1}, {1, 0}},
+				{{w, h, d}, {0, 0, 1}, {1, 1}},
+				{{-w, h, d}, {0, 0, 1}, {0, 1}},
+				// Back (-Z)
+				{{w, -h, -d}, {0, 0, -1}, {0, 0}},
+				{{-w, -h, -d}, {0, 0, -1}, {1, 0}},
+				{{-w, h, -d}, {0, 0, -1}, {1, 1}},
+				{{w, h, -d}, {0, 0, -1}, {0, 1}},
+				// Top (+Y)
+				{{-w, h, d}, {0, 1, 0}, {0, 0}},
+				{{w, h, d}, {0, 1, 0}, {1, 0}},
+				{{w, h, -d}, {0, 1, 0}, {1, 1}},
+				{{-w, h, -d}, {0, 1, 0}, {0, 1}},
+				// Bottom (-Y)
+				{{-w, -h, -d}, {0, -1, 0}, {0, 0}},
+				{{w, -h, -d}, {0, -1, 0}, {1, 0}},
+				{{w, -h, d}, {0, -1, 0}, {1, 1}},
+				{{-w, -h, d}, {0, -1, 0}, {0, 1}},
+				// Right (+X)
+				{{w, -h, d}, {1, 0, 0}, {0, 0}},
+				{{w, -h, -d}, {1, 0, 0}, {1, 0}},
+				{{w, h, -d}, {1, 0, 0}, {1, 1}},
+				{{w, h, d}, {1, 0, 0}, {0, 1}},
+				// Left (-X)
+				{{-w, -h, -d}, {-1, 0, 0}, {0, 0}},
+				{{-w, -h, d}, {-1, 0, 0}, {1, 0}},
+				{{-w, h, d}, {-1, 0, 0}, {1, 1}},
+				{{-w, h, -d}, {-1, 0, 0}, {0, 1}},
+			};
+
+			MeshData raw;
+			raw.materialIndex = 0;
+			for (const auto& v : verts)
+			{
+				raw.vertices.insert(raw.vertices.end(), {v.p.x, v.p.y, v.p.z});
+				raw.normals.insert(raw.normals.end(), {v.n.x, v.n.y, v.n.z});
+				raw.texcoords.insert(raw.texcoords.end(), {v.t.x, v.t.y});
+			}
+			for (uint32_t face = 0; face < 6; ++face)
+			{
+				uint32_t b = face * 4;
+				raw.indices.insert(raw.indices.end(), {b, b + 1, b + 2, b + 2, b + 3, b});
+			}
+			raw.MinBounds = -dimensions * 0.5f;
+			raw.MaxBounds = dimensions * 0.5f;
+			return raw;
+		}
+
+		// UV-sphere with positions == normals*radius (unit normals), matching GenerateSphere.
+		MeshData BuildSphere(float radius, int slices, int stacks)
+		{
+			MeshData raw;
+			raw.materialIndex = 0;
+
+			for (int stackIndex = 0; stackIndex <= stacks; ++stackIndex)
+			{
+				float stackFraction = (float)stackIndex / (float)stacks;
+				float polarAngle = stackFraction * glm::pi<float>();
+
+				for (int sliceIndex = 0; sliceIndex <= slices; ++sliceIndex)
+				{
+					float sliceFraction = (float)sliceIndex / (float)slices;
+					float azimuthAngle = sliceFraction * 2.0f * glm::pi<float>();
+
+					float nx = std::cos(azimuthAngle) * std::sin(polarAngle);
+					float ny = std::cos(polarAngle);
+					float nz = std::sin(azimuthAngle) * std::sin(polarAngle);
+
+					raw.vertices.insert(raw.vertices.end(), {nx * radius, ny * radius, nz * radius});
+					raw.texcoords.insert(raw.texcoords.end(), {sliceFraction, 1.0f - stackFraction});
+					raw.normals.insert(raw.normals.end(), {nx, ny, nz});
+				}
+			}
+
+			for (int stackIndex = 0; stackIndex < stacks; ++stackIndex)
+			{
+				for (int sliceIndex = 0; sliceIndex < slices; ++sliceIndex)
+				{
+					uint32_t row0 = stackIndex * (slices + 1) + sliceIndex;
+					uint32_t row1 = (stackIndex + 1) * (slices + 1) + sliceIndex;
+					raw.indices.insert(raw.indices.end(), {row0, row0 + 1, row1 + 1, row0, row1 + 1, row1});
+				}
+			}
+
+			raw.MinBounds = {-radius, -radius, -radius};
+			raw.MaxBounds = {radius, radius, radius};
+			return raw;
+		}
+
+		// Flat XZ plane (up = +Y), spanning dimensions.x by dimensions.z (or dimensions.y).
+		MeshData BuildPlane(const glm::vec3& dimensions)
+		{
+			float hx = dimensions.x * 0.5f;
+			float hz = (dimensions.z != 1.0f || dimensions.y == 1.0f) ? dimensions.z * 0.5f : dimensions.y * 0.5f;
+			if (dimensions.z == 1.0f && dimensions.y != 1.0f)
+			{
+				hz = dimensions.y * 0.5f;
+			}
+
+			MeshData raw;
+			raw.materialIndex = 0;
+			const glm::vec3 pos[] = {{-hx, 0.0f, -hz}, {hx, 0.0f, -hz}, {hx, 0.0f, hz}, {-hx, 0.0f, hz}};
+			const glm::vec2 uv[] = {{0, 0}, {1, 0}, {1, 1}, {0, 1}};
+			for (int i = 0; i < 4; ++i)
+			{
+				raw.vertices.insert(raw.vertices.end(), {pos[i].x, pos[i].y, pos[i].z});
+				raw.normals.insert(raw.normals.end(), {0.0f, 1.0f, 0.0f});
+				raw.texcoords.insert(raw.texcoords.end(), {uv[i].x, uv[i].y});
+			}
+			// Double-sided quad so planes are visible from both top and bottom
+			raw.indices = {0, 3, 2, 0, 2, 1, 0, 2, 3, 0, 1, 2};
+			raw.MinBounds = {-hx, -0.01f, -hz};
+			raw.MaxBounds = {hx, 0.01f, hz};
+			return raw;
+		}
+
+		// Capsule: cylinder body + two hemispheres. Normals are the unit sphere directions
+		// (a good approximation; the cylinder band gets radial normals from the polar sweep).
+		MeshData BuildCapsule(float radius, float height, int slices, int stacks)
+		{
+			MeshData raw;
+			raw.materialIndex = 0;
+
+			float cylinderHeight = std::max(0.0f, height - 2.0f * radius);
+			float halfCylinderHeight = cylinderHeight * 0.5f;
+
+			for (int stackIndex = 0; stackIndex <= stacks; ++stackIndex)
+			{
+				float stackFraction = (float)stackIndex / (float)stacks;
+				float polarAngle = stackFraction * glm::pi<float>();
+				float yOffset = (stackFraction < 0.5f) ? halfCylinderHeight : -halfCylinderHeight;
+
+				for (int sliceIndex = 0; sliceIndex <= slices; ++sliceIndex)
+				{
+					float sliceFraction = (float)sliceIndex / (float)slices;
+					float azimuthAngle = sliceFraction * 2.0f * glm::pi<float>();
+
+					float nx = std::cos(azimuthAngle) * std::sin(polarAngle);
+					float ny = std::cos(polarAngle);
+					float nz = std::sin(azimuthAngle) * std::sin(polarAngle);
+
+					raw.vertices.insert(raw.vertices.end(), {nx * radius, ny * radius + yOffset, nz * radius});
+					raw.texcoords.insert(raw.texcoords.end(), {sliceFraction, 1.0f - stackFraction});
+					raw.normals.insert(raw.normals.end(), {nx, ny, nz});
+				}
+			}
+
+			for (int stackIndex = 0; stackIndex < stacks; ++stackIndex)
+			{
+				for (int sliceIndex = 0; sliceIndex < slices; ++sliceIndex)
+				{
+					uint32_t row0 = stackIndex * (slices + 1) + sliceIndex;
+					uint32_t row1 = (stackIndex + 1) * (slices + 1) + sliceIndex;
+					raw.indices.insert(raw.indices.end(), {row0, row0 + 1, row1 + 1, row0, row1 + 1, row1});
+				}
+			}
+
+			float halfH = halfCylinderHeight + radius;
+			raw.MinBounds = {-radius, -halfH, -radius};
+			raw.MaxBounds = {radius, halfH, radius};
+			return raw;
+		}
+
+		// Cylinder aligned to Y, base at Y=0, top at Y=height.
+		// `radiusBottom`/`radiusTop` differ for a cone (top == 0) or a truncated cone.
+		// Side wall + two caps. `slices` = radial segments.
+		MeshData BuildConeLike(float radiusBottom, float radiusTop, float height, int slices)
+		{
+			MeshData raw;
+			raw.materialIndex = 0;
+			slices = std::max(3, slices);
+
+			// Base at Y=0, tip/top at Y=height
+			float slant = std::sqrt(height * height + (radiusBottom - radiusTop) * (radiusBottom - radiusTop));
+			float ny = (slant > 0.0f) ? (radiusBottom - radiusTop) / slant : 0.0f;
+			float nradial = (slant > 0.0f) ? height / slant : 1.0f;
+
+			auto pushVert = [&](const glm::vec3& p, const glm::vec3& n, const glm::vec2& t) {
+				raw.vertices.insert(raw.vertices.end(), {p.x, p.y, p.z});
+				raw.normals.insert(raw.normals.end(), {n.x, n.y, n.z});
+				raw.texcoords.insert(raw.texcoords.end(), {t.x, t.y});
+			};
+
+			// --- Side wall (2 rings, welded per-slice so normals are radial) ---
+			uint32_t sideStart = 0;
+			for (int i = 0; i <= slices; ++i)
+			{
+				float f = (float)i / (float)slices;
+				float a = f * 2.0f * glm::pi<float>();
+				float cx = std::cos(a), cz = std::sin(a);
+				glm::vec3 n = glm::normalize(glm::vec3(cx * nradial, ny, cz * nradial));
+				// bottom ring at Y=0
+				pushVert({cx * radiusBottom, 0.0f, cz * radiusBottom}, n, {f, 0.0f});
+				// top ring at Y=height
+				pushVert({cx * radiusTop, height, cz * radiusTop}, n, {f, 1.0f});
+			}
+			for (int i = 0; i < slices; ++i)
+			{
+				uint32_t b = sideStart + i * 2;
+				// quad (b bottom, b+1 top, b+2 next bottom, b+3 next top)
+				// CCW winding from outside: reverse original order
+				raw.indices.insert(raw.indices.end(), {b + 2, b, b + 1, b + 2, b + 1, b + 3});
+			}
+
+			// --- Bottom cap (facing -Y) at Y=0 ---
+			if (radiusBottom > 0.0f)
+			{
+				uint32_t center = (uint32_t)(raw.vertices.size() / 3);
+				pushVert({0.0f, 0.0f, 0.0f}, {0, -1, 0}, {0.5f, 0.5f});
+				uint32_t ringStart = (uint32_t)(raw.vertices.size() / 3);
+				for (int i = 0; i <= slices; ++i)
+				{
+					float f = (float)i / (float)slices;
+					float a = f * 2.0f * glm::pi<float>();
+					float cx = std::cos(a), cz = std::sin(a);
+					pushVert({cx * radiusBottom, 0.0f, cz * radiusBottom}, {0, -1, 0},
+							 {cx * 0.5f + 0.5f, cz * 0.5f + 0.5f});
+				}
+				for (int i = 0; i < slices; ++i)
+				{
+					raw.indices.insert(raw.indices.end(), {center, ringStart + i + 1, ringStart + i});
+				}
+			}
+
+			// --- Top cap (facing +Y) at Y=height ---
+			if (radiusTop > 0.0f)
+			{
+				uint32_t center = (uint32_t)(raw.vertices.size() / 3);
+				pushVert({0.0f, height, 0.0f}, {0, 1, 0}, {0.5f, 0.5f});
+				uint32_t ringStart = (uint32_t)(raw.vertices.size() / 3);
+				for (int i = 0; i <= slices; ++i)
+				{
+					float f = (float)i / (float)slices;
+					float a = f * 2.0f * glm::pi<float>();
+					float cx = std::cos(a), cz = std::sin(a);
+					pushVert({cx * radiusTop, height, cz * radiusTop}, {0, 1, 0}, {cx * 0.5f + 0.5f, cz * 0.5f + 0.5f});
+				}
+				for (int i = 0; i < slices; ++i)
+				{
+					raw.indices.insert(raw.indices.end(), {center, ringStart + i, ringStart + i + 1});
+				}
+			}
+
+			float maxR = std::max(radiusBottom, radiusTop);
+			raw.MinBounds = {-maxR, 0.0f, -maxR};
+			raw.MaxBounds = {maxR, height, maxR};
+			return raw;
+		}
+
+		// Upper half of a sphere (dome) + a flat bottom cap. `stacks` covers the dome only.
+		MeshData BuildHemisphere(float radius, int slices, int stacks)
+		{
+			MeshData raw;
+			raw.materialIndex = 0;
+			slices = std::max(3, slices);
+			stacks = std::max(2, stacks);
+
+			auto pushVert = [&](const glm::vec3& p, const glm::vec3& n, const glm::vec2& t) {
+				raw.vertices.insert(raw.vertices.end(), {p.x, p.y, p.z});
+				raw.normals.insert(raw.normals.end(), {n.x, n.y, n.z});
+				raw.texcoords.insert(raw.texcoords.end(), {t.x, t.y});
+			};
+
+			// Dome: polar angle 0 (top) .. pi/2 (equator)
+			for (int st = 0; st <= stacks; ++st)
+			{
+				float sf = (float)st / (float)stacks;
+				float polar = sf * glm::half_pi<float>();
+				for (int sl = 0; sl <= slices; ++sl)
+				{
+					float slf = (float)sl / (float)slices;
+					float az = slf * 2.0f * glm::pi<float>();
+					float nx = std::cos(az) * std::sin(polar);
+					float ny = std::cos(polar);
+					float nz = std::sin(az) * std::sin(polar);
+					pushVert({nx * radius, ny * radius, nz * radius}, {nx, ny, nz}, {slf, 1.0f - sf});
+				}
+			}
+			for (int st = 0; st < stacks; ++st)
+			{
+				for (int sl = 0; sl < slices; ++sl)
+				{
+					uint32_t row0 = st * (slices + 1) + sl;
+					uint32_t row1 = (st + 1) * (slices + 1) + sl;
+					raw.indices.insert(raw.indices.end(), {row0, row0 + 1, row1 + 1, row0, row1 + 1, row1});
+				}
+			}
+
+			// Flat bottom cap at y = 0 (single-sided, downward-facing normal -Y, CCW when viewed from -Y)
+			uint32_t center = (uint32_t)(raw.vertices.size() / 3);
+			pushVert({0.0f, 0.0f, 0.0f}, {0, -1, 0}, {0.5f, 0.5f});
+			uint32_t ringStart = (uint32_t)(raw.vertices.size() / 3);
+			for (int sl = 0; sl <= slices; ++sl)
+			{
+				float slf = (float)sl / (float)slices;
+				float az = slf * 2.0f * glm::pi<float>();
+				float cx = std::cos(az), cz = std::sin(az);
+				pushVert({cx * radius, 0.0f, cz * radius}, {0, -1, 0}, {cx * 0.5f + 0.5f, cz * 0.5f + 0.5f});
+			}
+			for (int sl = 0; sl < slices; ++sl)
+			{
+				raw.indices.insert(raw.indices.end(), {center, ringStart + sl, ringStart + sl + 1});
+			}
+
+			raw.MinBounds = {-radius, 0.0f, -radius};
+			raw.MaxBounds = {radius, radius, radius};
+			return raw;
+		}
+
+		// Torus in the XZ plane. `majorRadius` = ring center distance, `minorRadius` = tube radius.
+		// `slices` = segments around the ring, `stacks` = segments around the tube.
+		MeshData BuildTorus(float majorRadius, float minorRadius, int slices, int stacks)
+		{
+			MeshData raw;
+			raw.materialIndex = 0;
+			slices = std::max(3, slices);
+			stacks = std::max(3, stacks);
+
+			for (int i = 0; i <= slices; ++i)
+			{
+				float u = (float)i / (float)slices * 2.0f * glm::pi<float>();
+				float cu = std::cos(u), su = std::sin(u);
+				for (int j = 0; j <= stacks; ++j)
+				{
+					float v = (float)j / (float)stacks * 2.0f * glm::pi<float>();
+					float cv = std::cos(v), sv = std::sin(v);
+
+					// Tube center for this ring position, in XZ plane
+					glm::vec3 center = {majorRadius * cu, 0.0f, majorRadius * su};
+					glm::vec3 normal = {cv * cu, sv, cv * su};
+					glm::vec3 pos = center + minorRadius * normal;
+
+					raw.vertices.insert(raw.vertices.end(), {pos.x, pos.y, pos.z});
+					raw.normals.insert(raw.normals.end(), {normal.x, normal.y, normal.z});
+					raw.texcoords.insert(raw.texcoords.end(), {(float)i / (float)slices, (float)j / (float)stacks});
+				}
+			}
+			int stride = stacks + 1;
+			for (int i = 0; i < slices; ++i)
+			{
+				for (int j = 0; j < stacks; ++j)
+				{
+					uint32_t a = i * stride + j;
+					uint32_t b = (i + 1) * stride + j;
+					raw.indices.insert(raw.indices.end(), {a, a + 1, b + 1, a, b + 1, b});
+				}
+			}
+
+			float outer = majorRadius + minorRadius;
+			raw.MinBounds = {-outer, -minorRadius, -outer};
+			raw.MaxBounds = {outer, minorRadius, outer};
+			return raw;
+		}
+
+		// Trefoil knot: a tube of radius `minorRadius` swept along a (2,3) torus knot curve
+		// scaled by `majorRadius`. `slices` = segments along the curve, `stacks` = segments
+		// around the tube. The frame is built from the analytic tangent plus an arbitrary
+		// reference axis, which is stable here because the curve never runs parallel to +Y.
+		MeshData BuildKnot(float majorRadius, float minorRadius, int slices, int stacks)
+		{
+			MeshData raw;
+			raw.materialIndex = 0;
+			slices = std::max(16, slices);
+			stacks = std::max(3, stacks);
+
+			// Curve point and tangent for the standard trefoil parametrization.
+			auto curve = [](float t) {
+				return glm::vec3(std::sin(t) + 2.0f * std::sin(2.0f * t), std::cos(t) - 2.0f * std::cos(2.0f * t),
+								 -std::sin(3.0f * t));
+			};
+			auto tangent = [](float t) {
+				return glm::normalize(glm::vec3(std::cos(t) + 4.0f * std::cos(2.0f * t),
+												-std::sin(t) + 4.0f * std::sin(2.0f * t), -3.0f * std::cos(3.0f * t)));
+			};
+
+			// The raw trefoil spans roughly [-3, 3]; normalize so majorRadius is the outer extent.
+			const float curveScale = majorRadius / 3.0f;
+
+			glm::vec3 minB(std::numeric_limits<float>::max());
+			glm::vec3 maxB(std::numeric_limits<float>::lowest());
+
+			for (int i = 0; i <= slices; ++i)
+			{
+				float t = (float)i / (float)slices * 2.0f * glm::pi<float>();
+				glm::vec3 center = curve(t) * curveScale;
+				glm::vec3 tan = tangent(t);
+
+				// Build an orthonormal frame around the tangent.
+				glm::vec3 ref = std::abs(tan.y) < 0.9f ? glm::vec3(0, 1, 0) : glm::vec3(1, 0, 0);
+				glm::vec3 normal = glm::normalize(glm::cross(tan, ref));
+				glm::vec3 binormal = glm::cross(tan, normal);
+
+				for (int j = 0; j <= stacks; ++j)
+				{
+					float v = (float)j / (float)stacks * 2.0f * glm::pi<float>();
+					glm::vec3 n = glm::normalize(std::cos(v) * normal + std::sin(v) * binormal);
+					glm::vec3 pos = center + minorRadius * n;
+
+					raw.vertices.insert(raw.vertices.end(), {pos.x, pos.y, pos.z});
+					raw.normals.insert(raw.normals.end(), {n.x, n.y, n.z});
+					raw.texcoords.insert(raw.texcoords.end(), {(float)i / (float)slices, (float)j / (float)stacks});
+
+					minB = glm::min(minB, pos);
+					maxB = glm::max(maxB, pos);
+				}
+			}
+
+			int stride = stacks + 1;
+			for (int i = 0; i < slices; ++i)
+			{
+				for (int j = 0; j < stacks; ++j)
+				{
+					uint32_t a = i * stride + j;
+					uint32_t b = (i + 1) * stride + j;
+					raw.indices.insert(raw.indices.end(), {a, a + 1, b + 1, a, b + 1, b});
+				}
+			}
+
+			raw.MinBounds = minB;
+			raw.MaxBounds = maxB;
+			return raw;
+		}
+	} // namespace
+
+	PendingModelData GeometryGenerator::GeneratePrimitivePendingData(const std::string& type,
+																	 const ProceduralParameters& params)
+	{
+		PendingModelData data;
+
+		MeshData raw;
+		bool generated = true;
+
+		if (type == ":cube:")
+		{
+			raw = BuildCube(params.Dimensions);
+		}
+		else if (type == ":sphere:")
+		{
+			raw = BuildSphere(params.Radius, params.Slices, params.Stacks);
+		}
+		else if (type == ":plane:")
+		{
+			raw = BuildPlane(params.Dimensions);
+		}
+		else if (type == ":cylinder:")
+		{
+			raw = BuildConeLike(params.Radius, params.Radius, params.Height, params.Slices);
+		}
+		else if (type == ":cone:")
+		{
+			raw = BuildConeLike(params.Radius, 0.0f, params.Height, params.Slices);
+		}
+		else if (type == ":hemisphere:")
+		{
+			raw = BuildHemisphere(params.Radius, params.Slices, params.Stacks);
+		}
+		else if (type == ":torus:")
+		{
+			// The tube must stay thinner than the ring it wraps, otherwise the torus turns
+			// inside out and renders as a shapeless blob.
+			float tube = std::min(params.InnerRadius, params.Radius * 0.95f);
+			raw = BuildTorus(params.Radius, tube, params.Slices, params.Stacks);
+		}
+		else if (type == ":knot:")
+		{
+			float tube = std::min(params.InnerRadius, params.Radius * 0.5f);
+			raw = BuildKnot(params.Radius, tube, params.Slices, params.Stacks);
+		}
+		else
+		{
+			generated = false;
+		}
+
+		if (!generated)
+		{
+			return data; // isValid stays false → OnLoaded is a no-op
+		}
+
+		data.meshes.push_back(std::move(raw));
+		data.instances.push_back(MeshInstance{0, glm::mat4(1.0f)});
+
+		MaterialData defaultMat;
+		// Named so it shows up as a selectable entry in the Material Editor's list.
+		defaultMat.name = "Primitive Material";
+		defaultMat.albedoColor = {1.0f, 1.0f, 1.0f, 1.0f};
+		defaultMat.roughness = 0.5f;
+		defaultMat.metalness = 0.0f;
+		data.materials.push_back(defaultMat);
+
+		data.isValid = true;
+		return data;
+	}
+} // namespace Chained
diff --git a/engine/graphics/pipeline/geometry_generator.h b/engine/graphics/pipeline/geometry_generator.h
index 8f837c3f3..cf200f3af 100644
--- a/engine/graphics/pipeline/geometry_generator.h
+++ b/engine/graphics/pipeline/geometry_generator.h
@@ -1,31 +1,44 @@
 #ifndef CH_GEOMETRY_GENERATOR_H
 #define CH_GEOMETRY_GENERATOR_H
 
-#include "engine/graphics/pipeline/renderer_types.h"
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/assets/model_data.h"
+#include "engine/assets/loaders/model_loader.h"
+#include <string>
 
-namespace CHEngine
+namespace Chained
 {
-    class GeometryGenerator
-    {
-    public:
-        // Generates a sphere mesh
-        static Mesh GenerateSphere(float radius, int slices, int stacks);
-
-        // Generates a unit cube mesh for skyboxes/cubemaps (triangles)
-        static Mesh GenerateUnitCube();
-
-        // Generates a wireframe cube with 12 edges for debug drawing (GL_LINES)
-        static Mesh GenerateWireCube();
-
-        // Generates a grid mesh
-        static Mesh GenerateGrid(int slices, float spacing);
-
-        // Generates a fullscreen quad or a simple plane quad
-        static Mesh GenerateQuad(float size);
-
-         // Generate a cube mesh with given dimensions (for procedural cube generation)
-        static Mesh GenerateCube(const glm::vec3& dimensions);
-    };
-}
+	class GeometryGenerator
+	{
+	public:
+		// Generates a sphere mesh
+		static Mesh GenerateSphere(float radius, int slices, int stacks);
+
+		// Generates a unit cube mesh for skyboxes/cubemaps (triangles)
+		static Mesh GenerateUnitCube();
+
+		// Generates a wireframe cube with 12 edges for debug drawing (GL_LINES)
+		static Mesh GenerateWireCube();
+
+		// Generates a grid mesh
+		static Mesh GenerateGrid(int slices, float spacing);
+
+		// Generates a fullscreen quad or a simple plane quad
+		static Mesh GenerateQuad(float size);
+
+		// Generates a capsule mesh (cylinder + two hemispheres)
+		static Mesh GenerateCapsule(float radius, float height, int slices, int stacks);
+
+		// Generate a cube mesh with given dimensions (for procedural cube generation)
+		static Mesh GenerateCube(const glm::vec3& dimensions);
+
+		// Generate raw CPU-side model data (de-interleaved vertices/normals/texcoords/indices + one
+		// identity instance + a default material) for a procedural primitive. Does NOT create a VAO;
+		// feed the result to ModelAsset::SetPendingData + OnLoaded (main thread) to finalize on GPU.
+		// `type` uses ":cube:"/":sphere:"/":plane:"/":cylinder:"/... markers.
+		static PendingModelData GeneratePrimitivePendingData(const std::string& type,
+															 const ProceduralParameters& params);
+	};
+} // namespace Chained
 
 #endif // CH_GEOMETRY_GENERATOR_H
diff --git a/engine/graphics/pipeline/lighting_manager.cpp b/engine/graphics/pipeline/lighting_manager.cpp
new file mode 100644
index 000000000..f21d71f7b
--- /dev/null
+++ b/engine/graphics/pipeline/lighting_manager.cpp
@@ -0,0 +1,146 @@
+#include "engine/graphics/pipeline/lighting_manager.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/api/shader.h"
+#include "engine/graphics/api/storage_buffer.h"
+
+namespace Chained
+{
+
+	void LightingManager::Initialize()
+	{
+		m_Lighting.LightSSBO = StorageBuffer::Create(sizeof(RenderLight) * LightingData::MaxLights);
+		m_Lighting.LightsDirty = true;
+	}
+
+	void LightingManager::Shutdown()
+	{
+		m_Lighting.LightSSBO.reset();
+	}
+
+	void LightingManager::Clear()
+	{
+		for (int i = 0; i < LightingData::MaxLights; i++)
+		{
+			m_Lighting.Lights[i].enabled = 0;
+		}
+		m_Lighting.LightCount = 0;
+		m_Lighting.LightsDirty = true;
+	}
+
+	void LightingManager::SetLight(int index, const RenderLight& light)
+	{
+		if (index >= 0 && index < LightingData::MaxLights)
+		{
+			m_Lighting.Lights[index] = light;
+			m_Lighting.LightsDirty = true;
+		}
+	}
+
+	void LightingManager::SetLightCount(int count)
+	{
+		m_Lighting.LightCount = count;
+	}
+
+	void LightingManager::ApplyEnvironment(const EnvironmentSettings& settings)
+	{
+		m_Lighting.CurrentLighting = settings.Lighting;
+		m_Lighting.CurrentFog = settings.Fog;
+	}
+
+	void LightingManager::SetMainLight(const LightingSettings& settings)
+	{
+		m_Lighting.CurrentLighting = settings;
+	}
+
+	void LightingManager::SetShadowState(bool enabled, uint32_t mapTextureID, const glm::mat4& lightSpaceMatrix,
+										 float bias)
+	{
+		m_Shadow.Enabled = enabled;
+		m_Shadow.MapTextureID = mapTextureID;
+		m_Shadow.LightSpaceMatrix = lightSpaceMatrix;
+		m_Shadow.Bias = bias;
+	}
+
+	void LightingManager::Upload()
+	{
+		if (m_Lighting.LightsDirty && m_Lighting.LightSSBO)
+		{
+			m_Lighting.LightSSBO->SetData(m_Lighting.Lights, sizeof(RenderLight) * LightingData::MaxLights);
+			m_Lighting.LightsDirty = false;
+		}
+	}
+
+	void LightingManager::ApplyUniforms(Shader* shader, const FrameState& frame)
+	{
+		if (!shader)
+		{
+			return;
+		}
+
+		shader->Bind();
+
+		// ── Scene Lighting ──────────────────────────────────────────────────────
+		const auto& lighting = m_Lighting.CurrentLighting;
+
+		glm::vec4 lightColor = {lighting.LightColor.r / 255.0f, lighting.LightColor.g / 255.0f,
+								lighting.LightColor.b / 255.0f, lighting.LightColor.a / 255.0f};
+		glm::vec4 skyColor = lightColor;
+		skyColor.w = lighting.Ambient * 0.35f;
+
+		glm::vec3 lightDirNorm = glm::length(lighting.Direction) > 0.0001f ? glm::normalize(lighting.Direction)
+																		   : glm::vec3(0.0f, -1.0f, 0.0f);
+
+		// Camera / frame state
+		shader->SetVec3("viewPos", frame.CameraPosition);
+		shader->SetFloat("uTime", frame.Time);
+		shader->SetFloat("uMode", frame.DiagnosticMode);
+		shader->SetFloat("uExposure", lighting.Exposure);
+		shader->SetFloat("uGamma", lighting.Gamma);
+
+		// Legacy flat uniforms (kept for older shaders and unlit/sprite/postfx paths)
+		shader->SetVec3("lightDir", lightDirNorm);
+		shader->SetVec4("lightColor", lightColor);
+		shader->SetFloat("ambient", lighting.Ambient);
+		shader->SetVec4("skyAmbientColor", skyColor);
+		shader->SetInt("uLightCount", m_Lighting.LightCount);
+
+		// Struct-style uniform for the generic directional light
+		// (used by the new lighting.glsl / lighting.frag).
+		// Note: u_MainLight represents the scene's primary directional light source
+		// (could be sun, moon, or any global directional light set per scene).
+		shader->SetVec3("u_MainLight.direction", lightDirNorm);
+		shader->SetVec4("u_MainLight.color", lightColor);
+		shader->SetFloat("u_MainLight.intensity", 1.0f);
+		shader->SetFloat("u_MainLight.ambient", lighting.Ambient);
+
+		// ── SSBO ────────────────────────────────────────────────────────────────
+		if (m_Lighting.LightSSBO)
+		{
+			m_Lighting.LightSSBO->BindBase(0);
+		}
+
+		// ── Shadows ─────────────────────────────────────────────────────────────
+		shader->SetInt("u_ShadowsEnabled", m_Shadow.Enabled ? 1 : 0);
+		shader->SetMatrix("u_LightSpaceMatrix", m_Shadow.LightSpaceMatrix);
+		shader->SetFloat("u_ShadowBias", m_Shadow.Bias);
+		if (m_Shadow.Enabled && m_Shadow.MapTextureID > 0)
+		{
+			GraphicsDevice::Get().SetTexture(6, m_Shadow.MapTextureID);
+			shader->SetInt("u_ShadowMap", 6);
+		}
+
+		// ── Fog ─────────────────────────────────────────────────────────────────
+		const auto& fog = m_Lighting.CurrentFog;
+		glm::vec4 fogColorVec = {fog.FogColor.r / 255.0f, fog.FogColor.g / 255.0f, fog.FogColor.b / 255.0f,
+								 fog.FogColor.a / 255.0f};
+
+		shader->SetInt("fogEnabled", fog.Enabled ? 1 : 0);
+		shader->SetVec4("fogColor", fogColorVec);
+		shader->SetFloat("fogDensity", fog.Density);
+		shader->SetFloat("fogStart", fog.Start);
+		shader->SetFloat("fogEnd", fog.End);
+		shader->SetInt("fogMode", (int)fog.Mode);
+		shader->SetFloat("fogHeightFalloff", fog.HeightFalloff);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/lighting_manager.h b/engine/graphics/pipeline/lighting_manager.h
new file mode 100644
index 000000000..3205e9f8e
--- /dev/null
+++ b/engine/graphics/pipeline/lighting_manager.h
@@ -0,0 +1,79 @@
+#ifndef CH_LIGHTING_MANAGER_H
+#define CH_LIGHTING_MANAGER_H
+
+#include "engine/common/base.h"
+#include "engine/common/timestep.h"
+#include "engine/graphics/pipeline/renderer_data.h"
+#include "engine/assets/types/environment_asset.h"
+#include <glm/glm.hpp>
+#include <cstdint>
+
+namespace Chained
+{
+
+	class Shader;
+
+	/// @brief Owns all per-frame lighting and shadow state.
+	/// Centralizes light array management, SSBO upload, and uniform binding
+	/// so that Renderer and SceneRenderer don't need to know the details.
+	class CH_API LightingManager
+	{
+	public:
+		LightingManager() = default;
+		~LightingManager() = default;
+
+		/// @brief Initialize GPU resources (SSBO). Call after GraphicsDevice is ready.
+		void Initialize();
+
+		/// @brief Release GPU resources.
+		void Shutdown();
+
+		// --- Light array management ---
+
+		void Clear();
+		void SetLight(int index, const RenderLight& light);
+		void SetLightCount(int count);
+
+		/// @brief Apply environment settings (lighting + fog) from a scene/level.
+		void ApplyEnvironment(const EnvironmentSettings& settings);
+		void SetMainLight(const LightingSettings& settings);
+
+		// --- Shadow state ---
+
+		void SetShadowState(bool enabled, uint32_t mapTextureID, const glm::mat4& lightSpaceMatrix, float bias);
+
+		/// @brief Upload the light SSBO to the GPU. Call once per frame.
+		void Upload();
+
+		/// @brief Bind all lighting + shadow + fog uniforms to the given shader.
+		/// @param frame  Read-only frame state (camera position, time, diagnostic mode).
+		void ApplyUniforms(Shader* shader, const FrameState& frame);
+
+		// --- Accessors ---
+
+		LightingData& GetLighting()
+		{
+			return m_Lighting;
+		}
+		const LightingData& GetLighting() const
+		{
+			return m_Lighting;
+		}
+
+		ShadowState& GetShadow()
+		{
+			return m_Shadow;
+		}
+		const ShadowState& GetShadow() const
+		{
+			return m_Shadow;
+		}
+
+	private:
+		LightingData m_Lighting;
+		ShadowState m_Shadow;
+	};
+
+} // namespace Chained
+
+#endif // CH_LIGHTING_MANAGER_H
diff --git a/engine/graphics/pipeline/material.h b/engine/graphics/pipeline/material.h
index b540b6d13..de9e000f7 100644
--- a/engine/graphics/pipeline/material.h
+++ b/engine/graphics/pipeline/material.h
@@ -1,103 +1,51 @@
 #ifndef CH_MATERIAL_H
 #define CH_MATERIAL_H
 
-#include "engine/core/base.h"
-#include "engine/core/reflection.h"
-#include <string>
+#include "asset.h"
+#include "engine/reflection/reflection_rfl.h"
 
-namespace CHEngine
+namespace Chained
 {
-// Editable material parameters and asset references used by the renderer and inspector.
-struct MaterialInstance
-{
-    // Albedo/Base Color
-    Color AlbedoColor = { 255, 255, 255, 255 };
-    std::string AlbedoPath = "";
-    bool OverrideAlbedo = false;
-
-    // PBR Maps
-    std::string NormalMapPath = "";
-    bool OverrideNormal = false;
-
-    std::string MetallicRoughnessPath = "";
-    bool OverrideMetallicRoughness = false;
-
-    std::string OcclusionMapPath = "";
-    bool OverrideOcclusion = false;
-
-    // Optional Emissive
-    std::string EmissivePath = "";
-    Color EmissiveColor = { 0, 0, 0, 255 };
-    float EmissiveIntensity = 0.0f;
-    bool OverrideEmissive = false;
-
-    // Shader
-    std::string ShaderPath = "";
-    bool OverrideShader = false;
-
-    // Material Parameters
-    float Metalness = 0.0f;
-    float Roughness = 0.5f;
-
-    // Rendering State
-    bool DoubleSided = false;
-    bool Transparent = false;
-    float Alpha = 1.0f;
-
-    CH_REFLECT_BEGIN(MaterialInstance)
-        if (props.BeginGroup("Albedo"))
-        {
-            props.Property("AlbedoColor", AlbedoColor);
-            props.File("AlbedoPath", AlbedoPath, "png,jpg,tga");
-            props.Property("OverrideAlbedo", OverrideAlbedo);
-            props.EndGroup();
-        }
-
-        if (props.BeginGroup("PBR Maps"))
-        {
-            props.File("NormalMapPath", NormalMapPath, "png,jpg,tga");
-            props.Property("OverrideNormal", OverrideNormal);
-            props.File("MetallicRoughnessPath", MetallicRoughnessPath, "png,jpg,tga");
-            props.Property("OverrideMetallicRoughness", OverrideMetallicRoughness);
-            props.File("OcclusionMapPath", OcclusionMapPath, "png,jpg,tga");
-            props.Property("OverrideOcclusion", OverrideOcclusion);
-            props.EndGroup();
-        }
-
-        if (props.BeginGroup("Emissive"))
-        {
-            props.Property("EmissiveColor", EmissiveColor);
-            props.Property("EmissiveIntensity", EmissiveIntensity);
-            props.File("EmissivePath", EmissivePath, "png,jpg,tga");
-            props.Property("OverrideEmissive", OverrideEmissive);
-            props.EndGroup();
-        }
-
-        if (props.BeginGroup("Parameters"))
-        {
-            props.Property("Metalness", Metalness);
-            props.Property("Roughness", Roughness);
-            props.EndGroup();
-        }
-
-        if (props.BeginGroup("Rendering"))
-        {
-            props.Property("DoubleSided", DoubleSided);
-            props.Property("Transparent", Transparent);
-            if (Transparent)
-                props.Property("Alpha", Alpha);
-            props.EndGroup();
-        }
-
-        if (props.BeginGroup("Shader"))
-        {
-            props.File("Path", ShaderPath, "chshader");
-            props.Property("Override", OverrideShader);
-            props.EndGroup();
-        }
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
+	// Editable material parameters and asset references used by the renderer and inspector.
+	struct MaterialInstance
+	{
+		// Albedo/Base Color
+		Color AlbedoColor = {255, 255, 255, 255};
+		AssetHandle AlbedoHandle = AssetHandle(0);
+		bool OverrideAlbedo = false;
+
+		// PBR Maps
+		AssetHandle NormalHandle = AssetHandle(0);
+		bool OverrideNormal = false;
+
+		AssetHandle MetallicRoughnessHandle = AssetHandle(0);
+		bool OverrideMetallicRoughness = false;
+
+		AssetHandle OcclusionHandle = AssetHandle(0);
+		bool OverrideOcclusion = false;
+
+		// Optional Emissive
+		AssetHandle EmissiveHandle = AssetHandle(0);
+		Color EmissiveColor = {0, 0, 0, 255};
+		float EmissiveIntensity = 0.0f;
+		bool OverrideEmissive = false;
+
+		// Shader
+		AssetHandle ShaderHandle = AssetHandle(0);
+		bool OverrideShader = false;
+
+		// Material Parameters
+		float Metalness = 0.0f;
+		float Roughness = 0.5f;
+
+		// Rendering State
+		bool DoubleSided = false;
+		bool Transparent = false;
+		float Alpha = 1.0f;
+	};
+
+	CH_MARK_RFL(MaterialInstance);
+
+} // namespace Chained
 
 #endif // CH_MATERIAL_H
diff --git a/engine/graphics/pipeline/material_manager.cpp b/engine/graphics/pipeline/material_manager.cpp
new file mode 100644
index 000000000..4fe303e23
--- /dev/null
+++ b/engine/graphics/pipeline/material_manager.cpp
@@ -0,0 +1,150 @@
+#include "engine/graphics/pipeline/material_manager.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/api/shader.h"
+#include "engine/assets/types/model_asset.h"
+
+namespace Chained
+{
+
+	Material MaterialManager::Resolve(int meshIndex, const Model& model, const std::vector<Material>& materials,
+									  ModelAsset* modelAsset) const
+	{
+		if (meshIndex < 0 || meshIndex >= (int)model.Meshes.size())
+		{
+			return {};
+		}
+
+		int matIdx = model.Meshes[meshIndex].MaterialIndex;
+
+		// Tier 1: Caller-supplied materials vector
+		if (matIdx >= 0 && matIdx < (int)materials.size())
+		{
+			return materials[matIdx];
+		}
+
+		// Tier 2: ModelAsset embedded materials
+		if (modelAsset && modelAsset->IsReady())
+		{
+			const auto& assetMaterials = modelAsset->GetMaterials();
+			if (matIdx >= 0 && matIdx < (int)assetMaterials.size())
+			{
+				return assetMaterials[matIdx];
+			}
+		}
+
+		// Tier 3: Model struct embedded materials
+		if (matIdx < 0 || matIdx >= (int)model.Materials.size())
+		{
+			return Material();
+		}
+
+		return model.Materials[matIdx];
+	}
+
+	void MaterialManager::Bind(Shader* shader, const Material& material, int meshIndex, const Model& model) const
+	{
+		if (!shader)
+		{
+			return;
+		}
+
+		shader->Bind();
+
+		auto resolveMap = [](const std::shared_ptr<Texture>& currentTex, const std::string& path) -> uint32_t {
+			if (currentTex)
+			{
+				return currentTex->GetNativeHandle();
+			}
+			if (path.empty() || path.front() == '*')
+			{
+				return 0;
+			}
+
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			auto texAsset = am ? am->Get<TextureAsset>(path) : nullptr;
+			if (texAsset && texAsset->GetTexture())
+			{
+				return texAsset->GetTexture()->GetNativeHandle();
+			}
+			return 0;
+		};
+
+		uint32_t albedoMap = resolveMap(material.AlbedoMap, material.AlbedoPath);
+		uint32_t normalMap = resolveMap(material.NormalMap, material.NormalPath);
+		uint32_t metallicMap = resolveMap(material.MetallicRoughnessMap, material.MetallicRoughnessPath);
+		uint32_t emissiveMap = resolveMap(material.EmissiveMap, material.EmissivePath);
+		uint32_t occlusionMap = resolveMap(material.OcclusionMap, material.OcclusionPath);
+
+		// 1. Albedo (Texture Unit 0)
+		if (albedoMap > 0)
+		{
+			GraphicsDevice::Get().SetTexture(0, albedoMap);
+			shader->SetInt("texture0", 0);
+			shader->SetInt("useTexture", 1);
+		}
+		else
+		{
+			shader->SetInt("useTexture", 0);
+		}
+		shader->SetVec4("colDiffuse", material.AlbedoColor);
+
+		// 2. Metallic-Roughness Packed Map (Texture Unit 1)
+		if (metallicMap > 0)
+		{
+			GraphicsDevice::Get().SetTexture(1, metallicMap);
+			shader->SetInt("texture1", 1);
+			shader->SetInt("useMetallicMap", 1);
+			shader->SetInt("useRoughnessMap", 1);
+		}
+		else
+		{
+			shader->SetInt("useMetallicMap", 0);
+			shader->SetInt("useRoughnessMap", 0);
+		}
+
+		// 3. Normal Map (Texture Unit 2)
+		if (normalMap > 0)
+		{
+			GraphicsDevice::Get().SetTexture(2, normalMap);
+			shader->SetInt("texture2", 2);
+			shader->SetInt("useNormalMap", 1);
+		}
+		else
+		{
+			shader->SetInt("useNormalMap", 0);
+		}
+
+		// 4. Occlusion Map (Texture Unit 4)
+		if (occlusionMap > 0)
+		{
+			GraphicsDevice::Get().SetTexture(4, occlusionMap);
+			shader->SetInt("texture4", 4);
+			shader->SetInt("useOcclusionMap", 1);
+		}
+		else
+		{
+			shader->SetInt("useOcclusionMap", 0);
+		}
+
+		// 5. Emissive Map (Texture Unit 5)
+		if (emissiveMap > 0)
+		{
+			GraphicsDevice::Get().SetTexture(5, emissiveMap);
+			shader->SetInt("texture5", 5);
+			shader->SetInt("useEmissiveTexture", 1);
+		}
+		else
+		{
+			shader->SetInt("useEmissiveTexture", 0);
+		}
+
+		shader->SetFloat("metalness", material.Metalness);
+		shader->SetFloat("roughness", material.Roughness);
+		shader->SetVec4("colEmissive", material.EmissiveColor);
+		shader->SetFloat("emissiveIntensity", material.EmissiveIntensity);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/material_manager.h b/engine/graphics/pipeline/material_manager.h
new file mode 100644
index 000000000..142cb9226
--- /dev/null
+++ b/engine/graphics/pipeline/material_manager.h
@@ -0,0 +1,39 @@
+#ifndef CH_MATERIAL_MANAGER_H
+#define CH_MATERIAL_MANAGER_H
+
+#include "engine/common/base.h"
+#include "engine/graphics/api/renderer_types.h"
+#include <vector>
+
+namespace Chained
+{
+
+	class Shader;
+	class ModelAsset;
+	struct Model;
+
+	/// @brief Centralizes material resolution and GPU binding.
+	/// Extracted from SceneRenderer to isolate texture loading, PBR uniform
+	/// binding, and the 3-tier material fallback chain.
+	class CH_API MaterialManager
+	{
+	public:
+		MaterialManager() = default;
+		~MaterialManager() = default;
+
+		/// @brief Resolve the material for a specific mesh using a 3-tier fallback:
+		///   1. Caller-supplied @p materials vector
+		///   2. ModelAsset embedded materials
+		///   3. Model struct embedded materials
+		///   Returns a default Material if nothing matches.
+		Material Resolve(int meshIndex, const Model& model, const std::vector<Material>& materials,
+						 ModelAsset* modelAsset = nullptr) const;
+
+		/// @brief Bind all PBR textures and uniforms for the given material to the shader.
+		/// Resolves lazy-loaded textures via AssetManager when shared_ptr is null.
+		void Bind(Shader* shader, const Material& material, int meshIndex, const Model& model) const;
+	};
+
+} // namespace Chained
+
+#endif // CH_MATERIAL_MANAGER_H
diff --git a/engine/graphics/pipeline/passes/composite_pass.cpp b/engine/graphics/pipeline/passes/composite_pass.cpp
new file mode 100644
index 000000000..6dfd25782
--- /dev/null
+++ b/engine/graphics/pipeline/passes/composite_pass.cpp
@@ -0,0 +1,59 @@
+#include "composite_pass.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/graphics/pipeline/lighting_manager.h"
+
+namespace Chained
+{
+
+	void CompositePass::Init()
+	{
+		m_Initialized = true;
+	}
+
+	void CompositePass::Execute(const RenderContext& ctx)
+	{
+		if (!m_Initialized)
+		{
+			return;
+		}
+
+		const auto& env = ctx.Renderer->GetEnvironment();
+
+		// Delegate fog uniform upload to LightingManager to avoid duplication.
+		auto* renderer = ServiceLocator::TryGet<Renderer>();
+		if (!renderer)
+		{
+			return;
+		}
+		if (!renderer->GetShaderLibrary().Exists("Lighting"))
+		{
+			return;
+		}
+
+		auto lightingAsset = renderer->GetShaderLibrary().Get("Lighting");
+		if (!lightingAsset)
+		{
+			return;
+		}
+
+		auto shader = lightingAsset->GetShader();
+		if (!shader)
+		{
+			return;
+		}
+
+		shader->Bind();
+		renderer->GetLightingManager().ApplyUniforms(shader.get(), renderer->GetFrame());
+
+		// Future: full-screen HDR blit with tone-mapping when m_HDRTarget is set.
+	}
+
+	void CompositePass::Shutdown()
+	{
+		m_HDRTarget.reset();
+		m_Initialized = false;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/passes/composite_pass.h b/engine/graphics/pipeline/passes/composite_pass.h
new file mode 100644
index 000000000..00f30d487
--- /dev/null
+++ b/engine/graphics/pipeline/passes/composite_pass.h
@@ -0,0 +1,40 @@
+#ifndef COMPOSITE_PASS_H
+#define COMPOSITE_PASS_H
+
+#include "engine/graphics/pipeline/render_pass.h"
+#include "engine/graphics/api/framebuffer.h"
+#include <string>
+
+namespace Chained
+{
+
+	// Final composite / post-processing pass.
+	// Uploads per-frame post-process uniforms (fog, tone-mapping) and, in the
+	// future, can blit from an HDR intermediate framebuffer to the back buffer.
+	class CompositePass : public IRenderPass
+	{
+	public:
+		void Init() override;
+		void Execute(const RenderContext& ctx) override;
+		void Shutdown() override;
+
+		const std::string& GetName() const override
+		{
+			static std::string name = "CompositePass";
+			return name;
+		}
+
+		// Provide an HDR intermediate target produced by earlier passes.
+		// If null, the pass operates in a passthrough mode.
+		void SetHDRTarget(std::shared_ptr<Framebuffer> target)
+		{
+			m_HDRTarget = target;
+		}
+
+	private:
+		std::shared_ptr<Framebuffer> m_HDRTarget;
+		bool m_Initialized = false;
+	};
+
+} // namespace Chained
+#endif
diff --git a/engine/graphics/pipeline/passes/geometry_pass.cpp b/engine/graphics/pipeline/passes/geometry_pass.cpp
new file mode 100644
index 000000000..7d97699cd
--- /dev/null
+++ b/engine/graphics/pipeline/passes/geometry_pass.cpp
@@ -0,0 +1,39 @@
+#include "geometry_pass.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/graphics/pipeline/frustum.h"
+#include "engine/graphics/api/graphics_device.h"
+
+namespace Chained
+{
+
+	void GeometryPass::Execute(const RenderContext& renderCtx)
+	{
+		PipelineStateGuard stateGuard;
+		auto& renderer = *renderCtx.Renderer;
+
+		// 1. Opaque Pass — no blending
+		GraphicsDevice::Get().EnableDepthTest();
+		GraphicsDevice::Get().SetDepthFunc(GraphicsDevice::DepthFunc::LEqual);
+		GraphicsDevice::Get().EnableDepthMask();
+		GraphicsDevice::Get().SetBlendEnabled(false);
+		for (const auto& item : renderer.GetOpaqueQueue())
+		{
+			renderer.DrawModel(item.Asset, item.Transform, item.BoneMatrices, item.Materials, item.ShaderOverride,
+							   item.CustomUniforms, RenderPassStage::Opaque);
+		}
+
+		// 2. Transparent Pass — enable blending
+		GraphicsDevice::Get().SetBlendEnabled(true);
+		GraphicsDevice::Get().SetBlendFunc(GraphicsDevice::BlendFactor::SrcAlpha,
+										   GraphicsDevice::BlendFactor::OneMinusSrcAlpha);
+		GraphicsDevice::Get().DisableDepthMask();
+		for (const auto& item : renderer.GetTransparentQueue())
+		{
+			renderer.DrawModel(item.Asset, item.Transform, item.BoneMatrices, item.Materials, item.ShaderOverride,
+							   item.CustomUniforms, RenderPassStage::Transparent);
+		}
+		GraphicsDevice::Get().EnableDepthMask();
+		GraphicsDevice::Get().SetBlendEnabled(false);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/passes/geometry_pass.h b/engine/graphics/pipeline/passes/geometry_pass.h
new file mode 100644
index 000000000..746ab8ebe
--- /dev/null
+++ b/engine/graphics/pipeline/passes/geometry_pass.h
@@ -0,0 +1,21 @@
+#ifndef GEOMETRY_PASS_H
+#define GEOMETRY_PASS_H
+
+#include "engine/graphics/pipeline/render_pass.h"
+
+namespace Chained
+{
+
+	class GeometryPass : public IRenderPass
+	{
+	public:
+		void Execute(const RenderContext& ctx) override;
+		const std::string& GetName() const override
+		{
+			static std::string name = "GeometryPass";
+			return name;
+		}
+	};
+
+} // namespace Chained
+#endif
diff --git a/engine/graphics/pipeline/passes/shadow_pass.cpp b/engine/graphics/pipeline/passes/shadow_pass.cpp
new file mode 100644
index 000000000..01b399839
--- /dev/null
+++ b/engine/graphics/pipeline/passes/shadow_pass.cpp
@@ -0,0 +1,150 @@
+#include "shadow_pass.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/project/project.h"
+
+namespace Chained
+{
+
+	void ShadowPass::Init()
+	{
+		if (m_Initialized)
+		{
+			return;
+		}
+
+		// Grab the depth-pass shader from the library. Use LoadOrGet so it resolves the
+		// path from the config and loads it on demand — LoadEngineResources only eagerly
+		// loads the common material shaders (Lighting/Skinned/Unlit/Billboard), not ShadowDepth.
+		auto* renderer = ServiceLocator::TryGet<Renderer>();
+		if (!renderer)
+		{
+			return;
+		}
+		m_DepthShaderAsset = renderer->GetShaderLibrary().LoadOrGet("ShadowDepth");
+
+		// Only mark initialized once the shader is really loaded. If SceneRenderer was
+		// constructed before the shader config was parsed, Execute() will retry the load.
+		if (m_DepthShaderAsset && m_DepthShaderAsset->GetShader())
+		{
+			CH_INFO("Shadow depth shader loaded");
+			m_Initialized = true;
+		}
+	}
+
+	void ShadowPass::Execute(const RenderContext& ctx)
+	{
+		// Always cast shadows from the global environment directional light,
+		// unless the project's Render settings have shadows disabled entirely.
+		auto project = Project::GetActive();
+		if (project && !project->GetConfig().Render.EnableShadows)
+		{
+			m_HasShadows = false;
+			CH_INFO("Shadows disabled in project settings");
+			return;
+		}
+
+		const auto& lightingSettings = ctx.Renderer->GetEnvironment().Lighting;
+		glm::vec3 lightDir = glm::length(glm::vec3(lightingSettings.Direction)) > 0.0001f
+								 ? glm::normalize(glm::vec3(lightingSettings.Direction))
+								 : glm::normalize(glm::vec3(0.3f, -0.7f, 0.3f));
+
+		m_HasShadows = true;
+
+		// The shader may not have been available when Init() ran (SceneRenderer can be
+		// constructed before the shader config is parsed). Retry the load lazily here.
+		if (!m_DepthShaderAsset || !m_DepthShaderAsset->GetShader())
+		{
+			Init();
+		}
+		if (!m_DepthShaderAsset || !m_DepthShaderAsset->GetShader())
+		{
+			return;
+		}
+
+		// Read shadow resolution from project settings
+		uint32_t shadowRes = 2048;
+		if (project)
+		{
+			shadowRes = (uint32_t)project->GetConfig().Render.ShadowResolution;
+			if (shadowRes == 0)
+			{
+				shadowRes = 2048;
+			}
+		}
+		m_ShadowMapSize = shadowRes;
+
+		// Recreate shadow map FBO if size changed (depth-only)
+		if (!m_ShadowMap || m_ShadowMap->GetSpecification().Width != shadowRes)
+		{
+			FramebufferSpecification shadowFboSpec;
+			shadowFboSpec.Width = shadowRes;
+			shadowFboSpec.Height = shadowRes;
+			shadowFboSpec.Samples = 1;
+			shadowFboSpec.DepthOnly = true; // Pure depth texture — no color attachment
+			m_ShadowMap = Framebuffer::Create(shadowFboSpec);
+		}
+
+		if (!m_ShadowMap || !m_ShadowMap->IsValid())
+		{
+			return;
+		}
+
+		// Build light-space matrix
+		constexpr float orthoSize = 80.0f;
+		constexpr float nearPlane = 1.0f;
+		constexpr float farPlane = 300.0f;
+
+		glm::mat4 lightProjection = glm::ortho(-orthoSize, orthoSize, -orthoSize, orthoSize, nearPlane, farPlane);
+		glm::vec3 lightPos = -lightDir * (farPlane * 0.5f);
+		glm::mat4 lightView = glm::lookAt(lightPos, glm::vec3(0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+		m_LightSpaceMatrix = lightProjection * lightView;
+
+		// Set shadow bias on renderer
+		if (auto* r = ServiceLocator::TryGet<Renderer>())
+		{
+			r->GetLightingManager().GetShadow().Bias = 0.003f;
+		}
+
+		auto* shader = m_DepthShaderAsset->GetShader().get();
+		shader->Bind();
+		shader->SetMatrix("u_LightSpaceMatrix", m_LightSpaceMatrix);
+
+		// Save current FBO binding and viewport — both must be restored so the
+		// subsequent scene passes render at the camera's resolution, not the shadow map's.
+		uint32_t previousFBO = GraphicsDevice::Get().GetFramebufferBinding();
+		int prevViewport[4] = {0, 0, 0, 0};
+		GraphicsDevice::Get().GetViewport(&prevViewport[0], &prevViewport[1], &prevViewport[2], &prevViewport[3]);
+
+		m_ShadowMap->Bind();
+		GraphicsDevice::Get().SetViewport(0, 0, shadowRes, shadowRes);
+		GraphicsDevice::Get().ClearDepth();
+
+		// Depth bias to prevent shadow acne (surface-shadow self-intersection)
+		GraphicsDevice::Get().SetPolygonOffset(true, 2.0f, 1.0f);
+
+		// Render all opaque items into the depth buffer using the depth shader.
+		for (const auto& item : ctx.Renderer->GetOpaqueQueue())
+		{
+			ctx.Renderer->DrawModel(item.Asset, item.Transform, item.BoneMatrices, item.Materials,
+									m_DepthShaderAsset->GetShader().get(), {}, RenderPassStage::Opaque);
+		}
+
+		GraphicsDevice::Get().SetPolygonOffset(false);
+
+		// Restore previous FBO binding and viewport
+		m_ShadowMap->Unbind();
+		GraphicsDevice::Get().BindFramebuffer(previousFBO);
+		GraphicsDevice::Get().SetViewport(prevViewport[0], prevViewport[1], prevViewport[2], prevViewport[3]);
+	}
+
+	void ShadowPass::Shutdown()
+	{
+		m_ShadowMap.reset();
+		m_DepthShaderAsset.reset();
+		m_Initialized = false;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/passes/shadow_pass.h b/engine/graphics/pipeline/passes/shadow_pass.h
new file mode 100644
index 000000000..9d075ac70
--- /dev/null
+++ b/engine/graphics/pipeline/passes/shadow_pass.h
@@ -0,0 +1,57 @@
+#ifndef SHADOW_PASS_H
+#define SHADOW_PASS_H
+
+#include "engine/graphics/pipeline/render_pass.h"
+#include "engine/graphics/api/framebuffer.h"
+#include "engine/assets/types/shader_asset.h"
+#include <glm/glm.hpp>
+#include <memory>
+
+namespace Chained
+{
+
+	// Renders a shadow map for the primary directional light.
+	// The result (m_ShadowMap framebuffer) is available to later passes via GetShadowMap().
+	class ShadowPass : public IRenderPass
+	{
+	public:
+		void Init() override;
+		void Execute(const RenderContext& ctx) override;
+		void Shutdown() override;
+
+		const std::string& GetName() const override
+		{
+			static std::string name = "ShadowPass";
+			return name;
+		}
+
+		// Other passes can call this to bind the shadow depth attachment.
+		std::shared_ptr<Framebuffer> GetShadowMap() const
+		{
+			return m_ShadowMap;
+		}
+		const glm::mat4& GetLightSpaceMatrix() const
+		{
+			return m_LightSpaceMatrix;
+		}
+		uint32_t GetShadowMapSize() const
+		{
+			return m_ShadowMapSize;
+		}
+		bool HasShadows() const
+		{
+			return m_HasShadows;
+		}
+
+	private:
+		std::shared_ptr<Framebuffer> m_ShadowMap;
+		std::shared_ptr<ShaderAsset> m_DepthShaderAsset;
+		glm::mat4 m_LightSpaceMatrix{1.0f};
+		uint32_t m_ShadowMapSize = 2048;
+		bool m_HasShadows = false;
+
+		bool m_Initialized = false;
+	};
+
+} // namespace Chained
+#endif
diff --git a/engine/graphics/pipeline/passes/skybox_pass.cpp b/engine/graphics/pipeline/passes/skybox_pass.cpp
new file mode 100644
index 000000000..493b3b03a
--- /dev/null
+++ b/engine/graphics/pipeline/passes/skybox_pass.cpp
@@ -0,0 +1,84 @@
+#include "skybox_pass.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/graphics/api/texture.h"
+#include "types/environment_asset.h"
+
+namespace Chained
+{
+
+	void SkyboxPass::Execute(const RenderContext& ctx)
+	{
+		auto environment = ctx.Settings.Environment;
+		if (!environment)
+		{
+			environment = ctx.Options.EnvironmentOverride;
+		}
+
+		if (environment)
+		{
+			const auto& envSettings = environment->GetSettings();
+			const auto& skySettings = envSettings.Skybox;
+
+			if (skySettings.Mode == 3)
+			{
+				// Mode 3: Six Faces Cubemap
+				std::string key;
+				bool hasAny = false;
+				for (int i = 0; i < 6; ++i)
+				{
+					key += skySettings.CubeFaces[i] + ";";
+					if (!skySettings.CubeFaces[i].empty())
+					{
+						hasAny = true;
+					}
+				}
+
+				if (hasAny)
+				{
+					if (key != m_CachedFacesKey || !m_CachedSixFacesCubemap)
+					{
+						m_CachedSixFacesCubemap = Texture::CreateCubemapFromFiles(skySettings.CubeFaces);
+						m_CachedFacesKey = key;
+					}
+
+					if (m_CachedSixFacesCubemap)
+					{
+						uint32_t texId = m_CachedSixFacesCubemap->GetNativeHandle();
+						if (auto* r = ServiceLocator::TryGet<Renderer>())
+						{
+							r->DrawSkybox(texId, 2, false, skySettings.Exposure, skySettings.Brightness,
+										  skySettings.Contrast, ctx.Camera, false);
+						}
+					}
+				}
+			}
+			else if (!skySettings.TexturePath.empty())
+			{
+				auto* am = ServiceLocator::TryGet<AssetManager>();
+				if (!am)
+				{
+					return;
+				}
+				auto textureAsset = am->Get<TextureAsset>(skySettings.TexturePath);
+				if (textureAsset && textureAsset->IsReady() && textureAsset->GetTexture())
+				{
+					int skyboxMode = std::clamp(skySettings.Mode, 0, 2);
+					uint32_t texId = textureAsset->GetTexture()->GetNativeHandle();
+
+					// Logic mapped directly from old SceneRenderer implementation
+					if (auto* r = ServiceLocator::TryGet<Renderer>())
+					{
+						r->DrawSkybox(texId, skyboxMode, textureAsset->IsHDR(), skySettings.Exposure,
+									  skySettings.Brightness, skySettings.Contrast, ctx.Camera, true);
+					}
+				}
+			}
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/passes/skybox_pass.h b/engine/graphics/pipeline/passes/skybox_pass.h
new file mode 100644
index 000000000..97d2bf4ed
--- /dev/null
+++ b/engine/graphics/pipeline/passes/skybox_pass.h
@@ -0,0 +1,27 @@
+#ifndef SKYBOX_PASS_H
+#define SKYBOX_PASS_H
+
+#include "engine/graphics/pipeline/render_pass.h"
+
+namespace Chained
+{
+
+	class Texture;
+
+	class SkyboxPass : public IRenderPass
+	{
+	public:
+		void Execute(const RenderContext& ctx) override;
+		const std::string& GetName() const override
+		{
+			static std::string name = "SkyboxPass";
+			return name;
+		}
+
+	private:
+		std::shared_ptr<Texture> m_CachedSixFacesCubemap;
+		std::string m_CachedFacesKey;
+	};
+
+} // namespace Chained
+#endif
diff --git a/engine/graphics/pipeline/render_command.cpp b/engine/graphics/pipeline/render_command.cpp
deleted file mode 100644
index bb3796fd2..000000000
--- a/engine/graphics/pipeline/render_command.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "render_command.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-
-std::unique_ptr<RendererAPI> RenderCommand::s_RendererAPI = RendererAPI::Create();
-
-void RenderCommand::Initialize()
-{
-    s_RendererAPI->Init();
-}
-
-void RenderCommand::Shutdown()
-{
-}
-    // These empty stubs were removed in favor of the full implementation in Renderer::DrawLine/DrawGrid
-
-} // namespace CHEngine
diff --git a/engine/graphics/pipeline/render_command.h b/engine/graphics/pipeline/render_command.h
deleted file mode 100644
index a59f16d00..000000000
--- a/engine/graphics/pipeline/render_command.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef CH_RENDER_COMMAND_H
-#define CH_RENDER_COMMAND_H
-
-#include "engine/graphics/api/renderer_api.h"
-
-namespace CHEngine
-{
-// Thin static wrapper over the active RendererAPI.
-class RenderCommand
-{
-public:
-    static void Initialize();
-    static void Shutdown();
-
-    static void Clear(Color color)
-    {
-        s_RendererAPI->SetClearColor(color);
-        s_RendererAPI->Clear();
-    }
-    static void SetViewport(int x, int y, int width, int height)
-    {
-        s_RendererAPI->SetViewport(x, y, width, height);
-    }
- 
-    static void SetDepthFunc(RendererAPI::DepthFunc func)
-    {
-        s_RendererAPI->SetDepthFunc(func);
-    }
-
-    static void DrawIndexed(const std::shared_ptr<VertexArray>& vertexArray, uint32_t indexCount = 0)
-    {
-        s_RendererAPI->DrawIndexed(vertexArray, indexCount);
-    }
-
-    // Removed empty DrawLine and DrawGrid stubs. Use Renderer::DrawLine/DrawGrid instead.
-    static void SetCullMode(RendererAPI::CullMode mode)
-    {
-        s_RendererAPI->SetCullMode(mode);
-    }
-
-    static void SetBlendFunc(RendererAPI::BlendFactor src, RendererAPI::BlendFactor dst)
-    {
-        s_RendererAPI->SetBlendFunc(src, dst);
-    }
-
-    static void SetLineWidth(float width)
-    {
-        s_RendererAPI->SetLineWidth(width);
-    }
-
-    static void EnableDepthTest() { s_RendererAPI->SetDepthTest(true); }
-    static void DisableDepthTest() { s_RendererAPI->SetDepthTest(false); }
-    static void EnableDepthMask() { s_RendererAPI->SetDepthMask(true); }
-    static void DisableDepthMask() { s_RendererAPI->SetDepthMask(false); }
-    static void SetBlendMode(bool enabled) { s_RendererAPI->SetBlendMode(enabled); }
-
-private:
-    static std::unique_ptr<RendererAPI> s_RendererAPI;
-};
-} // namespace CHEngine
-
-#endif // CH_RENDER_COMMAND_H
diff --git a/engine/graphics/pipeline/render_pass.h b/engine/graphics/pipeline/render_pass.h
new file mode 100644
index 000000000..57e6c1e0f
--- /dev/null
+++ b/engine/graphics/pipeline/render_pass.h
@@ -0,0 +1,40 @@
+#ifndef CH_RENDER_PASS_H
+#define CH_RENDER_PASS_H
+
+#include "engine/common/base.h"
+#include "engine/graphics/camera_types.h"
+#include "engine/scene/scene_settings.h"
+#include <entt/entt.hpp>
+#include <string>
+
+namespace Chained
+{
+	class SceneRenderer;
+	struct SceneRenderOptions;
+
+	struct RenderContext
+	{
+		entt::registry& Registry;
+		const SceneSettings& Settings;
+		const Camera3D& Camera;
+		const SceneRenderOptions& Options;
+		SceneRenderer* Renderer;
+	};
+
+	class IRenderPass
+	{
+	public:
+		virtual ~IRenderPass() = default;
+
+		virtual void Init()
+		{
+		}
+		virtual void Execute(const RenderContext& ctx) = 0;
+		virtual void Shutdown()
+		{
+		}
+
+		virtual const std::string& GetName() const = 0;
+	};
+} // namespace Chained
+#endif
diff --git a/engine/graphics/pipeline/renderer.cpp b/engine/graphics/pipeline/renderer.cpp
index c3608ea6c..bd60cae63 100644
--- a/engine/graphics/pipeline/renderer.cpp
+++ b/engine/graphics/pipeline/renderer.cpp
@@ -1,887 +1,538 @@
 #include "engine/graphics/pipeline/renderer.h"
-#include "engine/core/application.h"
-#include "engine/core/log.h"
-#include "engine/graphics/api/framebuffer.h"
-#include "engine/graphics/pipeline/render_command.h"
-
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/shader_asset.h"
-#include "engine/graphics/assets/texture_asset.h"
 #include "engine/graphics/pipeline/geometry_generator.h"
+#include "engine/graphics/pipeline/shader_uniform_utils.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/graphics/pipeline/shader_storage.h"
+#include "engine/assets/asset_manager.h"
 
-#include <algorithm>
-#include <glad/gl.h>
-#include <glm/gtc/type_ptr.hpp>
-#include <vector>
-
-#include "render_command.h"
-#include "engine/graphics/loaders/texture_loader.h"
-#include "engine/graphics/loaders/model_loader.h"
-#include "engine/graphics/loaders/shader_loader.h"
-#include "engine/graphics/loaders/environment_loader.h"
-
-namespace CHEngine
-{
-
-Renderer* Renderer::s_Instance = nullptr;
-
-bool Renderer::IsInitialized()
-{
-    return s_Instance != nullptr && s_Instance->m_Data != nullptr && s_Instance->m_Initialized;
-}
-
-Renderer& Renderer::Get()
-{
-    return *s_Instance;
-}
-
-void Renderer::Init()
-{
-    if (!s_Instance)
-    {
-        s_Instance = new Renderer();
-    }
-
-    if (s_Instance->m_Initialized)
-    {
-        return;
-    }
-
-    // Register Graphics loaders
-    auto& assetManager = AssetManager::Get();
-    assetManager.RegisterLoader(AssetType::Texture, std::make_unique<TextureLoader>());
-    assetManager.RegisterLoader(AssetType::Model, std::make_unique<ModelLoader>());
-    assetManager.RegisterLoader(AssetType::Shader, std::make_unique<ShaderLoader>());
-    assetManager.RegisterLoader(AssetType::Environment, std::make_unique<EnvironmentLoader>());
-
-    s_Instance->InternalInit();
-}
-
-void Renderer::LoadEngineResources()
-{
-    auto& shaders = Get().GetShaderLibrary();
-
-    auto loadShader = [&](const std::string& name, const std::string& path) { shaders.LoadOrGet(name, path); };
-
-    loadShader("Lighting", "engine/resources/shaders/lighting.chshader");
-    loadShader("Unlit", "engine/resources/shaders/unlit.chshader");
-
-    CH_CORE_INFO("[Renderer] LoadEngineResources done. {} shader(s) loaded.", shaders.GetNames().size());
-}
-
-void Renderer::InternalInit()
-{
-    if (m_Initialized)
-    {
-        return;
-    }
-
-    if (Application::Get().GetSpecification().Headless)
-    {
-        CH_CORE_INFO("[Renderer] Headless mode enabled, skipping OpenGL initialization.");
-        m_Initialized = true;
-        return;
-    }
-
-    RenderCommand::Initialize();
-
-    // Initialize SSBO for lights using raw OpenGL
-    glGenBuffers(1, &m_Data->Lighting.LightSSBO);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_Data->Lighting.LightSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(RenderLight) * LightingData::MaxLights, nullptr, GL_DYNAMIC_DRAW);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    m_Data->Lighting.LightsDirty = true;
-
-    // Initialize Engine static resources
-    if (!m_Data->FullscreenQuadVAO)
-    {
-        float vertices[] = {-1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f,  -1.0f, 0.0f, 1.0f, 0.0f,
-                            1.0f,  1.0f,  0.0f, 1.0f, 1.0f, -1.0f, 1.0f,  0.0f, 0.0f, 1.0f};
-        uint32_t indices[] = {0, 1, 2, 2, 3, 0};
-
-        m_Data->FullscreenQuadVAO = VertexArray::Create();
-        auto vbo = VertexBuffer::Create(vertices, sizeof(vertices));
-        vbo->SetLayout({{ShaderDataType::Float3, "vertexPosition"}, {ShaderDataType::Float2, "vertexTexCoord"}});
-        m_Data->FullscreenQuadVAO->AddVertexBuffer(vbo);
-        auto ibo = IndexBuffer::Create(indices, 6);
-        m_Data->FullscreenQuadVAO->SetIndexBuffer(ibo);
-    }
-
-    InitializeResources();
-    InitializeSkybox();
-
-    // Always load engine resources after initialization
-    LoadEngineResources();
-    m_Initialized = true;
-}
-
-void Renderer::Shutdown()
-{
-    if (s_Instance)
-    {
-        s_Instance->InternalShutdown();
-        delete s_Instance;
-        s_Instance = nullptr;
-    }
-}
-
-void Renderer::InternalShutdown()
-{
-    if (!m_Initialized)
-    {
-        return;
-    }
-
-    CH_CORE_INFO("Shutting down Render System...");
-
-    if (Application::Get().GetSpecification().Headless)
-    {
-        m_Initialized = false;
-        return;
-    }
-
-    CleanupResources();
-    CleanupSkybox();
-
-    if (m_Data->Lighting.LightSSBO > 0)
-    {
-        glDeleteBuffers(1, &m_Data->Lighting.LightSSBO);
-        m_Data->Lighting.LightSSBO = 0;
-    }
-
-    m_Initialized = false;
-}
-
-Renderer::Renderer()
-{
-    s_Instance = this;
-    m_Data = std::make_unique<RendererData>();
-    m_Data->Shaders = std::make_unique<ShaderLibrary>();
-}
-
-Renderer::~Renderer()
-{
-}
-
-void Renderer::BeginScene(const Camera3D& camera, float nearClip, float farClip)
-{
-    m_Data->CurrentCameraPosition = camera.Position;
-
-    // Update light SSBO once per frame
-    if (m_Data->Lighting.LightsDirty)
-    {
-        glBindBuffer(GL_SHADER_STORAGE_BUFFER, m_Data->Lighting.LightSSBO);
-        glBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, sizeof(RenderLight) * LightingData::MaxLights,
-                        m_Data->Lighting.Lights);
-        glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-        m_Data->Lighting.LightsDirty = false;
-    }
-
-    // Bind lighting uniforms to the default lighting shader if it exists
-    auto lightingShaderAsset = m_Data->Shaders->Exists("Lighting") ? m_Data->Shaders->Get("Lighting") : nullptr;
-    if (lightingShaderAsset && lightingShaderAsset->GetShader())
-    {
-        lightingShaderAsset->GetShader()->Bind();
-
-        float time = m_Data->Time;
-        float diagMode = m_Data->DiagnosticMode;
-        int lightCount = m_Data->LightCount;
-        float ambient = m_Data->Lighting.CurrentLighting.Ambient;
-        float exposure = m_Data->Lighting.CurrentLighting.Exposure;
-        float gamma = m_Data->Lighting.CurrentLighting.Gamma;
-
-        lightingShaderAsset->GetShader()->SetVec3("viewPos", camera.Position);
-        lightingShaderAsset->GetShader()->SetFloat("uTime", time);
-        lightingShaderAsset->GetShader()->SetFloat("uMode", diagMode);
-
-        lightingShaderAsset->GetShader()->SetVec3("lightDir", m_Data->Lighting.CurrentLighting.Direction);
-
-        glm::vec4 lightColor = {m_Data->Lighting.CurrentLighting.LightColor.r / 255.0f,
-                                m_Data->Lighting.CurrentLighting.LightColor.g / 255.0f,
-                                m_Data->Lighting.CurrentLighting.LightColor.b / 255.0f,
-                                m_Data->Lighting.CurrentLighting.LightColor.a / 255.0f};
-        lightingShaderAsset->GetShader()->SetVec4("lightColor", lightColor);
-
-        lightingShaderAsset->GetShader()->SetFloat("ambient", ambient);
-
-        glm::vec4 skyColor = lightColor;
-        skyColor.w = ambient * 0.35f;
-        lightingShaderAsset->GetShader()->SetVec4("skyAmbientColor", skyColor);
-
-        lightingShaderAsset->GetShader()->SetInt("uLightCount", lightCount);
-        lightingShaderAsset->GetShader()->SetFloat("uExposure", exposure);
-        lightingShaderAsset->GetShader()->SetFloat("uGamma", gamma);
-
-        ApplyFogUniforms(lightingShaderAsset);
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_Data->Lighting.LightSSBO);
-        m_Data->CurrentShaderId = lightingShaderAsset->GetShader()->GetRendererID();
-    }
-
-    // --- Direct glm::mat4 Management (Pure OpenGL style) ---
-    // 1. Calculate View Transform
-    m_Data->CurrentView = glm::lookAt(camera.Position, camera.Target, camera.Up);
-
-    // 2. Calculate Projection Transform
-    int width = Application::Get().GetWindow().GetWidth();
-    int height = Application::Get().GetWindow().GetHeight();
-    float aspect = (height > 0) ? (float)width / (float)height : 1.0f;
-
-    if (camera.Projection == 0 /* CAMERA_PERSPECTIVE */)
-    {
-        m_Data->CurrentProj = glm::perspective(glm::radians(camera.Fovy), aspect, nearClip, farClip);
-    }
-    else
-    {
-        float top = camera.Fovy / 2.0f;
-        float right = top * aspect;
-        m_Data->CurrentProj = glm::ortho(-right, right, -top, top, nearClip, farClip);
-    }
-}
-
-void Renderer::EndScene()
-{
-    m_Data->CurrentShaderId = 0;
-}
-
-void Renderer::Clear(const glm::vec4& color)
-{
-    CHEngine::Color chColor((unsigned char)(color.r * 255), (unsigned char)(color.g * 255),
-                            (unsigned char)(color.b * 255), (unsigned char)(color.a * 255));
-    RenderCommand::Clear(chColor);
-}
-
-void Renderer::SetViewport(int x, int y, int width, int height)
-{
-    RenderCommand::SetViewport(x, y, width, height);
-}
-
-void Renderer::DrawMesh(const Mesh& mesh, const Material& material, const glm::mat4& transform)
-{
-    uint32_t shaderId = material.ShaderID;
-    if (shaderId == 0)
-    {
-        shaderId = m_Data->CurrentShaderId;
-    }
-    if (shaderId == 0)
-    {
-        return;
-    }
-
-    auto shaderAsset = GetShaderLibrary().GetById(shaderId);
-    if (!shaderAsset)
-    {
-        return;
-    }
-
-    shaderAsset->GetShader()->Bind();
-
-    // Set matrices
-    shaderAsset->GetShader()->SetMatrix("matModel", transform);
-    shaderAsset->GetShader()->SetMatrix("matView", m_Data->CurrentView);
-    shaderAsset->GetShader()->SetMatrix("matProjection", m_Data->CurrentProj);
-
-    glm::mat4 matNormal = glm::transpose(glm::inverse(transform));
-    shaderAsset->GetShader()->SetMatrix("matNormal", matNormal);
-
-    glm::mat4 mvp = m_Data->CurrentProj * m_Data->CurrentView * transform;
-    shaderAsset->GetShader()->SetMatrix("mvp", mvp);
-
-    // Bind VAO and Draw
-    if (mesh.VAO)
-    {
-        mesh.VAO->Bind();
-        if (mesh.TriangleCount > 0)
-        {
-            glDrawElements(GL_TRIANGLES, mesh.TriangleCount * 3, GL_UNSIGNED_INT, 0);
-        }
-        else
-        {
-            glDrawArrays(GL_TRIANGLES, 0, mesh.VertexCount);
-        }
-        mesh.VAO->Unbind();
-    }
-}
-
-void Renderer::DrawMeshInstanced(const Mesh& mesh, const Material& material, const std::vector<glm::mat4>& transforms)
-{
-    if (transforms.empty() || !mesh.VAO)
-    {
-        return;
-    }
-
-    uint32_t shaderId = material.ShaderID;
-    if (shaderId == 0)
-    {
-        shaderId = m_Data->CurrentShaderId;
-    }
-    if (shaderId == 0)
-    {
-        return;
-    }
-
-    auto shaderAsset = GetShaderLibrary().GetById(shaderId);
-    if (!shaderAsset)
-    {
-        return;
-    }
-
-    shaderAsset->GetShader()->Bind();
-
-    // Set up matrices
-    glm::mat4 mvp = m_Data->CurrentProj * m_Data->CurrentView;
-    shaderAsset->GetShader()->SetMatrix("u_ViewProjection", mvp);
-    shaderAsset->GetShader()->SetMatrix("u_Transform", glm::mat4(1.0f));
-
-    // Create instance buffer with all transforms
-    uint32_t instanceVBO = 0;
-    glGenBuffers(1, &instanceVBO);
-    glBindBuffer(GL_ARRAY_BUFFER, instanceVBO);
-    glBufferData(GL_ARRAY_BUFFER, transforms.size() * sizeof(glm::mat4), transforms.data(), GL_STATIC_DRAW);
-
-    // Bind the mesh VAO
-    mesh.VAO->Bind();
-    glBindBuffer(GL_ARRAY_BUFFER, instanceVBO);
-
-    // Set up instance vertex attributes for the model matrix (4 vec4 attributes per mat4)
-    size_t vec4Size = sizeof(glm::vec4);
-    for (int i = 0; i < 4; i++)
-    {
-        glEnableVertexAttribArray(5 + i);
-        glVertexAttribPointer(5 + i, 4, GL_FLOAT, GL_FALSE, sizeof(glm::mat4), (void*)(i * vec4Size));
-        glVertexAttribDivisor(5 + i, 1); // One matrix per instance
-    }
-
-    // Draw with instances
-    if (mesh.TriangleCount > 0)
-    {
-        glDrawElementsInstanced(GL_TRIANGLES, mesh.TriangleCount * 3, GL_UNSIGNED_INT, 0, (GLsizei)transforms.size());
-    }
-    else
-    {
-        glDrawArraysInstanced(GL_TRIANGLES, 0, mesh.VertexCount, (GLsizei)transforms.size());
-    }
-
-    // Cleanup instance attributes
-    for (int i = 0; i < 4; i++)
-    {
-        glVertexAttribDivisor(5 + i, 0);
-        glDisableVertexAttribArray(5 + i);
-    }
-
-    mesh.VAO->Unbind();
-    glDeleteBuffers(1, &instanceVBO);
-}
-
-void Renderer::DrawLine(const glm::vec3& start, const glm::vec3& end, const glm::vec4& color)
-{
-    auto debugShader = m_Data->Shaders->LoadOrGet("ColliderDebug", "engine/resources/shaders/collider_debug.chshader");
-    if (!debugShader || !debugShader->GetShader())
-    {
-        return;
-    }
-
-    auto shader = debugShader->GetShader();
-    shader->Bind();
-
-    glm::mat4 vp = m_Data->CurrentProj * m_Data->CurrentView;
-    shader->SetMatrix("u_ViewProj", vp);
-    shader->SetMatrix("u_Transform", glm::mat4(1.0f));
-    shader->SetVec4("u_Color", color);
-
-    // Immediate mode replacement or small buffer
-    float vertices[] = {start.x, start.y, start.z, end.x, end.y, end.z};
-    uint32_t vbo, vao;
-    glGenVertexArrays(1, &vao);
-    glGenBuffers(1, &vbo);
-    glBindVertexArray(vao);
-    glBindBuffer(GL_ARRAY_BUFFER, vbo);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STREAM_DRAW);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-
-    glDrawArrays(GL_LINES, 0, 2);
-
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    glBindVertexArray(0);
-    glDeleteBuffers(1, &vbo);
-    glDeleteVertexArrays(1, &vao);
-}
-
-void Renderer::DrawMeshWire(const Mesh& mesh, const glm::vec4& color, const glm::mat4& transform, bool useWireframe)
-{
-    auto debugShader = m_Data->Shaders->LoadOrGet("ColliderDebug", "engine/resources/shaders/collider_debug.chshader");
-    if (!debugShader || !debugShader->GetShader())
-    {
-        return;
-    }
-
-     if (useWireframe)
-    {
-        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-    }
-    else
-    {
-        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-    }
-   
-
-    auto shader = debugShader->GetShader();
-    shader->Bind();
-
-    // Set matrices and color with correct uniform names for ColliderDebug
-    glm::mat4 vp = m_Data->CurrentProj * m_Data->CurrentView;
-    shader->SetMatrix("u_ViewProj", vp);
-    shader->SetMatrix("u_Transform", transform);
-    shader->SetVec4("u_Color", color);
-
-    // Render mesh geometry
-    if (mesh.VAO)
-    {
-        mesh.VAO->Bind();
-        if (mesh.TriangleCount > 0)
-        {
-            glDrawElements(GL_TRIANGLES, mesh.TriangleCount * 3, GL_UNSIGNED_INT, 0);
-        }
-        else
-        {
-            glDrawArrays(GL_TRIANGLES, 0, mesh.VertexCount);
-        }
-        mesh.VAO->Unbind();
-    }
-
-    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-    
-}
-
-void Renderer::DrawGrid(int slices, float spacing)
-{
-    // Draw grid manually using DrawLine
-    float halfSize = (slices * spacing) / 2.0f;
-    glm::vec4 color = {0.5f, 0.5f, 0.5f, 1.0f};
-
-    for (int i = 0; i <= slices; i++)
-    {
-        float pos = -halfSize + (i * spacing);
-        DrawLine({pos, 0, -halfSize}, {pos, 0, halfSize}, color);
-        DrawLine({-halfSize, 0, pos}, {halfSize, 0, pos}, color);
-    }
-}
-
-void Renderer::DrawInfiniteGrid(const Camera3D& camera, float spacing, const glm::vec4& color)
-{
-    auto& shaders = GetShaderLibrary();
-    auto shaderAsset = shaders.LoadOrGet("Grid", "engine/resources/shaders/grid.chshader");
-    if (!shaderAsset || !shaderAsset->GetShader())
-    {
-        return;
-    }
-
-    shaderAsset->GetShader()->Bind();
-
-    glm::mat4 mvp = m_Data->CurrentProj * m_Data->CurrentView;
-    shaderAsset->GetShader()->SetMatrix("u_ViewProjection", mvp);
-
-    // Position the plane slightly below Y=0 to prevent Z-fighting
-    glm::vec3 planePos = {camera.Position.x, -0.005f, camera.Position.z};
-    glm::mat4 model = glm::translate(glm::mat4(1.0f), planePos);
-    shaderAsset->GetShader()->SetMatrix("matModel", model);
-
-    shaderAsset->GetShader()->SetVec3("cameraPos", camera.Position);
-
-    glm::vec4 col = color;
-    shaderAsset->GetShader()->SetVec4("gridColor", col);
-    shaderAsset->GetShader()->SetFloat("gridSize", spacing);
-    shaderAsset->GetShader()->SetFloat("uTime", m_Data->Time);
-
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    // Use shared mesh from GeometryGenerator
-    static Mesh gridPlane;
-    if (!gridPlane.VAO)
-    {
-        gridPlane = GeometryGenerator::GenerateQuad(15000.0f);
-    }
-
-    gridPlane.VAO->Bind();
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-    gridPlane.VAO->Unbind();
-}
-
-void Renderer::DrawSkybox(uint32_t textureId, int skyboxMode, bool isHDR, float exposure, float brightness,
-                          float contrast, const Camera3D& camera)
-{
-    if (textureId == 0)
-    {
-        return;
-    }
-
-    skyboxMode = std::clamp(skyboxMode, 0, 2);
-
-    auto shaderAsset = (skyboxMode == 2)
-                           ? m_Data->Shaders->LoadOrGet("SkyboxCubemap", "engine/resources/shaders/skybox_cubemap.chshader")
-                           : (skyboxMode == 1 ? m_Data->Shaders->LoadOrGet("SkyboxCross", "engine/resources/shaders/skybox_cross.chshader")
-                                              : m_Data->Shaders->LoadOrGet("Skybox", "engine/resources/shaders/skybox.chshader"));
-    if (!shaderAsset || !shaderAsset->GetShader())
-    {
-        return;
-    }
-
-    // 1. Prepare Render State
-    RenderCommand::SetDepthFunc(RendererAPI::DepthFunc::LEqual);
-    RenderCommand::SetCullMode(RendererAPI::CullMode::None);
-    RenderCommand::DisableDepthMask(); // Використовую твій метод
-
-    // 2. Setup Uniforms
-    shaderAsset->GetShader()->Bind();
-
-    // Always remove translation from view matrix for skybox (Виправлено: беремо з переданої camera)
-    glm::mat4 view = glm::mat4(glm::mat3(m_Data->CurrentView));
-    shaderAsset->GetShader()->SetMatrix("u_View", view);
-    shaderAsset->GetShader()->SetMatrix("u_Projection", m_Data->CurrentProj);
-
-    shaderAsset->GetShader()->SetFloat("u_Exposure", exposure);
-    shaderAsset->GetShader()->SetFloat("u_Brightness", brightness);
-    shaderAsset->GetShader()->SetFloat("u_Contrast", contrast);
-
-    shaderAsset->GetShader()->SetInt("u_IsHDR", isHDR ? 1 : 0);
-    shaderAsset->GetShader()->SetInt("u_VFlipped", skyboxMode == 2 ? 0 : 1);
-
-    ApplyFogUniforms(shaderAsset);
-
-    // 3. Bind Textures and Draw Mesh
-    if (skyboxMode == 2)
-    {
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_CUBE_MAP, textureId);
-        shaderAsset->GetShader()->SetInt("u_Cubemap", 0);
-
-        if (m_Data->Skybox.SkyboxCubeModel && !m_Data->Skybox.SkyboxCubeModel->Meshes.empty())
-        {
-            auto& mesh = m_Data->Skybox.SkyboxCubeModel->Meshes[0];
-            mesh.VAO->Bind();
-            glDrawElements(GL_TRIANGLES, 36, GL_UNSIGNED_INT, 0);
-            mesh.VAO->Unbind();
-        }
-    }
-    else if (skyboxMode == 1)
-    {
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, textureId);
-        shaderAsset->GetShader()->SetInt("u_CrossMap", 0);
-
-        if (m_Data->Skybox.SkyboxCubeModel && !m_Data->Skybox.SkyboxCubeModel->Meshes.empty())
-        {
-            auto& mesh = m_Data->Skybox.SkyboxCubeModel->Meshes[0];
-            mesh.VAO->Bind();
-            glDrawElements(GL_TRIANGLES, 36, GL_UNSIGNED_INT, 0);
-            mesh.VAO->Unbind();
-        }
-    }
-    else
-    {
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, textureId);
-        shaderAsset->GetShader()->SetInt("u_Panorama", 0);
-
-        if (m_Data->Skybox.SkyboxSphereModel && !m_Data->Skybox.SkyboxSphereModel->Meshes.empty())
-        {
-            auto& mesh = m_Data->Skybox.SkyboxSphereModel->Meshes[0];
-            mesh.VAO->Bind();
-            glDrawElements(GL_TRIANGLES, mesh.TriangleCount * 3, GL_UNSIGNED_INT, 0);
-            mesh.VAO->Unbind();
-        }
-    }
-
-    // 4. Restore Render State (Виправлено: робимо через API рушія)
-    RenderCommand::SetDepthFunc(RendererAPI::DepthFunc::Less);
-    RenderCommand::SetCullMode(RendererAPI::CullMode::Back);
-    RenderCommand::EnableDepthMask(); // Якщо в тебе DisableDepthMask, то має бути і Enable, або SetDepthMask(true)
-}
-
-void Renderer::DrawBillboard(const Camera3D& camera, uint32_t textureId, const glm::vec3& position, float size,
-                             const glm::vec4& tint)
-{
-    auto unlitShaderAsset = m_Data->Shaders->LoadOrGet("Unlit", "engine/resources/shaders/unlit.chshader");
-    if (!unlitShaderAsset || !unlitShaderAsset->GetShader() || textureId == 0)
-    {
-        return;
-    }
-
-    auto shader = unlitShaderAsset->GetShader();
-    shader->Bind();
-
-    glm::vec3 look = glm::normalize(camera.Position - position);
-    glm::vec3 right = glm::cross(camera.Up, look);
-    if (glm::length(right) < 0.0001f)
-    {
-        right = glm::vec3(1.0f, 0.0f, 0.0f);
-    }
-    else
-    {
-        right = glm::normalize(right);
-    }
-    glm::vec3 up = glm::normalize(glm::cross(look, right));
-
-    glm::mat4 model = glm::mat4(1.0f);
-    model[0] = glm::vec4(right * size, 0.0f);
-    model[1] = glm::vec4(up * size, 0.0f);
-    model[2] = glm::vec4(look * size, 0.0f);
-    model[3] = glm::vec4(position, 1.0f);
-
-    shader->SetMatrix("mvp", m_Data->CurrentProj * m_Data->CurrentView * model);
-    shader->SetMatrix("matModel", model);
-    shader->SetMatrix("matNormal", glm::transpose(glm::inverse(model)));
-    shader->SetVec3("viewPos", camera.Position);
-    shader->SetVec4("colDiffuse", tint);
-    shader->SetVec4("colEmissive", glm::vec4(0.0f));
-    shader->SetInt("useTexture", 1);
-    shader->SetInt("useEmissiveTexture", 0);
-    shader->SetFloat("emissiveIntensity", 0.0f);
-    shader->SetInt("useSkinning", 0);
-
-    glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_2D, textureId);
-    shader->SetInt("texture0", 0);
-
-    const GLboolean blendWasEnabled = glIsEnabled(GL_BLEND);
-    const GLboolean cullWasEnabled = glIsEnabled(GL_CULL_FACE);
-    if (!blendWasEnabled)
-    {
-        glEnable(GL_BLEND);
-    }
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    if (cullWasEnabled)
-    {
-        glDisable(GL_CULL_FACE);
-    }
-
-    static uint32_t quadVAO = 0;
-    static uint32_t quadVBO = 0;
-    if (quadVAO == 0)
-    {
-        const float vertices[] = {
-            -0.5f, -0.5f, 0.0f, 0.0f, 0.0f,
-             0.5f, -0.5f, 0.0f, 1.0f, 0.0f,
-             0.5f,  0.5f, 0.0f, 1.0f, 1.0f,
-            -0.5f,  0.5f, 0.0f, 0.0f, 1.0f,
-        };
-
-        glGenVertexArrays(1, &quadVAO);
-        glGenBuffers(1, &quadVBO);
-        glBindVertexArray(quadVAO);
-        glBindBuffer(GL_ARRAY_BUFFER, quadVBO);
-        glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
-        glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(float), 0);
-        glEnableVertexAttribArray(1);
-        glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (void*)(3 * sizeof(float)));
-    }
-
-    glBindVertexArray(quadVAO);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-    glBindVertexArray(0);
-
-    if (cullWasEnabled)
-    {
-        glEnable(GL_CULL_FACE);
-    }
-    if (!blendWasEnabled)
-    {
-        glDisable(GL_BLEND);
-    }
-}
-
-void Renderer::DrawCubeWires(const glm::mat4& transform, const glm::vec3& size, const glm::vec4& color)
-{
-    auto shaderAsset = m_Data->Shaders->LoadOrGet("ColliderDebug", "engine/resources/shaders/collider_debug.chshader");
-    if (!shaderAsset || !shaderAsset->GetShader()) return;
-
-    auto shader = shaderAsset->GetShader();
-    shader->Bind();
-    shader->SetMatrix("u_ViewProj", m_Data->CurrentProj * m_Data->CurrentView);
-    shader->SetMatrix("u_Transform", transform * glm::scale(glm::mat4(1.0f), size));
-    shader->SetVec4("u_Color", color);
-
-    if (m_Data->Resources.WireCubeModel)
-    {
-        for (auto& mesh : m_Data->Resources.WireCubeModel->Meshes)
-        {
-            mesh.VAO->Bind();
-            glDrawElements(GL_LINES, mesh.VAO->GetIndexBuffer()->GetCount(), GL_UNSIGNED_INT, 0);
-        }
-    }
-}
-
-void Renderer::DrawCapsuleWires(const glm::mat4& transform, float radius, float height, const glm::vec4& color)
-{
-    // Simplified: Draw a box representing the capsule for now, until we add a proper capsule mesh
-    DrawCubeWires(transform, glm::vec3(radius * 2.0f, height, radius * 2.0f), color);
-}
-
-void Renderer::DrawSphereWires(const glm::mat4& transform, float radius, const glm::vec4& color)
-{
-    auto shaderAsset = m_Data->Shaders->LoadOrGet("ColliderDebug", "engine/resources/shaders/collider_debug.chshader");
-    if (!shaderAsset || !shaderAsset->GetShader()) return;
-
-    auto shader = shaderAsset->GetShader();
-    shader->Bind();
-    shader->SetMatrix("u_ViewProj", m_Data->CurrentProj * m_Data->CurrentView);
-    shader->SetMatrix("u_Transform", transform * glm::scale(glm::mat4(1.0f), glm::vec3(radius)));
-    shader->SetVec4("u_Color", color);
-
-    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-    if (m_Data->Resources.UnitSphereModel)
-    {
-        for (auto& mesh : m_Data->Resources.UnitSphereModel->Meshes)
-        {
-            mesh.VAO->Bind();
-            glDrawElements(GL_TRIANGLES, mesh.VAO->GetIndexBuffer()->GetCount(), GL_UNSIGNED_INT, 0);
-        }
-    }
-    glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-}
-
-void Renderer::ApplyPostProcessing(uint32_t screenTextureId, uint32_t depthTextureId, const Camera3D& camera)
-{
-    auto shaderAsset = m_Data->Shaders->LoadOrGet("PostProcess", "engine/resources/shaders/post_process.chshader");
-    if (shaderAsset && shaderAsset->GetShader())
-    {
-        shaderAsset->GetShader()->Bind();
-
-        // Fullscreen quad doesn't need transformation, set MVP to identity
-        glm::mat4 identity = glm::mat4(1.0f);
-        shaderAsset->GetShader()->SetMatrix("mvp", identity);
-
-        glm::mat4 invViewProj = glm::inverse(m_Data->CurrentProj * m_Data->CurrentView);
-        shaderAsset->GetShader()->SetMatrix("matInverseViewProj", invViewProj);
-        shaderAsset->GetShader()->SetVec3("viewPos", camera.Position);
-
-        shaderAsset->GetShader()->SetFloat("uTime", m_Data->Time);
-        shaderAsset->GetShader()->SetFloat("uExposure", m_Data->Lighting.CurrentLighting.Exposure);
-        shaderAsset->GetShader()->SetFloat("uGamma", m_Data->Lighting.CurrentLighting.Gamma);
-
-        ApplyFogUniforms(shaderAsset);
-
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, screenTextureId);
-        shaderAsset->GetShader()->SetInt("texture0", 0);
-
-        glActiveTexture(GL_TEXTURE1);
-        glBindTexture(GL_TEXTURE_2D, depthTextureId);
-        shaderAsset->GetShader()->SetInt("texture1", 1);
-
-        glDisable(GL_DEPTH_TEST);
-        glDisable(GL_CULL_FACE);
-
-        if (m_Data->FullscreenQuadVAO)
-        {
-            m_Data->FullscreenQuadVAO->Bind();
-            RenderCommand::DrawIndexed(m_Data->FullscreenQuadVAO);
-            m_Data->FullscreenQuadVAO->Unbind();
-        }
-
-        glEnable(GL_DEPTH_TEST);
-        glEnable(GL_CULL_FACE);
-    }
-}
-
-void Renderer::SetLight(int index, const RenderLight& light)
-{
-    if (index >= 0 && index < LightingData::MaxLights)
-    {
-        m_Data->Lighting.Lights[index] = light;
-        m_Data->Lighting.LightsDirty = true;
-    }
-}
-
-void Renderer::SetLightCount(int count)
-{
-    m_Data->LightCount = count;
-}
-
-void Renderer::ClearLights()
-{
-    for (int i = 0; i < LightingData::MaxLights; i++)
-    {
-        m_Data->Lighting.Lights[i].enabled = 0;
-    }
-    m_Data->LightCount = 0;
-    m_Data->Lighting.LightsDirty = true;
-}
-
-void Renderer::ApplyEnvironment(const EnvironmentSettings& settings)
-{
-    m_Data->Lighting.CurrentLighting = settings.Lighting;
-    m_Data->Lighting.CurrentFog = settings.Fog;
-    m_Data->CurrentEnv = settings;
-}
-
-void Renderer::SetMainLight(const LightingSettings& settings)
-{
-    m_Data->Lighting.CurrentLighting = settings;
-}
-
-void Renderer::SetDiagnosticMode(float mode)
-{
-    m_Data->DiagnosticMode = mode;
-}
-
-void Renderer::UpdateTime(Timestep time)
-{
-    m_Data->Time = time;
-}
-
-void Renderer::ApplyFogUniforms(const std::shared_ptr<ShaderAsset>& shader)
-{
-    const auto& fog = m_Data->Lighting.CurrentFog;
-    int enabled = fog.Enabled ? 1 : 0;
-    int mode = (int)fog.Mode;
-    glm::vec4 color = {fog.FogColor.r / 255.0f, fog.FogColor.g / 255.0f, fog.FogColor.b / 255.0f,
-                       fog.FogColor.a / 255.0f};
-
-    shader->GetShader()->SetInt("fogEnabled", enabled);
-    shader->GetShader()->SetVec4("fogColor", color);
-    shader->GetShader()->SetFloat("fogDensity", fog.Density);
-    shader->GetShader()->SetFloat("fogStart", fog.Start);
-    shader->GetShader()->SetFloat("fogEnd", fog.End);
-    shader->GetShader()->SetInt("fogMode", mode);
-}
-
-void Renderer::InitializeSkybox()
-{
-    m_Data->Skybox.SkyboxCubeModel = std::make_unique<Model>();
-    m_Data->Skybox.SkyboxCubeModel->Meshes.push_back(GeometryGenerator::GenerateUnitCube());
-
-    m_Data->Skybox.SkyboxSphereModel = std::make_unique<Model>();
-    m_Data->Skybox.SkyboxSphereModel->Meshes.push_back(GeometryGenerator::GenerateSphere(50.0f, 64, 64));
-}
-
-void Renderer::InitializeResources()
-{
-    m_Data->Resources.UnitCubeModel = std::make_unique<Model>();
-    m_Data->Resources.UnitCubeModel->Meshes.push_back(GeometryGenerator::GenerateUnitCube());
-
-    m_Data->Resources.UnitSphereModel = std::make_unique<Model>();
-    m_Data->Resources.UnitSphereModel->Meshes.push_back(GeometryGenerator::GenerateSphere(1.0f, 32, 32));
-
-    m_Data->Resources.WireCubeModel = std::make_unique<Model>();
-    m_Data->Resources.WireCubeModel->Meshes.push_back(GeometryGenerator::GenerateWireCube());
-}
-
-void Renderer::CleanupSkybox()
-{
-    m_Data->Skybox.SkyboxCubeModel.reset();
-    m_Data->Skybox.SkyboxSphereModel.reset();
-
-    m_Data->Skybox.CachedCubemap.reset();
-}
-
-void Renderer::CleanupResources()
-{
-    m_Data->Resources.UnitCubeModel.reset();
-    m_Data->Resources.UnitSphereModel.reset();
-    m_Data->Resources.WireCubeModel.reset();
-}
-} // namespace CHEngine
+#include "engine/core/service_locator.h"
+#include "engine/graphics/api/buffer.h"
+#include "engine/graphics/api/storage_buffer.h"
+#include "engine/graphics/api/vertex_array.h"
+#include "engine/assets/types/environment_asset.h"
+#include "engine/assets/types/shader_asset.h"
+
+#include <variant> // Added for type-safe variant visitation
+
+namespace Chained
+{
+
+	void Renderer::Initialize()
+	{
+		if (m_Headless)
+		{
+			GraphicsDevice::SetAPI(GraphicsDevice::API::None);
+			CH_CORE_INFO("[Renderer] Headless mode enabled, skipping OpenGL initialization.");
+			return;
+		}
+
+		GraphicsDevice::Set(GraphicsDevice::Create());
+		GraphicsDevice::Get().Init();
+
+		// Initialize lighting subsystem (SSBO + state)
+		m_LightingManager.Initialize();
+
+		// Initialize UBOs (must be before methods that reference them)
+		m_Data->CameraUBO = UniformBuffer::Create(sizeof(CameraData), 0);
+
+		// Initialize shared GPU geometry (fullscreen quad, billboard/sprite quad)
+		m_GeometryFactory.Initialize();
+
+		InitializeSkybox();
+	}
+
+	void Renderer::LoadEngineResources()
+	{
+		if (m_ResourcesLoaded)
+		{
+			return;
+		}
+
+		auto& shaders = GetShaderLibrary();
+
+		shaders.LoadConfig("engine/resources/config/shaders.yaml");
+
+		// Eager load common shaders if needed, or let them lazy load
+		shaders.LoadOrGet("Lighting");
+		shaders.LoadOrGet("Skinned");
+		shaders.LoadOrGet("Unlit");
+		shaders.LoadOrGet("Billboard");
+
+		m_ResourcesLoaded = true;
+		CH_CORE_INFO("[Renderer] LoadEngineResources done. {} shader(s) loaded.", shaders.GetNames().size());
+	}
+
+	void Renderer::Shutdown()
+	{
+		CH_CORE_INFO("Shutting down Render System...");
+
+		if (m_Headless)
+		{
+			return;
+		}
+
+		CleanupSkybox();
+
+		m_LightingManager.Shutdown();
+		m_GeometryFactory.Shutdown();
+		m_Data->Shaders.reset();
+		m_Data->CameraUBO.reset();
+
+		m_Data->Instancing.VAOCache.clear();
+		m_Data->Instancing.Buffer.reset();
+
+		GraphicsDevice::Get().Shutdown();
+	}
+
+	Renderer::Renderer()
+	{
+		m_Data = std::make_unique<RendererData>();
+		m_Data->Shaders = std::make_unique<ShaderStorage>();
+	}
+
+	Renderer::~Renderer() = default;
+
+	void Renderer::BeginScene(const Camera3D& camera)
+	{
+		m_LightingManager.Upload();
+
+		// Use precomputed matrices from Camera3D
+		m_Data->Frame.CameraPosition = camera.Position;
+		m_Data->Frame.View = camera.ViewMatrix;
+		m_Data->Frame.Proj = camera.ProjectionMatrix;
+
+		// Upload to UBO
+		if (m_Data->CameraUBO)
+		{
+			CameraData cameraData;
+			cameraData.ViewProjection = m_Data->Frame.Proj * m_Data->Frame.View;
+			cameraData.Projection = m_Data->Frame.Proj;
+			cameraData.View = m_Data->Frame.View;
+			m_Data->CameraUBO->SetData(&cameraData, sizeof(CameraData));
+			m_Data->CameraUBO->BindBase(0);
+		}
+
+		// Track the default lighting shader handle for DrawMesh fallback
+		auto lightingShaderAsset = m_Data->Shaders->Exists("Lighting") ? m_Data->Shaders->Get("Lighting") : nullptr;
+		if (lightingShaderAsset && lightingShaderAsset->GetShader())
+		{
+			m_Data->Frame.CurrentShaderId = lightingShaderAsset->GetShader()->GetNativeHandle();
+		}
+	}
+
+	void Renderer::EndScene()
+	{
+		m_Data->Frame.CurrentShaderId = 0;
+	}
+
+	void Renderer::Clear(const glm::vec4& color)
+	{
+		Color chColor((unsigned char)(color.r * 255), (unsigned char)(color.g * 255), (unsigned char)(color.b * 255),
+					  (unsigned char)(color.a * 255));
+		GraphicsDevice::Get().Clear(chColor);
+	}
+
+	void Renderer::SetViewport(int x, int y, int width, int height)
+	{
+		GraphicsDevice::Get().SetViewport(x, y, width, height);
+	}
+
+	void Renderer::DrawMesh(const Mesh& mesh, const Material& material, const glm::mat4& transform)
+	{
+		uint32_t shaderId = material.ShaderID;
+		if (shaderId == 0)
+		{
+			shaderId = m_Data->Frame.CurrentShaderId;
+		}
+		if (shaderId == 0)
+		{
+			return;
+		}
+
+		auto shaderAsset = GetShaderLibrary().GetById(shaderId);
+		if (!shaderAsset)
+		{
+			return;
+		}
+
+		auto shader = shaderAsset->GetShader();
+		if (!shader)
+		{
+			return;
+		}
+
+		shader->Bind();
+
+		// Set model matrix
+		shader->SetMatrix("matModel", transform);
+
+		glm::mat4 matNormal = glm::transpose(glm::inverse(transform));
+		shader->SetMatrix("matNormal", matNormal);
+
+		// Bind VAO and Draw
+		if (mesh.VAO)
+		{
+			mesh.VAO->Bind();
+			// DrawIndexed only if the VAO actually has an index buffer. A mesh can carry
+			// TriangleCount > 0 yet lack an EBO (e.g. a malformed procedural mesh); calling
+			// glDrawElements then reads from a null index buffer and segfaults. Fall back to
+			// DrawArrays in that case rather than crashing the whole renderer.
+			if (mesh.TriangleCount > 0 && mesh.VAO->GetIndexBuffer())
+			{
+				GraphicsDevice::Get().DrawIndexed(mesh.VAO, mesh.TriangleCount * 3);
+			}
+			else
+			{
+				GraphicsDevice::Get().DrawArrays(mesh.VertexCount);
+			}
+			mesh.VAO->Unbind();
+		}
+	}
+
+	void Renderer::DrawMeshInstanced(const Mesh& mesh, const Material& material,
+									 const std::vector<glm::mat4>& transforms)
+	{
+		if (transforms.empty() || !mesh.VAO)
+		{
+			return;
+		}
+
+		uint32_t shaderId = material.ShaderID;
+		if (shaderId == 0)
+		{
+			shaderId = m_Data->Frame.CurrentShaderId;
+		}
+		if (shaderId == 0)
+		{
+			return;
+		}
+
+		auto shaderAsset = GetShaderLibrary().GetById(shaderId);
+		if (!shaderAsset)
+		{
+			return;
+		}
+
+		auto shader = shaderAsset->GetShader();
+		if (!shader)
+		{
+			return;
+		}
+
+		shader->Bind();
+
+		// Set up matrices
+		glm::mat4 mvp = m_Data->Frame.Proj * m_Data->Frame.View;
+		shader->SetMatrix("u_ViewProjection", mvp);
+		shader->SetMatrix("u_Transform", glm::mat4(1.0f));
+
+		// 1. Manage/Reuse Instance Buffer
+		uint32_t dataSize = (uint32_t)(transforms.size() * sizeof(glm::mat4));
+		if (!m_Data->Instancing.Buffer || m_Data->Instancing.Capacity < dataSize)
+		{
+			// Reallocate if needed (starting at 1024 instances or required size)
+			m_Data->Instancing.Capacity = std::max(dataSize, (uint32_t)(1024 * sizeof(glm::mat4)));
+			m_Data->Instancing.Buffer = VertexBuffer::Create(m_Data->Instancing.Capacity);
+			m_Data->Instancing.Buffer->SetLayout({{VertexAttributeType::Mat4, "a_InstanceTransform", false, true}});
+
+			// Clear VAO cache because the VBO handle changed
+			m_Data->Instancing.VAOCache.clear();
+		}
+		m_Data->Instancing.Buffer->SetData(transforms.data(), dataSize);
+
+		// 2. Get or Create Cached Instanced VAO
+		auto& instancedVAO = m_Data->Instancing.VAOCache[mesh.VAO.get()];
+		if (!instancedVAO)
+		{
+			instancedVAO = VertexArray::Create();
+			for (const auto& vbo : mesh.VAO->GetVertexBuffers())
+			{
+				instancedVAO->AddVertexBuffer(vbo);
+			}
+			instancedVAO->AddVertexBuffer(m_Data->Instancing.Buffer);
+			instancedVAO->SetIndexBuffer(mesh.VAO->GetIndexBuffer());
+		}
+
+		// 3. Bind and Draw
+		instancedVAO->Bind();
+		if (mesh.TriangleCount > 0 && instancedVAO->GetIndexBuffer())
+		{
+			GraphicsDevice::Get().DrawIndexedInstanced(instancedVAO, (uint32_t)transforms.size(),
+													   mesh.TriangleCount * 3);
+		}
+		else
+		{
+			GraphicsDevice::Get().DrawArraysInstanced(mesh.VertexCount, (uint32_t)transforms.size());
+		}
+		instancedVAO->Unbind();
+	}
+
+	void Renderer::DrawSkybox(uint32_t textureId, int skyboxMode, bool isHDR, float exposure, float brightness,
+							  float contrast, const Camera3D& camera, bool flipped)
+	{
+		if (textureId == 0)
+		{
+			return;
+		}
+
+		skyboxMode = std::clamp(skyboxMode, 0, 2);
+
+		auto shaderAsset = (skyboxMode == 2) ? m_Data->Shaders->LoadOrGet("SkyboxCubemap")
+											 : (skyboxMode == 1 ? m_Data->Shaders->LoadOrGet("SkyboxCross")
+																: m_Data->Shaders->LoadOrGet("Skybox"));
+		if (!shaderAsset || !shaderAsset->GetShader())
+		{
+			return;
+		}
+
+		// 1. Prepare Render State
+		GraphicsDevice::Get().SetDepthFunc(GraphicsDevice::DepthFunc::LEqual);
+		GraphicsDevice::Get().SetCullMode(GraphicsDevice::CullMode::None);
+		GraphicsDevice::Get().DisableDepthMask();
+
+		// 2. Setup Uniforms
+		shaderAsset->GetShader()->Bind();
+
+		// Always remove translation from view matrix for skybox
+		glm::mat4 view = glm::mat4(glm::mat3(m_Data->Frame.View));
+		shaderAsset->GetShader()->SetMatrix("u_View", view);
+		shaderAsset->GetShader()->SetMatrix("u_Projection", m_Data->Frame.Proj);
+
+		shaderAsset->GetShader()->SetFloat("u_Exposure", exposure);
+		shaderAsset->GetShader()->SetFloat("u_Brightness", brightness);
+		shaderAsset->GetShader()->SetFloat("u_Contrast", contrast);
+		shaderAsset->GetShader()->SetInt("u_IsHDR", isHDR ? 1 : 0);
+		shaderAsset->GetShader()->SetInt("u_VFlipped", flipped ? 1 : 0);
+
+		// 3. Bind Textures and Draw Mesh
+		const char* texUniform = "u_Panorama";
+		uint32_t texFlags = 0; // 0 = 2D, true = cubemap
+		if (skyboxMode == 2)
+		{
+			texUniform = "u_Cubemap";
+			texFlags = true;
+		}
+		else if (skyboxMode == 1)
+		{
+			texUniform = "u_CrossMap";
+		}
+
+		GraphicsDevice::Get().SetTexture(0, textureId, texFlags != 0);
+		shaderAsset->GetShader()->SetInt(texUniform, 0);
+
+		auto& model = (skyboxMode == 0) ? m_Data->Skybox.SkyboxSphereModel : m_Data->Skybox.SkyboxCubeModel;
+		if (model && !model->Meshes.empty())
+		{
+			auto& mesh = model->Meshes[0];
+			mesh.VAO->Bind();
+			uint32_t indexCount = (skyboxMode == 0) ? mesh.TriangleCount * 3 : 36;
+			GraphicsDevice::Get().DrawIndexed(mesh.VAO, indexCount);
+			mesh.VAO->Unbind();
+		}
+
+		// 4. Restore Render State
+		GraphicsDevice::Get().SetDepthFunc(GraphicsDevice::DepthFunc::LEqual);
+		GraphicsDevice::Get().SetCullMode(GraphicsDevice::CullMode::Back);
+		GraphicsDevice::Get().EnableDepthMask();
+	}
+
+	void Renderer::DrawBillboard(const Camera3D& camera, uint32_t textureId, const glm::vec3& position, float size,
+								 const glm::vec4& tint)
+	{
+		auto billboardShaderAsset = m_Data->Shaders->LoadOrGet("Billboard");
+		if (!billboardShaderAsset || !billboardShaderAsset->GetShader() || textureId == 0)
+		{
+			return;
+		}
+
+		auto shader = billboardShaderAsset->GetShader();
+		shader->Bind();
+
+		glm::vec3 look = glm::normalize(camera.Position - position);
+		glm::vec3 right = glm::cross(camera.Up, look);
+		if (glm::length(right) < 0.0001f)
+		{
+			right = glm::vec3(1.0f, 0.0f, 0.0f);
+		}
+		else
+		{
+			right = glm::normalize(right);
+		}
+		glm::vec3 up = glm::normalize(glm::cross(look, right));
+
+		glm::mat4 model = glm::mat4(1.0f);
+		model[0] = glm::vec4(right * size, 0.0f);
+		model[1] = glm::vec4(up * size, 0.0f);
+		model[2] = glm::vec4(look * size, 0.0f);
+		model[3] = glm::vec4(position, 1.0f);
+
+		shader->SetMatrix("mvp", m_Data->Frame.Proj * m_Data->Frame.View * model);
+		shader->SetVec4("colDiffuse", tint);
+
+		GraphicsDevice::Get().SetTexture(0, textureId);
+		shader->SetInt("texture0", 0);
+
+		PipelineStateGuard stateGuard;
+		stateGuard.WithBlend().WithCullNone();
+
+		auto& quadVAO = m_GeometryFactory.GetQuad();
+		quadVAO->Bind();
+		GraphicsDevice::Get().DrawIndexed(quadVAO, 6);
+		quadVAO->Unbind();
+	}
+
+	void Renderer::ApplyPostProcessing(uint32_t screenTextureId, uint32_t depthTextureId, const Camera3D& camera,
+									   ShaderAsset* overrideShader, const std::vector<ShaderUniform>& uniforms)
+	{
+		std::shared_ptr<ShaderAsset> shaderAsset = nullptr;
+
+		if (overrideShader)
+		{
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				auto handle = am->ResolveToHandle(overrideShader->GetPath());
+				shaderAsset = am->Get<ShaderAsset>(handle);
+			}
+		}
+		else
+		{
+			shaderAsset = m_Data->Shaders->LoadOrGet("PostProcess");
+		}
+
+		if (shaderAsset && shaderAsset->GetShader())
+		{
+			auto shader = shaderAsset->GetShader();
+			shader->Bind();
+
+			// Safe extraction of diagnostic float values from variant
+			float diagIntensity = 0.0f;
+			for (const auto& u : uniforms)
+			{
+				if (u.Name == "uIntensity")
+				{
+					if (auto* fVal = std::get_if<float>(&u.Value))
+					{
+						diagIntensity = *fVal;
+					}
+				}
+			}
+			if (diagIntensity > 0.001f)
+			{
+				CH_CORE_TRACE("[RENDER DIAG] Applying shader '{}', Intensity={}", shaderAsset->GetPath(),
+							  diagIntensity);
+			}
+
+			// 1. Set System Uniforms
+			glm::mat4 identity = glm::mat4(1.0f);
+			shader->SetMatrix("mvp", identity);
+
+			glm::mat4 invViewProj = glm::inverse(m_Data->Frame.Proj * m_Data->Frame.View);
+			shader->SetMatrix("matInverseViewProj", invViewProj);
+			shader->SetVec3("viewPos", camera.Position);
+
+			float currentSeconds = (float)m_Data->Frame.Time.GetSeconds();
+			shader->SetFloat("uTimeF", currentSeconds);
+			shader->SetFloat("uTime", currentSeconds);
+			shader->SetFloat("time", currentSeconds);
+			shader->SetFloat("uExposure", m_LightingManager.GetLighting().CurrentLighting.Exposure);
+			shader->SetFloat("uGamma", m_LightingManager.GetLighting().CurrentLighting.Gamma);
+
+			// 2. Set Custom Uniforms using type-safe std::visit
+			ApplyShaderUniforms(shader.get(), uniforms);
+
+			// 3. Bind Textures
+			GraphicsDevice::Get().SetTexture(0, screenTextureId);
+			shader->SetInt("texture0", 0);
+
+			GraphicsDevice::Get().SetTexture(1, depthTextureId);
+			shader->SetInt("texture1", 1);
+
+			GraphicsDevice::Get().DisableDepthTest();
+
+			auto& fsQuad = m_GeometryFactory.GetFullscreenQuad();
+			fsQuad->Bind();
+			GraphicsDevice::Get().DrawIndexed(fsQuad, 6);
+			fsQuad->Unbind();
+
+			GraphicsDevice::Get().EnableDepthTest();
+			GraphicsDevice::Get().SetCullMode(GraphicsDevice::CullMode::Back);
+		}
+	}
+
+	void Renderer::Update(Timestep ts)
+	{
+		m_Data->Frame.Time = ts;
+	}
+
+	ShaderAsset* Renderer::BindShader(const std::string& name)
+	{
+		auto shaderAsset = m_Data->Shaders->LoadOrGet(name);
+		if (!shaderAsset || !shaderAsset->GetShader())
+		{
+			return nullptr;
+		}
+		shaderAsset->GetShader()->Bind();
+		return shaderAsset.get();
+	}
+
+	void Renderer::InitializeSkybox()
+	{
+		m_Data->Skybox.SkyboxCubeModel = std::make_unique<Model>();
+		m_Data->Skybox.SkyboxCubeModel->Meshes.push_back(GeometryGenerator::GenerateUnitCube());
+
+		m_Data->Skybox.SkyboxSphereModel = std::make_unique<Model>();
+		m_Data->Skybox.SkyboxSphereModel->Meshes.push_back(GeometryGenerator::GenerateSphere(50.0f, 64, 64));
+	}
+
+	void Renderer::CleanupSkybox()
+	{
+		m_Data->Skybox.SkyboxCubeModel.reset();
+		m_Data->Skybox.SkyboxSphereModel.reset();
+		m_Data->Skybox.CachedCubemap.reset();
+	}
+
+	void Renderer::DrawSprite(uint32_t textureId, const glm::mat4& transform, const glm::vec4& tint, bool flipX,
+							  bool flipY)
+	{
+		if (textureId == 0)
+		{
+			return;
+		}
+
+		auto shaderAsset = m_Data->Shaders->LoadOrGet("Sprite");
+		if (!shaderAsset || !shaderAsset->GetShader())
+		{
+			return;
+		}
+
+		auto shader = shaderAsset->GetShader();
+		shader->Bind();
+
+		shader->SetMatrix("mvp", m_Data->Frame.Proj * m_Data->Frame.View * transform);
+		shader->SetMatrix("matModel", transform);
+		shader->SetVec4("u_Tint", tint);
+		shader->SetVec2("u_Flip", glm::vec2(flipX ? 1.0f : 0.0f, flipY ? 1.0f : 0.0f));
+
+		PipelineStateGuard stateGuard;
+		stateGuard.WithBlend().WithCullNone();
+
+		auto& quadVAO = m_GeometryFactory.GetQuad();
+		quadVAO->Bind();
+		GraphicsDevice::Get().DrawIndexed(quadVAO, 6);
+		quadVAO->Unbind();
+	}
+
+	// --- Frame methods (formerly in FrameManager) ---
+
+	void Renderer::SetDiagnosticMode(float mode)
+	{
+		m_Data->Frame.DiagnosticMode = mode;
+	}
+
+	void Renderer::UpdateTime(Timestep time)
+	{
+		m_Data->Frame.Time = time;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/graphics/pipeline/renderer.h b/engine/graphics/pipeline/renderer.h
index c127551fc..a7521cd31 100644
--- a/engine/graphics/pipeline/renderer.h
+++ b/engine/graphics/pipeline/renderer.h
@@ -1,152 +1,126 @@
 #ifndef CH_RENDERER_H
 #define CH_RENDERER_H
 
-#include "engine/core/timestep.h"
-#include "engine/graphics/assets/environment.h"
-#include "engine/graphics/pipeline/shader_library.h"
-#include "engine/graphics/api/camera_types.h"
-#include "engine/graphics/pipeline/renderer_types.h"
+#include "engine/core/service.h"
+#include "engine/common/timestep.h"
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/graphics/camera_types.h"
+#include "engine/graphics/pipeline/renderer_data.h"
+#include "engine/graphics/pipeline/lighting_manager.h"
+#include "engine/graphics/pipeline/geometry_factory.h"
+#include "engine/graphics/pipeline/shader_storage.h"
+#include "engine/assets/types/environment_asset.h"
 #include <glm/glm.hpp>
 #include <memory>
 #include <vector>
 
-namespace CHEngine
+namespace Chained
 {
-    class Texture;
 
-// Packed light data uploaded to the renderer SSBO.
-struct RenderLight
-{
-    glm::vec4 color = {1.0f, 1.0f, 1.0f, 1.0f}; // 16 bytes
-    glm::vec3 position = {0, 0, 0};              // 12 bytes
-    float intensity = 1.0f;                  // 4 bytes
-    glm::vec3 direction = {0, -1, 0};            // 12 bytes
-    float radius = 10.0f;                     // 4 bytes
-    float innerCutoff = 15.0f;                // 4 bytes
-    float outerCutoff = 20.0f;                // 4 bytes
-    int type = 0;                               // 4 bytes
-    int enabled = 0;                            // 4 bytes
-};
-
-// Per-frame lighting state shared by scene rendering and post-processing.
-struct LightingData
-{
-    static constexpr int MaxLights = 256;
-    RenderLight Lights[MaxLights];
-    unsigned int LightSSBO = 0;
-    bool LightsDirty = true;
-
-    LightingSettings CurrentLighting;
-    FogSettings CurrentFog;
-};
-
-// Shared mesh resources for primitive and debug rendering.
-struct StaticResources
-{
-    std::unique_ptr<Model> UnitCubeModel;
-    std::unique_ptr<Model> UnitSphereModel;
-    std::unique_ptr<Model> WireCubeModel;  // 12-edge wireframe cube for GL_LINES
-};
-
-// Cached skybox resources and the last uploaded environment texture.
-struct SkyboxData
-{
-    std::unique_ptr<Model> SkyboxCubeModel;
-    std::unique_ptr<Model> SkyboxSphereModel;
-
-    std::shared_ptr<Texture> CachedCubemap;
-    std::string CachedCubemapPath = "";
-    unsigned int SourceTextureId = 0;
-};
-
-// Mutable renderer state owned by the singleton renderer.
-struct RendererData
-{
-    SkyboxData Skybox;
-    StaticResources Resources;
-    LightingData Lighting;
-
-    std::unique_ptr<ShaderLibrary> Shaders;
-
-    float DiagnosticMode = 0.0f;
-    glm::vec3 CurrentCameraPosition = {0.0f, 0.0f, 0.0f};
-    Timestep Time = 0.0f;
-    int LightCount = 0;
-    unsigned int CurrentShaderId = 0;
-    EnvironmentSettings CurrentEnv;
-
-    glm::mat4 CurrentView = glm::mat4(1.0f);
-    glm::mat4 CurrentProj = glm::mat4(1.0f);
-    
-    // Engine static resources
-    std::shared_ptr<VertexArray> FullscreenQuadVAO;
-    std::shared_ptr<VertexArray> BillboardVAO;
-};
-
-// Singleton renderer facade that owns GPU resources, frame state, and low-level draw calls.
-class Renderer
-{
-public:
-    static void Init();
-    static void Shutdown();
-    static Renderer& Get();
-    static void LoadEngineResources();
-
-    Renderer();
-    ~Renderer();
-
-    void InternalInit();
-    void InternalShutdown();
-
-    void InitializeResources();
-    void CleanupResources();
-
-    void BeginScene(const Camera3D& camera, float nearClip = 0.01f, float farClip = 10000.0f);
-    void EndScene();
-
-    void Clear(const glm::vec4& color);
-    void SetViewport(int x, int y, int width, int height);
-
-    // Low-level Draw calls
-    void DrawMesh(const Mesh& mesh, const Material& material, const glm::mat4& transform);
-    void DrawMeshInstanced(const Mesh& mesh, const Material& material, const std::vector<glm::mat4>& transforms);
-    void DrawMeshWire(const Mesh& mesh, const glm::vec4& color, const glm::mat4& transform, bool useWireframe = true);
-    
-    void DrawLine(const glm::vec3& start, const glm::vec3& end, const glm::vec4& color);
-    void DrawGrid(int slices, float spacing);
-    void DrawInfiniteGrid(const Camera3D& camera, float spacing, const glm::vec4& color);
-    void DrawSkybox(uint32_t textureId, int skyboxMode, bool isHDR, float exposure, float brightness, float contrast, const Camera3D& camera);
-    void DrawBillboard(const Camera3D& camera, uint32_t textureId, const glm::vec3& position, float size, const glm::vec4& tint);
-    void DrawCubeWires(const glm::mat4& transform, const glm::vec3& size, const glm::vec4& color);
-    void DrawCapsuleWires(const glm::mat4& transform, float radius, float height, const glm::vec4& color);
-    void DrawSphereWires(const glm::mat4& transform, float radius, const glm::vec4& color);
-
-    void ApplyPostProcessing(uint32_t screenTextureId, uint32_t depthTextureId, const Camera3D& camera);
-
-    // Light management
-    void SetLight(int index, const RenderLight& light);
-    void SetLightCount(int count);
-    void ClearLights();
-    void ApplyEnvironment(const EnvironmentSettings& settings);
-    void SetMainLight(const LightingSettings& settings);
-    void SetDiagnosticMode(float mode);
-    void UpdateTime(Timestep time);
-
-    ShaderLibrary& GetShaderLibrary() { return *m_Data->Shaders; }
-    RendererData& GetData() { return *m_Data; }
-
-    static bool IsInitialized();
-private:
-    void ApplyFogUniforms(const std::shared_ptr<ShaderAsset>& shader);
-    void InitializeSkybox();
-    void CleanupSkybox();
-
-private:
-    std::unique_ptr<RendererData> m_Data;
-    bool m_Initialized = false;
-
-    static Renderer* s_Instance;
-};
-} // namespace CHEngine
-
-#endif // CH_RENDERER_H
+	class Shader;
+	class ShaderAsset;
+
+	/// @brief Singleton renderer facade that owns GPU resources, frame state, and low-level draw calls.
+	///
+	/// Manages the OpenGL rendering pipeline: shader compilation, uniform buffer management,
+	/// draw call batching, skybox rendering, and post-processing. Accessed globally via ServiceLocator.
+	class CH_API Renderer : public Service
+	{
+	public:
+		Renderer();
+		virtual ~Renderer() override;
+
+		/// @brief Load engine-level shaders and static resources (unit meshes, fullscreen quad).
+		void LoadEngineResources();
+		void InitializeResources();
+
+		/// @brief Begin a new render frame with the given camera.
+		void BeginScene(const Camera3D& camera);
+
+		/// @brief Flush pending draw calls and finalize the frame.
+		void EndScene();
+
+		void Clear(const glm::vec4& color);
+		void SetViewport(int x, int y, int width, int height);
+
+		// Low-level Draw calls
+		void DrawMesh(const Mesh& mesh, const Material& material, const glm::mat4& transform);
+		void DrawMeshInstanced(const Mesh& mesh, const Material& material, const std::vector<glm::mat4>& transforms);
+		void DrawSkybox(uint32_t textureId, int skyboxMode, bool isHDR, float exposure, float brightness,
+						float contrast, const Camera3D& camera, bool flipped = false);
+		void DrawBillboard(const Camera3D& camera, uint32_t textureId, const glm::vec3& position, float size,
+						   const glm::vec4& tint);
+		void DrawSprite(uint32_t textureId, const glm::mat4& transform, const glm::vec4& tint, bool flipX = false,
+						bool flipY = false);
+		void ApplyPostProcessing(uint32_t screenTextureId, uint32_t depthTextureId, const Camera3D& camera,
+								 ShaderAsset* overrideShader = nullptr,
+								 const std::vector<ShaderUniform>& uniforms = {});
+
+		// Lighting (delegated to LightingManager)
+		LightingManager& GetLightingManager()
+		{
+			return m_LightingManager;
+		}
+		const LightingManager& GetLightingManager() const
+		{
+			return m_LightingManager;
+		}
+
+		// Frame
+		void SetDiagnosticMode(float mode);
+		void UpdateTime(Timestep time);
+
+		ShaderStorage& GetShaderLibrary()
+		{
+			return *m_Data->Shaders;
+		}
+		const FrameState& GetFrame() const
+		{
+			return m_Data->Frame;
+		}
+
+		void SetHeadless(bool headless)
+		{
+			m_Headless = headless;
+		}
+		void SetViewportSize(uint32_t width, uint32_t height)
+		{
+			m_ViewportWidth = width;
+			m_ViewportHeight = height;
+		}
+		uint32_t GetViewportWidth() const
+		{
+			return m_ViewportWidth;
+		}
+		uint32_t GetViewportHeight() const
+		{
+			return m_ViewportHeight;
+		}
+		bool IsHeadless() const
+		{
+			return m_Headless;
+		}
+
+	protected:
+		virtual void Initialize() override;
+		virtual void Shutdown() override;
+		void Update(Timestep ts);
+
+	private:
+		void InitializeSkybox();
+		void CleanupSkybox();
+		ShaderAsset* BindShader(const std::string& name);
+
+	private:
+		std::unique_ptr<RendererData> m_Data;
+		LightingManager m_LightingManager;
+		GeometryFactory m_GeometryFactory;
+		bool m_Headless = false;
+		bool m_ResourcesLoaded = false;
+		uint32_t m_ViewportWidth = 1280;
+		uint32_t m_ViewportHeight = 720;
+	};
+
+} // namespace Chained
+
+#endif // CH_RENDERER_H
\ No newline at end of file
diff --git a/engine/graphics/pipeline/renderer_data.h b/engine/graphics/pipeline/renderer_data.h
new file mode 100644
index 000000000..c82f62b9d
--- /dev/null
+++ b/engine/graphics/pipeline/renderer_data.h
@@ -0,0 +1,117 @@
+#ifndef CH_RENDERER_DATA_H
+#define CH_RENDERER_DATA_H
+
+#include "engine/assets/types/environment_asset.h"
+#include "engine/common/timestep.h"
+#include "engine/graphics/api/buffer.h"
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/graphics/api/storage_buffer.h"
+#include "engine/graphics/api/vertex_array.h"
+#include "engine/graphics/camera_types.h"
+#include "engine/graphics/pipeline/shader_storage.h"
+#include <glm/glm.hpp>
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+namespace Chained
+{
+
+	// ---------------------------------------------------------------------------
+	// RenderLight — packed light data uploaded per-frame to the SSBO (binding 0)
+	// ---------------------------------------------------------------------------
+	struct RenderLight
+	{
+		glm::vec4 color = {1.0f, 1.0f, 1.0f, 1.0f}; // 16 bytes
+		glm::vec3 position = {0, 0, 0};				// 12 bytes
+		float intensity = 1.0f;						// 4 bytes
+		glm::vec3 direction = {0, -1, 0};			// 12 bytes
+		float radius = 10.0f;						// 4 bytes
+		float innerCutoff = 15.0f;					// 4 bytes
+		float outerCutoff = 20.0f;					// 4 bytes
+		int lightType = 0;							// 4 bytes
+		int enabled = 0;							// 4 bytes
+	};
+
+	// ---------------------------------------------------------------------------
+	// CameraData — uploaded once per frame to UBO (binding 0)
+	// Must match layout in resources/shaders/include/camera.glsl
+	// ---------------------------------------------------------------------------
+	struct CameraData
+	{
+		glm::mat4 ViewProjection;
+		glm::mat4 Projection;
+		glm::mat4 View;
+	};
+
+	// ---------------------------------------------------------------------------
+	// LightingData — owns the SSBO and all per-frame lighting state
+	// ---------------------------------------------------------------------------
+	struct LightingData
+	{
+		static constexpr int MaxLights = 256;
+
+		RenderLight Lights[MaxLights];
+		std::shared_ptr<StorageBuffer> LightSSBO;
+		bool LightsDirty = true;
+		int LightCount = 0;
+		LightingSettings CurrentLighting;
+		FogSettings CurrentFog;
+	};
+
+	// ---------------------------------------------------------------------------
+	// SkyboxData — cached skybox geometry and texture handle
+	// ---------------------------------------------------------------------------
+	struct SkyboxData
+	{
+		std::unique_ptr<Model> SkyboxCubeModel;
+		std::unique_ptr<Model> SkyboxSphereModel;
+		std::shared_ptr<Texture> CachedCubemap;
+		std::string CachedCubemapPath;
+		unsigned int SourceTextureId = 0;
+	};
+
+	struct FrameState
+	{
+		glm::vec3 CameraPosition = {0.0f, 0.0f, 0.0f};
+		Timestep Time = 0.0f;
+		float DiagnosticMode = 0.0f;
+		unsigned int CurrentShaderId = 0;
+		glm::mat4 View = glm::mat4(1.0f);
+		glm::mat4 Proj = glm::mat4(1.0f);
+	};
+
+	// Shadow state — propagated from ShadowPass after Execute
+	struct ShadowState
+	{
+		bool Enabled = false;
+		uint32_t MapTextureID = 0;
+		glm::mat4 LightSpaceMatrix = glm::mat4(1.0f);
+		float Bias = 0.005f;
+	};
+
+	// GPU instancing cache
+	struct InstancingState
+	{
+		std::shared_ptr<class VertexBuffer> Buffer;
+		uint32_t Capacity = 0;
+		std::unordered_map<VertexArray*, std::shared_ptr<VertexArray>> VAOCache;
+	};
+
+	// RendererData — composes all sub-states; owned by the Renderer singleton
+	// ---------------------------------------------------------------------------
+	struct RendererData
+	{
+		SkyboxData Skybox;
+		FrameState Frame;
+		InstancingState Instancing;
+
+		std::unique_ptr<ShaderStorage> Shaders;
+		std::shared_ptr<UniformBuffer> CameraUBO;
+
+		EnvironmentSettings CurrentEnv;
+	};
+
+} // namespace Chained
+
+#endif // CH_RENDERER_DATA_H
diff --git a/engine/graphics/pipeline/renderer_types.cpp b/engine/graphics/pipeline/renderer_types.cpp
deleted file mode 100644
index 3cf25de87..000000000
--- a/engine/graphics/pipeline/renderer_types.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "renderer_types.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/core/assets/asset_manager.h"
-
-namespace CHEngine
-{
-
-Model Model::CreateFromFile(const std::string& path)
-{
-    auto asset = AssetManager::Get().Get<ModelAsset>(path);
-    if (asset && asset->GetState() == AssetState::Ready)
-    {
-        return asset->GetModel();
-    }
-    return Model{};
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/pipeline/renderer_types.h b/engine/graphics/pipeline/renderer_types.h
deleted file mode 100644
index 436350b64..000000000
--- a/engine/graphics/pipeline/renderer_types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef CH_RENDERER_TYPES_H
-#define CH_RENDERER_TYPES_H
-
-#include "engine/core/ch_math.h"
-#include <string>
-#include <vector>
-#include <memory>
-#include "engine/graphics/api/vertex_array.h"
-
-namespace CHEngine
-{
-    struct Material
-    {
-        glm::vec4 AlbedoColor = { 1.0f, 1.0f, 1.0f, 1.0f };
-        glm::vec4 EmissiveColor = { 0.0f, 0.0f, 0.0f, 1.0f };
-        float EmissiveIntensity = 0.0f;
-        float Metalness = 0.0f;
-        float Roughness = 0.5f;
-
-        uint32_t AlbedoMap = 0;
-        uint32_t NormalMap = 0;
-        uint32_t MetallicRoughnessMap = 0;
-        uint32_t EmissiveMap = 0;
-        uint32_t OcclusionMap = 0;
-
-        std::string AlbedoPath;
-        std::string NormalPath;
-        std::string MetallicRoughnessPath;
-        std::string EmissivePath;
-        std::string OcclusionPath;
-
-        uint32_t ShaderID = 0;
-
-        std::string Name;
-    };
-
-    struct Mesh
-    {
-        std::shared_ptr<VertexArray> VAO;
-        uint32_t VertexCount = 0;
-        uint32_t TriangleCount = 0;
-        int MaterialIndex = 0;
-
-        glm::vec3 MinBounds = { 0.0f, 0.0f, 0.0f };
-        glm::vec3 MaxBounds = { 0.0f, 0.0f, 0.0f };
-    };
-
-    struct Model
-    {
-        std::vector<Mesh> Meshes;
-        std::vector<Material> Materials;
-        glm::mat4 Transform = glm::mat4(1.0f);
-
-        // Hazel-style asset loading
-        static Model CreateFromFile(const std::string& path);
-    };
-}
-
-#endif // CH_RENDERER_TYPES_H
diff --git a/engine/graphics/pipeline/scene_renderer.cpp b/engine/graphics/pipeline/scene_renderer.cpp
index 1860c94d3..ae49107b0 100644
--- a/engine/graphics/pipeline/scene_renderer.cpp
+++ b/engine/graphics/pipeline/scene_renderer.cpp
@@ -1,928 +1,356 @@
 #include "scene_renderer.h"
-#include "engine/audio/audio.h"
-#include "engine/core/application.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/ch_assert.h"
-#include "engine/core/profiler.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/graphics/assets/shader_asset.h"
-#include "engine/graphics/loaders/model_loader.h"
+#include "engine/assets/asset.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/types/shader_asset.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/api/graphics_device.h"
+#include "engine/graphics/pipeline/debug_renderer.h"
 #include "engine/graphics/pipeline/frustum.h"
+#include "engine/graphics/pipeline/shader_uniform_utils.h"
 #include "engine/graphics/pipeline/renderer.h"
-#include "engine/graphics/pipeline/texture_utility.h"
-#include "engine/graphics/texture_system.h"
-#include "engine/physics/physics.h"
-#include "engine/scene/components/camera_component.h"
-#include "engine/scene/components/game_components.h"
-#include "engine/scene/components/light_component.h"
-#include "engine/scene/components/mesh_component.h"
-#include "imgui.h"
-#include <GLFW/glfw3.h>
-#include <algorithm>
-#include <glad/gl.h>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/quaternion.hpp>
-
-namespace CHEngine
+#include "engine/graphics/pipeline/lighting_manager.h"
+#include "engine/graphics/pipeline/material_manager.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+#include "engine/graphics/nametag_system.h"
+#include "engine/core/platform.h"
+
+#include "engine/graphics/pipeline/passes/composite_pass.h"
+#include "engine/graphics/pipeline/passes/geometry_pass.h"
+#include "engine/graphics/pipeline/passes/shadow_pass.h"
+#include "engine/graphics/pipeline/passes/skybox_pass.h"
+
+namespace Chained
 {
 
-glm::mat4 SceneRenderer::GetWorldTransform(entt::registry& registry, entt::entity entity)
-{
-    if (registry.all_of<TransformComponent>(entity))
-    {
-        return registry.get<TransformComponent>(entity).WorldTransform;
-    }
-    return glm::mat4(1.0f);
-}
-
-glm::vec3 SceneRenderer::GetWorldPosition(entt::registry& registry, entt::entity entity)
-{
-    return glm::vec3(GetWorldTransform(registry, entity)[3]);
-}
-
-void SceneRenderer::RenderScene(Scene* scene, const Camera3D& camera, float nearClip, float farClip,
-                                const SceneRenderOptions& options)
-{
-    CH_PROFILE_FUNCTION();
-    if (!Renderer::IsInitialized() || !scene)
-    {
-        return;
-    }
-
-    glEnable(GL_DEPTH_TEST);
-
-    auto environment = scene->GetSettings().Environment;
-    if (!environment)
-    {
-        environment = options.EnvironmentOverride;
-    }
-
-    if (environment)
-    {
-        Renderer::Get().ApplyEnvironment(environment->GetSettings());
-    }
-
-    Renderer::Get().UpdateTime(Timestep((float)glfwGetTime()));
-
-    m_CurrentStats = {};
-    m_CurrentStats.EntityCount = (uint32_t)scene->GetRegistry().storage<entt::entity>().size();
-
-    Audio::Get().SetListenerPosition(camera.Position, glm::normalize(camera.Target - camera.Position), camera.Up);
-
-    Renderer::Get().BeginScene(camera, nearClip, farClip);
-    {
-        if (environment)
-        {
-            const auto& envSettings = environment->GetSettings();
-            const auto& settings = envSettings.Skybox;
-            if (!settings.TexturePath.empty())
-            {
-                auto textureHandle = TextureSystem::Get().LoadTexture(settings.TexturePath);
-                auto texture = TextureSystem::Get().GetTexture(textureHandle);
-                if (texture)
-                {
-                    int skyboxMode = std::clamp(settings.Mode, 0, 2);
-                    uint32_t texId = texture->GetRendererID();
-                    auto& renderer = Renderer::Get();
-                    auto& rd = renderer.GetData();
-
-                    if (skyboxMode == 2)
-                    {
-                        if (!rd.Skybox.CachedCubemap || rd.Skybox.CachedCubemapPath != settings.TexturePath)
-                        {
-                            auto genShader = rd.Shaders->LoadOrGet("CubemapGen", "engine/resources/shaders/cubemap.chshader");
-                            if (genShader && rd.Skybox.SkyboxCubeModel && !rd.Skybox.SkyboxCubeModel->Meshes.empty())
-                            {
-                                rd.Skybox.CachedCubemap =
-                                    TextureUtility::GenTextureCubemap(genShader->GetShader()->GetRendererID(), texId,
-                                                                      1024, rd.Skybox.SkyboxCubeModel->Meshes[0]);
-                                rd.Skybox.CachedCubemapPath = settings.TexturePath;
-                                rd.Skybox.SourceTextureId = texId;
-                            }
-                        }
-                        if (rd.Skybox.CachedCubemap)
-                        {
-                            texId = rd.Skybox.CachedCubemap->GetRendererID();
-                        }
-                    }
-                    renderer.DrawSkybox(texId, skyboxMode, TextureSystem::Get().IsHDR(textureHandle), settings.Exposure, settings.Brightness,
-                                        settings.Contrast, camera);
-                }
-            }
-        }
-
-        RenderModels(scene, camera, nearClip, farClip);
-        RenderDebug(scene, camera, options);
-        if (options.ShowEditorIcons)
-        {
-            RenderEditorIcons(scene, camera);
-        }
-    }
-    Renderer::Get().EndScene();
-
-    Profiler::UpdateStats(m_CurrentStats);
-}
-
-void SceneRenderer::RenderModels(Scene* scene, const Camera3D& camera, float nearClip, float farClip)
-{
-    auto& registry = scene->GetRegistry();
-    Frustum frustum;
-    {
-        float w = (float)Application::Get().GetWindow().GetWidth();
-        float h = (float)Application::Get().GetWindow().GetHeight();
-        float aspect = (h > 0) ? (float)w / (float)h : 1.0f;
-        glm::mat4 view = glm::lookAt(camera.Position, camera.Target, camera.Up);
-        glm::mat4 proj =
-            (camera.Projection == 0)
-                ? glm::perspective(glm::radians(camera.Fovy), aspect, nearClip, farClip)
-                : glm::ortho(-aspect * camera.Fovy, aspect * camera.Fovy, -camera.Fovy, camera.Fovy, nearClip, farClip);
-        frustum.Extract(proj * view);
-    }
-
-    PrepareLights(registry, frustum);
-
-    std::vector<AnimatedEntry> animatedEntries;
-    CollectAndRenderItems(registry, frustum, animatedEntries);
-    DrawAnimatedEntities(animatedEntries);
-}
-
-void SceneRenderer::PrepareLights(entt::registry& registry, const Frustum& frustum)
-{
-    Renderer::Get().ClearLights();
-    int lightCount = 0;
-    auto view = registry.view<LightComponent>();
-    for (auto entity : view)
-    {
-        auto& light = view.get<LightComponent>(entity);
-        glm::vec3 worldPos = GetWorldPosition(registry, entity);
-        if (light.Type != LightType::Directional && !frustum.IsSphereVisible(worldPos, light.Radius))
-        {
-            continue;
-        }
-
-        RenderLight rl;
-        rl.color = {light.LightColor.r / 255.0f, light.LightColor.g / 255.0f, light.LightColor.b / 255.0f,
-                    light.LightColor.a / 255.0f};
-        rl.position = worldPos;
-        rl.intensity = (light.Intensity > 0.0f) ? light.Intensity : 0.0f;
-        rl.radius = light.Radius;
-        rl.type = (int)light.Type;
-        rl.enabled = 1;
-        Renderer::Get().SetLight(lightCount++, rl);
-    }
-    Renderer::Get().SetLightCount(lightCount);
-}
-
-void SceneRenderer::CollectAndRenderItems(entt::registry& registry, const Frustum& frustum,
-                                          std::vector<AnimatedEntry>& animatedEntries)
-{
-    auto meshView = registry.view<TransformComponent, ModelComponent>();
-    auto& am = AssetManager::Get();
-
-    for (auto entity : meshView)
-    {
-        auto [transform, mesh] = meshView.get<TransformComponent, ModelComponent>(entity);
-        if (mesh.ModelPath.empty())
-        {
-            continue;
-        }
-
-        auto modelAsset = am.Get<ModelAsset>(mesh.ModelPath);
-        if (!modelAsset)
-        {
-            continue;
-        }
-
-        // Sync materials if not already initialized
-        mesh.SyncMaterials(modelAsset->GetID());
-
-        AssetState state = modelAsset->GetState();
-        if (state != AssetState::Ready)
-        {
-            continue;
-        }
-
-        if (!frustum.IsBoxVisible(modelAsset->GetBoundingBox(), transform.WorldTransform))
-        {
-            continue;
-        }
-
-        std::shared_ptr<ShaderAsset> shaderOver;
-        std::vector<ShaderUniform> uniforms;
-        if (registry.all_of<ShaderComponent>(entity))
-        {
-            auto& sc = registry.get<ShaderComponent>(entity);
-            if (sc.Enabled && !sc.ShaderPath.empty())
-            {
-                shaderOver = am.Get<ShaderAsset>(sc.ShaderPath);
-                uniforms = sc.Uniforms;
-            }
-        }
-
-        std::vector<MaterialSlot> materials = mesh.Materials;
-        if (registry.all_of<MaterialComponent>(entity))
-        {
-            materials = registry.get<MaterialComponent>(entity).Materials;
-        }
-
-        if (registry.all_of<AnimationComponent>(entity))
-        {
-            AnimatedEntry entry;
-            entry.asset = modelAsset;
-            entry.worldTransform = transform.WorldTransform;
-            entry.materials = materials;
-            entry.shaderOverride = shaderOver;
-            entry.customUniforms = uniforms;
-            entry.animation = registry.get<AnimationComponent>(entity);
-            animatedEntries.push_back(std::move(entry));
-        }
-        else
-        {
-            DrawModel(modelAsset, transform.WorldTransform, materials, {}, shaderOver, uniforms);
-        }
-    }
-
-    auto primView = registry.view<TransformComponent, PrimitiveComponent>();
-    for (auto entity : primView)
-    {
-        auto [transform, primitive] = primView.get<TransformComponent, PrimitiveComponent>(entity);
-        if (primitive.Type == PrimitiveType::None)
-        {
-            continue;
-        }
-
-        if (!primitive.Asset || primitive.Dirty)
-        {
-            const char* paths[] = {
-                "", ":cube:", ":sphere:", ":plane:", ":cylinder:", ":cone:", ":torus:", ":knot:", ":hemisphere:"};
-            int idx = (int)primitive.Type;
-            if (idx > 0 && idx < 9)
-            {
-                ProceduralParameters p;
-                p.Radius = primitive.Radius;
-                p.Height = primitive.Height;
-                p.Slices = primitive.Slices;
-                p.Stacks = primitive.Stacks;
-                p.Dimensions = primitive.Dimensions;
-                Model m = ModelLoader::GenerateProceduralModel(paths[idx], p);
-                if (!m.Meshes.empty())
-                {
-                    if (!primitive.Asset)
-                    {
-                        primitive.Asset = std::make_shared<ModelAsset>();
-                        primitive.Asset->SetPath(paths[idx]);
-                    }
-                    primitive.Asset->SetModel(m);
-                    primitive.Asset->SetState(AssetState::Ready);
-                }
-                primitive.Dirty = false;
-            }
-        }
-
-        if (!primitive.Asset || primitive.Asset->GetState() != AssetState::Ready)
-        {
-            continue;
-        }
-        if (!frustum.IsBoxVisible(primitive.Asset->GetBoundingBox(), transform.WorldTransform))
-        {
-            continue;
-        }
-
-        std::shared_ptr<ShaderAsset> shaderOver;
-        if (registry.all_of<ShaderComponent>(entity))
-        {
-            auto& sc = registry.get<ShaderComponent>(entity);
-            if (sc.Enabled && !sc.ShaderPath.empty())
-            {
-                shaderOver = am.Get<ShaderAsset>(sc.ShaderPath);
-            }
-        }
-        DrawModel(primitive.Asset, transform.WorldTransform, {}, {}, shaderOver);
-    }
-}
-
-void SceneRenderer::DrawAnimatedEntities(const std::vector<AnimatedEntry>& animatedEntries)
-{
-    for (const auto& entry : animatedEntries)
-    {
-        std::vector<glm::mat4> boneMatrices;
-        if (entry.animation.CurrentAnimationIndex >= 0 && entry.asset)
-        {
-            boneMatrices = entry.asset->GetBoneMatrices(entry.animation.CurrentAnimationIndex, entry.animation.CurrentFrame);
-        }
-        DrawModel(entry.asset, entry.worldTransform, entry.materials, boneMatrices, entry.shaderOverride, entry.customUniforms);
-    }
-}
-
-void SceneRenderer::DrawModel(const std::shared_ptr<ModelAsset>& modelAsset, const glm::mat4& transform,
-                              const std::vector<MaterialSlot>& materialSlotOverrides,
-                              const std::vector<glm::mat4>& boneMatrices,
-                              const std::shared_ptr<ShaderAsset>& shaderOverride,
-                              const std::vector<ShaderUniform>& shaderUniformOverrides)
-{
-    if (!modelAsset || modelAsset->GetState() != AssetState::Ready)
-    {
-        return;
-    }
-
-    auto& model = modelAsset->GetModel();
-    auto& renderer = Renderer::Get();
-    auto activeShader =
-        shaderOverride
-            ? shaderOverride
-            : (renderer.GetShaderLibrary().Exists("Lighting") ? renderer.GetShaderLibrary().Get("Lighting") : nullptr);
-
-    if (!activeShader || !activeShader->GetShader())
-    {
-        return;
-    }
-
-    for (const auto& inst : modelAsset->GetInstances())
-    {
-        int i = inst.meshIndex;
-        if (i < 0 || i >= (int)model.Meshes.size())
-        {
-            continue;
-        }
-
-        m_CurrentStats.DrawCalls++;
-        m_CurrentStats.MeshCount++;
-        m_CurrentStats.PolyCount += model.Meshes[i].TriangleCount;
-
-        Material material = ResolveMaterialForMesh(i, model, materialSlotOverrides, modelAsset);
-
-        BindShaderUniforms(activeShader.get(), boneMatrices, shaderUniformOverrides);
-        BindMaterialUniforms(activeShader.get(), material, i, model, materialSlotOverrides);
-
-        uint32_t originalID = material.ShaderID;
-        material.ShaderID = activeShader->GetShader()->GetRendererID();
-
-        bool useSkinning = !boneMatrices.empty();
-        activeShader->GetShader()->Bind();
-        activeShader->GetShader()->SetInt("useSkinning", useSkinning ? 1 : 0);
-
-        renderer.DrawMesh(model.Meshes[i], material, useSkinning ? transform : transform * inst.localTransform);
-        material.ShaderID = originalID;
-    }
-}
-
-Material SceneRenderer::ResolveMaterialForMesh(int meshIndex, const Model& model,
-                                               const std::vector<MaterialSlot>& materialSlotOverrides,
-                                               const std::shared_ptr<ModelAsset>& modelAsset)
-{
-    Material material = model.Materials[model.Meshes[meshIndex].MaterialIndex];
-    for (const auto& slot : materialSlotOverrides)
-    {
-        bool match =
-            (slot.Target == MaterialSlotTarget::MeshIndex && slot.Index == meshIndex) ||
-            (slot.Target == MaterialSlotTarget::MaterialIndex && slot.Index == model.Meshes[meshIndex].MaterialIndex);
-        if (match)
-        {
-            material.AlbedoColor = {slot.Material.AlbedoColor.r / 255.0f, slot.Material.AlbedoColor.g / 255.0f,
-                                    slot.Material.AlbedoColor.b / 255.0f, slot.Material.AlbedoColor.a / 255.0f};
-            if (slot.Material.OverrideAlbedo && !slot.Material.AlbedoPath.empty())
-            {
-                // Check if this is an embedded texture (path starts with '*')
-                if (modelAsset && slot.Material.AlbedoPath.front() == '*')
-                {
-                    uint32_t embeddedTexID = modelAsset->GetEmbeddedTextureID(slot.Material.AlbedoPath);
-                    if (embeddedTexID > 0)
-                    {
-                        material.AlbedoMap = embeddedTexID;
-                    }
-                }
-                else
-                {
-                    auto textureHandle = TextureSystem::Get().LoadTexture(slot.Material.AlbedoPath);
-                    material.AlbedoMap = TextureSystem::Get().GetRendererID(textureHandle);
-                }
-            }
-            material.EmissiveIntensity = slot.Material.EmissiveIntensity;
-            material.Metalness = slot.Material.Metalness;
-            material.Roughness = slot.Material.Roughness;
-            break;
-        }
-    }
-    return material;
-}
-
-void SceneRenderer::BindShaderUniforms(ShaderAsset* shaderAsset, const std::vector<glm::mat4>& boneMatrices,
-                                       const std::vector<ShaderUniform>& overrides)
-{
-    auto shader = shaderAsset->GetShader();
-    shader->Bind();
-
-    auto& rd = Renderer::Get().GetData();
-    const auto& lighting = rd.Lighting.CurrentLighting;
-
-    glm::vec4 lightColor = {lighting.LightColor.r / 255.0f, lighting.LightColor.g / 255.0f,
-                            lighting.LightColor.b / 255.0f, lighting.LightColor.a / 255.0f};
-    glm::vec4 skyColor = lightColor;
-    skyColor.w = lighting.Ambient * 0.35f;
-
-    shader->SetVec3("viewPos", rd.CurrentCameraPosition);
-    shader->SetFloat("uTime", rd.Time);
-    shader->SetFloat("uMode", rd.DiagnosticMode);
-    shader->SetVec3("lightDir", lighting.Direction);
-    shader->SetVec4("lightColor", lightColor);
-    shader->SetFloat("ambient", lighting.Ambient);
-    shader->SetVec4("skyAmbientColor", skyColor);
-    shader->SetInt("uLightCount", rd.LightCount);
-    shader->SetFloat("uExposure", lighting.Exposure);
-    shader->SetFloat("uGamma", lighting.Gamma);
-
-    if (!boneMatrices.empty())
-    {
-        shader->SetMatrices("boneMatrices", boneMatrices.data(), std::min((int)boneMatrices.size(), 128));
-    }
-    for (const auto& u : overrides)
-    {
-        if (u.Type == 0)
-        {
-            shader->SetFloat(u.Name, u.Value[0]);
-        }
-        else if (u.Type == 1)
-        {
-            shader->SetVec2(u.Name, {u.Value[0], u.Value[1]});
-        }
-        else if (u.Type == 2)
-        {
-            shader->SetVec3(u.Name, {u.Value[0], u.Value[1], u.Value[2]});
-        }
-        else if (u.Type >= 3)
-        {
-            shader->SetVec4(u.Name, {u.Value[0], u.Value[1], u.Value[2], u.Value[3]});
-        }
-    }
-}
-
-void SceneRenderer::BindMaterialUniforms(ShaderAsset* shaderAsset, const Material& material, int meshIndex,
-                                         const Model& model, const std::vector<MaterialSlot>& overrides)
-{
-    auto shader = shaderAsset->GetShader();
-    shader->Bind();
-
-    auto resolveMap = [](uint32_t currentId, const std::string& path) -> uint32_t {
-        if (currentId > 0)
-        {
-            return currentId;
-        }
-        // Embedded textures (path starts with '*') are never in the AssetManager.
-        // Their GPU ID is stored directly in AlbedoMap/NormalMap etc. by model_asset.cpp.
-        if (path.empty() || (!path.empty() && path.front() == '*'))
-        {
-            return 0;
-        }
-        auto textureHandle = TextureSystem::Get().LoadTexture(path);
-        return TextureSystem::Get().GetRendererID(textureHandle);
-    };
-
-    uint32_t albedoMap = resolveMap(material.AlbedoMap, material.AlbedoPath);
-    uint32_t normalMap = resolveMap(material.NormalMap, material.NormalPath);
-    uint32_t metallicMap = resolveMap(material.MetallicRoughnessMap, material.MetallicRoughnessPath);
-    uint32_t emissiveMap = resolveMap(material.EmissiveMap, material.EmissivePath);
-    uint32_t occlusionMap = resolveMap(material.OcclusionMap, material.OcclusionPath);
-
-    // 1. Albedo (texture0, Unit 0)
-    if (albedoMap > 0)
-    {
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, albedoMap);
-        shader->SetInt("texture0", 0);
-        shader->SetInt("useTexture", 1);
-    }
-    else
-    {
-        shader->SetInt("useTexture", 0);
-    }
-    shader->SetVec4("colDiffuse", material.AlbedoColor);
-
-    // 2. Metallic (texture1, Unit 1)
-    if (metallicMap > 0)
-    {
-        glActiveTexture(GL_TEXTURE1);
-        glBindTexture(GL_TEXTURE_2D, metallicMap);
-        shader->SetInt("texture1", 1);
-        shader->SetInt("useMetallicMap", 1);
-        shader->SetInt("useRoughnessMap", 1); // GLTF packed map
-    }
-    else
-    {
-        shader->SetInt("useMetallicMap", 0);
-        shader->SetInt("useRoughnessMap", 0);
-    }
-
-    // 3. Normal (texture2, Unit 2)
-    if (normalMap > 0)
-    {
-        glActiveTexture(GL_TEXTURE2);
-        glBindTexture(GL_TEXTURE_2D, normalMap);
-        shader->SetInt("texture2", 2);
-        shader->SetInt("useNormalMap", 1);
-    }
-    else
-    {
-        shader->SetInt("useNormalMap", 0);
-    }
-
-    // 4. Roughness (texture3, Unit 3) - Often same as metallicMap in GLTF
-    if (metallicMap > 0)
-    {
-        glActiveTexture(GL_TEXTURE3);
-        glBindTexture(GL_TEXTURE_2D, metallicMap);
-        shader->SetInt("texture3", 3);
-    }
-
-    // 5. Occlusion (texture4, Unit 4)
-    if (occlusionMap > 0)
-    {
-        glActiveTexture(GL_TEXTURE4);
-        glBindTexture(GL_TEXTURE_2D, occlusionMap);
-        shader->SetInt("texture4", 4);
-        shader->SetInt("useOcclusionMap", 1);
-    }
-    else
-    {
-        shader->SetInt("useOcclusionMap", 0);
-    }
-
-    // 6. Emissive (texture5, Unit 5)
-    if (emissiveMap > 1)
-    {
-        glActiveTexture(GL_TEXTURE5);
-        glBindTexture(GL_TEXTURE_2D, emissiveMap);
-        shader->SetInt("texture5", 5);
-        shader->SetInt("useEmissiveTexture", 1);
-    }
-    else
-    {
-        shader->SetInt("useEmissiveTexture", 0);
-    }
-
-    shader->SetFloat("metalness", material.Metalness);
-    shader->SetFloat("roughness", material.Roughness);
-    shader->SetVec4("colEmissive", material.EmissiveColor);
-    shader->SetFloat("emissiveIntensity", material.EmissiveIntensity);
-}
-
-void SceneRenderer::RenderDebug(Scene* scene, const Camera3D& camera, const SceneRenderOptions& options)
-{
-    if (!options.ShowDebugColliders && !options.ShowDebugCollisionModelBox && !options.ShowDebugSpawnZones &&
-        !options.DrawGrid)
-    {
-        return;
-    }
-
-    auto& registry = scene->GetRegistry();
-
-    // Save current GL state
-    GLboolean depthTestEnabled = glIsEnabled(GL_DEPTH_TEST);
-    GLboolean blendEnabled = glIsEnabled(GL_BLEND);
-    GLint polygonMode[2];
-    glGetIntegerv(GL_POLYGON_MODE, polygonMode);
-
-    // Setup for debug drawing
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_BLEND);
-    if (options.SetCollisionWireframeMode == 1)
-    {
-        glPolygonMode(GL_FRONT_FACE_COMMAND_NV, GL_LINE);
-    }
-    else
-    {
-        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-    }
-
-    if (options.DrawGrid && scene->GetSettings().Mode == BackgroundMode::Environment3D)
-    {
-        Renderer::Get().DrawInfiniteGrid(camera, scene->GetSettings().Grid.Spacing, {0.8f, 0.8f, 0.8f, 1.0f});
-    }
-
-    if (options.ShowDebugColliders)
-    {
-        DrawColliderDebug(registry, options);
-    }
-
-    if (options.ShowDebugCollisionModelBox)
-    {
-        DrawCollisionModelBoxDebug(registry);
-    }
-
-    if (options.ShowDebugSpawnZones)
-    {
-        DrawSpawnDebug(registry);
-    }
-
-    // Restore GL state
-    if (depthTestEnabled)
-    {
-        glEnable(GL_DEPTH_TEST);
-    }
-    else
-    {
-        glDisable(GL_DEPTH_TEST);
-    }
-
-    if (blendEnabled)
-    {
-        glEnable(GL_BLEND);
-    }
-    else
-    {
-        glDisable(GL_BLEND);
-    }
-
-    glPolygonMode(GL_FRONT_AND_BACK, polygonMode[0]);
-    glBindVertexArray(0); // Unbind VAO
-}
-
-void SceneRenderer::DrawColliderDebug(entt::registry& registry, const SceneRenderOptions& options)
-{
-    auto view = registry.view<TransformComponent, ColliderComponent>();
-    for (auto entity : view)
-    {
-        auto [transform, collider] = view.get<TransformComponent, ColliderComponent>(entity);
-        if (!collider.Enabled)
-        {
-            continue;
-        }
-        glm::vec4 color = collider.IsColliding ? glm::vec4(1, 0, 0, 1) : glm::vec4(0, 1, 0, 1);
-        if (collider.Type == ColliderType::Box || collider.Type == ColliderType::Sphere ||
-            collider.Type == ColliderType::Capsule)
-        {
-            // Extract scale from WorldTransform column lengths
-            glm::vec3 entityScale(glm::length(glm::vec3(transform.WorldTransform[0])),
-                                  glm::length(glm::vec3(transform.WorldTransform[1])),
-                                  glm::length(glm::vec3(transform.WorldTransform[2])));
-
-            // Build a rotation-only transform (remove scale from matrix)
-            glm::mat4 rotTrans = transform.WorldTransform;
-            if (entityScale.x > 0.0001f)
-            {
-                rotTrans[0] = glm::vec4(glm::vec3(rotTrans[0]) / entityScale.x, 0.0f);
-            }
-            if (entityScale.y > 0.0001f)
-            {
-                rotTrans[1] = glm::vec4(glm::vec3(rotTrans[1]) / entityScale.y, 0.0f);
-            }
-            if (entityScale.z > 0.0001f)
-            {
-                rotTrans[2] = glm::vec4(glm::vec3(rotTrans[2]) / entityScale.z, 0.0f);
-            }
-
-            glm::mat4 baseTransform = rotTrans * glm::translate(glm::mat4(1.0f), collider.Offset);
-
-            if (collider.Type == ColliderType::Box)
-            {
-                Renderer::Get().DrawCubeWires(baseTransform, collider.Size * entityScale, color);
-            }
-            else if (collider.Type == ColliderType::Sphere)
-            {
-                // For sphere, we use the maximum component of the entity scale for the overall radius multiplier
-                float maxScale = glm::max(entityScale.x, glm::max(entityScale.y, entityScale.z));
-                Renderer::Get().DrawSphereWires(baseTransform, collider.Radius * maxScale, color);
-            }
-            else if (collider.Type == ColliderType::Capsule)
-            {
-                float maxScale = glm::max(entityScale.x, glm::max(entityScale.y, entityScale.z));
-                Renderer::Get().DrawCapsuleWires(baseTransform, collider.Radius * maxScale,
-                                                 collider.Height * entityScale.y, color);
-            }
-        }
-        else if (collider.Type == ColliderType::Mesh)
-        {
-            AssetHandle modelHandle = collider.ModelHandle;
-
-            // Fallback to visual mesh if AutoCalculate is enable and handle is 0
-            if (modelHandle == 0 && collider.AutoCalculate && registry.all_of<ModelComponent>(entity))
-            {
-                auto& mc = registry.get<ModelComponent>(entity);
-                auto asset = AssetManager::Get().Get<ModelAsset>(mc.ModelPath);
-                if (asset)
-                {
-                    modelHandle = asset->GetID();
-                }
-            }
-
-            if (modelHandle != 0)
-            {
-                auto modelAsset = AssetManager::Get().Get<ModelAsset>(modelHandle);
-                if (modelAsset && modelAsset->IsReady())
-                {
-                    const auto& model = modelAsset->GetModel();
-                    const auto& instances = modelAsset->GetInstances();
-                    bool useWireframe = (options.SetCollisionWireframeMode == 0);
-                    for (const auto& inst : instances)
-                    {
-                        if (inst.meshIndex >= 0 && inst.meshIndex < (int)model.Meshes.size())
-                        {
-                            Renderer::Get().DrawMeshWire(model.Meshes[inst.meshIndex], color,
-                                                         transform.WorldTransform * inst.localTransform, useWireframe);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void SceneRenderer::DrawCollisionModelBoxDebug(entt::registry& registry)
-{
-    // Draw bounding boxes for collision model box entities
-    // This shows mesh collider bounding boxes
-    auto view = registry.view<TransformComponent, ColliderComponent>();
-    for (auto entity : view)
-    {
-        auto [transform, collider] = view.get<TransformComponent, ColliderComponent>(entity);
-        if (!collider.Enabled)
-        {
-            continue;
-        }
-
-        // Only render for mesh colliders
-        if (collider.Type != ColliderType::Mesh)
-        {
-            continue;
-        }
-
-        glm::vec4 color = glm::vec4(1.0f, 1.0f, 0.0f, 1.0f); // Yellow for collision model boxes
-
-        if (collider.ModelHandle != 0)
-        {
-            auto model = AssetManager::Get().Get<ModelAsset>(collider.ModelHandle);
-            if (model && model->IsReady())
-            {
-                const BoundingBox& localBox = model->GetBoundingBox();
-                glm::vec3 center = (localBox.Min + localBox.Max) * 0.5f;
-                glm::vec3 size = localBox.Max - localBox.Min;
-
-                // Note: transform.WorldTransform already includes entity scale,
-                // but the localBox is also scaled if the importer applied scale?
-                // Usually localBox is untransformed.
-                Renderer::Get().DrawCubeWires(transform.WorldTransform * glm::translate(glm::mat4(1.0f), center), size,
-                                              color);
-            }
-        }
-    }
-}
-
-void SceneRenderer::DrawSpawnDebug(entt::registry& registry)
-{
-    // Draw spawn zones
-    auto view = registry.view<TransformComponent, SpawnComponent>();
-    for (auto entity : view)
-    {
-        auto [transform, spawn] = view.get<TransformComponent, SpawnComponent>(entity);
-        if (!spawn.IsActive)
-        {
-            continue;
-        }
-
-        glm::vec4 color = glm::vec4(1.0f, 0.65f, 0.0f, 1.0f); // Orange for spawn zones
-
-        // Draw zone as wireframe cube
-        Renderer::Get().DrawCubeWires(transform.WorldTransform * glm::translate(glm::mat4(1.0f), spawn.SpawnPoint),
-                                      spawn.ZoneSize, color);
-    }
-}
-
-void SceneRenderer::RenderEditorIcons(Scene* scene, const Camera3D& camera)
-{
-    auto& registry = scene->GetRegistry();
-    const glm::vec3 activeCameraPos = camera.Position;
-
-    auto tryLoadIcon = [&](const char* path, unsigned int& cachedId) {
-        if (cachedId != 0)
-        {
-            return;
-        }
-
-        auto textureHandle = TextureSystem::Get().LoadTexture(path);
-        cachedId = TextureSystem::Get().GetRendererID(textureHandle);
-    };
-
-    tryLoadIcon("engine/resources/icons/camera_icon.png", m_EditorResources.CameraIconId);
-    tryLoadIcon("engine/resources/icons/light_bulb.png", m_EditorResources.LightIconId);
-    tryLoadIcon("engine/resources/icons/leaf_icon.png", m_EditorResources.SpawnIconId);
-
-    auto iconSizeFromDistance = [&](const glm::vec3& worldPos, float minSize, float maxSize, float scale) {
-        const float distanceToCamera = glm::distance(worldPos, activeCameraPos);
-        return std::clamp(distanceToCamera * scale, minSize, maxSize);
-    };
-
-    // Camera icons
-    auto cameraView = registry.view<TransformComponent, CameraComponent>();
-    for (auto entity : cameraView)
-    {
-        auto [transform, cameraComp] = cameraView.get<TransformComponent, CameraComponent>(entity);
-        (void)cameraComp;
-
-        const glm::vec3 iconPos = glm::vec3(transform.WorldTransform[3]);
-        if (glm::distance(iconPos, activeCameraPos) < 0.25f)
-        {
-            continue;
-        }
-
-        const float iconSize = iconSizeFromDistance(iconPos, 0.10f, 0.70f, 0.040f);
-        const glm::vec4 cameraTint = glm::vec4(0.65f, 0.95f, 1.0f, 0.95f);
-        if (m_EditorResources.CameraIconId != 0)
-        {
-            Renderer::Get().DrawBillboard(camera, m_EditorResources.CameraIconId, iconPos, iconSize, cameraTint);
-        }
-        else
-        {
-            Renderer::Get().DrawCubeWires(transform.WorldTransform, glm::vec3(iconSize * 0.35f), cameraTint);
-        }
-    }
-
-    // Light icons
-    if (scene->GetSettings().DebugFlags.DrawLights)
-    {
-        auto lightView = registry.view<TransformComponent, LightComponent>();
-        for (auto entity : lightView)
-        {
-            auto [transform, light] = lightView.get<TransformComponent, LightComponent>(entity);
-            const glm::vec3 iconPos = glm::vec3(transform.WorldTransform[3]);
-            const float iconSize = iconSizeFromDistance(iconPos, 0.10f, 0.85f, 0.045f);
-
-            glm::vec4 lightTint = {
-                light.LightColor.r / 255.0f,
-                light.LightColor.g / 255.0f,
-                light.LightColor.b / 255.0f,
-                0.95f,
-            };
-
-            if (m_EditorResources.LightIconId != 0)
-            {
-                Renderer::Get().DrawBillboard(camera, m_EditorResources.LightIconId, iconPos, iconSize, lightTint);
-                if (light.Type == LightType::Directional)
-                {
-                    glm::vec3 dir = glm::normalize(glm::vec3(transform.WorldTransform[2])) * 0.45f;
-                    Renderer::Get().DrawLine(iconPos, iconPos + dir, lightTint);
-                }
-            }
-            else if (light.Type == LightType::Directional)
-            {
-                glm::vec3 dir = glm::normalize(glm::vec3(transform.WorldTransform[2])) * 0.5f;
-                Renderer::Get().DrawLine(iconPos, iconPos + dir, lightTint);
-            }
-            else if (light.Type == LightType::Point)
-            {
-                Renderer::Get().DrawSphereWires(transform.WorldTransform, light.Radius * 0.1f, lightTint);
-            }
-            else if (light.Type == LightType::Spot)
-            {
-                Renderer::Get().DrawSphereWires(transform.WorldTransform, light.Radius * 0.05f, lightTint);
-            }
-        }
-    }
-
-    // Spawn icons
-    if (scene->GetSettings().DebugFlags.DrawSpawnZones)
-    {
-        auto spawnView = registry.view<TransformComponent, SpawnComponent>();
-        for (auto entity : spawnView)
-        {
-            auto [transform, spawn] = spawnView.get<TransformComponent, SpawnComponent>(entity);
-            if (!spawn.IsActive)
-            {
-                continue;
-            }
-
-            const glm::vec3 iconPos =
-                glm::vec3(transform.WorldTransform * glm::vec4(spawn.SpawnPoint, 1.0f));
-            const float iconSize = iconSizeFromDistance(iconPos, 0.09f, 0.60f, 0.036f);
-            const glm::vec4 spawnTint = glm::vec4(1.0f, 0.75f, 0.20f, 0.95f);
-
-            if (m_EditorResources.SpawnIconId != 0)
-            {
-                Renderer::Get().DrawBillboard(camera, m_EditorResources.SpawnIconId, iconPos, iconSize, spawnTint);
-            }
-        }
-    }
-}
-
-BoundingBox SceneRenderer::CalculateColliderWorldAABB(const ColliderComponent& collider,
-                                                      const glm::mat4& worldTransform)
-{
-    glm::vec3 halfExtents = collider.Size * 0.5f;
-    glm::vec3 min = collider.Offset - halfExtents;
-    glm::vec3 max = collider.Offset + halfExtents;
-    glm::vec3 corners[8] = {{min.x, min.y, min.z}, {max.x, min.y, min.z}, {min.x, max.y, min.z}, {max.x, max.y, min.z},
-                            {min.x, min.y, max.z}, {max.x, min.y, max.z}, {min.x, max.y, max.z}, {max.x, max.y, max.z}};
-    BoundingBox result = {{FLT_MAX, FLT_MAX, FLT_MAX}, {-FLT_MAX, -FLT_MAX, -FLT_MAX}};
-    for (int i = 0; i < 8; i++)
-    {
-        glm::vec3 worldCorner = glm::vec3(worldTransform * glm::vec4(corners[i], 1.0f));
-        result.Min.x = (worldCorner.x < result.Min.x) ? worldCorner.x : result.Min.x;
-        result.Min.y = (worldCorner.y < result.Min.y) ? worldCorner.y : result.Min.y;
-        result.Min.z = (worldCorner.z < result.Min.z) ? worldCorner.z : result.Min.z;
-        result.Max.x = (worldCorner.x > result.Max.x) ? worldCorner.x : result.Max.x;
-        result.Max.y = (worldCorner.y > result.Max.y) ? worldCorner.y : result.Max.y;
-        result.Max.z = (worldCorner.z > result.Max.z) ? worldCorner.z : result.Max.z;
-    }
-    return result;
-}
-
-} // namespace CHEngine
+	static glm::vec4 ColorToVec4(const Color& c)
+	{
+		return {c.r / 255.0f, c.g / 255.0f, c.b / 255.0f, c.a / 255.0f};
+	}
+
+	SceneRenderer::SceneRenderer()
+		: m_Collector(m_MaterialManager)
+	{
+		AddPass(std::make_unique<ShadowPass>());
+		AddPass(std::make_unique<SkyboxPass>());
+		AddPass(std::make_unique<GeometryPass>());
+		AddPass(std::make_unique<CompositePass>());
+	}
+
+	void SceneRenderer::AddPass(std::unique_ptr<IRenderPass> pass)
+	{
+		pass->Init();
+		m_RenderPasses.push_back(std::move(pass));
+	}
+
+	std::optional<Camera3D> SceneRenderer::GetActiveCamera(entt::registry& reg)
+	{
+		auto view = reg.view<CameraComponent, TransformComponent>();
+		for (auto entity : view)
+		{
+			auto [camera, transform] = view.get<CameraComponent, TransformComponent>(entity);
+			if (camera.Primary)
+			{
+				return camera.Camera.GetCamera3D(transform.WorldTransform);
+			}
+		}
+		return std::nullopt;
+	}
+
+	Entity SceneRenderer::GetPrimaryCameraEntity(entt::registry& reg, entt::registry* registryPtr)
+	{
+		auto view = reg.view<CameraComponent>();
+		for (auto entity : view)
+		{
+			if (view.get<CameraComponent>(entity).Primary)
+			{
+				return {entity, registryPtr};
+			}
+		}
+		return {};
+	}
+
+	void SceneRenderer::RenderScene(entt::registry& registry, const SceneSettings& settings, const Camera3D& camera,
+									const SceneRenderOptions& options)
+	{
+		CH_PROFILE_FUNCTION();
+
+		auto* renderer = ServiceLocator::TryGet<Renderer>();
+		if (!renderer)
+		{
+			return;
+		}
+
+		GraphicsDevice::Get().EnableDepthTest();
+
+		auto environment = options.EnvironmentOverride ? options.EnvironmentOverride : settings.Environment;
+
+		if (environment)
+		{
+			const auto& envSettings = environment->GetSettings();
+			renderer->GetLightingManager().ApplyEnvironment(envSettings);
+			m_CurrentEnv = envSettings;
+		}
+
+		renderer->UpdateTime(Timestep(Platform::GetTime()));
+
+		m_CurrentStats = {};
+		m_CurrentStats.EntityCount = (uint32_t)registry.storage<entt::entity>().size();
+
+		glm::mat4 view = camera.ViewMatrix;
+		glm::mat4 proj = camera.ProjectionMatrix;
+		Frustum frustum = FromMatrix(proj * view);
+
+		// Prepare lights (delegated to LightingManager via Renderer)
+		{
+			auto& lighting = renderer->GetLightingManager().GetLighting();
+			for (auto& l : lighting.Lights)
+			{
+				l.enabled = 0;
+			}
+			lighting.LightCount = 0;
+			lighting.LightsDirty = true;
+
+			int lightCount = 0;
+			auto lightView = registry.view<LightComponent>();
+			for (auto entity : lightView)
+			{
+				if (lightCount >= LightingData::MaxLights)
+				{
+					break;
+				}
+
+				auto& light = lightView.get<LightComponent>(entity);
+				glm::vec3 worldPos = Entity(entity, &registry).GetWorldPosition();
+				if (light.Type != LightType::Directional && !IsSphereVisible(frustum, worldPos, light.Radius))
+				{
+					continue;
+				}
+
+				RenderLight rl;
+				rl.position = worldPos;
+				rl.color = ColorToVec4(light.LightColor);
+				rl.intensity = light.Intensity;
+				rl.radius = light.Radius;
+				rl.lightType = (int)light.Type;
+				rl.direction = Entity(entity, &registry).GetForward();
+				rl.innerCutoff = light.InnerCutoff;
+				rl.outerCutoff = light.OuterCutoff;
+				rl.enabled = 1;
+
+				lighting.Lights[lightCount++] = rl;
+			}
+			lighting.LightsDirty = true;
+			lighting.LightCount = lightCount;
+		}
+
+		renderer->BeginScene(camera);
+
+		// Collect entities
+		m_Collector.Collect(registry, frustum, camera.Position);
+
+		// Sort transparent queue back-to-front once for all passes
+		auto& transparentQueue = m_Collector.GetTransparentQueue();
+		std::sort(transparentQueue.begin(), transparentQueue.end(),
+				  [](const auto& a, const auto& b) { return a.Distance > b.Distance; });
+
+		for (auto& pass : m_RenderPasses)
+		{
+			RenderContext ctx{registry, settings, camera, options, this};
+			pass->Execute(ctx);
+
+			if (pass->GetName() == "ShadowPass")
+			{
+				auto* shadowPass = static_cast<ShadowPass*>(pass.get());
+				uint32_t shadowTexID = 0;
+				if (shadowPass->HasShadows() && shadowPass->GetShadowMap())
+				{
+					shadowTexID = shadowPass->GetShadowMap()->GetDepthAttachmentRendererID();
+				}
+				renderer->GetLightingManager().SetShadowState(shadowPass->HasShadows(), shadowTexID,
+															  shadowPass->GetLightSpaceMatrix(), 0.003f);
+			}
+		}
+
+		RenderSprites(registry, camera);
+
+		// Debug overlay — delegated to DebugRenderer
+		if (auto* dbg = ServiceLocator::TryGet<DebugRenderer>())
+		{
+			dbg->RenderDebug(registry, settings, camera, options, *renderer);
+		}
+
+		NametagSystem::DrawNametags(registry, camera);
+
+		renderer->EndScene();
+
+		Instrumentor::Get().UpdateStats(m_CurrentStats);
+	}
+
+	void SceneRenderer::RenderSprites(entt::registry& registry, const Camera3D& camera)
+	{
+		CH_PROFILE_FUNCTION();
+		auto* renderer = ServiceLocator::TryGet<Renderer>();
+		if (!renderer)
+		{
+			return;
+		}
+		auto view = registry.view<TransformComponent, SpriteComponent>();
+
+		struct SpriteEntry
+		{
+			entt::entity Entity;
+			int ZOrder;
+		};
+
+		std::vector<SpriteEntry> sortedSprites;
+		for (auto entity : view)
+		{
+			sortedSprites.push_back(SpriteEntry{entity, registry.get<SpriteComponent>(entity).ZOrder});
+		}
+
+		std::sort(sortedSprites.begin(), sortedSprites.end(), [](const SpriteEntry& a, const SpriteEntry& b) {
+			if (a.ZOrder != b.ZOrder)
+			{
+				return a.ZOrder < b.ZOrder;
+			}
+			return a.Entity < b.Entity;
+		});
+
+		for (const auto& entry : sortedSprites)
+		{
+			auto& transform = registry.get<TransformComponent>(entry.Entity);
+			auto& sprite = registry.get<SpriteComponent>(entry.Entity);
+
+			if (sprite.TexturePath.empty())
+			{
+				continue;
+			}
+
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			auto textureAsset = am ? am->Get<TextureAsset>(sprite.TexturePath) : nullptr;
+			if (textureAsset && textureAsset->IsReady() && textureAsset->GetTexture())
+			{
+				renderer->DrawSprite(textureAsset->GetTexture()->GetNativeHandle(), transform.WorldTransform,
+									 ColorToVec4(sprite.Tint), sprite.FlipX, sprite.FlipY);
+			}
+		}
+	}
+
+	void SceneRenderer::DrawAnimatedEntities(const std::vector<AnimatedEntry>& animatedEntries)
+	{
+		for (const auto& entry : animatedEntries)
+		{
+			std::vector<glm::mat4> boneMatrices;
+			if (entry.Animation.CurrentAnimationIndex >= 0 && entry.Asset)
+			{
+				boneMatrices =
+					entry.Asset->GetBoneMatrices(entry.Animation.CurrentAnimationIndex, entry.Animation.CurrentFrame);
+			}
+			DrawModel(entry.Asset, entry.WorldTransform, boneMatrices, {}, entry.ShaderOverride, entry.CustomUniforms);
+		}
+	}
+
+	void SceneRenderer::DrawModel(Chained::ModelAsset* modelAsset, const glm::mat4& transform,
+								  const std::vector<glm::mat4>& boneMatrices,
+								  const std::vector<Chained::Material>& materials, Chained::Shader* shaderOverride,
+								  const std::vector<Chained::ShaderUniform>& shaderUniformOverrides,
+								  Chained::RenderPassStage pass)
+	{
+		auto* renderer = ServiceLocator::TryGet<Renderer>();
+		if (!renderer)
+		{
+			return;
+		}
+
+		if (!modelAsset || modelAsset->GetState() != Chained::AssetState::Ready)
+		{
+			return;
+		}
+
+		const auto& model = modelAsset->GetModel();
+		for (const auto& inst : modelAsset->GetInstances())
+		{
+			int i = inst.meshIndex;
+			if (i < 0 || i >= (int)model.Meshes.size())
+			{
+				continue;
+			}
+
+			const auto& mesh = model.Meshes[i];
+			m_CurrentStats.DrawCalls++;
+			m_CurrentStats.MeshCount++;
+
+			Material material = m_MaterialManager.Resolve(i, model, materials, modelAsset);
+
+			bool isTransparent = material.Transparent || material.AlbedoColor.a < 0.99f;
+			if (pass == RenderPassStage::Opaque && isTransparent)
+			{
+				continue;
+			}
+			if (pass == RenderPassStage::Transparent && !isTransparent)
+			{
+				continue;
+			}
+
+			bool useSkinning = mesh.HasSkinning && !boneMatrices.empty();
+			std::string fallbackName = useSkinning ? "Skinned" : "Lighting";
+			Shader* activeShader = shaderOverride;
+			if (!activeShader)
+			{
+				auto fallbackAsset = renderer->GetShaderLibrary().Exists(fallbackName)
+										 ? renderer->GetShaderLibrary().Get(fallbackName)
+										 : nullptr;
+				if (fallbackAsset)
+				{
+					activeShader = fallbackAsset->GetShader().get();
+				}
+			}
+
+			if (!activeShader)
+			{
+				continue;
+			}
+
+			BindShaderUniforms(activeShader, useSkinning ? boneMatrices : std::vector<glm::mat4>{},
+							   shaderUniformOverrides);
+			m_MaterialManager.Bind(activeShader, material, i, model);
+
+			uint32_t originalID = material.ShaderID;
+			material.ShaderID = activeShader->GetNativeHandle();
+
+			activeShader->Bind();
+			renderer->DrawMesh(mesh, material, transform * inst.localTransform);
+			material.ShaderID = originalID;
+		}
+	}
+
+	void SceneRenderer::BindShaderUniforms(Chained::Shader* shader, const std::vector<glm::mat4>& boneMatrices,
+										   const std::vector<Chained::ShaderUniform>& shaderUniformOverrides)
+	{
+		if (!shader)
+		{
+			return;
+		}
+
+		auto* renderer = ServiceLocator::TryGet<Renderer>();
+		if (!renderer)
+		{
+			return;
+		}
+
+		shader->Bind();
+
+		renderer->GetLightingManager().ApplyUniforms(shader, renderer->GetFrame());
+
+		if (!boneMatrices.empty())
+		{
+			shader->SetMatrices("boneMatrices", boneMatrices.data(), std::min((int)boneMatrices.size(), 128));
+		}
+
+		ApplyShaderUniforms(shader, shaderUniformOverrides);
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/pipeline/scene_renderer.h b/engine/graphics/pipeline/scene_renderer.h
index 2b64a8a6f..3e8893fee 100644
--- a/engine/graphics/pipeline/scene_renderer.h
+++ b/engine/graphics/pipeline/scene_renderer.h
@@ -1,102 +1,83 @@
 #ifndef CH_SCENE_RENDERER_H
 #define CH_SCENE_RENDERER_H
 
-#include "engine/graphics/pipeline/renderer.h"
-#include "engine/scene/scene.h"
+#include "engine/scene/scene_settings.h"
 #include "engine/core/profiler.h"
-#include <unordered_map>
+#include "engine/scene/entity.h"
+#include "engine/graphics/pipeline/render_pass.h"
+#include "engine/graphics/pipeline/material_manager.h"
+#include "engine/graphics/pipeline/entity_collector.h"
+#include <entt/entt.hpp>
 #include <memory>
 #include <vector>
 #include <glm/glm.hpp>
+#include "engine/graphics/api/texture.h"
 
-namespace CHEngine
+namespace Chained
 {
-struct Frustum;
-
-// Per-render-pass toggles for runtime and editor scene rendering.
-struct SceneRenderOptions
-{
-    std::shared_ptr<class EnvironmentAsset> EnvironmentOverride = nullptr;
-
-    bool ShowDebugColliders        = false;
-    bool ShowDebugCollisionModelBox = false;
-    bool ShowDebugSpawnZones       = true;
-    bool DrawGrid                  = false;
-    bool ShowEditorIcons           = true;
-    int  SetCollisionWireframeMode = 0;
-};
-
-// Cached editor icon textures used during scene rendering.
-struct EditorResourcesData
-{
-    unsigned int LightIconId   = 0;
-    unsigned int SpawnIconId   = 0;
-    unsigned int CameraIconId  = 0;
-};
-
-// High-level scene render orchestrator that collects visible entities, draws them, and emits debug overlays.
-class SceneRenderer
-{
-public:
-    SceneRenderer()  = default;
-    ~SceneRenderer() = default;
-
-    // Renders the scene using the supplied camera and options.
-    void RenderScene(Scene* scene, const Camera3D& camera, float nearClip, float farClip,
-                     const SceneRenderOptions& options);
-
-private:
-    struct AnimatedEntry
-    {
-        std::shared_ptr<class ModelAsset>  asset;
-        glm::mat4                          worldTransform;
-        std::vector<MaterialSlot>          materials;
-        std::shared_ptr<class ShaderAsset> shaderOverride;
-        std::vector<ShaderUniform>         customUniforms;
-        AnimationComponent                 animation;
-    };
-
-    // Render passes
-    void RenderModels(Scene* scene, const Camera3D& camera, float nearClip, float farClip);
-    void RenderDebug(Scene* scene, const Camera3D& camera, const SceneRenderOptions& options);
-    void RenderEditorIcons(Scene* scene, const Camera3D& camera);
-
-    // Helpers
-    void PrepareLights(entt::registry& registry, const Frustum& frustum);
-    void CollectAndRenderItems(entt::registry& registry, const Frustum& frustum,
-                               std::vector<AnimatedEntry>& animatedEntries);
-    
-    void DrawAnimatedEntities(const std::vector<AnimatedEntry>& animatedEntries);
-
-    void DrawModel(const std::shared_ptr<ModelAsset>& modelAsset, const glm::mat4& transform,
-                   const std::vector<MaterialSlot>& materialSlotOverrides = {},
-                   const std::vector<glm::mat4>& boneMatrices = {},
-                   const std::shared_ptr<ShaderAsset>& shaderOverride = nullptr,
-                   const std::vector<ShaderUniform>& shaderUniformOverrides = {});
-
-    Material ResolveMaterialForMesh(int meshIndex, const Model& model,
-                                   const std::vector<MaterialSlot>& materialSlotOverrides,
-                                   const std::shared_ptr<class ModelAsset>& modelAsset = nullptr);
-
-    void BindShaderUniforms(ShaderAsset* shader, const std::vector<glm::mat4>& boneMatrices,
-                           const std::vector<ShaderUniform>& shaderUniformOverrides);
-
-    void BindMaterialUniforms(ShaderAsset* shader, const Material& material, int meshIndex,
-                             const Model& model, const std::vector<MaterialSlot>& materialSlotOverrides);
-
-    void DrawColliderDebug(entt::registry& registry, const SceneRenderOptions& options);
-    void DrawCollisionModelBoxDebug(entt::registry& registry);
-    void DrawSpawnDebug(entt::registry& registry);
-
-    static BoundingBox CalculateColliderWorldAABB(const ColliderComponent& collider, const glm::mat4& worldTransform);
-    static glm::mat4 GetWorldTransform(entt::registry& registry, entt::entity entity);
-    static glm::vec3 GetWorldPosition(entt::registry& registry, entt::entity entity);
-
-private:
-    EditorResourcesData m_EditorResources;
-    ProfilerStats       m_CurrentStats;
-};
-
-} // namespace CHEngine
+	struct Frustum;
+	class AssetManager;
+	class Renderer; // forward declaration — full include in .cpp only
+	class Shader;	// forward declaration — full include in .cpp only
+
+	// High-level scene render orchestrator that collects visible entities, draws them, and emits debug overlays.
+	class SceneRenderer
+	{
+	public:
+		SceneRenderer();
+		~SceneRenderer() = default;
+
+		// Renders the scene using the supplied camera and options.
+		// Internally manages Renderer::BeginScene/EndScene — callers should NOT call them separately.
+		void RenderScene(entt::registry& registry, const SceneSettings& settings, const Camera3D& camera,
+						 const SceneRenderOptions& options);
+
+		// Architectural Helper: Retrieves the primary camera from scene entities.
+		static std::optional<Camera3D> GetActiveCamera(entt::registry& registry);
+		static Entity GetPrimaryCameraEntity(entt::registry& registry, entt::registry* registryPtr);
+
+		void AddPass(std::unique_ptr<IRenderPass> pass);
+
+		void DrawAnimatedEntities(const std::vector<AnimatedEntry>& animatedEntries);
+		void DrawModel(ModelAsset* modelAsset, const glm::mat4& transform,
+					   const std::vector<glm::mat4>& boneMatrices = {}, const std::vector<Material>& materials = {},
+					   Shader* shaderOverride = nullptr, const std::vector<ShaderUniform>& shaderUniformOverrides = {},
+					   RenderPassStage pass = RenderPassStage::Both);
+
+		void BindShaderUniforms(Shader* shader, const std::vector<glm::mat4>& boneMatrices,
+								const std::vector<ShaderUniform>& shaderUniformOverrides);
+
+		// Expose internals for passes
+		std::vector<RenderItem>& GetOpaqueQueue()
+		{
+			return m_Collector.GetOpaqueQueue();
+		}
+		std::vector<RenderItem>& GetTransparentQueue()
+		{
+			return m_Collector.GetTransparentQueue();
+		}
+		EnvironmentSettings& GetEnvironment()
+		{
+			return m_CurrentEnv;
+		}
+
+		void RenderSprites(entt::registry& registry, const Camera3D& camera);
+
+	private:
+		std::vector<std::unique_ptr<IRenderPass>> m_RenderPasses;
+
+		ProfilerStats m_CurrentStats;
+		MaterialManager m_MaterialManager;
+		EntityCollector m_Collector;
+
+		EnvironmentSettings m_CurrentEnv;
+
+		// Skybox cache
+		std::shared_ptr<Texture> m_CachedCubemap;
+		std::string m_CachedCubemapPath;
+		std::shared_ptr<ModelAsset> m_SkyboxCubeModel;
+	};
+
+} // namespace Chained
 
 #endif // CH_SCENE_RENDERER_H
diff --git a/engine/graphics/pipeline/scene_renderer_types.h b/engine/graphics/pipeline/scene_renderer_types.h
new file mode 100644
index 000000000..e43ca0948
--- /dev/null
+++ b/engine/graphics/pipeline/scene_renderer_types.h
@@ -0,0 +1,57 @@
+#ifndef CH_SCENE_RENDERER_TYPES_H
+#define CH_SCENE_RENDERER_TYPES_H
+
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/scene/components/animation/animation_component.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/types/environment_asset.h"
+#include <vector>
+#include <memory>
+#include <glm/glm.hpp>
+
+namespace Chained
+{
+
+	class Shader;
+
+	enum class RenderPassStage
+	{
+		Opaque,
+		Transparent,
+		Both
+	};
+
+	struct SceneRenderOptions
+	{
+		std::shared_ptr<EnvironmentAsset> EnvironmentOverride = nullptr;
+
+		bool ShowDebugColliders = false;
+		bool ShowDebugCollisionModelBox = false;
+		bool ShowDebugSpawnZones = false;
+		bool DrawGrid = false;
+		int SetCollisionWireframeMode = 0;
+	};
+
+	struct AnimatedEntry
+	{
+		ModelAsset* Asset;
+		glm::mat4 WorldTransform;
+		Shader* ShaderOverride;
+		std::vector<ShaderUniform> CustomUniforms;
+		AnimationComponent Animation;
+	};
+
+	struct RenderItem
+	{
+		ModelAsset* Asset;
+		glm::mat4 Transform;
+		std::vector<glm::mat4> BoneMatrices;
+		std::vector<Material> Materials;
+		Shader* ShaderOverride;
+		std::vector<ShaderUniform> CustomUniforms;
+		float Distance = 0.0f;
+	};
+
+} // namespace Chained
+
+#endif // CH_SCENE_RENDERER_TYPES_H
diff --git a/engine/graphics/pipeline/shader_library.cpp b/engine/graphics/pipeline/shader_library.cpp
deleted file mode 100644
index 0198b0866..000000000
--- a/engine/graphics/pipeline/shader_library.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "shader_library.h"
-#include "engine/core/ch_assert.h"
-#include "engine/core/log.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/scene/project.h"
-#include <filesystem>
-
-namespace CHEngine
-{
-void ShaderLibrary::Add(const std::string& name, const std::shared_ptr<ShaderAsset>& shader)
-{
-    CH_CORE_ASSERT(!Exists(name), "Shader already exists in library!");
-    m_Shaders[name] = shader;
-}
-
-void ShaderLibrary::Add(const std::shared_ptr<ShaderAsset>& shader)
-{
-    std::filesystem::path path = shader->GetPath();
-    Add(path.stem().string(), shader);
-}
-
-void ShaderLibrary::Load(const std::string& path)
-{
-    auto shader = AssetManager::Get().Get<ShaderAsset>(path);
-    if (shader)
-    {
-        Add(shader);
-    }
-}
-
-void ShaderLibrary::Load(const std::string& name, const std::string& path)
-{
-    auto shader = AssetManager::Get().Get<ShaderAsset>(path);
-    if (shader)
-    {
-        if (Exists(name))
-        {
-            m_Shaders[name] = shader;
-        }
-        else
-        {
-            Add(name, shader);
-        }
-    }
-}
-
-std::shared_ptr<ShaderAsset> ShaderLibrary::LoadOrGet(const std::string& name, const std::string& path)
-{
-    if (auto it = m_Shaders.find(name); it != m_Shaders.end())
-    {
-        return it->second;
-    }
-
-    auto shader = AssetManager::Get().Get<ShaderAsset>(path);
-    if (shader)
-    {
-        m_Shaders[name] = shader;
-    }
-    return shader;
-}
-
-std::shared_ptr<ShaderAsset> ShaderLibrary::Get(const std::string& name)
-{
-    CH_CORE_ASSERT(Exists(name), "Shader name not found!");
-    return m_Shaders[name];
-}
-
-std::shared_ptr<Shader> ShaderLibrary::GetShader(const std::string& name)
-{
-    if (auto asset = Get(name))
-    {
-        return asset->GetShader();
-    }
-    return nullptr;
-}
-
-std::shared_ptr<ShaderAsset> ShaderLibrary::GetById(uint32_t id) const
-{
-    for (const auto& [name, shader] : m_Shaders)
-    {
-        if (shader->GetShader() && shader->GetShader()->GetRendererID() == id)
-            return shader;
-    }
-    return nullptr;
-}
-
-bool ShaderLibrary::Exists(const std::string& name) const
-{
-    return m_Shaders.find(name) != m_Shaders.end();
-}
-
-std::vector<std::string> ShaderLibrary::GetNames() const
-{
-    std::vector<std::string> names;
-    for (const auto& [name, shader] : m_Shaders)
-    {
-        names.push_back(name);
-    }
-    return names;
-}
-
-void ShaderLibrary::ReloadAll()
-{
-    CH_CORE_INFO("ShaderLibrary: Reloading all shaders...");
-    
-    for (auto& [name, shader] : m_Shaders)
-    {
-        if (shader && !shader->GetPath().empty())
-        {
-            CH_CORE_TRACE("ShaderLibrary: Reloading shader '{}' from '{}'", name, shader->GetPath());
-            AssetManager::Get().Reload<ShaderAsset>(shader->GetPath());
-        }
-    }
-}
-} // namespace CHEngine
diff --git a/engine/graphics/pipeline/shader_library.h b/engine/graphics/pipeline/shader_library.h
deleted file mode 100644
index a9c3e71bf..000000000
--- a/engine/graphics/pipeline/shader_library.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef CH_SHADER_LIBRARY_H
-#define CH_SHADER_LIBRARY_H
-
-#include "engine/graphics/assets/shader_asset.h"
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-namespace CHEngine
-{
-// Named shader cache with load-on-demand and hot-reload support.
-class ShaderLibrary
-{
-public:
-    ShaderLibrary() = default;
-    ~ShaderLibrary() = default;
-
-    // Adds a shader under a unique library name; asserts if the name already exists.
-    void Add(const std::string& name, const std::shared_ptr<ShaderAsset>& shader);
-    // Adds a shader using the source file stem as the library key.
-    void Add(const std::shared_ptr<ShaderAsset>& shader);
-    // Loads a shader from disk and stores it under the source file stem.
-    void Load(const std::string& path);
-    // Loads a shader from disk and stores it under the provided name, replacing any existing entry.
-    void Load(const std::string& name, const std::string& path);
-    // Returns the cached shader if present; otherwise loads it from disk and caches it under the provided name.
-    std::shared_ptr<ShaderAsset> LoadOrGet(const std::string& name, const std::string& path);
-
-    // Returns the shader for a name; asserts if the name is missing.
-    std::shared_ptr<ShaderAsset> Get(const std::string& name);
-    // Returns the compiled GPU shader owned by the asset, or null if the asset has not produced one.
-    std::shared_ptr<Shader> GetShader(const std::string& name);
-    // Returns the shader asset matching a renderer ID by scanning the cache.
-    std::shared_ptr<ShaderAsset> GetById(uint32_t id) const;
-    // Checks whether a shader name exists in the cache.
-    bool Exists(const std::string& name) const;
-
-    // Exposes the cache for read-only iteration.
-    const std::unordered_map<std::string, std::shared_ptr<ShaderAsset>>& GetShaders() const
-    {
-        return m_Shaders;
-    }
-    // Returns a snapshot of the current shader names.
-    std::vector<std::string> GetNames() const;
-
-    // Reloads every cached shader that still has a valid source path.
-    void ReloadAll();
-
-private:
-    std::unordered_map<std::string, std::shared_ptr<ShaderAsset>> m_Shaders;
-};
-} // namespace CHEngine
-
-#endif // CH_SHADER_LIBRARY_H
diff --git a/engine/graphics/pipeline/shader_storage.cpp b/engine/graphics/pipeline/shader_storage.cpp
new file mode 100644
index 000000000..33a44cfb2
--- /dev/null
+++ b/engine/graphics/pipeline/shader_storage.cpp
@@ -0,0 +1,231 @@
+#include "engine/graphics/pipeline/shader_storage.h"
+#include "engine/common/engine_assert.h"
+
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "engine/project/project.h"
+
+namespace Chained
+{
+	ShaderStorage::ShaderStorage() = default;
+
+	void ShaderStorage::Insert(const std::string& name, const std::shared_ptr<ShaderAsset>& shader)
+	{
+		m_Shaders[name] = shader;
+		if (shader && shader->GetShader())
+		{
+			m_HandleToName[shader->GetShader()->GetNativeHandle()] = name;
+		}
+	}
+
+	void ShaderStorage::Add(const std::string& name, const std::shared_ptr<ShaderAsset>& shader)
+	{
+		CH_CORE_ASSERT(!Exists(name), "Shader already exists in library!");
+		Insert(name, shader);
+	}
+
+	void ShaderStorage::Add(const std::shared_ptr<ShaderAsset>& shader)
+	{
+		std::filesystem::path path = shader->GetPath();
+		Add(path.stem().string(), shader);
+	}
+
+	void ShaderStorage::Load(const std::string& path)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		auto shader = am ? am->Get<ShaderAsset>(path) : nullptr;
+		if (shader)
+		{
+			Add(shader);
+		}
+	}
+
+	void ShaderStorage::Load(const std::string& name, const std::string& path)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		auto shader = am ? am->Get<ShaderAsset>(path) : nullptr;
+		if (shader)
+		{
+			Insert(name, shader);
+		}
+	}
+
+	std::shared_ptr<ShaderAsset> ShaderStorage::LoadOrGet(const std::string& name, const std::string& path)
+	{
+		if (auto it = m_Shaders.find(name); it != m_Shaders.end())
+		{
+			return it->second;
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		auto shader = am ? am->Get<ShaderAsset>(path) : nullptr;
+		if (shader)
+		{
+			Insert(name, shader);
+		}
+		return shader;
+	}
+
+	std::shared_ptr<ShaderAsset> ShaderStorage::LoadOrGet(const std::string& name)
+	{
+		if (auto it = m_Shaders.find(name); it != m_Shaders.end())
+		{
+			return it->second;
+		}
+
+		if (auto pathIt = m_ShaderPaths.find(name); pathIt != m_ShaderPaths.end())
+		{
+			return LoadOrGet(name, pathIt->second);
+		}
+
+		CH_CORE_ERROR("ShaderStorage: Could not find path for shader '{}' in configuration!", name);
+		return nullptr;
+	}
+
+	static void ApplyShaderConfig(const YAML::Node& config, std::unordered_map<std::string, std::string>& out)
+	{
+		if (!config["Shaders"])
+		{
+			return;
+		}
+		for (auto it = config["Shaders"].begin(); it != config["Shaders"].end(); ++it)
+		{
+			out[it->first.as<std::string>()] = it->second.as<std::string>();
+		}
+	}
+
+	void ShaderStorage::LoadConfig(const std::string& configPath)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+
+		// ── 1. Try reading via AssetManager (covers pack AND disk relative path) ─
+		// Strip optional "engine/" prefix so the path matches pack keys
+		// e.g. "engine/resources/config/shaders.yaml" → "resources/config/shaders.yaml"
+		if (am)
+		{
+			std::string packRelPath = configPath;
+			if (packRelPath.find("engine/") == 0)
+			{
+				packRelPath = packRelPath.substr(7);
+			}
+
+			auto data = am->ReadAssetData(packRelPath);
+			if (!data.empty())
+			{
+				try
+				{
+					YAML::Node shaderConfigNode = YAML::Load(std::string(data.begin(), data.end()));
+					ApplyShaderConfig(shaderConfigNode, m_ShaderPaths);
+					CH_CORE_INFO("ShaderStorage: Loaded {} shader paths from config.", m_ShaderPaths.size());
+					return;
+				} catch (const YAML::Exception& e)
+				{
+					CH_CORE_ERROR("ShaderStorage: Failed to parse shader config from pack '{}': {}", packRelPath,
+								  e.what());
+				}
+			}
+		}
+
+		// ── 2. Fallback: direct YAML::LoadFile with fully-resolved path (dev / loose files) ─
+		std::string resolvedPath = am ? am->ResolvePath(configPath) : configPath;
+		try
+		{
+			YAML::Node shaderConfigNode = YAML::LoadFile(resolvedPath);
+			ApplyShaderConfig(shaderConfigNode, m_ShaderPaths);
+			CH_CORE_INFO("ShaderStorage: Loaded {} shader paths from config.", m_ShaderPaths.size());
+		} catch (const YAML::Exception& e)
+		{
+			CH_CORE_ERROR("ShaderStorage: Failed to load config file '{}': {}", configPath, e.what());
+		}
+	}
+
+	std::shared_ptr<ShaderAsset> ShaderStorage::Get(const std::string& name)
+	{
+		auto it = m_Shaders.find(name);
+		if (it != m_Shaders.end())
+		{
+			return it->second;
+		}
+		CH_CORE_WARN("ShaderStorage: Shader '{}' not found!", name);
+		return nullptr;
+	}
+
+	std::shared_ptr<Shader> ShaderStorage::GetShader(const std::string& name)
+	{
+		if (auto asset = Get(name))
+		{
+			return asset->GetShader();
+		}
+		return nullptr;
+	}
+
+	std::shared_ptr<ShaderAsset> ShaderStorage::GetById(uint32_t id) const
+	{
+		auto it = m_HandleToName.find(id);
+		if (it != m_HandleToName.end())
+		{
+			auto shaderIt = m_Shaders.find(it->second);
+			if (shaderIt != m_Shaders.end())
+			{
+				return shaderIt->second;
+			}
+		}
+		return nullptr;
+	}
+
+	bool ShaderStorage::Exists(const std::string& name) const
+	{
+		return m_Shaders.find(name) != m_Shaders.end();
+	}
+
+	std::vector<std::string> ShaderStorage::GetNames() const
+	{
+		std::vector<std::string> names;
+		for (const auto& [name, shader] : m_Shaders)
+		{
+			names.push_back(name);
+		}
+		return names;
+	}
+
+	void ShaderStorage::ReloadAll()
+	{
+		CH_CORE_INFO("ShaderStorage: Reloading all shaders...");
+
+		for (auto& [name, shader] : m_Shaders)
+		{
+			if (shader && !shader->GetPath().empty())
+			{
+				CH_CORE_TRACE("ShaderStorage: Reloading shader '{}' from '{}'", name, shader->GetPath());
+				if (auto* am = ServiceLocator::TryGet<AssetManager>())
+				{
+					am->Reload<ShaderAsset>(shader->GetPath());
+				}
+			}
+		}
+
+		// Re-fetch all from cache and update handle map
+		for (auto& [name, shader] : m_Shaders)
+		{
+			if (shader && !shader->GetPath().empty())
+			{
+				if (auto* am = ServiceLocator::TryGet<AssetManager>())
+				{
+					shader = am->Get<ShaderAsset>(shader->GetPath());
+				}
+				Insert(name, shader);
+			}
+		}
+	}
+	void ShaderStorage::RebuildHandleMap()
+	{
+		m_HandleToName.clear();
+		for (const auto& [name, shader] : m_Shaders)
+		{
+			if (shader && shader->GetShader())
+			{
+				m_HandleToName[shader->GetShader()->GetNativeHandle()] = name;
+			}
+		}
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/graphics/pipeline/shader_storage.h b/engine/graphics/pipeline/shader_storage.h
new file mode 100644
index 000000000..230cec31e
--- /dev/null
+++ b/engine/graphics/pipeline/shader_storage.h
@@ -0,0 +1,68 @@
+#ifndef CH_SHADER_LIBRARY_H
+#define CH_SHADER_LIBRARY_H
+
+#include "engine/assets/types/shader_asset.h"
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace Chained
+{
+
+	// Named shader cache with load-on-demand and hot-reload support.
+	class ShaderStorage
+	{
+	public:
+		ShaderStorage();
+		~ShaderStorage() = default;
+
+		// Adds a shader under a unique library name; asserts if the name already exists.
+		void Add(const std::string& name, const std::shared_ptr<ShaderAsset>& shader);
+		// Adds a shader using the source file stem as the library key.
+		void Add(const std::shared_ptr<ShaderAsset>& shader);
+
+		// Loads a shader from disk and stores it under the source file stem.
+		void Load(const std::string& path);
+		// Loads a shader from disk and stores it under the provided name, replacing any existing entry.
+		void Load(const std::string& name, const std::string& path);
+		// Returns the cached shader if present; otherwise loads it from disk and caches it under the provided name.
+		std::shared_ptr<ShaderAsset> LoadOrGet(const std::string& name, const std::string& path);
+
+		// Returns the shader for a name; asserts if the name is missing.
+		std::shared_ptr<ShaderAsset> Get(const std::string& name);
+		// Returns the compiled GPU shader owned by the asset, or null if the asset has not produced one.
+		std::shared_ptr<Shader> GetShader(const std::string& name);
+		// Returns the shader asset matching a renderer ID by scanning the cache.
+		std::shared_ptr<ShaderAsset> GetById(uint32_t id) const;
+		// Checks whether a shader name exists in the cache.
+		bool Exists(const std::string& name) const;
+
+		// Exposes the cache for read-only iteration.
+		const std::unordered_map<std::string, std::shared_ptr<ShaderAsset>>& GetShaders() const
+		{
+			return m_Shaders;
+		}
+		// Returns a snapshot of the current shader names.
+		std::vector<std::string> GetNames() const;
+
+		// Returns the cached shader if present; otherwise looks up the path in the loaded config and loads it.
+		std::shared_ptr<ShaderAsset> LoadOrGet(const std::string& name);
+
+		// Reloads every cached shader that still has a valid source path.
+		void ReloadAll();
+
+		// Load a YAML configuration file mapping shader names to paths.
+		void LoadConfig(const std::string& configPath);
+
+	private:
+		void Insert(const std::string& name, const std::shared_ptr<ShaderAsset>& shader);
+		void RebuildHandleMap();
+
+		std::unordered_map<std::string, std::string> m_ShaderPaths;
+		std::unordered_map<std::string, std::shared_ptr<ShaderAsset>> m_Shaders;
+		std::unordered_map<uint32_t, std::string> m_HandleToName;
+	};
+} // namespace Chained
+
+#endif // CH_SHADER_LIBRARY_H
diff --git a/engine/graphics/pipeline/shader_uniform_utils.h b/engine/graphics/pipeline/shader_uniform_utils.h
new file mode 100644
index 000000000..3b58a6477
--- /dev/null
+++ b/engine/graphics/pipeline/shader_uniform_utils.h
@@ -0,0 +1,44 @@
+#ifndef CH_SHADER_UNIFORM_UTILS_H
+#define CH_SHADER_UNIFORM_UTILS_H
+
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/graphics/api/shader.h"
+#include <variant>
+
+namespace Chained
+{
+	inline void ApplyShaderUniforms(Shader* shader, const std::vector<ShaderUniform>& uniforms)
+	{
+		for (const auto& u : uniforms)
+		{
+			std::visit(
+				[&](auto&& arg) {
+					using T = std::decay_t<decltype(arg)>;
+					if constexpr (std::is_same_v<T, float>)
+					{
+						shader->SetFloat(u.Name, arg);
+					}
+					else if constexpr (std::is_same_v<T, glm::vec2>)
+					{
+						shader->SetVec2(u.Name, arg);
+					}
+					else if constexpr (std::is_same_v<T, glm::vec3>)
+					{
+						shader->SetVec3(u.Name, arg);
+					}
+					else if constexpr (std::is_same_v<T, glm::vec4>)
+					{
+						shader->SetVec4(u.Name, arg);
+					}
+					else if constexpr (std::is_same_v<T, Color>)
+					{
+						glm::vec4 colorVec = {arg.r / 255.0f, arg.g / 255.0f, arg.b / 255.0f, arg.a / 255.0f};
+						shader->SetVec4(u.Name, colorVec);
+					}
+				},
+				u.Value);
+		}
+	}
+} // namespace Chained
+
+#endif // CH_SHADER_UNIFORM_UTILS_H
diff --git a/engine/graphics/pipeline/texture_utility.cpp b/engine/graphics/pipeline/texture_utility.cpp
deleted file mode 100644
index 5804d3bde..000000000
--- a/engine/graphics/pipeline/texture_utility.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <glm/gtc/type_ptr.hpp>
-#include "engine/graphics/pipeline/texture_utility.h"
-#include "engine/graphics/api/texture.h"
-#include "engine/graphics/api/framebuffer.h"
-#include "engine/graphics/pipeline/render_command.h"
-#include "engine/graphics/assets/model_asset.h"
-#include <glad/gl.h>
-
-namespace CHEngine
-{
-    std::shared_ptr<Texture> TextureUtility::GenTextureCubemap(uint32_t shaderId, uint32_t panoramaId, int size, const Mesh& cubeMesh)
-    {
-        auto cubemap = Texture::CreateCubemap(size, TextureFormat::RGBA16F);
-        
-        GLint viewport[4];
-        glGetIntegerv(GL_VIEWPORT, viewport);
-        
-        auto spec = FramebufferSpecification();
-        spec.Width = size;
-        spec.Height = size;
-        spec.ColorFormat = FramebufferColorFormat::RGBA16F;
-        auto captureFBO = Framebuffer::Create(spec);
-        
-        glm::mat4 captureProjection = glm::perspective(glm::radians(90.0f), 1.0f, 0.1f, 10.0f);
-        glm::mat4 captureViews[] = {
-            glm::lookAt(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3( 1.0f,  0.0f,  0.0f), glm::vec3(0.0f, -1.0f,  0.0f)),
-            glm::lookAt(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(-1.0f,  0.0f,  0.0f), glm::vec3(0.0f, -1.0f,  0.0f)),
-            glm::lookAt(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3( 0.0f,  1.0f,  0.0f), glm::vec3(0.0f,  0.0f,  1.0f)),
-            glm::lookAt(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3( 0.0f, -1.0f,  0.0f), glm::vec3(0.0f,  0.0f, -1.0f)),
-            glm::lookAt(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3( 0.0f,  0.0f,  1.0f), glm::vec3(0.0f, -1.0f,  0.0f)),
-            glm::lookAt(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3( 0.0f,  0.0f, -1.0f), glm::vec3(0.0f, -1.0f,  0.0f))
-        };
-
-        // TODO: Shader abstraction needed here too for cleaner code
-        glUseProgram(shaderId);
-        glUniformMatrix4fv(glGetUniformLocation(shaderId, "projection"), 1, GL_FALSE, glm::value_ptr(captureProjection));
-        
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, panoramaId);
-        glUniform1i(glGetUniformLocation(shaderId, "equirectangularMap"), 0);
-
-        captureFBO->Bind();
-        RenderCommand::SetViewport(0, 0, size, size);
-        RenderCommand::SetCullMode(RendererAPI::CullMode::None);
-        RenderCommand::DisableDepthTest();
-
-        for (unsigned int i = 0; i < 6; ++i)
-        {
-            glUniformMatrix4fv(glGetUniformLocation(shaderId, "view"), 1, GL_FALSE, glm::value_ptr(captureViews[i]));
-            
-            // Still need a way to attach cubemap face to FBO in abstraction
-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, cubemap->GetRendererID(), 0);
-            
-            RenderCommand::Clear({0, 0, 0, 255});
-            
-            cubeMesh.VAO->Bind();
-            RenderCommand::DrawIndexed(cubeMesh.VAO, 36);
-        }
-        
-        captureFBO->Unbind();
-        RenderCommand::SetViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
-        
-        return cubemap;
-    }
-}
diff --git a/engine/graphics/pipeline/texture_utility.h b/engine/graphics/pipeline/texture_utility.h
deleted file mode 100644
index 9688681bd..000000000
--- a/engine/graphics/pipeline/texture_utility.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef CH_TEXTURE_UTILITY_H
-#define CH_TEXTURE_UTILITY_H
-
-#include <memory>
-#include "engine/graphics/pipeline/renderer_types.h"
-#include "engine/graphics/api/texture.h"
-
-namespace CHEngine
-{
-    class TextureUtility
-    {
-    public:
-        // Converts an equirectangular panorama to a cubemap
-        static std::shared_ptr<Texture> GenTextureCubemap(uint32_t shaderId, uint32_t panoramaId, int size, const Mesh& cubeMesh);
-    };
-}
-
-#endif // CH_TEXTURE_UTILITY_H
diff --git a/engine/graphics/pipeline/ui_font_registry.cpp b/engine/graphics/pipeline/ui_font_registry.cpp
deleted file mode 100644
index 53f5aec1e..000000000
--- a/engine/graphics/pipeline/ui_font_registry.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-#include "ui_font_registry.h"
-#include "engine/core/base.h"
-#include "engine/scene/project.h"
-#include <algorithm>
-#include <array>
-#include <cctype>
-#include <cmath>
-#include <cstdio>
-#include <filesystem>
-#include <system_error>
-#include <unordered_set>
-#include <vector>
-
-namespace CHEngine
-{
-
-static std::string TrimCopy(const std::string& value)
-{
-    auto begin = std::find_if_not(value.begin(), value.end(), [](unsigned char ch) {
-        return std::isspace(ch) != 0;
-    });
-    auto end = std::find_if_not(value.rbegin(), value.rend(), [](unsigned char ch) {
-        return std::isspace(ch) != 0;
-    }).base();
-
-    if (begin >= end)
-    {
-        return {};
-    }
-
-    return std::string(begin, end);
-}
-
-static bool ExistsNoThrow(const std::filesystem::path& path)
-{
-    std::error_code ec;
-    return std::filesystem::exists(path, ec) && !ec;
-}
-
-// Round font size to nearest 0.5 for cache key (avoids floating-point key mismatches)
-static float RoundFontSize(float size)
-{
-    return std::round(size * 2.0f) / 2.0f;
-}
-
-std::string UIFontRegistry::MakeKey(const std::string& name, float size)
-{
-    // e.g. "fonts/Roboto-Regular.ttf|16.0"
-    char buf[32];
-    snprintf(buf, sizeof(buf), "|%.1f", RoundFontSize(size));
-    return name + buf;
-}
-
-std::string UIFontRegistry::NormalizeFontName(std::string name)
-{
-    name = TrimCopy(name);
-    if (name.empty())
-    {
-        return name;
-    }
-
-    std::replace(name.begin(), name.end(), '\\', '/');
-
-    while (name.rfind("./", 0) == 0)
-    {
-        name = name.substr(2);
-    }
-
-    if (name.rfind("assets/", 0) == 0)
-    {
-        name = name.substr(7);
-    }
-
-    return name;
-}
-
-void UIFontRegistry::LoadProjectFonts()
-{
-    m_KnownPaths.clear();
-
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        CH_CORE_WARN("UIFontRegistry: No active project, skipping font load.");
-        return;
-    }
-
-    const std::filesystem::path assetDir = Project::GetAssetDirectory();
-    const std::array<std::filesystem::path, 2> candidateDirs = {
-        assetDir / "fonts",
-        assetDir / "font",
-    };
-
-    const std::array<std::string, 2> validExtensions = {".ttf", ".otf"};
-    int discovered = 0;
-
-    for (const auto& fontsDir : candidateDirs)
-    {
-        if (!ExistsNoThrow(fontsDir))
-        {
-            continue;
-        }
-
-        std::error_code iterError;
-        std::filesystem::recursive_directory_iterator it(
-            fontsDir,
-            std::filesystem::directory_options::skip_permission_denied,
-            iterError);
-        std::filesystem::recursive_directory_iterator end;
-
-        if (iterError)
-        {
-            CH_CORE_WARN("UIFontRegistry: Failed to scan '{}' ({})", fontsDir.string(), iterError.message());
-            continue;
-        }
-
-        for (; it != end; it.increment(iterError))
-        {
-            if (iterError)
-            {
-                CH_CORE_WARN("UIFontRegistry: Iteration failed in '{}' ({})", fontsDir.string(), iterError.message());
-                iterError.clear();
-                continue;
-            }
-
-            const auto& entry = *it;
-            if (!entry.is_regular_file(iterError) || iterError)
-            {
-                iterError.clear();
-                continue;
-            }
-
-            auto ext = entry.path().extension().string();
-            std::transform(ext.begin(), ext.end(), ext.begin(), [](unsigned char ch) {
-                return static_cast<char>(std::tolower(ch));
-            });
-
-            bool validExt = false;
-            for (const auto& ve : validExtensions)
-            {
-                if (ext == ve)
-                {
-                    validExt = true;
-                    break;
-                }
-            }
-            if (!validExt)
-            {
-                continue;
-            }
-
-            auto relativePath = std::filesystem::relative(entry.path(), assetDir, iterError);
-            if (iterError)
-            {
-                CH_CORE_WARN("UIFontRegistry: Failed to build relative path for '{}' ({})",
-                             entry.path().string(),
-                             iterError.message());
-                iterError.clear();
-                continue;
-            }
-
-            std::string relKey = NormalizeFontName(relativePath.generic_string());
-            std::string absPath = entry.path().string();
-
-            if (m_KnownPaths.emplace(relKey, absPath).second)
-            {
-                CH_CORE_INFO("UIFontRegistry: Discovered font '{}'", relKey);
-                discovered++;
-            }
-
-            // Compatibility alias between legacy "font/" and "fonts/" prefixes.
-            if (relKey.rfind("font/", 0) == 0)
-            {
-                m_KnownPaths.emplace("fonts/" + relKey.substr(5), absPath);
-            }
-            else if (relKey.rfind("fonts/", 0) == 0)
-            {
-                m_KnownPaths.emplace("font/" + relKey.substr(6), absPath);
-            }
-        }
-    }
-
-    if (discovered == 0)
-    {
-        CH_CORE_INFO("UIFontRegistry: No project fonts found in '{}' or '{}'.",
-                     (assetDir / "font").string(),
-                     (assetDir / "fonts").string());
-        return;
-    }
-
-    CH_CORE_INFO("UIFontRegistry: Discovered {} font file(s).", discovered);
-}
-
-ImFont* UIFontRegistry::EnsureDefaultProjectFont(float pixelSize, bool allowRuntimeMutation)
-{
-    const float size = (pixelSize > 0.0f) ? pixelSize : 16.0f;
-
-    static const std::array<const char*, 8> preferredFonts = {
-        "font/alan_sans/static/alansans-regular.ttf",
-        "font/alan_sans/static/alansans-medium.ttf",
-        "fonts/alan_sans/static/alansans-regular.ttf",
-        "fonts/alan_sans/static/alansans-medium.ttf",
-        "font/lato/lato-regular.ttf",
-        "font/lato/lato-bold.ttf",
-        "fonts/lato/lato-regular.ttf",
-        "fonts/lato/lato-bold.ttf",
-    };
-
-    std::vector<std::pair<std::string, float>> preloadRequests;
-    for (const char* preferred : preferredFonts)
-    {
-        const std::string normalized = NormalizeFontName(preferred);
-        if (m_KnownPaths.find(normalized) != m_KnownPaths.end())
-        {
-            preloadRequests.emplace_back(normalized, size);
-            break;
-        }
-    }
-
-    if (preloadRequests.empty() && !m_KnownPaths.empty())
-    {
-        std::string fallbackName;
-        for (const auto& [name, _] : m_KnownPaths)
-        {
-            if (name.rfind("font/", 0) == 0 || name.rfind("fonts/", 0) == 0)
-            {
-                fallbackName = name;
-                break;
-            }
-        }
-
-        if (!fallbackName.empty())
-        {
-            preloadRequests.emplace_back(fallbackName, size);
-        }
-    }
-
-    if (preloadRequests.empty())
-    {
-        return nullptr;
-    }
-
-    PreloadFonts(preloadRequests, allowRuntimeMutation);
-
-    for (const auto& [name, requestedSize] : preloadRequests)
-    {
-        ImFont* font = GetFont(name, requestedSize);
-        if (font)
-        {
-            return font;
-        }
-    }
-
-    return nullptr;
-}
-
-ImFont* UIFontRegistry::GetFont(const std::string& relativeName, float pixelSize) const
-{
-    const std::string normalizedName = NormalizeFontName(relativeName);
-    if (normalizedName.empty() || normalizedName == "Default")
-    {
-        return nullptr; // caller should use ImGui default
-    }
-
-    const float size = (pixelSize > 0.0f) ? pixelSize : 16.0f;
-    const std::string key = MakeKey(normalizedName, size);
-
-    // Avoid mutating ImGui font atlas at runtime. If a custom font wasn't preloaded
-    // before the first frame, caller should gracefully fallback to default font.
-    if (ImGui::GetFrameCount() > 0)
-    {
-        auto it = m_Fonts.find(key);
-        if (it != m_Fonts.end())
-        {
-            return it->second;
-        }
-        return nullptr;
-    }
-
-    // Fast path: already in atlas
-    auto it = m_Fonts.find(key);
-    if (it != m_Fonts.end())
-    {
-        return it->second;
-    }
-
-    // Slow path: need to register for this size.
-    // NOTE: This only works before ImGui font atlas is built (before first frame).
-    // At runtime this returns nullptr — font must be pre-registered.
-    auto pathIt = m_KnownPaths.find(normalizedName);
-    if (pathIt != m_KnownPaths.end())
-    {
-        // Cast away const — lazy loading into atlas (only valid pre-build)
-        return const_cast<UIFontRegistry*>(this)->RegisterFont(normalizedName, pathIt->second, size);
-    }
-
-    std::filesystem::path directPath(normalizedName);
-    if (directPath.is_absolute() && ExistsNoThrow(directPath))
-    {
-        return const_cast<UIFontRegistry*>(this)->RegisterFont(normalizedName, directPath.string(), size);
-    }
-
-    CH_CORE_WARN("UIFontRegistry: Font '{}' not discovered. Check assets/font or assets/fonts.", normalizedName);
-    return nullptr;
-}
-
-int UIFontRegistry::PreloadFonts(const std::vector<std::pair<std::string, float>>& requests, bool allowRuntimeMutation)
-{
-    if (requests.empty())
-    {
-        return 0;
-    }
-
-    if (ImGui::GetFrameCount() > 0 && !allowRuntimeMutation)
-    {
-        CH_CORE_WARN("UIFontRegistry: Ignoring preload request after first frame (runtime mutation disabled).");
-        return 0;
-    }
-
-    int loaded = 0;
-    std::unordered_set<std::string> seenKeys;
-    std::unordered_set<std::string> missingFonts;
-
-    for (const auto& [fontNameRaw, pixelSizeRaw] : requests)
-    {
-        const std::string fontName = NormalizeFontName(fontNameRaw);
-        if (fontName.empty() || fontName == "Default")
-        {
-            continue;
-        }
-
-        const float pixelSize = (pixelSizeRaw > 0.0f) ? pixelSizeRaw : 16.0f;
-        const std::string key = MakeKey(fontName, pixelSize);
-        if (!seenKeys.insert(key).second)
-        {
-            continue;
-        }
-
-        if (m_Fonts.find(key) != m_Fonts.end())
-        {
-            continue;
-        }
-
-        std::string absolutePath;
-        auto knownPathIt = m_KnownPaths.find(fontName);
-        if (knownPathIt != m_KnownPaths.end())
-        {
-            absolutePath = knownPathIt->second;
-        }
-        else
-        {
-            std::filesystem::path directPath(fontName);
-            if (directPath.is_absolute() && ExistsNoThrow(directPath))
-            {
-                absolutePath = directPath.string();
-            }
-        }
-
-        if (absolutePath.empty())
-        {
-            missingFonts.insert(fontName);
-            continue;
-        }
-
-        if (RegisterFont(fontName, absolutePath, pixelSize))
-        {
-            loaded++;
-        }
-    }
-
-    for (const auto& fontName : missingFonts)
-    {
-        CH_CORE_WARN("UIFontRegistry: Missing font '{}' requested by runtime scene.", fontName);
-    }
-
-    return loaded;
-}
-
-ImFont* UIFontRegistry::RegisterFont(const std::string& relativeName, const std::string& absolutePath, float pixelSize)
-{
-    const std::string normalizedName = NormalizeFontName(relativeName);
-    if (normalizedName.empty())
-    {
-        return nullptr;
-    }
-
-    std::string key = MakeKey(normalizedName, pixelSize);
-
-    ImGuiIO& io = ImGui::GetIO();
-    ImFont* font = io.Fonts->AddFontFromFileTTF(absolutePath.c_str(), pixelSize);
-    if (!font)
-    {
-        CH_CORE_ERROR("UIFontRegistry: Failed to load font '{}' at size {:.1f}", absolutePath, pixelSize);
-        return nullptr;
-    }
-
-    m_Fonts[key] = font;
-
-    if (!m_DefaultFont)
-    {
-        m_DefaultFont = font;
-    }
-
-    CH_CORE_INFO("UIFontRegistry: Loaded '{}' at {:.1f}px", normalizedName, pixelSize);
-    return font;
-}
-
-void UIFontRegistry::Clear()
-{
-    m_Fonts.clear();
-    m_KnownPaths.clear();
-    m_DefaultFont = nullptr;
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/pipeline/ui_font_registry.h b/engine/graphics/pipeline/ui_font_registry.h
deleted file mode 100644
index 4df780f2f..000000000
--- a/engine/graphics/pipeline/ui_font_registry.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef CH_UI_FONT_REGISTRY_H
-#define CH_UI_FONT_REGISTRY_H
-
-#include "imgui.h"
-#include <string>
-#include <utility>
-#include <unordered_map>
-#include <vector>
-
-namespace CHEngine
-{
-
-// Manages ImGui font atlas entries for UI rendering.
-// Fonts must be registered before BuildAtlas() is called (before the first frame).
-// Typical usage: call LoadProjectFonts() between ImGui::CreateContext() and the first frame.
-class UIFontRegistry
-{
-public:
-    UIFontRegistry()  = default;
-    ~UIFontRegistry() = default;
-
-    // Scans <ProjectAssetDir>/fonts/ for all TTF/OTF files and discovers paths.
-    // FontName key = relative path from assets/, e.g. "fonts/Roboto-Regular.ttf".
-    // Multiple sizes are loaded explicitly via PreloadFonts().
-    void LoadProjectFonts();
-
-    // Preloads explicit font tuples into ImGui atlas.
-    // Returns number of newly registered tuples.
-    int PreloadFonts(const std::vector<std::pair<std::string, float>>& requests, bool allowRuntimeMutation);
-
-    // Ensures project default font is available and returns it.
-    // Falls back to nullptr if no project font files are found.
-    ImFont* EnsureDefaultProjectFont(float pixelSize, bool allowRuntimeMutation);
-
-    // Returns the ImFont* for the given relative font name and pixel size.
-    // If not found or not loaded, returns nullptr (ImGui will use its default font).
-    ImFont* GetFont(const std::string& relativeName, float pixelSize) const;
-
-    // Returns the default font (first registered, or ImGui built-in default).
-    ImFont* GetDefaultFont() const { return m_DefaultFont; }
-
-    // True if any fonts were successfully loaded.
-    bool HasFonts() const { return !m_Fonts.empty(); }
-
-    // Clears all registered fonts (call before re-loading a new project).
-    void Clear();
-
-private:
-    // Registers a single TTF/OTF file at the given absolute path under a relative name key.
-    // Returns the loaded ImFont* or nullptr on failure.
-    ImFont* RegisterFont(const std::string& relativeName, const std::string& absolutePath, float pixelSize);
-
-    // Build a cache key from name + size (rounded to 0.5px increments).
-    static std::string MakeKey(const std::string& name, float size);
-    static std::string NormalizeFontName(std::string name);
-
-    // map<"fonts/Roboto.ttf|16.0" -> ImFont*>
-    std::unordered_map<std::string, ImFont*> m_Fonts;
-
-    // Tracks which relative paths have been discovered (name -> absolute path)
-    std::unordered_map<std::string, std::string> m_KnownPaths;
-
-    ImFont* m_DefaultFont = nullptr;
-};
-
-} // namespace CHEngine
-
-#endif // CH_UI_FONT_REGISTRY_H
diff --git a/engine/graphics/pipeline/ui_renderer.cpp b/engine/graphics/pipeline/ui_renderer.cpp
deleted file mode 100644
index f9b430ba7..000000000
--- a/engine/graphics/pipeline/ui_renderer.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-#include "ui_renderer.h"
-#include "ui_widget_renderer.h"
-#include "engine/core/profiler.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/loaders/font_loader.h"
-#include "engine/scene/scene.h"
-#include <algorithm>
-#include <map>
-
-namespace CHEngine
-{
-
-UIRenderer* UIRenderer::s_Instance = nullptr;
-
-UIRenderer& UIRenderer::Get()
-{
-    CH_CORE_ASSERT(s_Instance, "UIRenderer not initialized!");
-    return *s_Instance;
-}
-
-bool UIRenderer::IsInitialized()
-{
-    return s_Instance != nullptr && s_Instance->m_Initialized;
-}
-
-void UIRenderer::Init()
-{
-    if (!s_Instance)
-    {
-        s_Instance = new UIRenderer();
-    }
-
-    if (s_Instance->m_Initialized)
-    {
-        return;
-    }
-
-    // Register Font loader
-    AssetManager::Get().RegisterLoader(AssetType::Font, std::make_unique<FontLoader>());
-
-    s_Instance->m_Initialized = true;
-    CH_CORE_INFO("Initializing UIRenderer...");
-}
-
-void UIRenderer::Shutdown()
-{
-    if (s_Instance)
-    {
-        if (s_Instance->m_Initialized)
-        {
-            CH_CORE_INFO("Shutting down UIRenderer...");
-            s_Instance->m_Initialized = false;
-        }
-        delete s_Instance;
-        s_Instance = nullptr;
-    }
-}
-
-void UIRenderer::LoadProjectFonts()
-{
-    m_FontRegistry.Clear();
-    m_FontRegistry.LoadProjectFonts();
-}
-
-// ---------------------------------------------------------------------------
-// Animation
-// ---------------------------------------------------------------------------
-
-static Color LerpColor(const Color& a, const Color& b, float t)
-{
-    return {
-        (uint8_t)(a.r + (b.r - a.r) * t),
-        (uint8_t)(a.g + (b.g - a.g) * t),
-        (uint8_t)(a.b + (b.b - a.b) * t),
-        (uint8_t)(a.a + (b.a - a.a) * t)
-    };
-}
-
-void UIRenderer::UpdateStyleAnimation(UIStyle& style, bool isHovered, bool isDown, float dt)
-{
-    float target = isDown ? 1.0f : (isHovered ? 0.5f : 0.0f);
-    if (style.TransitionSpeed > 0.0f)
-        style.State.AnimationAlpha += (target - style.State.AnimationAlpha) * std::min(1.0f, dt / style.TransitionSpeed);
-    else
-        style.State.AnimationAlpha = target;
-
-    float a = style.State.AnimationAlpha;
-    style.State.CurrentColor = (a <= 0.5f)
-        ? LerpColor(style.BackgroundColor, style.HoverColor,    a * 2.0f)
-        : LerpColor(style.HoverColor,      style.PressedColor,  (a - 0.5f) * 2.0f);
-
-    float targetScale = isDown ? style.PressedScale : (isHovered ? style.HoverScale : 1.0f);
-    style.State.CurrentScale = 1.0f + (targetScale - 1.0f) * a;
-}
-
-// ---------------------------------------------------------------------------
-// Layout helpers
-// ---------------------------------------------------------------------------
-
-std::vector<entt::entity> UIRenderer::SortUIEntities(entt::registry& registry)
-{
-    auto view = registry.view<ControlComponent>();
-    std::vector<entt::entity> sorted(view.begin(), view.end());
-    std::sort(sorted.begin(), sorted.end(), [&](entt::entity a, entt::entity b) {
-        return view.get<ControlComponent>(a).ZOrder < view.get<ControlComponent>(b).ZOrder;
-    });
-    return sorted;
-}
-
-UIRect UIRenderer::CalculateEntityRect(Entity entity, const UIRect& canvasRect, std::map<entt::entity, UIRect>& cache)
-{
-    auto& control = entity.GetComponent<ControlComponent>();
-
-    UIRect parentRect = canvasRect;
-    if (entity.HasComponent<HierarchyComponent>())
-    {
-        auto parentID = entity.GetComponent<HierarchyComponent>().Parent;
-        if (parentID != entt::null)
-        {
-            if (cache.count(parentID))
-            {
-                parentRect = cache[parentID];
-            }
-            else
-            {
-                Entity parentEntity{parentID, entity.GetRegistry()};
-                if (parentEntity.HasComponent<ControlComponent>())
-                {
-                    parentRect = CalculateEntityRect(parentEntity, canvasRect, cache);
-                    cache[parentID] = parentRect;
-                }
-            }
-        }
-    }
-
-    // AutoSize
-    if (entity.HasComponent<LabelControl>() && entity.GetComponent<LabelControl>().AutoSize)
-    {
-        auto& label  = entity.GetComponent<LabelControl>();
-        ImVec2 ts    = ImGui::CalcTextSize(label.Text.c_str());
-        control.Transform.OffsetMax = {control.Transform.OffsetMin.x + ts.x + 10.0f,
-                                       control.Transform.OffsetMin.y + ts.y + 4.0f};
-    }
-    else if (entity.HasComponent<ButtonControl>() && entity.GetComponent<ButtonControl>().AutoSize)
-    {
-        auto& btn  = entity.GetComponent<ButtonControl>();
-        ImVec2 ts  = ImGui::CalcTextSize(btn.Label.c_str());
-        float pad  = btn.Style.Padding * 2.0f;
-        control.Transform.OffsetMax = {control.Transform.OffsetMin.x + ts.x + pad + 10.0f,
-                                       control.Transform.OffsetMin.y + ts.y + pad + 4.0f};
-    }
-
-    Rectangle r = control.Transform.CalculateRect({parentRect.width, parentRect.height}, {parentRect.x, parentRect.y});
-    return {r.x, r.y, r.width, r.height};
-}
-
-UIRect UIRenderer::GetEntityRect(Entity entity, const ImVec2& viewportSize, const ImVec2& viewportPos)
-{
-    if (!entity || !entity.HasComponent<ControlComponent>())
-    {
-        return {0, 0, 0, 0};
-    }
-
-    float scaleFactor = 1.0f;
-    auto* sceneCtx = entity.GetRegistry().ctx().find<Scene*>();
-    if (sceneCtx && *sceneCtx)
-    {
-        const CanvasSettings& canvasSettings = (*sceneCtx)->GetSettings().Canvas;
-        if (canvasSettings.ScaleMode == CanvasScaleMode::ScaleWithScreenSize &&
-            canvasSettings.ReferenceResolution.x > 0.0f && canvasSettings.ReferenceResolution.y > 0.0f)
-        {
-            const float scaleX = viewportSize.x / canvasSettings.ReferenceResolution.x;
-            const float scaleY = viewportSize.y / canvasSettings.ReferenceResolution.y;
-            scaleFactor = scaleX * (1.0f - canvasSettings.MatchWidthOrHeight) +
-                          scaleY * canvasSettings.MatchWidthOrHeight;
-
-            if (scaleFactor <= 0.0001f)
-            {
-                scaleFactor = 1.0f;
-            }
-        }
-    }
-
-    std::map<entt::entity, UIRect> empty;
-    UIRect virtualCanvas = {
-        viewportPos.x / scaleFactor,
-        viewportPos.y / scaleFactor,
-        viewportSize.x / scaleFactor,
-        viewportSize.y / scaleFactor,
-    };
-
-    UIRect virtualRect = CalculateEntityRect(entity, virtualCanvas, empty);
-    return {
-        virtualRect.x * scaleFactor,
-        virtualRect.y * scaleFactor,
-        virtualRect.width * scaleFactor,
-        virtualRect.height * scaleFactor,
-    };
-}
-
-// ---------------------------------------------------------------------------
-// RenderUIComponent — dispatcher, delegates to UI::Render* free functions
-// ---------------------------------------------------------------------------
-
-bool UIRenderer::RenderUIComponent(Entity entity, const ImVec2& screenPos, const ImVec2& size, bool editMode)
-{
-    bool handled = false;
-    auto& reg    = entity.GetRegistry();
-
-    if (entity.HasComponent<PanelControl>())
-        UI::RenderPanel(entity.GetComponent<PanelControl>(), screenPos, size);
-
-    if (entity.HasComponent<LabelControl>())
-        UI::RenderLabel(entity.GetComponent<LabelControl>(), size);
-
-    if (entity.HasComponent<ButtonControl>())
-        handled |= UI::RenderButton(entity, entity.GetComponent<ButtonControl>(), size);
-
-    if (entity.HasComponent<SliderControl>())
-        handled |= UI::RenderSlider(entity.GetComponent<SliderControl>(), size);
-
-    if (entity.HasComponent<CheckboxControl>())
-        handled |= UI::RenderCheckbox(entity.GetComponent<CheckboxControl>());
-
-    if (entity.HasComponent<ImageControl>())
-        UI::RenderImage(entity.GetComponent<ImageControl>(), size);
-
-    if (entity.HasComponent<InputTextControl>())
-        handled |= UI::RenderInputText(entity, entity.GetComponent<InputTextControl>(), size);
-
-    if (entity.HasComponent<ProgressBarControl>())
-        UI::RenderProgressBar(entity.GetComponent<ProgressBarControl>(), size);
-
-    if (entity.HasComponent<ComboBoxControl>())
-        handled |= UI::RenderComboBox(entity.GetComponent<ComboBoxControl>(), size);
-
-    if (entity.HasComponent<ImageButtonControl>())
-        handled |= UI::RenderImageButton(entity.GetComponent<ImageButtonControl>(), size);
-
-    if (entity.HasComponent<RadioButtonControl>())
-        handled |= UI::RenderRadioButton(entity.GetComponent<RadioButtonControl>());
-
-    if (entity.HasComponent<ColorPickerControl>())
-        handled |= UI::RenderColorPicker(entity.GetComponent<ColorPickerControl>());
-
-    if (entity.HasComponent<SeparatorControl>())
-        UI::RenderSeparator(entity.GetComponent<SeparatorControl>());
-
-    if (entity.HasComponent<DragFloatControl>())
-        handled |= UI::RenderDragFloat(entity.GetComponent<DragFloatControl>(), size);
-
-    if (entity.HasComponent<DragIntControl>())
-        handled |= UI::RenderDragInt(entity.GetComponent<DragIntControl>(), size);
-
-    if (entity.HasComponent<TreeNodeControl>())
-        handled |= UI::RenderTreeNode(entity.GetComponent<TreeNodeControl>());
-
-    if (entity.HasComponent<CollapsingHeaderControl>())
-        handled |= UI::RenderCollapsingHeader(entity.GetComponent<CollapsingHeaderControl>());
-
-    if (entity.HasComponent<PlotLinesControl>())
-        handled |= UI::RenderPlotLines(entity.GetComponent<PlotLinesControl>());
-
-    if (entity.HasComponent<PlotHistogramControl>())
-        handled |= UI::RenderPlotHistogram(entity.GetComponent<PlotHistogramControl>());
-
-    if (entity.HasComponent<TabBarControl>())
-    {
-        UI::RenderTabBar(entity, entity.GetComponent<TabBarControl>(), reg);
-        handled = true;
-    }
-
-    return handled;
-}
-
-// ---------------------------------------------------------------------------
-// ResetButtonStates — resets per-frame one-shot flags before scripts run
-// ---------------------------------------------------------------------------
-
-void UIRenderer::ResetButtonStates(Scene* scene)
-{
-    if (!scene) return;
-    auto& registry = scene->GetRegistry();
-
-    auto buttonView = registry.view<ButtonControl>();
-    for (entt::entity id : buttonView)
-        buttonView.get<ButtonControl>(id).PressedThisFrame = false;
-
-    auto imageButtonView = registry.view<ImageButtonControl>();
-    for (entt::entity id : imageButtonView)
-        imageButtonView.get<ImageButtonControl>(id).PressedThisFrame = false;
-}
-
-// ---------------------------------------------------------------------------
-// DrawCanvas — main entry point
-// ---------------------------------------------------------------------------
-
-void UIRenderer::DrawCanvas(Scene* scene, const ImVec2& referencePosition, const ImVec2& referenceSize, bool editMode)
-{
-    CH_CORE_ASSERT(scene, "Scene is null!");
-    CH_PROFILE_FUNCTION();
-
-    ImVec2 refSize = (referenceSize.x > 0) ? referenceSize : ImGui::GetIO().DisplaySize;
-    if (refSize.x <= 0 || refSize.y <= 0)
-        return;
-    auto&  registry  = scene->GetRegistry();
-
-    auto uiEntities = SortUIEntities(registry);
-    static bool s_LoggedOnce = false;
-    if (!s_LoggedOnce) {
-        CH_CORE_WARN("UIRenderer: Drawing canvas with {} UI entities.", uiEntities.size());
-        s_LoggedOnce = true;
-    }
-
-    // Reset one-shot button press flags once per ImGui frame per registry.
-    const int frameNumber = ImGui::GetFrameCount();
-    static int s_LastResetFrame = -1;
-    static const entt::registry* s_LastResetRegistry = nullptr;
-    if (s_LastResetFrame != frameNumber || s_LastResetRegistry != &registry)
-    {
-        auto buttonView = registry.view<ButtonControl>();
-        for (entt::entity id : buttonView)
-        {
-            buttonView.get<ButtonControl>(id).PressedThisFrame = false;
-        }
-
-        auto imageButtonView = registry.view<ImageButtonControl>();
-        for (entt::entity id : imageButtonView)
-        {
-            imageButtonView.get<ImageButtonControl>(id).PressedThisFrame = false;
-        }
-
-        s_LastResetFrame = frameNumber;
-        s_LastResetRegistry = &registry;
-    }
-
-    const CanvasSettings& canvas = scene->GetSettings().Canvas;
-    float scaleFactor = 1.0f;
-    if (canvas.ScaleMode == CanvasScaleMode::ScaleWithScreenSize &&
-        canvas.ReferenceResolution.x > 0 && canvas.ReferenceResolution.y > 0)
-    {
-        float scaleX = refSize.x / canvas.ReferenceResolution.x;
-        float scaleY = refSize.y / canvas.ReferenceResolution.y;
-        scaleFactor  = scaleX * (1.0f - canvas.MatchWidthOrHeight) + scaleY * canvas.MatchWidthOrHeight;
-    }
-
-    float virtualW  = refSize.x / scaleFactor;
-    float virtualH  = refSize.y / scaleFactor;
-    float virtualOX = referencePosition.x / scaleFactor;
-    float virtualOY = referencePosition.y / scaleFactor;
-
-    UIRect canvasRect = {virtualOX, virtualOY, virtualW, virtualH};
-    std::map<entt::entity, UIRect> rectCache;
-    float dt = ImGui::GetIO().DeltaTime;
-
-    // Clip all UI rendering to canvas bounds first.
-    ImVec2 canvasClipMin = referencePosition;
-    ImVec2 canvasClipMax = {referencePosition.x + refSize.x, referencePosition.y + refSize.y};
-    ImGui::PushClipRect(canvasClipMin, canvasClipMax, true);
-
-    for (entt::entity id : SortUIEntities(registry))
-    {
-        Entity entity(id, &registry);
-        auto& control = registry.get<ControlComponent>(id);
-        if (!control.IsActive) continue;
-
-        // Animate interactable controls
-        if (entity.HasComponent<ButtonControl>()) {
-            auto& btn = entity.GetComponent<ButtonControl>();
-            UpdateStyleAnimation(btn.Style, btn.IsHovered, btn.IsDown, dt);
-        }
-        if (entity.HasComponent<ImageControl>()) {
-            auto& img = entity.GetComponent<ImageControl>();
-            UpdateStyleAnimation(img.Style, img.IsHovered, img.IsDown, dt);
-        }
-        if (entity.HasComponent<PanelControl>()) {
-            auto& panel = entity.GetComponent<PanelControl>();
-            UpdateStyleAnimation(panel.Style, panel.IsHovered, panel.IsDown, dt);
-        }
-
-        UIRect rect = CalculateEntityRect(entity, canvasRect, rectCache);
-        rectCache[id] = rect;
-
-        ImVec2 screenPos = {rect.x * scaleFactor, rect.y * scaleFactor};
-        ImVec2 size      = {rect.width * scaleFactor, rect.height * scaleFactor};
-
-        // Apply clipping for child elements to their parent bounds
-        bool needsClipPop = false;
-        if (entity.HasComponent<HierarchyComponent>())
-        {
-            auto parentID = entity.GetComponent<HierarchyComponent>().Parent;
-            if (parentID != entt::null && registry.valid(parentID))
-            {
-                UIRect parentRect{};
-                bool hasParentRect = false;
-
-                auto it = rectCache.find(parentID);
-                if (it != rectCache.end())
-                {
-                    parentRect = it->second;
-                    hasParentRect = true;
-                }
-                else
-                {
-                    Entity parentEntity{parentID, &registry};
-                    if (parentEntity.HasComponent<ControlComponent>())
-                    {
-                        parentRect = CalculateEntityRect(parentEntity, canvasRect, rectCache);
-                        rectCache[parentID] = parentRect;
-                        hasParentRect = true;
-                    }
-                }
-
-                if (hasParentRect && parentRect.width > 1.0f && parentRect.height > 1.0f)
-                {
-                    ImVec2 clipMin = {parentRect.x * scaleFactor, parentRect.y * scaleFactor};
-                    ImVec2 clipMax = {(parentRect.x + parentRect.width) * scaleFactor,
-                                      (parentRect.y + parentRect.height) * scaleFactor};
-                    ImGui::PushClipRect(clipMin, clipMax, true);
-                    needsClipPop = true;
-                }
-            }
-        }
-
-        if (size.x > 0.0f && size.y > 0.0f)
-        {
-            ImGui::SetCursorScreenPos(screenPos);
-            ImGui::BeginGroup();
-            ImGui::PushID((int)id);
-
-            RenderUIComponent(entity, screenPos, size, editMode);
-
-            if (editMode)
-            {
-                ImGui::SetCursorScreenPos(screenPos);
-                ImGui::InvisibleButton("##DragZone", size);
-
-                if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left))
-                {
-                    ImVec2 delta = ImGui::GetIO().MouseDelta;
-                    control.Transform.OffsetMin.x += delta.x / scaleFactor;
-                    control.Transform.OffsetMax.x += delta.x / scaleFactor;
-                    control.Transform.OffsetMin.y += delta.y / scaleFactor;
-                    control.Transform.OffsetMax.y += delta.y / scaleFactor;
-                }
-            }
-
-            ImGui::PopID();
-            ImGui::EndGroup();
-        }
-
-        if (needsClipPop)
-            ImGui::PopClipRect();
-    }
-
-    ImGui::PopClipRect();
-}
-
-} // namespace CHEngine
diff --git a/engine/graphics/pipeline/ui_renderer.h b/engine/graphics/pipeline/ui_renderer.h
deleted file mode 100644
index c8ab9397c..000000000
--- a/engine/graphics/pipeline/ui_renderer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef CH_UI_RENDERER_H
-#define CH_UI_RENDERER_H
-
-#include "ui_font_registry.h"
-#include "engine/scene/entity.h"
-#include "engine/scene/components.h"
-#include "imgui.h"
-#include "entt/entt.hpp"
-#include <map>
-#include <vector>
-
-namespace CHEngine
-{
-class Scene;
-
-// Screen-space rectangle used for UI layout and hit testing.
-struct UIRect
-{
-    float x, y, width, height;
-};
-
-// Singleton renderer for in-world UI canvases and project fonts.
-class UIRenderer
-{
-public:
-    UIRenderer() = default;
-    ~UIRenderer() = default;
-
-    static void Init();
-    static void Shutdown();
-    static bool IsInitialized();
-    static UIRenderer& Get();
-
-    // Draws a UI canvas for the given scene.
-    void DrawCanvas(Scene* scene, const ImVec2& referencePosition, const ImVec2& referenceSize, bool editMode = false);
-    // Resets per-frame button press flags for all ButtonControl/ImageButtonControl components.
-    // Must be called once per frame before scripts run to prevent stale PressedThisFrame values.
-    static void ResetButtonStates(Scene* scene);
-    // Loads fonts required by the current project/UI theme.
-    void LoadProjectFonts();
-
-    // Computes the screen-space bounds for a UI entity.
-    UIRect GetEntityRect(Entity entity, const ImVec2& viewportSize, const ImVec2& viewportPos);
-
-    UIFontRegistry&       GetFontRegistry()       { return m_FontRegistry; }
-    const UIFontRegistry& GetFontRegistry() const  { return m_FontRegistry; }
-
-private:
-    void   UpdateStyleAnimation(UIStyle& style, bool isHovered, bool isDown, float dt);
-    bool   RenderUIComponent(Entity entity, const ImVec2& screenPos, const ImVec2& size, bool editMode);
-
-    std::vector<entt::entity> SortUIEntities(entt::registry& registry);
-    UIRect CalculateEntityRect(Entity entity, const UIRect& canvasRect, std::map<entt::entity, UIRect>& rectCache);
-
-    UIFontRegistry    m_FontRegistry;
-    bool m_Initialized = false;
-    static UIRenderer* s_Instance;
-};
-
-} // namespace CHEngine
-
-#endif // CH_UI_RENDERER_H
diff --git a/engine/graphics/pipeline/ui_widget_renderer.cpp b/engine/graphics/pipeline/ui_widget_renderer.cpp
deleted file mode 100644
index d85166c02..000000000
--- a/engine/graphics/pipeline/ui_widget_renderer.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-#include "ui_widget_renderer.h"
-#include "ui_renderer.h"
-#include "engine/graphics/texture_system.h"
-#include "engine/scene/components.h"
-#include "engine/core/log.h"
-#include <algorithm>
-
-namespace CHEngine::UI
-{
-
-// ---------------------------------------------------------------------------
-// Style helpers
-// ---------------------------------------------------------------------------
-
-StyleCounts PushUIStyle(const UIStyle& style, bool interactable)
-{
-    StyleCounts c;
-
-    ImGui::PushStyleColor(ImGuiCol_Button,         ToImVec4(style.BackgroundColor));
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered,  ToImVec4(style.HoverColor));
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive,   ToImVec4(style.PressedColor));
-    ImGui::PushStyleColor(ImGuiCol_ChildBg,        ToImVec4(style.BackgroundColor));
-    ImGui::PushStyleColor(ImGuiCol_Border,         ToImVec4(style.BorderColor));
-    ImGui::PushStyleColor(ImGuiCol_FrameBg,        ToImVec4(style.BackgroundColor));
-    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ToImVec4(style.HoverColor));
-    ImGui::PushStyleColor(ImGuiCol_FrameBgActive,  ToImVec4(style.PressedColor));
-    c.colors += 8;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding,   style.Rounding);
-    ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding,   style.Rounding);
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, style.BorderSize);
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,    ImVec2(style.Padding, style.Padding));
-    c.vars += 4;
-
-    if (!interactable)
-    {
-        ImGui::BeginDisabled(true);
-        c.disabled = true;
-    }
-
-    return c;
-}
-
-void PushTextStyle(const TextStyle& text, StyleCounts& c)
-{
-    ImGui::PushStyleColor(ImGuiCol_Text, ToImVec4(text.TextColor));
-    c.colors++;
-
-    float hAlign = (text.HorizontalAlignment == TextAlignment::Left)   ? 0.0f
-                 : (text.HorizontalAlignment == TextAlignment::Center)  ? 0.5f : 1.0f;
-    float vAlign = (text.VerticalAlignment == TextAlignment::Top)       ? 0.0f
-                 : (text.VerticalAlignment == TextAlignment::Center)    ? 0.5f : 1.0f;
-    ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(hAlign, vAlign));
-    c.vars++;
-
-    const std::string& fontName = text.FontName;
-
-    // Default/empty uses regular ImGui font to avoid runtime font atlas mutations.
-    if (!fontName.empty() && fontName != "Default")
-    {
-        ImFont* font = UIRenderer::Get().GetFontRegistry().GetFont(fontName, text.FontSize);
-        if (font)
-        {
-            ImGui::PushFont(font);
-            c.fonts++;
-        }
-    }
-}
-
-void PopUIStyle(const StyleCounts& c)
-{
-    for (int i = 0; i < c.fonts; ++i) ImGui::PopFont();
-    ImGui::PopStyleVar(c.vars);
-    ImGui::PopStyleColor(c.colors);
-    if (c.disabled) ImGui::EndDisabled();
-}
-
-// ---------------------------------------------------------------------------
-// Widget rendering
-// ---------------------------------------------------------------------------
-
-void RenderPanel(const PanelControl& panel, const ImVec2& pos, const ImVec2& size)
-{
-    ImDrawList* dl   = ImGui::GetWindowDrawList();
-    ImU32 bgColor    = ImGui::GetColorU32(ToImVec4(panel.Style.BackgroundColor));
-    ImU32 borderCol  = ImGui::GetColorU32(ToImVec4(panel.Style.BorderColor));
-    ImVec2 pMax      = {pos.x + size.x, pos.y + size.y};
-
-    TextureHandle textureHandle = panel.TextureHandle;
-    if (textureHandle == 0 && !panel.TexturePath.empty())
-    {
-        textureHandle = TextureSystem::Get().LoadTexture(panel.TexturePath);
-    }
-
-    if (textureHandle != 0)
-    {
-        auto texture = TextureSystem::Get().GetTexture(textureHandle);
-        if (texture && texture->IsReady())
-        {
-            ImTextureID texId = (ImTextureID)(uintptr_t)texture->GetRendererID();
-            // UI textures are loaded with stb vertical flip enabled; invert V in ImGui sampling to keep them upright.
-            dl->AddImageRounded(texId, pos, pMax, {0,1}, {1,0}, IM_COL32_WHITE, panel.Style.Rounding);
-        }
-    }
-    else if (panel.Style.UseGradient)
-    {
-        ImU32 gradColor = ImGui::GetColorU32(ToImVec4(panel.Style.GradientColor));
-        dl->AddRectFilledMultiColor(pos, pMax, bgColor, bgColor, gradColor, gradColor);
-    }
-    else
-    {
-        dl->AddRectFilled(pos, pMax, bgColor, panel.Style.Rounding);
-    }
-
-    if (panel.Style.BorderSize > 0.0f)
-        dl->AddRect(pos, pMax, borderCol, panel.Style.Rounding, 0, panel.Style.BorderSize);
-}
-
-void RenderLabel(const LabelControl& label, const ImVec2& size)
-{
-    StyleCounts c;
-    PushTextStyle(label.Style, c);
-
-    ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + size.x);
-    ImVec2 ts = ImGui::CalcTextSize(label.Text.c_str(), nullptr, true, size.x);
-
-    float sx = 0, sy = 0;
-    if (label.Style.HorizontalAlignment == TextAlignment::Center)  sx = (size.x - ts.x) * 0.5f;
-    else if (label.Style.HorizontalAlignment == TextAlignment::Right) sx = size.x - ts.x;
-    if (label.Style.VerticalAlignment == TextAlignment::Center)    sy = (size.y - ts.y) * 0.5f;
-    else if (label.Style.VerticalAlignment == TextAlignment::Bottom)  sy = size.y - ts.y;
-
-    ImGui::SetCursorPos({ImGui::GetCursorPosX() + sx, ImGui::GetCursorPosY() + sy});
-    ImGui::TextUnformatted(label.Text.c_str());
-    ImGui::PopTextWrapPos();
-
-    PopUIStyle(c);
-}
-
-bool RenderButton(Entity entity, ButtonControl& button, const ImVec2& size)
-{
-    ImGui::PushID((int)entity);
-    ImGui::InvisibleButton(button.Label.c_str(), size);
-
-    button.IsHovered = ImGui::IsItemHovered();
-    button.IsDown    = ImGui::IsItemActive();
-    if (ImGui::IsItemClicked())
-    {
-        CH_CORE_INFO("UI: Button '{}' clicked", button.Label);
-        button.PressedThisFrame = true;
-    }
-
-    bool handled = ImGui::IsItemActive();
-
-    ImDrawList* dl   = ImGui::GetWindowDrawList();
-    ImVec2 pos       = ImGui::GetItemRectMin();
-    ImVec2 aSize     = size;
-
-    if (button.Style.State.CurrentScale != 1.0f)
-    {
-        ImVec2 center = {pos.x + size.x * 0.5f, pos.y + size.y * 0.5f};
-        aSize.x *= button.Style.State.CurrentScale;
-        aSize.y *= button.Style.State.CurrentScale;
-        pos.x = center.x - aSize.x * 0.5f;
-        pos.y = center.y - aSize.y * 0.5f;
-    }
-
-    ImVec2 pMax = {pos.x + aSize.x, pos.y + aSize.y};
-    ImU32 color = ImGui::GetColorU32(ToImVec4(button.Style.State.CurrentColor));
-    dl->AddRectFilled(pos, pMax, color, button.Style.Rounding);
-
-    if (button.Style.BorderSize > 0.0f)
-        dl->AddRect(pos, pMax, ImGui::GetColorU32(ToImVec4(button.Style.BorderColor)), button.Style.Rounding, 0, button.Style.BorderSize);
-
-    StyleCounts c;
-    PushTextStyle(button.Text, c);
-    ImVec2 ts  = ImGui::CalcTextSize(button.Label.c_str());
-    ImVec2 tp  = {pos.x + (aSize.x - ts.x) * 0.5f, pos.y + (aSize.y - ts.y) * 0.5f};
-    dl->AddText(tp, ImGui::GetColorU32(ImGuiCol_Text), button.Label.c_str());
-    PopUIStyle(c);
-
-    ImGui::PopID();
-    return handled;
-}
-
-bool RenderSlider(SliderControl& slider, const ImVec2& size)
-{
-    StyleCounts c = PushUIStyle(slider.Style);
-    PushTextStyle(slider.Text, c);
-    ImGui::SetNextItemWidth(size.x);
-    slider.Changed = ImGui::SliderFloat(slider.Label.c_str(), &slider.Value, slider.Min, slider.Max);
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderCheckbox(CheckboxControl& cb)
-{
-    StyleCounts c = PushUIStyle(cb.Style);
-    PushTextStyle(cb.Text, c);
-    cb.Changed = ImGui::Checkbox(cb.Label.c_str(), &cb.Checked);
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-void RenderImage(ImageControl& image, const ImVec2& size)
-{
-    ImDrawList* dl  = ImGui::GetWindowDrawList();
-    ImVec2 pos      = ImGui::GetCursorScreenPos();
-    ImVec2 aSize    = size;
-
-    ImGui::InvisibleButton("##img", size);
-    image.IsHovered = ImGui::IsItemHovered();
-    image.IsDown    = ImGui::IsItemActive();
-
-    if (image.Style.State.CurrentScale != 1.0f)
-    {
-        ImVec2 center = {pos.x + size.x * 0.5f, pos.y + size.y * 0.5f};
-        aSize.x *= image.Style.State.CurrentScale;
-        aSize.y *= image.Style.State.CurrentScale;
-        pos.x = center.x - aSize.x * 0.5f;
-        pos.y = center.y - aSize.y * 0.5f;
-    }
-
-    ImVec2 pMax = {pos.x + aSize.x, pos.y + aSize.y};
-
-    TextureHandle textureHandle = image.TextureHandle;
-    if (textureHandle == 0 && !image.TexturePath.empty())
-    {
-        textureHandle = TextureSystem::Get().LoadTexture(image.TexturePath);
-        image.TextureHandle = textureHandle;
-    }
-
-    if (textureHandle != 0)
-    {
-        auto tex = TextureSystem::Get().GetTexture(textureHandle);
-        if (tex && tex->IsReady())
-        {
-            ImTextureID tid = (ImTextureID)(uintptr_t)tex->GetRendererID();
-            dl->AddImageRounded(tid, pos, pMax, {0,1}, {1,0}, ImGui::GetColorU32(ToImVec4(image.TintColor)), image.Style.Rounding);
-        }
-    }
-    else
-    {
-        ImU32 bg = ImGui::GetColorU32(ToImVec4(image.Style.State.CurrentColor));
-        if (image.Style.UseGradient)
-        {
-            ImU32 gc = ImGui::GetColorU32(ToImVec4(image.Style.GradientColor));
-            dl->AddRectFilledMultiColor(pos, pMax, bg, bg, gc, gc);
-        }
-        else
-        {
-            dl->AddRectFilled(pos, pMax, bg, image.Style.Rounding);
-        }
-    }
-
-    if (image.Style.BorderSize > 0.0f)
-        dl->AddRect(pos, pMax, ImGui::GetColorU32(ToImVec4(image.BorderColor)), image.Style.Rounding, 0, image.Style.BorderSize);
-}
-
-bool RenderInputText(Entity entity, InputTextControl& it, const ImVec2& size)
-{
-    StyleCounts c = PushUIStyle(it.BoxStyle, !it.ReadOnly);
-    PushTextStyle(it.Style, c);
-
-    auto& buf = it.InputBuffer;
-    if (buf.size() != (size_t)it.MaxLength + 1)
-    {
-        buf.resize(it.MaxLength + 1, '\0');
-        strncpy(buf.data(), it.Text.c_str(), it.MaxLength);
-    }
-
-    ImGuiInputTextFlags flags = (it.ReadOnly ? ImGuiInputTextFlags_ReadOnly : 0) | (it.Password ? ImGuiInputTextFlags_Password : 0);
-    bool changed = false;
-    if (it.Multiline)
-        changed = ImGui::InputTextMultiline(it.Label.c_str(), buf.data(), buf.size(), size, flags);
-    else
-    {
-        ImGui::SetNextItemWidth(size.x);
-        changed = ImGui::InputText(it.Label.c_str(), buf.data(), buf.size(), flags);
-    }
-    if (changed) { it.Text = buf.data(); it.Changed = true; }
-
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-void RenderProgressBar(const ProgressBarControl& pb, const ImVec2& size)
-{
-    StyleCounts c = PushUIStyle(pb.BarStyle);
-    PushTextStyle(pb.Style, c);
-
-    std::string overlay = pb.OverlayText;
-    if (overlay.empty() && pb.ShowPercentage)
-        overlay = std::to_string((int)(pb.Progress * 100)) + "%";
-
-    ImGui::ProgressBar(pb.Progress, size, overlay.c_str());
-    PopUIStyle(c);
-}
-
-bool RenderComboBox(ComboBoxControl& cb, const ImVec2& size)
-{
-    StyleCounts c = PushUIStyle(cb.BoxStyle);
-    PushTextStyle(cb.Style, c);
-    ImGui::SetNextItemWidth(size.x);
-    const char* preview = (cb.SelectedIndex >= 0 && cb.SelectedIndex < (int)cb.Items.size()) ? cb.Items[cb.SelectedIndex].c_str() : "";
-    if (ImGui::BeginCombo(cb.Label.c_str(), preview))
-    {
-        for (int i = 0; i < (int)cb.Items.size(); i++)
-            if (ImGui::Selectable(cb.Items[i].c_str(), i == cb.SelectedIndex)) { cb.SelectedIndex = i; cb.Changed = true; }
-        ImGui::EndCombo();
-    }
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderImageButton(ImageButtonControl& ib, const ImVec2& size)
-{
-    TextureHandle textureHandle = ib.TextureHandle;
-    if (textureHandle == 0 && !ib.TexturePath.empty())
-    {
-        textureHandle = TextureSystem::Get().LoadTexture(ib.TexturePath);
-        ib.TextureHandle = textureHandle;
-    }
-
-    if (textureHandle == 0) return false;
-
-    auto tex = TextureSystem::Get().GetTexture(textureHandle);
-    if (!tex) return false;
-
-    ImTextureID tid = (ImTextureID)(uintptr_t)tex->GetRendererID();
-    if (ImGui::ImageButton(ib.Label.c_str(), tid, size, {0,1}, {1,0}, ToImVec4(ib.BackgroundColor), ToImVec4(ib.TintColor)))
-        ib.PressedThisFrame = true;
-    return ImGui::IsItemActive();
-}
-
-bool RenderRadioButton(RadioButtonControl& rb)
-{
-    StyleCounts c;
-    PushTextStyle(rb.Style, c);
-    for (int i = 0; i < (int)rb.Options.size(); i++)
-    {
-        if (ImGui::RadioButton(rb.Options[i].c_str(), rb.SelectedIndex == i)) { rb.SelectedIndex = i; rb.Changed = true; }
-        if (rb.Horizontal && i < (int)rb.Options.size() - 1) ImGui::SameLine();
-    }
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderColorPicker(ColorPickerControl& cp)
-{
-    float col[4] = {cp.SelectedColor.r / 255.f, cp.SelectedColor.g / 255.f, cp.SelectedColor.b / 255.f, cp.SelectedColor.a / 255.f};
-    if (cp.ShowPicker ? ImGui::ColorPicker4(cp.Label.c_str(), col) : ImGui::ColorEdit4(cp.Label.c_str(), col))
-    {
-        cp.SelectedColor = {(uint8_t)(col[0]*255), (uint8_t)(col[1]*255), (uint8_t)(col[2]*255), (uint8_t)(col[3]*255)};
-        cp.Changed = true;
-    }
-    return ImGui::IsItemActive();
-}
-
-void RenderSeparator(const SeparatorControl& sep)
-{
-    ImGui::PushStyleColor(ImGuiCol_Separator, ToImVec4(sep.LineColor));
-    ImGui::Separator();
-    ImGui::PopStyleColor();
-}
-
-bool RenderDragFloat(DragFloatControl& df, const ImVec2& size)
-{
-    StyleCounts c = PushUIStyle(df.BoxStyle);
-    PushTextStyle(df.Style, c);
-    ImGui::SetNextItemWidth(size.x);
-    df.Changed = ImGui::DragFloat(df.Label.c_str(), &df.Value, df.Speed, df.Min, df.Max, df.Format.c_str());
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderDragInt(DragIntControl& di, const ImVec2& size)
-{
-    StyleCounts c = PushUIStyle(di.BoxStyle);
-    PushTextStyle(di.Style, c);
-    ImGui::SetNextItemWidth(size.x);
-    di.Changed = ImGui::DragInt(di.Label.c_str(), &di.Value, di.Speed, di.Min, di.Max, di.Format.c_str());
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderTreeNode(TreeNodeControl& tn)
-{
-    StyleCounts c;
-    PushTextStyle(tn.Style, c);
-    ImGuiTreeNodeFlags flags = (tn.DefaultOpen ? ImGuiTreeNodeFlags_DefaultOpen : 0) |
-                               (tn.IsLeaf ? ImGuiTreeNodeFlags_Leaf : 0) | ImGuiTreeNodeFlags_SpanAvailWidth;
-    tn.IsOpen = ImGui::TreeNodeEx(tn.Label.c_str(), flags);
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderCollapsingHeader(CollapsingHeaderControl& ch)
-{
-    StyleCounts c;
-    PushTextStyle(ch.Style, c);
-    ch.IsOpen = ImGui::CollapsingHeader(ch.Label.c_str(), ch.DefaultOpen ? ImGuiTreeNodeFlags_DefaultOpen : 0);
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderPlotLines(const PlotLinesControl& pl)
-{
-    StyleCounts c = PushUIStyle(pl.BoxStyle);
-    PushTextStyle(pl.Style, c);
-    ImGui::PlotLines(pl.Label.c_str(), pl.Values.data(), (int)pl.Values.size(), 0, pl.OverlayText.c_str(), pl.ScaleMin, pl.ScaleMax, {pl.GraphSize.x, pl.GraphSize.y});
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-bool RenderPlotHistogram(const PlotHistogramControl& ph)
-{
-    StyleCounts c = PushUIStyle(ph.BoxStyle);
-    PushTextStyle(ph.Style, c);
-    ImGui::PlotHistogram(ph.Label.c_str(), ph.Values.data(), (int)ph.Values.size(), 0, ph.OverlayText.c_str(), ph.ScaleMin, ph.ScaleMax, {ph.GraphSize.x, ph.GraphSize.y});
-    bool handled = ImGui::IsItemActive();
-    PopUIStyle(c);
-    return handled;
-}
-
-void RenderTabBar(Entity tabBarEntity, const TabBarControl& tb, entt::registry& registry)
-{
-    ImGuiTabBarFlags flags = (tb.Reorderable ? ImGuiTabBarFlags_Reorderable : 0) |
-                             (tb.AutoSelectNewTabs ? ImGuiTabBarFlags_AutoSelectNewTabs : 0);
-    if (!ImGui::BeginTabBar(tb.Label.c_str(), flags)) return;
-
-    std::vector<entt::entity> tabItems;
-    if (tabBarEntity.HasComponent<HierarchyComponent>())
-    {
-        auto& hierarchy = tabBarEntity.GetComponent<HierarchyComponent>();
-        for (auto childID : hierarchy.Children)
-            if (registry.valid(childID) && registry.all_of<TabItemControl, ControlComponent>(childID))
-                tabItems.push_back(childID);
-        std::sort(tabItems.begin(), tabItems.end(), [&](entt::entity a, entt::entity b) {
-            return registry.get<ControlComponent>(a).ZOrder < registry.get<ControlComponent>(b).ZOrder;
-        });
-    }
-
-    for (auto childID : tabItems)
-    {
-        auto& ti = registry.get<TabItemControl>(childID);
-        std::string label = ti.Label + "##" + std::to_string((uint32_t)childID);
-        if (ImGui::BeginTabItem(label.c_str(), &ti.IsOpen)) { ti.Selected = true; ImGui::EndTabItem(); }
-        else ti.Selected = false;
-    }
-
-    ImGui::EndTabBar();
-}
-
-} // namespace CHEngine::UI
diff --git a/engine/graphics/pipeline/ui_widget_renderer.h b/engine/graphics/pipeline/ui_widget_renderer.h
deleted file mode 100644
index 8277067ad..000000000
--- a/engine/graphics/pipeline/ui_widget_renderer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef CH_UI_WIDGET_RENDERER_H
-#define CH_UI_WIDGET_RENDERER_H
-
-#include "engine/scene/components.h"
-#include "engine/scene/entity.h"
-#include "imgui.h"
-#include "entt/entt.hpp"
-
-namespace CHEngine::UI
-{
-
-// Converts engine Color to ImVec4
-inline ImVec4 ToImVec4(const Color& c)
-{
-    return ImVec4(c.r / 255.f, c.g / 255.f, c.b / 255.f, c.a / 255.f);
-}
-
-// Style push/pop helpers
-struct StyleCounts
-{
-    int  colors   = 0;
-    int  vars     = 0;
-    int  fonts    = 0;
-    bool disabled = false;
-};
-
-StyleCounts PushUIStyle(const UIStyle& style, bool interactable = true);
-void        PushTextStyle(const TextStyle& text, StyleCounts& c);
-void        PopUIStyle(const StyleCounts& c);
-
-// --- Widget rendering functions ---
-
-void RenderPanel   (const PanelControl& panel, const ImVec2& pos, const ImVec2& size);
-void RenderLabel   (const LabelControl& label, const ImVec2& size);
-bool RenderButton  (Entity entity, ButtonControl& button, const ImVec2& size);
-bool RenderSlider  (SliderControl& slider, const ImVec2& size);
-bool RenderCheckbox(CheckboxControl& cb);
-void RenderImage   (ImageControl& image, const ImVec2& size);
-bool RenderInputText(Entity entity, InputTextControl& it, const ImVec2& size);
-void RenderProgressBar(const ProgressBarControl& pb, const ImVec2& size);
-bool RenderComboBox(ComboBoxControl& cb, const ImVec2& size);
-bool RenderImageButton(ImageButtonControl& ib, const ImVec2& size);
-bool RenderRadioButton(RadioButtonControl& rb);
-bool RenderColorPicker(ColorPickerControl& cp);
-void RenderSeparator(const SeparatorControl& sep);
-bool RenderDragFloat(DragFloatControl& df, const ImVec2& size);
-bool RenderDragInt  (DragIntControl& di, const ImVec2& size);
-bool RenderTreeNode(TreeNodeControl& tn);
-bool RenderCollapsingHeader(CollapsingHeaderControl& ch);
-bool RenderPlotLines(const PlotLinesControl& pl);
-bool RenderPlotHistogram(const PlotHistogramControl& ph);
-void RenderTabBar  (Entity tabBarEntity, const TabBarControl& tb, entt::registry& registry);
-
-} // namespace CHEngine::UI
-
-#endif // CH_UI_WIDGET_RENDERER_H
diff --git a/engine/graphics/stb_impl.cpp b/engine/graphics/stb_impl.cpp
deleted file mode 100644
index 8ddfd1f54..000000000
--- a/engine/graphics/stb_impl.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
diff --git a/engine/graphics/text_renderer.cpp b/engine/graphics/text_renderer.cpp
new file mode 100644
index 000000000..562416f48
--- /dev/null
+++ b/engine/graphics/text_renderer.cpp
@@ -0,0 +1,300 @@
+#include "engine/graphics/text_renderer.h"
+#include "engine/graphics/api/texture.h"
+#include "engine/graphics/freetype_gl_atlas.h"
+#include "engine/assets/types/font_asset.h"
+
+#include <cstring>
+
+namespace Chained
+{
+
+	static std::vector<uint32_t> DecodeUTF8(const std::string& text)
+	{
+		std::vector<uint32_t> codepoints;
+		codepoints.reserve(text.size());
+		size_t i = 0;
+		const size_t len = text.size();
+		while (i < len)
+		{
+			uint32_t cp = 0;
+			unsigned char c = static_cast<unsigned char>(text[i]);
+			if (c < 0x80)
+			{
+				cp = c;
+				i += 1;
+			}
+			else if ((c & 0xE0) == 0xC0 && (i + 1 < len))
+			{
+				cp = (c & 0x1F) << 6;
+				cp |= (static_cast<unsigned char>(text[i + 1]) & 0x3F);
+				i += 2;
+			}
+			else if ((c & 0xF0) == 0xE0 && (i + 2 < len))
+			{
+				cp = (c & 0x0F) << 12;
+				cp |= (static_cast<unsigned char>(text[i + 1]) & 0x3F) << 6;
+				cp |= (static_cast<unsigned char>(text[i + 2]) & 0x3F);
+				i += 3;
+			}
+			else if ((c & 0xF8) == 0xF0 && (i + 3 < len))
+			{
+				cp = (c & 0x07) << 18;
+				cp |= (static_cast<unsigned char>(text[i + 1]) & 0x3F) << 12;
+				cp |= (static_cast<unsigned char>(text[i + 2]) & 0x3F) << 6;
+				cp |= (static_cast<unsigned char>(text[i + 3]) & 0x3F);
+				i += 4;
+			}
+			else
+			{
+				cp = '?';
+				i += 1;
+			}
+			codepoints.push_back(cp);
+		}
+		return codepoints;
+	}
+
+	void TextRenderer::Init()
+	{
+		m_Initialized = true;
+	}
+
+	void TextRenderer::Shutdown()
+	{
+		m_Cache.clear();
+		m_Initialized = false;
+	}
+
+	// ── glyph layout ────────────────────────────────────────────────────────
+
+	void TextRenderer::Measure(const std::string& text, const Font& font, float fontSize, float& outWidth,
+							   float& outHeight) const
+	{
+		if (text.empty())
+		{
+			outWidth = 0;
+			outHeight = 0;
+			return;
+		}
+		float scale = (font.fontSize > 0.0f) ? (fontSize / font.fontSize) : 1.0f;
+		std::vector<uint32_t> codepoints = DecodeUTF8(text);
+
+		float cursorX = 0.0f;
+		float maxH = 0.0f;
+		for (uint32_t cp : codepoints)
+		{
+			const auto& ch = font.GetChar(cp);
+			if (ch.xadvance > 0.0f)
+			{
+				cursorX += ch.xadvance * scale;
+			}
+			else
+			{
+				cursorX += fontSize * 0.5f;
+			}
+			float glyphH = (ch.y1 - ch.y0) * font.atlasHeight * scale;
+			if (glyphH > maxH)
+			{
+				maxH = glyphH;
+			}
+		}
+		if (maxH <= 0.0f)
+		{
+			maxH = fontSize;
+		}
+		outWidth = cursorX;
+		outHeight = maxH;
+	}
+
+	std::vector<GlyphQuad> TextRenderer::LayoutGlyphs(const std::string& text, const Font& font, float fontSize) const
+	{
+		std::vector<GlyphQuad> quads;
+		if (text.empty())
+		{
+			return quads;
+		}
+
+		float scale = (font.fontSize > 0.0f) ? (fontSize / font.fontSize) : 1.0f;
+		std::vector<uint32_t> codepoints = DecodeUTF8(text);
+		quads.reserve(codepoints.size());
+
+		float cursorX = 0.0f;
+
+		for (uint32_t cp : codepoints)
+		{
+			const auto& ch = font.GetChar(cp);
+
+			float gw = (ch.x1 - ch.x0) * font.atlasWidth * scale;
+			float gh = (ch.y1 - ch.y0) * font.atlasHeight * scale;
+
+			if (gw > 0.0f && gh > 0.0f)
+			{
+				GlyphQuad q;
+				q.x = cursorX + ch.xoff * scale;
+				q.y = fontSize + ch.yoff * scale; // y-off from baseline
+				q.w = gw;
+				q.h = gh;
+				q.s0 = ch.x0;
+				q.t0 = ch.y0;
+				q.s1 = ch.x1;
+				q.t1 = ch.y1;
+				q.advance = ch.xadvance * scale;
+				quads.push_back(q);
+			}
+
+			if (ch.xadvance > 0.0f)
+			{
+				cursorX += ch.xadvance * scale;
+			}
+			else
+			{
+				cursorX += fontSize * 0.5f;
+			}
+		}
+		return quads;
+	}
+
+	// ── legacy per-string texture (unchanged interface for compatibility) ────
+
+	static void RasterizeGlyph(uint8_t* dest, int destW, int destH, int x, int y, const uint8_t* atlas, int atlasW,
+							   int atlasH, const FontChar& ch, int glyphW, int glyphH)
+	{
+		int srcX0 = static_cast<int>(ch.x0 * atlasW);
+		int srcY0 = static_cast<int>(ch.y0 * atlasH);
+		int srcX1 = static_cast<int>(ch.x1 * atlasW);
+		int srcY1 = static_cast<int>(ch.y1 * atlasH);
+
+		int srcW = srcX1 - srcX0;
+		int srcH = srcY1 - srcY0;
+		if (srcW <= 0 || srcH <= 0)
+		{
+			return;
+		}
+
+		for (int row = 0; row < glyphH && (y + row) < destH; ++row)
+		{
+			if (y + row < 0)
+			{
+				continue;
+			}
+			int srcRow = (row * srcH) / glyphH;
+			for (int col = 0; col < glyphW && (x + col) < destW; ++col)
+			{
+				if (x + col < 0)
+				{
+					continue;
+				}
+				int srcCol = (col * srcW) / glyphW;
+
+				int srcIdx = ((srcY0 + srcRow) * atlasW + (srcX0 + srcCol)) * 4;
+				int dstIdx = ((y + row) * destW + (x + col)) * 4;
+
+				dest[dstIdx + 3] = atlas[srcIdx + 3];
+			}
+		}
+	}
+
+	uint32_t TextRenderer::GetOrCreateTexture(const std::string& text, const Font& font, float fontSize, int padding)
+	{
+		if (text.empty())
+		{
+			m_LastWidth = 0;
+			m_LastHeight = 0;
+			return 0;
+		}
+
+		std::string key = text + "_" + std::to_string((int)fontSize);
+		auto it = m_Cache.find(key);
+		if (it != m_Cache.end())
+		{
+			m_LastWidth = it->second.width;
+			m_LastHeight = it->second.height;
+			return it->second.gpuTexture ? it->second.gpuTexture->GetNativeHandle() : 0;
+		}
+
+		float totalWidth = 0.0f;
+		float maxHeight = 0.0f;
+		std::vector<uint32_t> codepoints = DecodeUTF8(text);
+
+		for (uint32_t cp : codepoints)
+		{
+			const auto& ch = font.GetChar(cp);
+			if (ch.xadvance > 0.0f)
+			{
+				totalWidth += ch.xadvance * ((font.fontSize > 0.0f) ? (fontSize / font.fontSize) : 1.0f);
+			}
+			else
+			{
+				totalWidth += fontSize * 0.5f;
+			}
+			float glyphH =
+				(ch.y1 - ch.y0) * font.atlasHeight * ((font.fontSize > 0.0f) ? (fontSize / font.fontSize) : 1.0f);
+			if (glyphH > maxHeight)
+			{
+				maxHeight = glyphH;
+			}
+		}
+		if (maxHeight <= 0.0f)
+		{
+			maxHeight = fontSize;
+		}
+
+		int width = std::max(1, static_cast<int>(totalWidth) + padding * 2);
+		int height = std::max(1, static_cast<int>(maxHeight) + padding * 2);
+
+		std::vector<uint8_t> pixels(width * height * 4);
+		for (size_t i = 0; i < pixels.size(); i += 4)
+		{
+			pixels[i + 0] = 255;
+			pixels[i + 1] = 255;
+			pixels[i + 2] = 255;
+			pixels[i + 3] = 0;
+		}
+
+		if (!font.atlasPixels.empty() && font.atlasWidth > 0 && font.atlasHeight > 0)
+		{
+			float scale = (font.fontSize > 0.0f) ? (fontSize / font.fontSize) : 1.0f;
+			float cursorX = 0.0f;
+
+			for (uint32_t cp : codepoints)
+			{
+				const auto& ch = font.GetChar(cp);
+
+				int glyphW = static_cast<int>((ch.x1 - ch.x0) * font.atlasWidth * scale);
+				int glyphH = static_cast<int>((ch.y1 - ch.y0) * font.atlasHeight * scale);
+				if (glyphW <= 0 || glyphH <= 0)
+				{
+					cursorX += (ch.xadvance > 0.0f) ? ch.xadvance * scale : fontSize * 0.5f;
+					continue;
+				}
+
+				int glyphX = padding + static_cast<int>(cursorX) + static_cast<int>(ch.xoff * scale);
+				int glyphY = padding + static_cast<int>(fontSize) + static_cast<int>(ch.yoff * scale);
+
+				RasterizeGlyph(pixels.data(), width, height, glyphX, glyphY, font.atlasPixels.data(), font.atlasWidth,
+							   font.atlasHeight, ch, glyphW, glyphH);
+
+				cursorX += ch.xadvance * scale;
+			}
+		}
+
+		auto texture =
+			Texture::Create(static_cast<uint32_t>(width), static_cast<uint32_t>(height), TextureFormat::RGBA8);
+		if (texture)
+		{
+			texture->SetData(pixels.data(), static_cast<uint32_t>(pixels.size()));
+		}
+
+		m_LastWidth = width;
+		m_LastHeight = height;
+
+		CachedText cached;
+		cached.gpuTexture = texture;
+		cached.width = width;
+		cached.height = height;
+		m_Cache[key] = cached;
+
+		return texture ? texture->GetNativeHandle() : 0;
+	}
+
+} // namespace Chained
diff --git a/engine/graphics/text_renderer.h b/engine/graphics/text_renderer.h
new file mode 100644
index 000000000..3e815069a
--- /dev/null
+++ b/engine/graphics/text_renderer.h
@@ -0,0 +1,70 @@
+#ifndef CH_TEXT_RENDERER_H
+#define CH_TEXT_RENDERER_H
+
+#include "engine/assets/types/font_asset.h"
+#include "engine/graphics/api/texture.h"
+#include <string>
+#include <unordered_map>
+#include <memory>
+#include <cstdint>
+
+namespace Chained
+{
+
+	struct GlyphQuad
+	{
+		float x, y;			  // top-left in pixels
+		float w, h;			  // quad size in pixels
+		float s0, t0, s1, t1; // UV into atlas
+		float advance;		  // horizontal advance for next glyph
+	};
+
+	class TextRenderer
+	{
+	public:
+		TextRenderer() = default;
+		~TextRenderer()
+		{
+			Shutdown();
+		}
+
+		void Init();
+		void Shutdown();
+
+		/// Create / return a GPU texture of the whole text string (legacy path, kept for compat).
+		uint32_t GetOrCreateTexture(const std::string& text, const Font& font, float fontSize = 32.0f, int padding = 4);
+
+		int GetLastWidth() const
+		{
+			return m_LastWidth;
+		}
+		int GetLastHeight() const
+		{
+			return m_LastHeight;
+		}
+
+		/// Layout glyphs without rasterising a texture.
+		/// Returns quads positioned relative to the top-left of the text region.
+		std::vector<GlyphQuad> LayoutGlyphs(const std::string& text, const Font& font, float fontSize = 32.0f) const;
+
+		/// Measure text extents without generating quads.
+		void Measure(const std::string& text, const Font& font, float fontSize, float& outWidth,
+					 float& outHeight) const;
+
+	private:
+		struct CachedText
+		{
+			std::shared_ptr<Texture> gpuTexture;
+			int width = 0;
+			int height = 0;
+		};
+
+		std::unordered_map<std::string, CachedText> m_Cache;
+		int m_LastWidth = 0;
+		int m_LastHeight = 0;
+		bool m_Initialized = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_TEXT_RENDERER_H
diff --git a/engine/graphics/texture_system.cpp b/engine/graphics/texture_system.cpp
deleted file mode 100644
index ac5c5b16f..000000000
--- a/engine/graphics/texture_system.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-#include "texture_system.h"
-#include "engine/core/log.h"
-#include "engine/scene/project.h"
-#include <stb_image.h>
-#include <filesystem>
-#include <algorithm>
-
-namespace CHEngine
-{
-    TextureHandle TextureSystem::LoadTexture(const std::string& filepath, bool isCubemap)
-    {
-        if (filepath.empty())
-            return TextureHandle(0);
-
-        std::filesystem::path resolvedPath = Project::GetAbsolutePath(filepath);
-        if (resolvedPath.empty() || !std::filesystem::exists(resolvedPath))
-            return TextureHandle(0);
-
-        std::string cacheKey = resolvedPath.generic_string();
-
-        std::lock_guard<std::mutex> lock(m_Mutex);
-
-        auto cachedPathIt = m_PathMap.find(cacheKey);
-        if (cachedPathIt != m_PathMap.end())
-        {
-            return cachedPathIt->second;
-        }
-
-        int width, height, channels;
-
-        bool isHDR = stbi_is_hdr(cacheKey.c_str());
-        stbi_set_flip_vertically_on_load(!isHDR);
-
-        void* data = nullptr;
-
-        if (isHDR)
-        {
-            data = stbi_loadf(cacheKey.c_str(), &width, &height, &channels, 0);
-        }
-        else
-        {
-            data = stbi_load(cacheKey.c_str(), &width, &height, &channels, 4);
-            channels = 4;
-        }
-
-        if (!data)
-        {
-            const char* reason = stbi_failure_reason();
-            CH_CORE_ERROR("TextureSystem: Failed to load image {}. Reason: {}", cacheKey, reason ? reason : "Unknown");
-            return TextureHandle(0);
-        }
-
-        TextureFormat format = TextureFormat::RGBA8;
-        if (isHDR)
-        {
-            format = (channels == 3) ? TextureFormat::RGB16F : TextureFormat::RGBA16F;
-        }
-        else
-        {
-            format = (channels == 3) ? TextureFormat::RGB8 : TextureFormat::RGBA8;
-        }
-
-        std::shared_ptr<Texture> texture;
-        if (isCubemap)
-        {
-            texture = Texture::CreateCubemap(width, format);
-        }
-        else
-        {
-            texture = Texture::Create(width, height, format);
-            if (texture)
-            {
-                texture->SetData(data, 0);
-            }
-        }
-
-        stbi_image_free(data);
-
-        if (!texture)
-        {
-            return TextureHandle(0);
-        }
-
-        TextureHandle newHandle = UUID();
-        m_Registry.emplace(newHandle, TextureInfo{texture, cacheKey, isHDR, isCubemap});
-        m_PathMap.emplace(cacheKey, newHandle);
-
-        return newHandle;
-    }
-
-    bool TextureSystem::IsLoaded(TextureHandle handle) const
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        return m_Registry.find(handle) != m_Registry.end();
-    }
-
-    uint32_t TextureSystem::GetRendererID(TextureHandle handle) const
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        auto it = m_Registry.find(handle);
-        if (it != m_Registry.end() && it->second.GPUTexture)
-        {
-            return it->second.GPUTexture->GetRendererID();
-        }
-        return 0;
-    }
-
-    std::shared_ptr<Texture> TextureSystem::GetTexture(TextureHandle handle) const
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        auto it = m_Registry.find(handle);
-        if (it != m_Registry.end())
-        {
-            return it->second.GPUTexture;
-        }
-        return nullptr;
-    }
-
-    bool TextureSystem::IsHDR(TextureHandle handle) const
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        auto it = m_Registry.find(handle);
-        return it != m_Registry.end() && it->second.IsHDR;
-    }
-
-    bool TextureSystem::IsCubemap(TextureHandle handle) const
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        auto it = m_Registry.find(handle);
-        return it != m_Registry.end() && it->second.IsCubemap;
-    }
-
-    void TextureSystem::Unload(TextureHandle handle)
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        auto it = m_Registry.find(handle);
-        if (it != m_Registry.end())
-        {
-            m_PathMap.erase(it->second.Path);
-            m_Registry.erase(it);
-        }
-    }
-
-    void TextureSystem::UnloadAll()
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        m_Registry.clear();
-        m_PathMap.clear();
-    }
-}
diff --git a/engine/graphics/texture_system.h b/engine/graphics/texture_system.h
deleted file mode 100644
index e64cf1ccd..000000000
--- a/engine/graphics/texture_system.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef CH_TEXTURE_SYSTEM_H
-#define CH_TEXTURE_SYSTEM_H
-
-#include "engine/core/uuid.h"
-#include "engine/graphics/api/texture.h"
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include <mutex>
-
-namespace CHEngine
-{
-    using TextureHandle = UUID;
-
-    // Cached GPU texture metadata tracked by the texture system.
-    struct TextureInfo
-    {
-        // The uploaded GPU texture, or nullptr until the asset is ready.
-        std::shared_ptr<Texture> GPUTexture;
-        // Resolved source path used to identify and reload the texture.
-        std::string Path;
-        // True when the source data is HDR encoded.
-        bool IsHDR = false;
-        // True when the texture was loaded as a cubemap.
-        bool IsCubemap = false;
-
-        // Returns true when the GPU texture object exists.
-        bool IsReady() const { return GPUTexture != nullptr; }
-    };
-
-    // Owns texture cache entries and provides lookup/unload helpers.
-    class TextureSystem
-    {
-    public:
-        // Returns the global texture system singleton.
-        static TextureSystem& Get()
-        {
-            static TextureSystem instance;
-            return instance;
-        }
-
-        // Loads a texture synchronously and returns its handle.
-        TextureHandle LoadTexture(const std::string& filepath, bool isCubemap = false);
-
-        // Returns true when the texture handle exists in the cache.
-        bool IsLoaded(TextureHandle handle) const;
-        // Returns the renderer-specific GPU texture ID, or 0 if missing.
-        uint32_t GetRendererID(TextureHandle handle) const;
-        // Returns the cached texture object for the given handle.
-        std::shared_ptr<Texture> GetTexture(TextureHandle handle) const;
-        // Returns true when the cached texture was loaded as HDR.
-        bool IsHDR(TextureHandle handle) const;
-        // Returns true when the cached texture was loaded as a cubemap.
-        bool IsCubemap(TextureHandle handle) const;
-        
-        // Removes one texture from the cache.
-        void Unload(TextureHandle handle);
-        // Clears the entire texture cache.
-        void UnloadAll();
-
-    private:
-        TextureSystem() = default;
-        ~TextureSystem() { UnloadAll(); }
-
-        TextureSystem(const TextureSystem&) = delete;
-        TextureSystem& operator=(const TextureSystem&) = delete;
-
-    private:
-        mutable std::mutex m_Mutex;
-        std::unordered_map<TextureHandle, TextureInfo> m_Registry;
-        std::unordered_map<std::string, TextureHandle> m_PathMap;
-    };
-}
-
-#endif // CH_TEXTURE_SYSTEM_H
diff --git a/engine/imgui/CMakeLists.txt b/engine/imgui/CMakeLists.txt
new file mode 100644
index 000000000..8895f14ab
--- /dev/null
+++ b/engine/imgui/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(engine_imgui STATIC
+    imgui_layer.h
+    imgui_layer.cpp
+)
+
+target_include_directories(engine_imgui PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_imgui PUBLIC
+    engine_core
+    engine_external_imgui
+    engine_platform
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_imgui PRIVATE engine_pch)
+endif()
diff --git a/engine/imgui/imgui_layer.cpp b/engine/imgui/imgui_layer.cpp
new file mode 100644
index 000000000..0563d8309
--- /dev/null
+++ b/engine/imgui/imgui_layer.cpp
@@ -0,0 +1,182 @@
+#include "imgui_layer.h"
+#include "engine/core/profiler.h"
+#include "engine/core/window.h"
+
+#include "ImGuizmo.h"
+#include "backends/imgui_impl_opengl3.h"
+#include "engine/app/application.h"
+#include "imgui.h"
+
+#include "backends/imgui_impl_glfw.h"
+#include <GLFW/glfw3.h>
+
+namespace Chained
+{
+	static constexpr const char* kGLSLVersion = "#version 430";
+
+	void ImGuiLayer::SetContext(ImGuiContext* context)
+	{
+		ImGui::SetCurrentContext(context);
+	}
+
+	void ImGuiLayer::OnAttach()
+	{
+		CH_PROFILE_FUNCTION();
+
+		// Validate native window before creating the ImGui context to avoid leaks on failure.
+		GLFWwindow* window = static_cast<GLFWwindow*>(Application::Get().GetWindow().GetNativeWindow());
+		if (!window)
+		{
+			CH_CORE_ERROR("ImGuiLayer: Failed to get native window handle!");
+			return;
+		}
+
+		// Setup ImGui context
+		IMGUI_CHECKVERSION();
+		ImGui::CreateContext();
+		ImGuiIO& io = ImGui::GetIO();
+
+		// Docking and viewports are always enabled
+		io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+		io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
+		io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports;
+		io.BackendFlags |= ImGuiBackendFlags_RendererHasViewports;
+
+		// Setup style
+		ImGui::StyleColorsDark();
+
+		ImGuiStyle& style = ImGui::GetStyle();
+		if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
+		{
+			style.WindowRounding = 0.0f;
+			style.Colors[ImGuiCol_WindowBg].w = 1.0f;
+		}
+
+		ImGui_ImplGlfw_InitForOpenGL(window, false);
+		ImGui_ImplOpenGL3_Init(kGLSLVersion);
+	}
+
+	void ImGuiLayer::OnDetach()
+	{
+		CH_PROFILE_FUNCTION();
+
+		ImGui::DestroyPlatformWindows();
+		ImGui_ImplOpenGL3_Shutdown();
+		ImGui_ImplGlfw_Shutdown();
+		ImGui::DestroyContext();
+	}
+
+	void ImGuiLayer::Begin()
+	{
+		CH_PROFILE_FUNCTION();
+
+		ImGui_ImplOpenGL3_NewFrame();
+		ImGui_ImplGlfw_NewFrame();
+		ImGui::NewFrame();
+		ImGuizmo::BeginFrame();
+	}
+
+	void ImGuiLayer::End()
+	{
+		CH_PROFILE_FUNCTION();
+
+		ImGuiIO& io = ImGui::GetIO();
+		io.DisplaySize =
+			ImVec2((float)Application::Get().GetWindow().GetWidth(), (float)Application::Get().GetWindow().GetHeight());
+
+		// 1. Render main window
+		ImGui::Render();
+		ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+
+		// 2. Render additional windows (Viewports)
+		if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
+		{
+			GLFWwindow* backup_current_context = glfwGetCurrentContext();
+			ImGui::UpdatePlatformWindows();
+			ImGui::RenderPlatformWindowsDefault();
+			glfwMakeContextCurrent(backup_current_context);
+		}
+
+		// === SUPER SAFE ZONE: FRAME FULLY COMPLETED ===
+		if (!m_DeferredTasks.empty())
+		{
+			for (const auto& task : m_DeferredTasks)
+			{
+				if (task)
+				{
+					task();
+				}
+			}
+			m_DeferredTasks.clear();
+		}
+	}
+
+	bool ImGuiLayer::RefreshFontAtlasTexture()
+	{
+		if (!ImGui::GetCurrentContext())
+		{
+			CH_CORE_WARN("ImGuiLayer: Cannot refresh font atlas without an active ImGui context.");
+			return false;
+		}
+
+		// Build the atlas explicitly so that CreateDeviceObjects() always uploads
+		// a valid texture (ImGui_ImplOpenGL3_CreateFontsTexture checks IsBuilt(),
+		// but after ClearFonts() + AddFontFromFile() the atlas is dirty/unbuilt).
+		ImGui::GetIO().Fonts->Build();
+
+		ImGui_ImplOpenGL3_DestroyDeviceObjects();
+		if (!ImGui_ImplOpenGL3_CreateDeviceObjects())
+		{
+			CH_CORE_ERROR("ImGuiLayer: Failed to recreate OpenGL device objects for font atlas refresh.");
+			return false;
+		}
+
+		CH_CORE_INFO("ImGuiLayer: Refreshed font atlas texture.");
+		return true;
+	}
+
+	void ImGuiLayer::OnEvent(Event& e)
+	{
+		if (m_BlockEvents && !e.Handled)
+		{
+			ImGuiIO& io = ImGui::GetIO();
+			e.Handled |= e.IsInCategory(EventCategoryKeyboard) && io.WantCaptureKeyboard;
+		}
+	}
+
+	void* ImGuiLayer::AddFontFromFile(const std::string& path, float size, const void* config, const void* ranges)
+	{
+		if (!ImGui::GetCurrentContext())
+		{
+			return nullptr;
+		}
+
+		ImGuiIO& io = ImGui::GetIO();
+
+		// ImGui внутрішньо робить глибоку копію конфігу, якщо ми передаємо його через AddFontFromFileTTF.
+		// Але він НЕ копіює масив ranges, тому static масив у EditorLayer — це єдиний порятунок від крашу.
+		ImFont* font =
+			io.Fonts->AddFontFromFileTTF(path.c_str(), size, (const ImFontConfig*)config, (const ImWchar*)ranges);
+
+		if (!font)
+		{
+			CH_CORE_ERROR("ImGuiLayer: Failed to load font from '{}'", path);
+		}
+		return font;
+	}
+
+	void ImGuiLayer::ClearFonts()
+	{
+		if (!ImGui::GetCurrentContext())
+		{
+			CH_CORE_WARN("ImGuiLayer: Cannot clear fonts without an active ImGui context.");
+			return;
+		}
+		ImGuiIO& io = ImGui::GetIO();
+		io.Fonts->Clear();
+		// Reset FontDefault to avoid a dangling pointer — it pointed into the
+		// now-freed atlas data.  ImGui will pick up the first font in the
+		// rebuilt atlas on the next frame.
+		io.FontDefault = nullptr;
+	}
+} // namespace Chained
diff --git a/engine/imgui/imgui_layer.h b/engine/imgui/imgui_layer.h
new file mode 100644
index 000000000..6d30a7a4f
--- /dev/null
+++ b/engine/imgui/imgui_layer.h
@@ -0,0 +1,58 @@
+#ifndef CH_IMGUI_LAYER_H
+#define CH_IMGUI_LAYER_H
+
+#include "engine/core/layer.h"
+#include <imgui.h>
+
+namespace Chained
+{
+	class ImGuiLayer : public Layer
+	{
+	public:
+		ImGuiLayer() = default;
+		~ImGuiLayer() override = default;
+
+		void OnAttach() override;
+		void OnDetach() override;
+		void OnEvent(Event& e) override;
+
+		void Begin();
+		void End();
+
+		// Recreate renderer device objects so newly added ImGui fonts become visible.
+		bool RefreshFontAtlasTexture();
+
+		// Centralized font loading in the DLL to avoid cross-module atlas corruption
+		void* AddFontFromFile(const std::string& path, float size, const void* config = nullptr,
+							  const void* ranges = nullptr);
+
+		// Clear all fonts from the atlas so they can be re-added at a new size/typeface.
+		// Follow with AddFontFromFile(...) + RefreshFontAtlasTexture() to apply.
+		void ClearFonts();
+
+		void BlockEvents(bool block)
+		{
+			m_BlockEvents = block;
+		}
+
+		static void SetContext(ImGuiContext* context);
+		void* GetContext() const
+		{
+			return ImGui::GetCurrentContext();
+		}
+
+	public:
+		// Enqueue a task to run after the current ImGui frame finishes (in End()).
+		// Contract: must only be called from the main/render thread.
+		void ExecuteNextFrame(std::function<void()>&& task)
+		{
+			m_DeferredTasks.push_back(std::move(task));
+		}
+
+	private:
+		std::vector<std::function<void()>> m_DeferredTasks;
+		bool m_BlockEvents = true;
+	};
+} // namespace Chained
+
+#endif // CH_IMGUI_LAYER_H
diff --git a/engine/networking/CMakeLists.txt b/engine/networking/CMakeLists.txt
new file mode 100644
index 000000000..56836cdd9
--- /dev/null
+++ b/engine/networking/CMakeLists.txt
@@ -0,0 +1,39 @@
+add_library(engine_network STATIC
+    network_types.h
+    network_session.h
+    network_session.cpp
+    network_transport.h
+    network_transport.cpp
+    network_player_manager.h
+    network_player_manager.cpp
+    network_service.h
+    network_service.cpp
+    net_packet.h
+    upnp_port_mapper.h
+    upnp_port_mapper.cpp
+    firewall_helper.h
+    firewall_helper.cpp
+)
+
+target_include_directories(engine_network PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_network PUBLIC
+    engine_core
+    engine_project
+    engine_external_entt
+    enet::enet_static
+    sodium
+    glm
+    engine_external_miniupnpc
+)
+
+if(WIN32)
+    target_link_libraries(engine_network PUBLIC ws2_32)
+endif()
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_network PRIVATE engine_pch)
+endif()
diff --git a/engine/networking/firewall_helper.cpp b/engine/networking/firewall_helper.cpp
new file mode 100644
index 000000000..4402bc708
--- /dev/null
+++ b/engine/networking/firewall_helper.cpp
@@ -0,0 +1,282 @@
+#include "firewall_helper.h"
+#include "engine/core/log.h"
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#pragma comment(lib, "advapi32.lib")
+#else
+#include <unistd.h>
+#include <sys/types.h>
+#endif
+
+#include <cstdio>
+#include <array>
+#include <memory>
+
+namespace Chained
+{
+	namespace Firewall
+	{
+
+#ifdef _WIN32
+
+		static bool IsElevated()
+		{
+			HANDLE hToken = nullptr;
+			if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
+			{
+				return false;
+			}
+
+			DWORD isElevated = 0;
+			DWORD size = sizeof(isElevated);
+			bool result =
+				GetTokenInformation(hToken, TokenElevation, &isElevated, sizeof(isElevated), &size) && isElevated != 0;
+			CloseHandle(hToken);
+			CH_CORE_INFO("Firewall: IsElevated = {}", result);
+			return result;
+		}
+
+		/// Runs a command via CreateProcess and captures stdout+stderr.
+		static std::string RunCommand(const char* cmd)
+		{
+			std::string output;
+
+			SECURITY_ATTRIBUTES sa{};
+			sa.nLength = sizeof(sa);
+			sa.bInheritHandle = TRUE;
+			sa.lpSecurityDescriptor = nullptr;
+
+			HANDLE hRead = nullptr, hWrite = nullptr;
+			if (!CreatePipe(&hRead, &hWrite, &sa, 0))
+			{
+				return {};
+			}
+			SetHandleInformation(hRead, HANDLE_FLAG_INHERIT, 0);
+
+			STARTUPINFOA si{};
+			si.cb = sizeof(si);
+			si.hStdOutput = hWrite;
+			si.hStdError = hWrite;
+			si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+			si.wShowWindow = SW_HIDE;
+
+			char cmdBuf[1024];
+			snprintf(cmdBuf, sizeof(cmdBuf), "cmd.exe /C %s", cmd);
+
+			PROCESS_INFORMATION pi{};
+			BOOL ok = CreateProcessA(nullptr, cmdBuf, nullptr, nullptr, TRUE, 0, nullptr, nullptr, &si, &pi);
+
+			CloseHandle(hWrite);
+			hWrite = nullptr;
+
+			if (!ok)
+			{
+				CloseHandle(hRead);
+				CH_CORE_WARN("Firewall: CreateProcess failed for: {}", cmd);
+				return {};
+			}
+
+			WaitForSingleObject(pi.hProcess, 10000);
+
+			char buf[512]{};
+			DWORD bytesRead = 0;
+			while (ReadFile(hRead, buf, sizeof(buf) - 1, &bytesRead, nullptr) && bytesRead > 0)
+			{
+				buf[bytesRead] = '\0';
+				output += buf;
+			}
+
+			CloseHandle(hRead);
+			CloseHandle(pi.hProcess);
+			CloseHandle(pi.hThread);
+
+			return output;
+		}
+
+		bool AddUDPRule(uint16_t port, const std::string& ruleName)
+		{
+			if (!IsElevated())
+			{
+				CH_CORE_WARN("Firewall: Not running as administrator — cannot add firewall rule. "
+							 "Run as admin to allow inbound connections.");
+				return false;
+			}
+
+			if (RuleExists(port, ruleName))
+			{
+				CH_CORE_INFO("Firewall: Rule '{}' for UDP {} already exists.", ruleName, port);
+				return true;
+			}
+
+			char cmd[512]{};
+			snprintf(cmd, sizeof(cmd),
+					 "netsh advfirewall firewall add rule "
+					 "name=\"%s\" dir=in action=allow protocol=udp localport=%u "
+					 "enable=yes profile=any",
+					 ruleName.c_str(), static_cast<unsigned>(port));
+
+			std::string output = RunCommand(cmd);
+
+			// netsh outputs the rule name on success, or "Ok." on some Windows versions
+			if (output.find("Ok.") != std::string::npos || output.find(ruleName) != std::string::npos)
+			{
+				CH_CORE_INFO("Firewall: Added inbound UDP rule '{}' for port {}. Output: {}", ruleName, port, output);
+				return true;
+			}
+
+			CH_CORE_WARN("Firewall: Failed to add rule '{}'. netsh output: [{}]", ruleName, output);
+			return false;
+		}
+
+		void RemoveUDPRule(uint16_t port, const std::string& ruleName)
+		{
+			if (!IsElevated())
+			{
+				return;
+			}
+
+			char cmd[512]{};
+			snprintf(cmd, sizeof(cmd), "netsh advfirewall firewall delete rule name=\"%s\" protocol=udp localport=%u",
+					 ruleName.c_str(), static_cast<unsigned>(port));
+
+			std::string output = RunCommand(cmd);
+
+			if (output.find("No rules") != std::string::npos || output.find("Нет правил") != std::string::npos)
+			{
+				CH_CORE_INFO("Firewall: No rule to remove for UDP {}.", port);
+			}
+			else
+			{
+				CH_CORE_INFO("Firewall: Remove result for UDP {}: {}", port, output);
+			}
+		}
+
+		bool RuleExists(uint16_t port, const std::string& ruleName)
+		{
+			char cmd[512]{};
+			snprintf(cmd, sizeof(cmd),
+					 "netsh advfirewall firewall show rule name=\"%s\" dir=in protocol=udp localport=%u",
+					 ruleName.c_str(), static_cast<unsigned>(port));
+
+			std::string output = RunCommand(cmd);
+			bool found = output.find(ruleName) != std::string::npos;
+			CH_CORE_INFO("Firewall: RuleExists('{}', {}) = {}", ruleName, port, found);
+			return found;
+		}
+
+#else
+
+		static bool IsElevated()
+		{
+			return getuid() == 0;
+		}
+
+		static std::string RunCommand(const char* cmd)
+		{
+			std::string result;
+			std::array<char, 256> buf{};
+			std::string fullCmd = std::string(cmd) + " 2>&1";
+			std::shared_ptr<FILE> pipe(popen(fullCmd.c_str(), "r"), pclose);
+			if (!pipe)
+			{
+				return {};
+			}
+			while (fgets(buf.data(), static_cast<int>(buf.size()), pipe.get()) != nullptr)
+			{
+				result += buf.data();
+			}
+			return result;
+		}
+
+		bool AddUDPRule(uint16_t port, const std::string& ruleName)
+		{
+			if (!IsElevated())
+			{
+				CH_CORE_WARN("Firewall: Not running as root — cannot add iptables rule. "
+							 "Run with sudo to enable automatic port forwarding.");
+				return false;
+			}
+
+			if (RuleExists(port, ruleName))
+			{
+				CH_CORE_INFO("Firewall: iptables rule '{}' for UDP {} already exists.", ruleName, port);
+				return true;
+			}
+
+			char cmd[512]{};
+			int ret = system("command -v nft >/dev/null 2>&1");
+			if (ret == 0)
+			{
+				snprintf(cmd, sizeof(cmd), "nft add rule inet filter input udp dport %u accept comment '%s'",
+						 static_cast<unsigned>(port), ruleName.c_str());
+			}
+			else
+			{
+				snprintf(cmd, sizeof(cmd), "iptables -A INPUT -p udp --dport %u -j ACCEPT -m comment --comment '%s'",
+						 static_cast<unsigned>(port), ruleName.c_str());
+			}
+
+			std::string output = RunCommand(cmd);
+
+			if (output.empty() || output.find("error") == std::string::npos)
+			{
+				CH_CORE_INFO("Firewall: Added inbound UDP rule '{}' for port {}.", ruleName, port);
+				return true;
+			}
+
+			CH_CORE_WARN("Firewall: Failed to add rule '{}'. Output: {}", ruleName, output);
+			return false;
+		}
+
+		void RemoveUDPRule(uint16_t port, const std::string& ruleName)
+		{
+			if (!IsElevated())
+			{
+				return;
+			}
+
+			char cmd[512]{};
+			int ret = system("command -v nft >/dev/null 2>&1");
+			if (ret == 0)
+			{
+				snprintf(cmd, sizeof(cmd),
+						 "nft delete rule inet filter input handle $(nft -a list chain inet filter input | "
+						 "grep 'comment \"%s\"' | awk '{print $NF}') 2>/dev/null; true",
+						 ruleName.c_str());
+			}
+			else
+			{
+				snprintf(cmd, sizeof(cmd),
+						 "iptables -D INPUT -p udp --dport %u -j ACCEPT -m comment --comment '%s' 2>/dev/null; true",
+						 static_cast<unsigned>(port), ruleName.c_str());
+			}
+
+			RunCommand(cmd);
+			CH_CORE_INFO("Firewall: Removed iptables rule '{}' for UDP {}.", ruleName, port);
+		}
+
+		bool RuleExists(uint16_t port, const std::string& ruleName)
+		{
+			char cmd[512]{};
+			int ret = system("command -v nft >/dev/null 2>&1");
+			if (ret == 0)
+			{
+				snprintf(cmd, sizeof(cmd), "nft list chain inet filter input 2>/dev/null | grep 'comment \"%s\"'",
+						 ruleName.c_str());
+			}
+			else
+			{
+				snprintf(cmd, sizeof(cmd), "iptables -L INPUT -n 2>/dev/null | grep 'udp.*dpt:%u' | grep '%s'",
+						 static_cast<unsigned>(port), ruleName.c_str());
+			}
+
+			std::string output = RunCommand(cmd);
+			return !output.empty();
+		}
+
+#endif
+
+	} // namespace Firewall
+} // namespace Chained
diff --git a/engine/networking/firewall_helper.h b/engine/networking/firewall_helper.h
new file mode 100644
index 000000000..0d658179a
--- /dev/null
+++ b/engine/networking/firewall_helper.h
@@ -0,0 +1,24 @@
+#ifndef CH_FIREWALL_HELPER_H
+#define CH_FIREWALL_HELPER_H
+
+#include <cstdint>
+#include <string>
+
+namespace Chained
+{
+	namespace Firewall
+	{
+		/// Adds an inbound UDP rule to Windows Firewall for the given port.
+		/// Returns true on success or if the rule already exists.
+		/// Requires administrator privileges; returns false if elevation fails.
+		bool AddUDPRule(uint16_t port, const std::string& ruleName = "ChainedDecos Game");
+
+		/// Removes the inbound UDP rule for the given port.
+		void RemoveUDPRule(uint16_t port, const std::string& ruleName = "ChainedDecos Game");
+
+		/// Checks whether the rule already exists.
+		bool RuleExists(uint16_t port, const std::string& ruleName = "ChainedDecos Game");
+	} // namespace Firewall
+} // namespace Chained
+
+#endif // CH_FIREWALL_HELPER_H
diff --git a/engine/networking/net_packet.h b/engine/networking/net_packet.h
new file mode 100644
index 000000000..d34ee7f38
--- /dev/null
+++ b/engine/networking/net_packet.h
@@ -0,0 +1,484 @@
+#ifndef CH_NET_PACKET_H
+#define CH_NET_PACKET_H
+
+#include <bit>
+#include <cstdint>
+#include <cstring>
+#include <string>
+#include <vector>
+
+static_assert(std::endian::native == std::endian::little, "Network packets assume little-endian byte order. "
+														  "Add byte-swapping for big-endian platforms.");
+
+namespace Chained
+{
+	static constexpr uint8_t kProtocolVersion = 1;
+
+	constexpr int kChannel_Reliable = 0;
+	constexpr int kChannel_Unreliable = 1;
+
+	enum MessageType : uint16_t
+	{
+		MessageType_InputState = 0,
+		MessageType_WorldState,
+		MessageType_EntitySpawn,
+		MessageType_EntityDestroy,
+		MessageType_SceneChange,
+		MessageType_PlayerAssign,
+		MessageType_PlayerInfo,
+		MessageType_PlayerList,
+		MessageType_ChatMessage,
+		MessageType_SceneLoaded,
+		MessageType_Count
+	};
+
+	enum InputAction : uint8_t
+	{
+		InputAction_None = 0,
+		InputAction_Jump = 1 << 0,
+		InputAction_Sprint = 1 << 1,
+		InputAction_Interact = 1 << 2,
+	};
+
+	// ── Byte serialization ───────────────────────────────────────────────
+
+	class ByteWriter
+	{
+	public:
+		void WriteU8(uint8_t v)
+		{
+			m_Buffer.push_back(v);
+		}
+
+		void WriteU16(uint16_t v)
+		{
+			m_Buffer.push_back(static_cast<uint8_t>(v & 0xFF));
+			m_Buffer.push_back(static_cast<uint8_t>((v >> 8) & 0xFF));
+		}
+
+		void WriteU32(uint32_t v)
+		{
+			for (int i = 0; i < 4; ++i)
+			{
+				m_Buffer.push_back(static_cast<uint8_t>((v >> (i * 8)) & 0xFF));
+			}
+		}
+
+		void WriteU64(uint64_t v)
+		{
+			for (int i = 0; i < 8; ++i)
+			{
+				m_Buffer.push_back(static_cast<uint8_t>((v >> (i * 8)) & 0xFF));
+			}
+		}
+
+		void WriteFloat(float v)
+		{
+			uint32_t u;
+			std::memcpy(&u, &v, sizeof(u));
+			WriteU32(u);
+		}
+
+		void WriteString(const char* str, size_t maxLen)
+		{
+			size_t len = str ? strnlen(str, maxLen) : 0;
+			WriteU8(static_cast<uint8_t>(len));
+			if (len > 0)
+			{
+				m_Buffer.insert(m_Buffer.end(), str, str + len);
+			}
+		}
+
+		void WriteBytes(const uint8_t* data, size_t len)
+		{
+			m_Buffer.insert(m_Buffer.end(), data, data + len);
+		}
+
+		const std::vector<uint8_t>& Data() const
+		{
+			return m_Buffer;
+		}
+		void Clear()
+		{
+			m_Buffer.clear();
+		}
+
+	private:
+		std::vector<uint8_t> m_Buffer;
+	};
+
+	class ByteReader
+	{
+	public:
+		ByteReader(const uint8_t* data, size_t size)
+			: m_Data(data),
+			  m_Size(size)
+		{
+		}
+
+		bool ReadU8(uint8_t& v)
+		{
+			if (m_Pos >= m_Size)
+			{
+				return false;
+			}
+			v = m_Data[m_Pos++];
+			return true;
+		}
+
+		bool ReadU16(uint16_t& v)
+		{
+			if (m_Pos + 2 > m_Size)
+			{
+				return false;
+			}
+			v = static_cast<uint16_t>(m_Data[m_Pos] | (m_Data[m_Pos + 1] << 8));
+			m_Pos += 2;
+			return true;
+		}
+
+		bool ReadU32(uint32_t& v)
+		{
+			if (m_Pos + 4 > m_Size)
+			{
+				return false;
+			}
+			v = 0;
+			for (int i = 0; i < 4; ++i)
+			{
+				v |= static_cast<uint32_t>(m_Data[m_Pos + i]) << (i * 8);
+			}
+			m_Pos += 4;
+			return true;
+		}
+
+		bool ReadU64(uint64_t& v)
+		{
+			if (m_Pos + 8 > m_Size)
+			{
+				return false;
+			}
+			v = 0;
+			for (int i = 0; i < 8; ++i)
+			{
+				v |= static_cast<uint64_t>(m_Data[m_Pos + i]) << (i * 8);
+			}
+			m_Pos += 8;
+			return true;
+		}
+
+		bool ReadFloat(float& v)
+		{
+			uint32_t u;
+			if (!ReadU32(u))
+			{
+				return false;
+			}
+			std::memcpy(&v, &u, sizeof(v));
+			return true;
+		}
+
+		bool ReadString(char* str, size_t maxLen)
+		{
+			uint8_t len = 0;
+			if (!ReadU8(len))
+			{
+				return false;
+			}
+			if (len >= maxLen)
+			{
+				return false;
+			}
+			if (m_Pos + len > m_Size)
+			{
+				return false;
+			}
+			std::memcpy(str, m_Data + m_Pos, len);
+			str[len] = '\0';
+			m_Pos += len;
+			return true;
+		}
+
+		bool ReadBytes(uint8_t* out, size_t len)
+		{
+			if (m_Pos + len > m_Size)
+			{
+				return false;
+			}
+			std::memcpy(out, m_Data + m_Pos, len);
+			m_Pos += len;
+			return true;
+		}
+
+		bool Eof() const
+		{
+			return m_Pos >= m_Size;
+		}
+		size_t Remaining() const
+		{
+			return m_Size - m_Pos;
+		}
+
+	private:
+		const uint8_t* m_Data;
+		size_t m_Size;
+		size_t m_Pos = 0;
+	};
+
+	// ── Message structs ──────────────────────────────────────────────────
+
+	struct InputStateMessage
+	{
+		uint32_t Tick = 0;
+		float MoveX = 0.0f;
+		float MoveZ = 0.0f;
+		uint8_t ActionFlags = 0;
+		float MouseX = 0.0f;
+		float MouseY = 0.0f;
+		float DeltaTime = 0.0f;
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU32(Tick);
+			w.WriteFloat(MoveX);
+			w.WriteFloat(MoveZ);
+			w.WriteU8(ActionFlags);
+			w.WriteFloat(MouseX);
+			w.WriteFloat(MouseY);
+			w.WriteFloat(DeltaTime);
+		}
+
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadU32(Tick) && r.ReadFloat(MoveX) && r.ReadFloat(MoveZ) && r.ReadU8(ActionFlags) &&
+				   r.ReadFloat(MouseX) && r.ReadFloat(MouseY) && r.ReadFloat(DeltaTime);
+		}
+	};
+
+	struct WorldStateMessage
+	{
+		uint32_t Tick = 0;
+		uint64_t NetworkID = 0;
+		float Position[3] = {0, 0, 0};
+		float Rotation[4] = {1, 0, 0, 0};
+		float Velocity[3] = {0, 0, 0};
+		uint8_t IsGrounded = 0;
+		uint8_t ActionFlags = 0;
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU32(Tick);
+			w.WriteU64(NetworkID);
+			for (int i = 0; i < 3; ++i)
+			{
+				w.WriteFloat(Position[i]);
+			}
+			for (int i = 0; i < 4; ++i)
+			{
+				w.WriteFloat(Rotation[i]);
+			}
+			for (int i = 0; i < 3; ++i)
+			{
+				w.WriteFloat(Velocity[i]);
+			}
+			w.WriteU8(IsGrounded);
+			w.WriteU8(ActionFlags);
+		}
+
+		bool Decode(ByteReader& r)
+		{
+			if (!r.ReadU32(Tick) || !r.ReadU64(NetworkID))
+			{
+				return false;
+			}
+			for (int i = 0; i < 3; ++i)
+			{
+				if (!r.ReadFloat(Position[i]))
+				{
+					return false;
+				}
+			}
+			for (int i = 0; i < 4; ++i)
+			{
+				if (!r.ReadFloat(Rotation[i]))
+				{
+					return false;
+				}
+			}
+			for (int i = 0; i < 3; ++i)
+			{
+				if (!r.ReadFloat(Velocity[i]))
+				{
+					return false;
+				}
+			}
+			r.ReadU8(IsGrounded);
+			r.ReadU8(ActionFlags);
+			return true;
+		}
+	};
+
+	struct EntitySpawnMessage
+	{
+		uint64_t NetworkID = 0;
+		char PrefabPath[128] = {};
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU64(NetworkID);
+			w.WriteString(PrefabPath, sizeof(PrefabPath));
+		}
+
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadU64(NetworkID) && r.ReadString(PrefabPath, sizeof(PrefabPath));
+		}
+	};
+
+	struct EntityDestroyMessage
+	{
+		uint64_t NetworkID = 0;
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU64(NetworkID);
+		}
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadU64(NetworkID);
+		}
+	};
+
+	struct SceneChangeMessage
+	{
+		char ScenePath[256] = {};
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteString(ScenePath, sizeof(ScenePath));
+		}
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadString(ScenePath, sizeof(ScenePath));
+		}
+	};
+
+	struct PlayerAssignMessage
+	{
+		uint64_t NetworkID = 0;
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU64(NetworkID);
+		}
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadU64(NetworkID);
+		}
+	};
+
+	struct PlayerInfoMessage
+	{
+		char Name[32] = {};
+		uint8_t SkinIndex = 0;
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteString(Name, sizeof(Name));
+			w.WriteU8(SkinIndex);
+		}
+
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadString(Name, sizeof(Name)) && r.ReadU8(SkinIndex);
+		}
+	};
+
+	struct PlayerListEntryInfo
+	{
+		uint64_t NetworkID = 0;
+		char Name[32] = {};
+		uint8_t SkinIndex = 0;
+		uint8_t IsHost = 0;
+	};
+
+	struct PlayerListMessage
+	{
+		uint8_t Count = 0;
+		PlayerListEntryInfo Entries[64];
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU8(Count);
+			for (int i = 0; i < Count && i < 64; ++i)
+			{
+				w.WriteU64(Entries[i].NetworkID);
+				w.WriteString(Entries[i].Name, sizeof(Entries[i].Name));
+				w.WriteU8(Entries[i].SkinIndex);
+				w.WriteU8(Entries[i].IsHost);
+			}
+		}
+
+		bool Decode(ByteReader& r)
+		{
+			if (!r.ReadU8(Count))
+			{
+				return false;
+			}
+			for (int i = 0; i < Count && i < 64; ++i)
+			{
+				if (!r.ReadU64(Entries[i].NetworkID) || !r.ReadString(Entries[i].Name, sizeof(Entries[i].Name)) ||
+					!r.ReadU8(Entries[i].SkinIndex) || !r.ReadU8(Entries[i].IsHost))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+	};
+
+	struct ChatMessageMessage
+	{
+		uint64_t SenderNetworkID = 0;
+		char SenderName[32] = {};
+		char Message[256] = {};
+
+		void Encode(ByteWriter& w) const
+		{
+			w.WriteU64(SenderNetworkID);
+			w.WriteString(SenderName, sizeof(SenderName));
+			w.WriteString(Message, sizeof(Message));
+		}
+
+		bool Decode(ByteReader& r)
+		{
+			return r.ReadU64(SenderNetworkID) && r.ReadString(SenderName, sizeof(SenderName)) &&
+				   r.ReadString(Message, sizeof(Message));
+		}
+	};
+
+	struct SceneLoadedMessage
+	{
+		void Encode(ByteWriter& w) const
+		{
+		}
+		bool Decode(ByteReader& r)
+		{
+			return true;
+		}
+	};
+
+	// ── Internal engine types ────────────────────────────────────────────
+
+	struct PlayerNetInfo
+	{
+		uint64_t NetworkID = 0;
+		uint32_t Ping = 0;
+		std::string Name;
+		uint8_t SkinIndex = 0;
+		uint8_t IsHost = 0;
+	};
+
+} // namespace Chained
+
+#endif /* CH_NET_PACKET_H */
diff --git a/engine/networking/network_player_manager.cpp b/engine/networking/network_player_manager.cpp
new file mode 100644
index 000000000..5f88c630d
--- /dev/null
+++ b/engine/networking/network_player_manager.cpp
@@ -0,0 +1,124 @@
+#include "network_player_manager.h"
+#include <random>
+
+namespace Chained
+{
+	void NetworkPlayerManager::Reset()
+	{
+		std::string savedName = m_LocalPlayerName;
+		uint8_t savedSkin = m_LocalSkinIndex;
+
+		m_PlayerList.clear();
+		m_ClientIndexToNetworkID.clear();
+		m_LocalNetworkID = 0;
+		m_NextNetworkID = 2;
+
+		m_LocalPlayerName = savedName;
+		m_LocalSkinIndex = savedSkin;
+	}
+
+	void NetworkPlayerManager::SetLocalPlayerInfo(const char* name, uint8_t skinIndex)
+	{
+		m_LocalPlayerName = name ? name : "";
+		m_LocalSkinIndex = skinIndex;
+	}
+
+	uint64_t NetworkPlayerManager::GetNetworkIDForConnection(int clientIndex) const
+	{
+		auto it = m_ClientIndexToNetworkID.find(clientIndex);
+		return it != m_ClientIndexToNetworkID.end() ? it->second : 0;
+	}
+
+	void NetworkPlayerManager::OnClientConnected(int clientIndex)
+	{
+		if (m_ClientIndexToNetworkID.find(clientIndex) != m_ClientIndexToNetworkID.end())
+		{
+			return;
+		}
+
+		const uint64_t networkID = m_NextNetworkID++;
+		m_ClientIndexToNetworkID[clientIndex] = networkID;
+
+		PlayerNetInfo newPlayer;
+		newPlayer.NetworkID = networkID;
+		newPlayer.Name = "Player...";
+		newPlayer.SkinIndex = 0;
+		newPlayer.IsHost = 0;
+		newPlayer.Ping = 0;
+		m_PlayerList.push_back(newPlayer);
+
+		CH_CORE_INFO("NetworkPlayerManager: Client connected (index={}, netID={}).", clientIndex, networkID);
+	}
+
+	void NetworkPlayerManager::OnClientDisconnected(int clientIndex)
+	{
+		auto idIt = m_ClientIndexToNetworkID.find(clientIndex);
+		if (idIt != m_ClientIndexToNetworkID.end())
+		{
+			const uint64_t networkID = idIt->second;
+			m_ClientIndexToNetworkID.erase(idIt);
+
+			auto entry = std::find_if(m_PlayerList.begin(), m_PlayerList.end(),
+									  [networkID](const PlayerNetInfo& p) { return p.NetworkID == networkID; });
+
+			if (entry != m_PlayerList.end())
+			{
+				CH_CORE_INFO("NetworkPlayerManager: Player '{}' disconnected.", entry->Name);
+				m_PlayerList.erase(entry);
+			}
+
+			CH_CORE_INFO("NetworkPlayerManager: Client disconnected (index={}).", clientIndex);
+		}
+	}
+
+	void NetworkPlayerManager::SetPlayerListFromMessage(const std::vector<PlayerNetInfo>& list)
+	{
+		m_PlayerList = list;
+	}
+
+	void NetworkPlayerManager::UpdatePlayerInfo(uint64_t networkID, const char* name, uint8_t skinIndex)
+	{
+		for (auto& p : m_PlayerList)
+		{
+			if (p.NetworkID == networkID)
+			{
+				p.Name = name ? name : "";
+				p.SkinIndex = skinIndex;
+				CH_CORE_INFO("NetworkPlayerManager: Updated player info: '{}' (netID={}, skin={}).", p.Name,
+							 p.NetworkID, (int)p.SkinIndex);
+				return;
+			}
+		}
+	}
+
+	uint64_t NetworkPlayerManager::GenerateClientId()
+	{
+		std::random_device rd;
+		std::mt19937_64 gen(rd());
+		return gen();
+	}
+
+	std::vector<int> NetworkPlayerManager::GetClients() const
+	{
+		std::vector<int> clients;
+		for (auto& [idx, netID] : m_ClientIndexToNetworkID)
+		{
+			clients.push_back(idx);
+		}
+		return clients;
+	}
+
+	void NetworkPlayerManager::AddHostSelf(uint64_t hostNetworkID, const std::string& localPlayerName,
+										   uint8_t localSkinIndex)
+	{
+		m_LocalNetworkID = hostNetworkID;
+
+		PlayerNetInfo self;
+		self.NetworkID = hostNetworkID;
+		self.Name = localPlayerName.empty() ? "Host" : localPlayerName;
+		self.SkinIndex = localSkinIndex;
+		self.IsHost = 1;
+		self.Ping = 0;
+		m_PlayerList.push_back(self);
+	}
+} // namespace Chained
diff --git a/engine/networking/network_player_manager.h b/engine/networking/network_player_manager.h
new file mode 100644
index 000000000..f01884206
--- /dev/null
+++ b/engine/networking/network_player_manager.h
@@ -0,0 +1,88 @@
+#ifndef CH_NETWORK_PLAYER_MANAGER_H
+#define CH_NETWORK_PLAYER_MANAGER_H
+
+#include "network_types.h"
+#include "net_packet.h"
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <unordered_map>
+
+namespace Chained
+{
+
+	class NetworkPlayerManager
+	{
+	public:
+		NetworkPlayerManager() = default;
+		~NetworkPlayerManager() = default;
+
+		NetworkPlayerManager(const NetworkPlayerManager&) = delete;
+		NetworkPlayerManager& operator=(const NetworkPlayerManager&) = delete;
+
+		void Reset();
+
+		void SetLocalPlayerInfo(const char* name, uint8_t skinIndex);
+		const std::string& GetLocalPlayerName() const
+		{
+			return m_LocalPlayerName;
+		}
+		uint8_t GetLocalSkinIndex() const
+		{
+			return m_LocalSkinIndex;
+		}
+
+		uint64_t GetLocalNetworkID() const
+		{
+			return m_LocalNetworkID;
+		}
+		void SetLocalNetworkID(uint64_t id)
+		{
+			m_LocalNetworkID = id;
+		}
+
+		void SetHostNetworkID(uint64_t id)
+		{
+			m_HostNetworkID = id;
+		}
+
+		uint64_t GetNetworkIDForConnection(int clientIndex) const;
+		void OnClientConnected(int clientIndex);
+		void OnClientDisconnected(int clientIndex);
+
+		const std::vector<PlayerNetInfo>& GetPlayerList() const
+		{
+			return m_PlayerList;
+		}
+		std::vector<PlayerNetInfo>& GetPlayerListMutable()
+		{
+			return m_PlayerList;
+		}
+
+		void SetPlayerListFromMessage(const std::vector<PlayerNetInfo>& list);
+		void UpdatePlayerInfo(uint64_t networkID, const char* name, uint8_t skinIndex);
+
+		uint64_t GenerateClientId();
+
+		size_t GetClientCount() const
+		{
+			return m_ClientIndexToNetworkID.size();
+		}
+		std::vector<int> GetClients() const;
+
+		void AddHostSelf(uint64_t hostNetworkID, const std::string& localPlayerName, uint8_t localSkinIndex);
+
+	private:
+		std::vector<PlayerNetInfo> m_PlayerList;
+		std::unordered_map<int, uint64_t> m_ClientIndexToNetworkID;
+		uint64_t m_LocalNetworkID = 0;
+		std::string m_LocalPlayerName;
+		uint8_t m_LocalSkinIndex = 0;
+		uint64_t m_HostNetworkID = 1;
+		uint64_t m_NextNetworkID = 2;
+	};
+
+} // namespace Chained
+
+#endif // CH_NETWORK_PLAYER_MANAGER_H
diff --git a/engine/networking/network_service.cpp b/engine/networking/network_service.cpp
new file mode 100644
index 000000000..27b27bc00
--- /dev/null
+++ b/engine/networking/network_service.cpp
@@ -0,0 +1,510 @@
+#include "network_service.h"
+#include "firewall_helper.h"
+#include <thread>
+#include <algorithm>
+#include <cctype>
+
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/socket.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#endif
+
+namespace Chained
+{
+	static std::string FetchPublicIPFromWeb()
+	{
+		struct addrinfo hints = {}, *res = nullptr;
+		hints.ai_family = AF_UNSPEC; // Підтримка IPv4 та IPv6
+		hints.ai_socktype = SOCK_STREAM;
+		if (getaddrinfo("api.ipify.org", "80", &hints, &res) != 0 || !res)
+		{
+			return {};
+		}
+
+		auto sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (sock == -1
+#ifdef _WIN32
+			|| sock == INVALID_SOCKET
+#endif
+		)
+		{
+			freeaddrinfo(res);
+			return {};
+		}
+
+#ifdef _WIN32
+		DWORD timeout = 3000;
+		setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));
+		setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout, sizeof(timeout));
+#else
+		struct timeval tv = {3, 0};
+		setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+		setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+#endif
+
+		if (connect(sock, res->ai_addr, (int)res->ai_addrlen) != 0)
+		{
+#ifdef _WIN32
+			closesocket(sock);
+#else
+			close(sock);
+#endif
+			freeaddrinfo(res);
+			return {};
+		}
+		freeaddrinfo(res);
+
+		const char* request =
+			"GET / HTTP/1.1\r\nHost: api.ipify.org\r\nConnection: close\r\nUser-Agent: ChainedEngine\r\n\r\n";
+		send(sock, request, (int)strlen(request), 0);
+
+		char buffer[1024] = {};
+		int totalBytes = 0;
+		int bytes = 0;
+		while ((bytes = recv(sock, buffer + totalBytes, sizeof(buffer) - 1 - totalBytes, 0)) > 0)
+		{
+			totalBytes += bytes;
+		}
+
+#ifdef _WIN32
+		closesocket(sock);
+#else
+		close(sock);
+#endif
+
+		if (totalBytes <= 0)
+		{
+			return {};
+		}
+		buffer[totalBytes] = '\0';
+
+		const char* body = strstr(buffer, "\r\n\r\n");
+		if (!body)
+		{
+			return {};
+		}
+		body += 4;
+
+		std::string ip(body);
+		ip.erase(std::remove_if(ip.begin(), ip.end(), [](unsigned char c) { return std::isspace(c); }), ip.end());
+		return ip;
+	}
+	static std::string FetchPublicIPv6FromWeb()
+	{
+		struct addrinfo hints = {}, *res = nullptr;
+		hints.ai_family = AF_INET6;
+		hints.ai_socktype = SOCK_STREAM;
+		hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
+		if (getaddrinfo("ipv6.api.ipify.org", "80", &hints, &res) != 0 || !res)
+		{
+			return {};
+		}
+
+		auto sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (sock == -1
+#ifdef _WIN32
+			|| sock == INVALID_SOCKET
+#endif
+		)
+		{
+			freeaddrinfo(res);
+			return {};
+		}
+
+#ifdef _WIN32
+		DWORD timeout = 3000;
+		setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));
+		setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout, sizeof(timeout));
+#else
+		struct timeval tv = {3, 0};
+		setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+		setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+#endif
+
+		if (connect(sock, res->ai_addr, (int)res->ai_addrlen) != 0)
+		{
+#ifdef _WIN32
+			closesocket(sock);
+#else
+			close(sock);
+#endif
+			freeaddrinfo(res);
+			return {};
+		}
+		freeaddrinfo(res);
+
+		const char* request = "GET /?format=text HTTP/1.1\r\nHost: ipv6.api.ipify.org\r\nConnection: "
+							  "close\r\nUser-Agent: ChainedEngine\r\n\r\n";
+		send(sock, request, (int)strlen(request), 0);
+
+		char buffer[1024] = {};
+		int totalBytes = 0;
+		int bytes = 0;
+		while ((bytes = recv(sock, buffer + totalBytes, sizeof(buffer) - 1 - totalBytes, 0)) > 0)
+		{
+			totalBytes += bytes;
+		}
+
+#ifdef _WIN32
+		closesocket(sock);
+#else
+		close(sock);
+#endif
+
+		if (totalBytes <= 0)
+		{
+			return {};
+		}
+		buffer[totalBytes] = '\0';
+
+		const char* body = strstr(buffer, "\r\n\r\n");
+		if (!body)
+		{
+			return {};
+		}
+		body += 4;
+
+		std::string ip(body);
+		ip.erase(std::remove_if(ip.begin(), ip.end(), [](unsigned char c) { return std::isspace(c); }), ip.end());
+		return ip;
+	}
+
+	Network::~Network()
+	{
+		if (m_Session.IsConnected())
+		{
+			CH_CORE_WARN("Network: Destructor called before explicit Shutdown().");
+			Shutdown();
+		}
+	}
+
+	void Network::Initialize()
+	{
+		NetworkError err = m_Session.Initialize();
+		if (err != NetworkError::None)
+		{
+			SetEnabled(false);
+			return;
+		}
+
+		static const uint8_t kSessionKey[32] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
+												0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+												0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20};
+		m_Transport.SetSessionKey(kSessionKey);
+		m_Transport.SetCryptoEnabled(false);
+		m_Transport.SetSession(&m_Session);
+
+		m_Session.SetConnectionCallback(
+			[this](int peerIndex, uint64_t networkID) { OnClientConnectedInternal(peerIndex, networkID); });
+		m_Session.SetDisconnectionCallback(
+			[this](int peerIndex, uint64_t networkID) { OnClientDisconnectedInternal(peerIndex, networkID); });
+		m_Session.SetEventCallback([this](int peerIndex, MessageType type, const uint8_t* data, size_t len) {
+			if (type == MessageType_Count)
+			{
+				m_Transport.HandleIncomingPacket(peerIndex, data, len);
+			}
+		});
+
+		CH_CORE_INFO("Network: Initialized.");
+	}
+
+	void Network::Shutdown()
+	{
+		uint16_t portToUnmap = m_Session.GetPort();
+
+		Disconnect();
+
+		if (m_UpnpMapper.IsAvailable() && portToUnmap != 0)
+		{
+			m_UpnpMapper.RemoveMapping(portToUnmap, "UDP");
+			m_UpnpMapper.Shutdown();
+		}
+
+		// Remove Windows Firewall rule
+		if (m_FirewallRuleActive && portToUnmap != 0)
+		{
+			Firewall::RemoveUDPRule(portToUnmap);
+			m_FirewallRuleActive = false;
+		}
+
+		m_Session.Shutdown();
+
+		CH_CORE_INFO("Network: Shutdown complete.");
+	}
+
+	void Network::HostGame(uint16_t port, int maxClients)
+	{
+		NetworkError err = m_Session.HostGame(port, maxClients);
+		if (err != NetworkError::None)
+		{
+			CH_CORE_ERROR("Network: Failed to host (error={}).", static_cast<int>(err));
+			return;
+		}
+
+		m_PlayerManager.Reset();
+		m_PlayerManager.SetHostNetworkID(HostNetworkID);
+		m_PlayerManager.AddHostSelf(HostNetworkID, m_PlayerManager.GetLocalPlayerName(),
+									m_PlayerManager.GetLocalSkinIndex());
+
+		if (!m_TestMode)
+		{
+			if (!m_UpnpMapper.IsAvailable())
+			{
+				m_UpnpMapper.Initialize();
+			}
+			if (m_UpnpMapper.IsAvailable())
+			{
+				m_UpnpMapper.AddMapping(port, "UDP", "ChainedDecos");
+				CH_CORE_INFO("Network: UPnP mapping added.");
+			}
+			else
+			{
+				CH_CORE_WARN("Network: UPnP unavailable — players must forward port {} manually.", port);
+			}
+
+			// Add Windows Firewall inbound rule
+			m_FirewallRuleActive = Firewall::AddUDPRule(port);
+			if (!m_FirewallRuleActive)
+			{
+				CH_CORE_WARN("Network: Could not add firewall rule. Run as admin to allow inbound connections.");
+			}
+		}
+
+		{
+			std::lock_guard<std::mutex> lock(m_PublicIPMutex);
+			m_CachedPublicIP = "Fetching...";
+			m_CachedPublicIPv6 = "Fetching...";
+		}
+
+		// Asynchronously resolve true public WAN IP from web (api.ipify.org)
+		std::thread([this, port]() {
+			std::string ip = FetchPublicIPFromWeb();
+			std::lock_guard<std::mutex> lock(m_PublicIPMutex);
+			if (!ip.empty())
+			{
+				m_CachedPublicIP = ip + ":" + std::to_string(port);
+				CH_CORE_INFO("Network: Public IPv4 resolved: {}", m_CachedPublicIP);
+			}
+			else
+			{
+				std::string upnpIp = m_UpnpMapper.GetPublicIP();
+				if (!upnpIp.empty())
+				{
+					m_CachedPublicIP = upnpIp + ":" + std::to_string(port);
+				}
+				else
+				{
+					m_CachedPublicIP = "Manual (Port " + std::to_string(port) + ")";
+				}
+			}
+		}).detach();
+
+		// Asynchronously resolve public IPv6 address
+		std::thread([this, port]() {
+			std::string ipv6 = FetchPublicIPv6FromWeb();
+			std::lock_guard<std::mutex> lock(m_PublicIPMutex);
+			if (!ipv6.empty() && ipv6.find("error") == std::string::npos)
+			{
+				m_CachedPublicIPv6 = "[" + ipv6 + "]:" + std::to_string(port);
+				CH_CORE_INFO("Network: Public IPv6 resolved: {}", m_CachedPublicIPv6);
+			}
+			else
+			{
+				m_CachedPublicIPv6 = "Not available";
+			}
+		}).detach();
+
+		CH_CORE_INFO("Network: Hosting on port {} (max {} clients).", port, maxClients);
+	}
+
+	void Network::ConnectTo(const std::string& ip, uint16_t port)
+	{
+		NetworkError err = m_Session.ConnectTo(ip, port);
+		if (err != NetworkError::None)
+		{
+			CH_CORE_ERROR("Network: Failed to connect (error={}).", static_cast<int>(err));
+			return;
+		}
+
+		m_PlayerManager.Reset();
+		CH_CORE_INFO("Network: Connecting to {}:{}...", ip, port);
+	}
+
+	void Network::Disconnect()
+	{
+		m_Session.Disconnect();
+		m_Transport.ClearPacketCallback();
+		m_Transport.ResetCounters();
+		m_PlayerManager.Reset();
+		m_PendingSceneChange.clear();
+		{
+			std::lock_guard<std::mutex> lock(m_PublicIPMutex);
+			m_CachedPublicIP.clear();
+			m_CachedPublicIPv6.clear();
+		}
+		CH_CORE_INFO("Network: Disconnected.");
+	}
+
+	void Network::Update(float dt)
+	{
+		m_Session.Update(dt);
+	}
+
+	// ── Sending ──────────────────────────────────────────────────────────
+
+	void Network::SendPacket(int clientIndex, MessageType type, const void* data, size_t len, bool reliable)
+	{
+		m_Transport.SendPacket(clientIndex, type, data, len, reliable);
+	}
+
+	void Network::BroadcastPacket(MessageType type, bool reliable, const std::function<void(ByteWriter&)>& populate)
+	{
+		m_Transport.BroadcastPacket(type, reliable, populate);
+	}
+
+	void Network::SendToServer(MessageType type, const void* data, size_t len, bool reliable)
+	{
+		m_Transport.SendToServer(type, data, len, reliable);
+	}
+
+	void Network::BroadcastSceneChange(const char* scenePath)
+	{
+		m_Transport.BroadcastSceneChange(scenePath);
+	}
+
+	// ── Packet callback ──────────────────────────────────────────────────
+
+	void Network::SetPacketCallback(PacketCallback callback)
+	{
+		m_Transport.SetPacketCallback(std::move(callback));
+	}
+
+	void Network::ClearPacketCallback()
+	{
+		m_Transport.ClearPacketCallback();
+	}
+
+	// ── Address ──────────────────────────────────────────────────────────
+
+	std::string Network::GetListenAddress()
+	{
+		if (m_UpnpMapper.IsAvailable() && m_UpnpMapper.GetLanIP()[0] != '\0')
+		{
+			return std::string(m_UpnpMapper.GetLanIP()) + ":" + std::to_string(m_Session.GetPort());
+		}
+		return m_Session.GetListenAddress();
+	}
+
+	std::string Network::GetPublicAddress()
+	{
+		std::lock_guard<std::mutex> lock(m_PublicIPMutex);
+		if (!m_CachedPublicIP.empty())
+		{
+			return m_CachedPublicIP;
+		}
+		return "Fetching...";
+	}
+
+	std::string Network::GetPublicIPv6Address()
+	{
+		std::lock_guard<std::mutex> lock(m_PublicIPMutex);
+		if (!m_CachedPublicIPv6.empty())
+		{
+			return m_CachedPublicIPv6;
+		}
+		return "Fetching...";
+	}
+
+	// ── Player management ────────────────────────────────────────────────
+
+	void Network::SetLocalPlayerInfo(const char* name, uint8_t skinIndex)
+	{
+		m_PlayerManager.SetLocalPlayerInfo(name, skinIndex);
+
+		if (!m_Session.IsHost())
+		{
+			return;
+		}
+
+		auto& playerList = m_PlayerManager.GetPlayerListMutable();
+		auto self = std::find_if(playerList.begin(), playerList.end(),
+								 [](const PlayerNetInfo& p) { return p.NetworkID == HostNetworkID; });
+
+		if (self != playerList.end())
+		{
+			self->Name = name ? name : "Host";
+			self->SkinIndex = skinIndex;
+			BroadcastPlayerList();
+		}
+	}
+
+	void Network::SendPlayerInfoToHost(const char* name, uint8_t skinIndex)
+	{
+		m_Transport.SendPlayerInfoToHost(name, skinIndex, m_PlayerManager.GetLocalNetworkID());
+	}
+
+	void Network::BroadcastPlayerList()
+	{
+		m_Transport.BroadcastPlayerList(m_PlayerManager.GetPlayerList());
+	}
+
+	void Network::SendChatMessage(const char* message)
+	{
+		m_Transport.SendChatMessage(message, m_PlayerManager.GetLocalNetworkID(), m_PlayerManager.GetLocalPlayerName());
+	}
+
+	void Network::StorePendingChatMessage(const ChatMessagePacket& pkt)
+	{
+		m_Transport.StorePendingChatMessage(pkt);
+	}
+
+	// ── Client info ──────────────────────────────────────────────────────
+
+	size_t Network::GetClientCount() const
+	{
+		return m_PlayerManager.GetClientCount();
+	}
+
+	std::vector<int> Network::GetClients() const
+	{
+		return m_PlayerManager.GetClients();
+	}
+
+	bool Network::IsClientConnected(int clientIndex) const
+	{
+		return m_Session.GetPeerForClient(clientIndex) != nullptr;
+	}
+
+	// ── Connection callbacks ─────────────────────────────────────────────
+
+	void Network::OnClientConnectedInternal(int clientIndex, uint64_t /*networkID*/)
+	{
+		m_PlayerManager.OnClientConnected(clientIndex);
+		const uint64_t assignedID = m_PlayerManager.GetNetworkIDForConnection(clientIndex);
+
+		PlayerAssignMessage assignMsg;
+		assignMsg.NetworkID = assignedID;
+		ByteWriter w;
+		assignMsg.Encode(w);
+		m_Transport.SendPacket(clientIndex, MessageType_PlayerAssign, w.Data().data(), w.Data().size(), true);
+
+		BroadcastPlayerList();
+		CH_CORE_INFO("Network: Client connected (index={}, netID={}).", clientIndex, assignedID);
+	}
+
+	void Network::OnClientDisconnectedInternal(int clientIndex, uint64_t /*networkID*/)
+	{
+		m_PlayerManager.OnClientDisconnected(clientIndex);
+		BroadcastPlayerList();
+	}
+
+} // namespace Chained
diff --git a/engine/networking/network_service.h b/engine/networking/network_service.h
new file mode 100644
index 000000000..cdb878d74
--- /dev/null
+++ b/engine/networking/network_service.h
@@ -0,0 +1,199 @@
+#ifndef CH_NETWORK_SERVICE_H
+#define CH_NETWORK_SERVICE_H
+
+#include "net_packet.h"
+#include "network_types.h"
+#include "network_session.h"
+#include "network_transport.h"
+#include "network_player_manager.h"
+#include "upnp_port_mapper.h"
+#include "engine/core/service.h"
+
+#include <functional>
+#include <string>
+#include <vector>
+#include <memory>
+#include <unordered_map>
+
+namespace Chained
+{
+	class Network : public Service
+	{
+	public:
+		using PacketCallback = std::function<void(int, MessageType, const uint8_t*, size_t)>;
+
+		Network() = default;
+		~Network() override;
+
+		void Initialize() override;
+		void Shutdown() override;
+
+		void HostGame(uint16_t port, int maxClients);
+		void ConnectTo(const std::string& ip, uint16_t port);
+		void Disconnect();
+
+		void Update(float dt);
+
+		void SendPacket(int clientIndex, MessageType type, const void* data, size_t len, bool reliable = true);
+		void BroadcastPacket(MessageType type, bool reliable, const std::function<void(ByteWriter&)>& populate);
+		void SendToServer(MessageType type, const void* data, size_t len, bool reliable = true);
+
+		void BroadcastSceneChange(const char* scenePath);
+
+		void SetPacketCallback(PacketCallback callback);
+		void ClearPacketCallback();
+
+		std::string GetListenAddress();
+		std::string GetPublicAddress();
+		std::string GetPublicIPv6Address();
+
+		bool HasPendingSceneChange() const
+		{
+			return !m_PendingSceneChange.empty();
+		}
+		const std::string& GetPendingSceneChange() const
+		{
+			return m_PendingSceneChange;
+		}
+		void ClearPendingSceneChange()
+		{
+			m_PendingSceneChange.clear();
+		}
+		void SetPendingSceneChange(const std::string& path)
+		{
+			m_PendingSceneChange = path;
+		}
+
+		void SendPlayerInfoToHost(const char* name, uint8_t skinIndex);
+		void BroadcastPlayerList();
+		void SendChatMessage(const char* message);
+		void StorePendingChatMessage(const ChatMessagePacket& pkt);
+		bool HasPendingChatMessages() const
+		{
+			return m_Transport.HasPendingChatMessages();
+		}
+		const std::vector<ChatMessagePacket>& GetPendingChatMessages() const
+		{
+			return m_Transport.GetPendingChatMessages();
+		}
+		void ClearPendingChatMessages()
+		{
+			m_Transport.ClearPendingChatMessages();
+		}
+
+		Role GetRole() const
+		{
+			return m_Session.GetRole();
+		}
+		bool IsHost() const
+		{
+			return m_Session.IsHost();
+		}
+		bool IsClient() const
+		{
+			return m_Session.IsClient();
+		}
+		bool IsConnected() const
+		{
+			return m_Session.IsConnected();
+		}
+		bool IsFullyConnected() const
+		{
+			return m_Session.IsFullyConnected();
+		}
+
+		size_t GetClientCount() const;
+		std::vector<int> GetClients() const;
+		int GetServerConnection() const
+		{
+			return m_Session.GetServerConnection();
+		}
+		uint16_t GetPort() const
+		{
+			return m_Session.GetPort();
+		}
+
+		uint64_t GetLocalNetworkID() const
+		{
+			return m_PlayerManager.GetLocalNetworkID();
+		}
+		void SetLocalNetworkID(uint64_t id)
+		{
+			m_PlayerManager.SetLocalNetworkID(id);
+		}
+
+		void SetLocalPlayerInfo(const char* name, uint8_t skinIndex);
+
+		uint64_t GetNetworkIDForConnection(int clientIndex) const
+		{
+			return m_PlayerManager.GetNetworkIDForConnection(clientIndex);
+		}
+
+		const std::vector<PlayerNetInfo>& GetPlayerList() const
+		{
+			return m_PlayerManager.GetPlayerList();
+		}
+		std::vector<PlayerNetInfo>& GetPlayerListMutable()
+		{
+			return m_PlayerManager.GetPlayerListMutable();
+		}
+
+		int GetMaxClients() const
+		{
+			return m_Session.GetMaxClients();
+		}
+		bool IsClientConnected(int clientIndex) const;
+		bool IsUpnpAvailable() const
+		{
+			return m_UpnpMapper.IsAvailable();
+		}
+		bool IsFirewallRuleActive() const
+		{
+			return m_FirewallRuleActive;
+		}
+
+		void SetTestMode(bool enabled)
+		{
+			m_TestMode = enabled;
+		}
+		bool IsTestMode() const
+		{
+			return m_TestMode;
+		}
+
+		NetworkSession& GetSession()
+		{
+			return m_Session;
+		}
+		NetworkTransport& GetTransport()
+		{
+			return m_Transport;
+		}
+		NetworkPlayerManager& GetPlayerManager()
+		{
+			return m_PlayerManager;
+		}
+
+	private:
+		void OnClientConnectedInternal(int clientIndex, uint64_t networkID);
+		void OnClientDisconnectedInternal(int clientIndex, uint64_t networkID);
+
+		NetworkSession m_Session;
+		NetworkTransport m_Transport;
+		NetworkPlayerManager m_PlayerManager;
+
+		std::string m_PendingSceneChange;
+		UpnpPortMapper m_UpnpMapper;
+
+		std::string m_CachedPublicIP;
+		std::string m_CachedPublicIPv6;
+		std::mutex m_PublicIPMutex;
+		bool m_FirewallRuleActive = false;
+		bool m_TestMode = false;
+
+		static constexpr uint64_t HostNetworkID = 1;
+	};
+
+} // namespace Chained
+
+#endif /* CH_NETWORK_SERVICE_H */
diff --git a/engine/networking/network_session.cpp b/engine/networking/network_session.cpp
new file mode 100644
index 000000000..35fb3ab8c
--- /dev/null
+++ b/engine/networking/network_session.cpp
@@ -0,0 +1,293 @@
+#include "network_session.h"
+
+#include <enet.h>
+
+namespace Chained
+{
+
+	NetworkSession::~NetworkSession()
+	{
+		if (m_Role != Role::Offline)
+		{
+			CH_CORE_WARN("NetworkSession: Destructor called before explicit Shutdown().");
+			Shutdown();
+		}
+	}
+
+	NetworkError NetworkSession::Initialize()
+	{
+		if (enet_initialize() != 0)
+		{
+			CH_CORE_ERROR("NetworkSession: Failed to initialize ENet.");
+			return NetworkError::ENetInitFailed;
+		}
+
+		m_Role = Role::Offline;
+		CH_CORE_INFO("NetworkSession: ENet initialized successfully.");
+		return NetworkError::None;
+	}
+
+	void NetworkSession::Shutdown()
+	{
+		m_ShuttingDown.store(true, std::memory_order_release);
+
+		Disconnect();
+
+		if (m_Host)
+		{
+			enet_host_destroy(m_Host);
+			m_Host = nullptr;
+		}
+
+		m_Role = Role::Offline;
+		m_Port = 0;
+		m_ServerConnection = kInvalidPeerHandle;
+		m_PeerMap.clear();
+
+		enet_deinitialize();
+
+		CH_CORE_INFO("NetworkSession: Shutdown complete.");
+	}
+
+	NetworkError NetworkSession::HostGame(uint16_t port, int maxClients)
+	{
+		if (m_Role != Role::Offline)
+		{
+			CH_CORE_ERROR("NetworkSession: Cannot host — already in {} mode.", static_cast<int>(m_Role));
+			return NetworkError::AlreadyConnected;
+		}
+
+		if (m_Host)
+		{
+			enet_host_destroy(m_Host);
+			m_Host = nullptr;
+		}
+
+		ENetAddress address;
+		address.host = ENET_HOST_ANY;
+		address.port = port;
+
+		m_Host = enet_host_create(&address, maxClients, 2, 0, 0);
+		if (!m_Host)
+		{
+			CH_CORE_ERROR("NetworkSession: Failed to create ENet host on port {}.", port);
+			return NetworkError::CreateHostFailed;
+		}
+
+		m_MaxClients = maxClients;
+		m_Port = port;
+		m_Role = Role::Host;
+
+		CH_CORE_INFO("NetworkSession: Hosting on port {} (max {} clients).", m_Port, maxClients);
+		return NetworkError::None;
+	}
+
+	NetworkError NetworkSession::ConnectTo(const std::string& ip, uint16_t port)
+	{
+		if (m_Role != Role::Offline)
+		{
+			CH_CORE_ERROR("NetworkSession: Cannot connect — already in {} mode.", static_cast<int>(m_Role));
+			return NetworkError::AlreadyConnected;
+		}
+
+		if (m_Host)
+		{
+			enet_host_destroy(m_Host);
+			m_Host = nullptr;
+		}
+
+		m_Host = enet_host_create(nullptr, 1, 2, 0, 0);
+		if (!m_Host)
+		{
+			CH_CORE_ERROR("NetworkSession: Failed to create ENet client host.");
+			return NetworkError::CreateHostFailed;
+		}
+
+		ENetAddress address;
+		if (enet_address_set_host(&address, ip.c_str()) != 0)
+		{
+			CH_CORE_ERROR("NetworkSession: Failed to resolve host '{}'.", ip);
+			enet_host_destroy(m_Host);
+			m_Host = nullptr;
+			return NetworkError::ConnectFailed;
+		}
+		address.port = port;
+
+		m_ServerPeer = enet_host_connect(m_Host, &address, 2, 0);
+		if (!m_ServerPeer)
+		{
+			CH_CORE_ERROR("NetworkSession: Failed to connect to {}:{}.", ip, port);
+			enet_host_destroy(m_Host);
+			m_Host = nullptr;
+			return NetworkError::ConnectFailed;
+		}
+
+		m_MaxClients = 1;
+		m_Role = Role::Client;
+		m_ServerConnection = 0;
+		CH_CORE_INFO("NetworkSession: Connecting to {}:{}...", ip, port);
+		return NetworkError::None;
+	}
+
+	void NetworkSession::Disconnect()
+	{
+		if (m_ServerPeer)
+		{
+			enet_peer_disconnect_now(m_ServerPeer, 0);
+			m_ServerPeer = nullptr;
+		}
+
+		if (m_Host)
+		{
+			if (m_Role == Role::Host)
+			{
+				for (auto& [idx, peer] : m_PeerMap)
+				{
+					enet_peer_disconnect_now(peer, 0);
+				}
+			}
+			enet_host_destroy(m_Host);
+			m_Host = nullptr;
+		}
+
+		m_PeerMap.clear();
+		m_Role = Role::Offline;
+		m_Connected = false;
+		m_ServerConnection = kInvalidPeerHandle;
+
+		CH_CORE_INFO("NetworkSession: Disconnected.");
+	}
+
+	void NetworkSession::ForceDisconnect()
+	{
+		Disconnect();
+	}
+
+	void NetworkSession::Update(float /*dt*/)
+	{
+		if (m_Role == Role::Offline || !m_Host)
+		{
+			return;
+		}
+
+		ProcessEvents();
+	}
+
+	void NetworkSession::ProcessEvents()
+	{
+		ENetEvent event;
+		while (enet_host_service(m_Host, &event, 0) > 0)
+		{
+			switch (event.type)
+			{
+			case ENET_EVENT_TYPE_CONNECT: {
+				if (m_Role == Role::Host)
+				{
+					int clientIndex = 0;
+					while (m_PeerMap.find(clientIndex) != m_PeerMap.end())
+					{
+						++clientIndex;
+					}
+					m_PeerMap[clientIndex] = event.peer;
+					event.peer->data = reinterpret_cast<void*>(static_cast<intptr_t>(clientIndex));
+					if (m_ConnectionCallback)
+					{
+						m_ConnectionCallback(clientIndex, 0);
+					}
+				}
+				else if (m_Role == Role::Client)
+				{
+					m_Connected = true;
+					CH_CORE_INFO("NetworkSession: Connected to server.");
+				}
+				break;
+			}
+
+			case ENET_EVENT_TYPE_DISCONNECT: {
+				if (m_Role == Role::Host)
+				{
+					int clientIndex = static_cast<int>(reinterpret_cast<intptr_t>(event.peer->data));
+
+					for (auto it = m_PeerMap.begin(); it != m_PeerMap.end(); ++it)
+					{
+						if (it->second == event.peer)
+						{
+							m_PeerMap.erase(it);
+							break;
+						}
+					}
+
+					if (m_DisconnectionCallback)
+					{
+						m_DisconnectionCallback(clientIndex, 0);
+					}
+				}
+				else if (m_Role == Role::Client)
+				{
+					m_Connected = false;
+					CH_CORE_INFO("NetworkSession: Disconnected from server.");
+					m_ServerPeer = nullptr;
+					m_Role = Role::Offline;
+				}
+				break;
+			}
+
+			case ENET_EVENT_TYPE_RECEIVE: {
+				int peerIndex = -1;
+				if (m_Role == Role::Host)
+				{
+					peerIndex = static_cast<int>(reinterpret_cast<intptr_t>(event.peer->data));
+				}
+				if (m_EventCallback)
+				{
+					m_EventCallback(peerIndex, MessageType_Count, event.packet->data, event.packet->dataLength);
+				}
+				enet_packet_destroy(event.packet);
+				break;
+			}
+
+			default:
+				break;
+			}
+		}
+	}
+
+	void NetworkSession::MarkClientConnected(int /*peerIndex*/)
+	{
+	}
+
+	void NetworkSession::MarkClientDisconnected(int /*peerIndex*/)
+	{
+	}
+
+	std::string NetworkSession::GetListenAddress() const
+	{
+		if (!m_Host || m_Role != Role::Host)
+		{
+			return {};
+		}
+
+		char ip[INET6_ADDRSTRLEN] = {};
+		if (enet_address_get_host_ip_new(&m_Host->address, ip, sizeof(ip)) == 0)
+		{
+			return std::string(ip) + ":" + std::to_string(m_Port);
+		}
+		return "127.0.0.1:" + std::to_string(m_Port);
+	}
+
+	std::string NetworkSession::GetPublicAddress() const
+	{
+		if (!m_PublicAddressFetched.load(std::memory_order_acquire))
+		{
+			return "Fetching...";
+		}
+		return m_CachedPublicAddress;
+	}
+
+	ENetPeer* NetworkSession::GetPeerForClient(int clientIndex) const
+	{
+		auto it = m_PeerMap.find(clientIndex);
+		return it != m_PeerMap.end() ? it->second : nullptr;
+	}
+
+} // namespace Chained
diff --git a/engine/networking/network_session.h b/engine/networking/network_session.h
new file mode 100644
index 000000000..45c5bb722
--- /dev/null
+++ b/engine/networking/network_session.h
@@ -0,0 +1,142 @@
+#ifndef CH_NETWORK_SESSION_H
+#define CH_NETWORK_SESSION_H
+
+#include "network_types.h"
+#include "net_packet.h"
+
+#include <enet.h>
+
+#include <atomic>
+#include <cstdint>
+#include <functional>
+#include <string>
+#include <unordered_map>
+
+namespace Chained
+{
+
+	class NetworkSession
+	{
+	public:
+		using EventCallback = std::function<void(int peerIndex, MessageType type, const uint8_t* data, size_t len)>;
+		using ConnectionCallback = std::function<void(int peerIndex, uint64_t networkID)>;
+		using DisconnectionCallback = std::function<void(int peerIndex, uint64_t networkID)>;
+
+		NetworkSession() = default;
+		~NetworkSession();
+
+		NetworkSession(const NetworkSession&) = delete;
+		NetworkSession& operator=(const NetworkSession&) = delete;
+
+		NetworkError Initialize();
+		void Shutdown();
+
+		NetworkError HostGame(uint16_t port, int maxClients);
+		NetworkError ConnectTo(const std::string& ip, uint16_t port);
+		void Disconnect();
+		void ForceDisconnect();
+
+		void Update(float dt);
+
+		Role GetRole() const
+		{
+			return m_Role;
+		}
+		bool IsHost() const
+		{
+			return m_Role == Role::Host || m_Role == Role::HostAndClient;
+		}
+		bool IsClient() const
+		{
+			return m_Role == Role::Client || m_Role == Role::HostAndClient;
+		}
+		bool IsConnected() const
+		{
+			return m_Role != Role::Offline;
+		}
+		bool IsFullyConnected() const
+		{
+			return m_Connected;
+		}
+
+		int GetMaxClients() const
+		{
+			return m_MaxClients;
+		}
+		uint16_t GetPort() const
+		{
+			return m_Port;
+		}
+		std::string GetListenAddress() const;
+		std::string GetPublicAddress() const;
+
+		void SetEventCallback(EventCallback cb)
+		{
+			m_EventCallback = std::move(cb);
+		}
+		void SetConnectionCallback(ConnectionCallback cb)
+		{
+			m_ConnectionCallback = std::move(cb);
+		}
+		void SetDisconnectionCallback(DisconnectionCallback cb)
+		{
+			m_DisconnectionCallback = std::move(cb);
+		}
+
+		void SetMaxClients(int max)
+		{
+			m_MaxClients = max;
+		}
+
+		void MarkClientConnected(int peerIndex);
+		void MarkClientDisconnected(int peerIndex);
+
+		ENetHost* GetHost() const
+		{
+			return m_Host;
+		}
+		ENetPeer* GetServerPeer() const
+		{
+			return m_ServerPeer;
+		}
+		ENetPeer* GetPeerForClient(int clientIndex) const;
+		const std::unordered_map<int, ENetPeer*>& GetPeerMap() const
+		{
+			return m_PeerMap;
+		}
+
+		void SetServerConnection(int conn)
+		{
+			m_ServerConnection = conn;
+		}
+		int GetServerConnection() const
+		{
+			return m_ServerConnection;
+		}
+
+		std::atomic<bool> m_ShuttingDown{false};
+
+	private:
+		void ProcessEvents();
+
+		Role m_Role = Role::Offline;
+		ENetHost* m_Host = nullptr;
+		ENetPeer* m_ServerPeer = nullptr;
+		int m_MaxClients = 0;
+		uint16_t m_Port = 0;
+		int m_ServerConnection = kInvalidPeerHandle;
+		bool m_Connected = false; ///< true only after ENET handshake completes
+
+		std::string m_CachedPublicAddress;
+		std::atomic<bool> m_PublicAddressFetched{false};
+
+		EventCallback m_EventCallback;
+		ConnectionCallback m_ConnectionCallback;
+		DisconnectionCallback m_DisconnectionCallback;
+
+		std::unordered_map<int, ENetPeer*> m_PeerMap;
+	};
+
+} // namespace Chained
+
+#endif // CH_NETWORK_SESSION_H
diff --git a/engine/networking/network_transport.cpp b/engine/networking/network_transport.cpp
new file mode 100644
index 000000000..93a0464d9
--- /dev/null
+++ b/engine/networking/network_transport.cpp
@@ -0,0 +1,309 @@
+#include "network_transport.h"
+#include "network_session.h"
+#include "net_packet.h"
+#include <sodium.h>
+#include <cstring>
+#include <random>
+
+namespace Chained
+{
+	static constexpr size_t kCryptoNonceSize = 24;
+	static constexpr size_t kCryptoMACSize = 16;
+
+	static void BuildNonce(uint8_t nonce[kCryptoNonceSize], uint64_t counter)
+	{
+		std::memset(nonce, 0, kCryptoNonceSize);
+		for (int i = 0; i < 8; ++i)
+		{
+			nonce[i] = static_cast<uint8_t>((counter >> (i * 8)) & 0xFF);
+		}
+	}
+
+	static bool CryptoEncrypt(const uint8_t* plaintext, size_t ptLen, uint8_t* ciphertext, size_t& ctLen,
+							  const uint8_t key[32], uint64_t counter)
+	{
+		uint8_t nonce[kCryptoNonceSize];
+		BuildNonce(nonce, counter);
+		unsigned long long actualCtLen = 0;
+		if (crypto_aead_xchacha20poly1305_ietf_encrypt(ciphertext, &actualCtLen, plaintext, ptLen, nullptr, 0, nullptr,
+													   nonce, key) != 0)
+		{
+			return false;
+		}
+		ctLen = static_cast<size_t>(actualCtLen);
+		return true;
+	}
+
+	static bool CryptoDecrypt(const uint8_t* ciphertext, size_t ctLen, uint8_t* plaintext, size_t& ptLen,
+							  const uint8_t key[32], uint64_t counter)
+	{
+		if (ctLen < kCryptoMACSize)
+		{
+			return false;
+		}
+		uint8_t nonce[kCryptoNonceSize];
+		BuildNonce(nonce, counter);
+		unsigned long long actualPtLen = 0;
+		if (crypto_aead_xchacha20poly1305_ietf_decrypt(plaintext, &actualPtLen, nullptr, ciphertext, ctLen, nullptr, 0,
+													   nonce, key) != 0)
+		{
+			return false;
+		}
+		ptLen = static_cast<size_t>(actualPtLen);
+		return true;
+	}
+
+	void NetworkTransport::SetPacketCallback(PacketCallback callback)
+	{
+		m_PacketCallback = std::move(callback);
+	}
+	void NetworkTransport::ClearPacketCallback()
+	{
+		m_PacketCallback = nullptr;
+	}
+	void NetworkTransport::SetSessionKey(const uint8_t key[32])
+	{
+		std::memcpy(m_SessionKey, key, 32);
+	}
+	void NetworkTransport::ResetCounters()
+	{
+		m_SendCounters.clear();
+		m_RecvCounters.clear();
+	}
+
+	void NetworkTransport::SendRaw(int peerIndex, MessageType type, const void* payload, size_t payloadLen,
+								   bool reliable)
+	{
+		ENetHost* host = m_Session ? m_Session->GetHost() : nullptr;
+		if (!host)
+		{
+			return;
+		}
+
+		size_t totalLen = sizeof(type) + payloadLen;
+		std::vector<uint8_t> packet(totalLen);
+		std::memcpy(packet.data(), &type, sizeof(type));
+		if (payloadLen > 0)
+		{
+			std::memcpy(packet.data() + sizeof(type), payload, payloadLen);
+		}
+
+		uint8_t encrypted[4096];
+		const uint8_t* sendBuf = packet.data();
+		size_t sendLen = totalLen;
+
+		if (m_CryptoEnabled)
+		{
+			uint64_t& sendCounter = m_SendCounters[peerIndex];
+			sendCounter++;
+			size_t encLen = 0;
+			if (CryptoEncrypt(packet.data(), totalLen, encrypted, encLen, m_SessionKey, sendCounter))
+			{
+				sendBuf = encrypted;
+				sendLen = encLen;
+			}
+			else
+			{
+				CH_CORE_WARN("NetworkTransport: Encryption failed for peer {}.", peerIndex);
+				return;
+			}
+		}
+
+		ENetPacket* enetPacket = enet_packet_create(sendBuf, sendLen, reliable ? ENET_PACKET_FLAG_RELIABLE : 0);
+		int channel = reliable ? kChannel_Reliable : kChannel_Unreliable;
+
+		if (peerIndex == kInvalidPeerHandle)
+		{
+			if (m_Session->IsHost())
+			{
+				for (auto& [idx, peer] : m_Session->GetPeerMap())
+				{
+					enet_peer_send(peer, channel, enetPacket);
+				}
+			}
+			else if (m_Session->IsClient() && m_Session->GetServerPeer())
+			{
+				enet_peer_send(m_Session->GetServerPeer(), channel, enetPacket);
+			}
+		}
+		else
+		{
+			ENetPeer* peer = m_Session->GetPeerForClient(peerIndex);
+			if (peer)
+			{
+				enet_peer_send(peer, channel, enetPacket);
+			}
+		}
+
+		enet_host_flush(host);
+	}
+
+	void NetworkTransport::HandleIncomingPacket(int peerIndex, const uint8_t* data, size_t len)
+	{
+		if (len < sizeof(uint16_t))
+		{
+			return;
+		}
+
+		uint8_t decrypted[4096];
+		const uint8_t* payload = data;
+		size_t payloadLen = len;
+
+		if (m_CryptoEnabled && len > kCryptoMACSize)
+		{
+			uint64_t& recvCounter = m_RecvCounters[peerIndex];
+			recvCounter++;
+			size_t decLen = 0;
+			if (CryptoDecrypt(data, len, decrypted, decLen, m_SessionKey, recvCounter))
+			{
+				payload = decrypted;
+				payloadLen = decLen;
+			}
+			else
+			{
+				CH_CORE_WARN("NetworkTransport: Decryption failed for peer {}.", peerIndex);
+				return;
+			}
+		}
+
+		uint16_t type = 0;
+		std::memcpy(&type, payload, sizeof(type));
+		payload += sizeof(type);
+		payloadLen -= sizeof(type);
+
+		if (type >= MessageType_Count)
+		{
+			return;
+		}
+		if (m_PacketCallback)
+		{
+			m_PacketCallback(peerIndex, static_cast<MessageType>(type), payload, payloadLen);
+		}
+	}
+
+	void NetworkTransport::SendPacket(int peerIndex, MessageType type, const void* data, size_t len, bool reliable)
+	{
+		SendRaw(peerIndex, type, data, len, reliable);
+	}
+
+	void NetworkTransport::BroadcastPacket(MessageType type, bool reliable,
+										   const std::function<void(ByteWriter&)>& populate)
+	{
+		if (!m_Session || !m_Session->IsHost())
+		{
+			return;
+		}
+		const auto& peerMap = m_Session->GetPeerMap();
+		for (auto& [clientIndex, peer] : peerMap)
+		{
+			ByteWriter w;
+			if (populate)
+			{
+				populate(w);
+			}
+			SendRaw(clientIndex, type, w.Data().data(), w.Data().size(), reliable);
+		}
+	}
+
+	void NetworkTransport::SendToServer(MessageType type, const void* data, size_t len, bool reliable)
+	{
+		if (!m_Session || !m_Session->IsClient() || !m_Session->GetServerPeer())
+		{
+			return;
+		}
+		SendRaw(kInvalidPeerHandle, type, data, len, reliable);
+	}
+
+	void NetworkTransport::BroadcastSceneChange(const char* scenePath)
+	{
+		if (!m_Session || !m_Session->IsHost())
+		{
+			return;
+		}
+		BroadcastPacket(MessageType_SceneChange, true, [scenePath](ByteWriter& bw) {
+			SceneChangeMessage msg;
+			std::strncpy(msg.ScenePath, scenePath, sizeof(msg.ScenePath) - 1);
+			msg.ScenePath[sizeof(msg.ScenePath) - 1] = '\0';
+			msg.Encode(bw);
+		});
+		CH_CORE_INFO("NetworkTransport: Broadcast scene change -> {}", scenePath);
+	}
+
+	void NetworkTransport::SendPlayerInfoToHost(const char* name, uint8_t skinIndex, uint64_t /*localNetworkID*/)
+	{
+		if (!m_Session || m_Session->GetRole() != Role::Client || !m_Session->GetServerPeer())
+		{
+			return;
+		}
+		PlayerInfoMessage msg;
+		std::strncpy(msg.Name, name ? name : "Player", sizeof(msg.Name) - 1);
+		msg.Name[sizeof(msg.Name) - 1] = '\0';
+		msg.SkinIndex = skinIndex;
+		ByteWriter w;
+		msg.Encode(w);
+		SendToServer(MessageType_PlayerInfo, w.Data().data(), w.Data().size(), true);
+		CH_CORE_INFO("NetworkTransport: Sent player info (name='{}', skin={}).", msg.Name, (int)skinIndex);
+	}
+
+	void NetworkTransport::BroadcastPlayerList(const std::vector<PlayerNetInfo>& playerList)
+	{
+		if (!m_Session || !m_Session->IsHost())
+		{
+			return;
+		}
+		uint8_t count = static_cast<uint8_t>(std::min(playerList.size(), size_t(64)));
+		BroadcastPacket(MessageType_PlayerList, true, [&playerList, count](ByteWriter& bw) {
+			PlayerListMessage msg;
+			msg.Count = count;
+			for (int i = 0; i < count && i < 64; ++i)
+			{
+				msg.Entries[i].NetworkID = playerList[i].NetworkID;
+				std::strncpy(msg.Entries[i].Name, playerList[i].Name.c_str(), sizeof(msg.Entries[i].Name) - 1);
+				msg.Entries[i].Name[sizeof(msg.Entries[i].Name) - 1] = '\0';
+				msg.Entries[i].SkinIndex = playerList[i].SkinIndex;
+				msg.Entries[i].IsHost = playerList[i].IsHost;
+			}
+			msg.Encode(bw);
+		});
+		CH_CORE_INFO("NetworkTransport: Broadcast player list ({} players).", count);
+	}
+
+	void NetworkTransport::SendChatMessage(const char* message, uint64_t localNetworkID,
+										   const std::string& localPlayerName)
+	{
+		if (!message || !message[0] || !m_Session)
+		{
+			return;
+		}
+
+		if (m_Session->IsHost())
+		{
+			BroadcastPacket(MessageType_ChatMessage, true, [&](ByteWriter& bw) {
+				ChatMessageMessage msg;
+				msg.SenderNetworkID = localNetworkID;
+				std::strncpy(msg.SenderName, localPlayerName.c_str(), sizeof(msg.SenderName) - 1);
+				msg.SenderName[sizeof(msg.SenderName) - 1] = '\0';
+				std::strncpy(msg.Message, message, sizeof(msg.Message) - 1);
+				msg.Message[sizeof(msg.Message) - 1] = '\0';
+				msg.Encode(bw);
+			});
+			ChatMessagePacket pkt;
+			pkt.SenderNetworkID = localNetworkID;
+			pkt.SenderName = localPlayerName;
+			pkt.Message = message;
+			m_PendingChatMessages.push_back(pkt);
+		}
+		else if (m_Session->IsClient() && m_Session->GetServerPeer())
+		{
+			ChatMessageMessage msg;
+			msg.SenderNetworkID = localNetworkID;
+			std::strncpy(msg.SenderName, localPlayerName.c_str(), sizeof(msg.SenderName) - 1);
+			msg.SenderName[sizeof(msg.SenderName) - 1] = '\0';
+			std::strncpy(msg.Message, message, sizeof(msg.Message) - 1);
+			msg.Message[sizeof(msg.Message) - 1] = '\0';
+			ByteWriter w;
+			msg.Encode(w);
+			SendToServer(MessageType_ChatMessage, w.Data().data(), w.Data().size(), true);
+		}
+	}
+} // namespace Chained
diff --git a/engine/networking/network_transport.h b/engine/networking/network_transport.h
new file mode 100644
index 000000000..1815bc7ed
--- /dev/null
+++ b/engine/networking/network_transport.h
@@ -0,0 +1,96 @@
+#ifndef CH_NETWORK_TRANSPORT_H
+#define CH_NETWORK_TRANSPORT_H
+
+#include "network_types.h"
+#include "net_packet.h"
+
+#include <cstdint>
+#include <functional>
+#include <vector>
+#include <unordered_map>
+
+struct _ENetHost;
+struct _ENetPeer;
+typedef struct _ENetHost ENetHost;
+typedef struct _ENetPeer ENetPeer;
+
+namespace Chained
+{
+
+	class NetworkSession;
+
+	class NetworkTransport
+	{
+	public:
+		using PacketCallback = std::function<void(int peerIndex, MessageType type, const uint8_t* data, size_t len)>;
+
+		NetworkTransport() = default;
+		~NetworkTransport() = default;
+
+		NetworkTransport(const NetworkTransport&) = delete;
+		NetworkTransport& operator=(const NetworkTransport&) = delete;
+
+		void SetSession(NetworkSession* session)
+		{
+			m_Session = session;
+		}
+
+		void SetPacketCallback(PacketCallback callback);
+		void ClearPacketCallback();
+
+		void SendPacket(int peerIndex, MessageType type, const void* data, size_t len, bool reliable = true);
+		void BroadcastPacket(MessageType type, bool reliable, const std::function<void(ByteWriter&)>& populate);
+		void SendToServer(MessageType type, const void* data, size_t len, bool reliable = true);
+		void BroadcastSceneChange(const char* scenePath);
+
+		void SendPlayerInfoToHost(const char* name, uint8_t skinIndex, uint64_t localNetworkID);
+		void BroadcastPlayerList(const std::vector<struct PlayerNetInfo>& playerList);
+		void SendChatMessage(const char* message, uint64_t localNetworkID, const std::string& localPlayerName);
+
+		void HandleIncomingPacket(int peerIndex, const uint8_t* data, size_t len);
+
+		void SetCryptoEnabled(bool enabled)
+		{
+			m_CryptoEnabled = enabled;
+		}
+		bool IsCryptoEnabled() const
+		{
+			return m_CryptoEnabled;
+		}
+
+		void ResetCounters();
+		void SetSessionKey(const uint8_t key[32]);
+
+		void ClearPendingChatMessages()
+		{
+			m_PendingChatMessages.clear();
+		}
+		bool HasPendingChatMessages() const
+		{
+			return !m_PendingChatMessages.empty();
+		}
+		const std::vector<ChatMessagePacket>& GetPendingChatMessages() const
+		{
+			return m_PendingChatMessages;
+		}
+		void StorePendingChatMessage(const ChatMessagePacket& pkt)
+		{
+			m_PendingChatMessages.push_back(pkt);
+		}
+
+	private:
+		void SendRaw(int peerIndex, MessageType type, const void* payload, size_t payloadLen, bool reliable);
+
+		NetworkSession* m_Session = nullptr;
+		PacketCallback m_PacketCallback;
+		std::vector<ChatMessagePacket> m_PendingChatMessages;
+
+		uint8_t m_SessionKey[32] = {};
+		bool m_CryptoEnabled = false;
+		std::unordered_map<int, uint64_t> m_SendCounters;
+		std::unordered_map<int, uint64_t> m_RecvCounters;
+	};
+
+} // namespace Chained
+
+#endif // CH_NETWORK_TRANSPORT_H
diff --git a/engine/networking/network_types.h b/engine/networking/network_types.h
new file mode 100644
index 000000000..9720e96b0
--- /dev/null
+++ b/engine/networking/network_types.h
@@ -0,0 +1,39 @@
+#ifndef CH_NETWORK_TYPES_H
+#define CH_NETWORK_TYPES_H
+
+#include <cstdint>
+#include <string>
+
+namespace Chained
+{
+	using NetworkPeerHandle = int;
+	constexpr NetworkPeerHandle kInvalidPeerHandle = -1;
+
+	enum class Role : uint8_t
+	{
+		Offline = 0,
+		Host,
+		Client,
+		HostAndClient,
+	};
+
+	enum class NetworkError : uint8_t
+	{
+		None = 0,
+		ENetInitFailed,
+		AlreadyConnected,
+		CreateHostFailed,
+		ConnectFailed,
+		BindFailed,
+	};
+
+	struct ChatMessagePacket
+	{
+		uint64_t SenderNetworkID = 0;
+		std::string SenderName;
+		std::string Message;
+	};
+
+} // namespace Chained
+
+#endif // CH_NETWORK_TYPES_H
diff --git a/engine/networking/upnp_port_mapper.cpp b/engine/networking/upnp_port_mapper.cpp
new file mode 100644
index 000000000..2ed59c291
--- /dev/null
+++ b/engine/networking/upnp_port_mapper.cpp
@@ -0,0 +1,210 @@
+#include "upnp_port_mapper.h"
+
+#include <miniupnpc.h>
+#include <upnpcommands.h>
+#include <igd_desc_parse.h>
+
+#include <cstring>
+#include <string.h>
+#include <cstdlib>
+
+namespace Chained
+{
+
+	UpnpPortMapper::~UpnpPortMapper()
+	{
+		Shutdown();
+	}
+
+	void UpnpPortMapper::CleanupDiscovery()
+	{
+		if (m_URLs)
+		{
+			FreeUPNPUrls(static_cast<UPNPUrls*>(m_URLs));
+			delete static_cast<UPNPUrls*>(m_URLs);
+			m_URLs = nullptr;
+		}
+		if (m_DevList)
+		{
+			freeUPNPDevlist(static_cast<UPNPDev*>(m_DevList));
+			m_DevList = nullptr;
+		}
+		if (m_IgdData)
+		{
+			delete static_cast<IGDdatas*>(m_IgdData);
+			m_IgdData = nullptr;
+		}
+		if (m_ControlURL)
+		{
+			free(m_ControlURL);
+			m_ControlURL = nullptr;
+		}
+		if (m_ServiceType)
+		{
+			free(m_ServiceType);
+			m_ServiceType = nullptr;
+		}
+		m_Available = false;
+		m_PublicIPFetched = false;
+		m_CachedPublicIP[0] = '\0';
+	}
+
+	bool UpnpPortMapper::Initialize()
+	{
+		CleanupDiscovery();
+
+		int error = 0;
+		m_DevList = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &error);
+
+		if (error != 0 || !m_DevList)
+		{
+			CH_CORE_WARN("UPnP: Discovery failed (error={}). UPnP not available.", error);
+			CleanupDiscovery();
+			return false;
+		}
+
+		m_IgdData = new IGDdatas{};
+		m_URLs = new UPNPUrls{};
+		m_ControlURL = static_cast<void*>(malloc(256));
+		m_ServiceType = static_cast<void*>(malloc(256));
+		static_cast<char*>(m_ControlURL)[0] = '\0';
+		static_cast<char*>(m_ServiceType)[0] = '\0';
+
+		char wanAddr[64] = {};
+
+		int status = UPNP_GetValidIGD(static_cast<UPNPDev*>(m_DevList), static_cast<UPNPUrls*>(m_URLs),
+									  static_cast<IGDdatas*>(m_IgdData), m_LanAddress, sizeof(m_LanAddress), wanAddr,
+									  sizeof(wanAddr));
+
+		if (status < 1)
+		{
+			CH_CORE_WARN("UPnP: No valid IGD found (status={}). Port forwarding unavailable.", status);
+			CleanupDiscovery();
+			return false;
+		}
+
+		// Copy control URL from the discovered IGD
+		auto* urls = static_cast<UPNPUrls*>(m_URLs);
+		auto* data = static_cast<IGDdatas*>(m_IgdData);
+
+		if (urls->controlURL && urls->controlURL[0])
+		{
+			free(m_ControlURL);
+			m_ControlURL = strdup(urls->controlURL);
+		}
+
+		// Use the WAN IP connection service type
+		if (data->first.servicetype[0])
+		{
+			free(m_ServiceType);
+			m_ServiceType = strdup(data->first.servicetype);
+		}
+
+		if (!m_ControlURL || !static_cast<char*>(m_ControlURL)[0])
+		{
+			CH_CORE_WARN("UPnP: Control URL is empty. Port forwarding unavailable.");
+			CleanupDiscovery();
+			return false;
+		}
+
+		if (wanAddr[0] != '\0')
+		{
+			std::strncpy(m_CachedPublicIP, wanAddr, sizeof(m_CachedPublicIP) - 1);
+			m_PublicIPFetched = true;
+		}
+
+		m_Available = true;
+		CH_CORE_INFO("UPnP: IGD found. ControlURL='{}', LAN='{}', WAN='{}'", static_cast<char*>(m_ControlURL),
+					 m_LanAddress, wanAddr);
+		return true;
+	}
+
+	void UpnpPortMapper::Shutdown()
+	{
+		CleanupDiscovery();
+	}
+
+	bool UpnpPortMapper::AddMapping(uint16_t port, const char* protocol, const char* description)
+	{
+		if (!m_Available || !m_ControlURL || !m_ServiceType)
+		{
+			return false;
+		}
+
+		char extPort[8] = {};
+		char intPort[8] = {};
+		std::snprintf(extPort, sizeof(extPort), "%u", port);
+		std::snprintf(intPort, sizeof(intPort), "%u", port);
+
+		char intClient[64] = {};
+		std::strncpy(intClient, m_LanAddress, sizeof(intClient) - 1);
+
+		int result = UPNP_AddPortMapping(static_cast<char*>(m_ControlURL), static_cast<char*>(m_ServiceType), extPort,
+										 intPort, intClient, description, protocol, nullptr, 0);
+
+		if (result != UPNPCOMMAND_SUCCESS)
+		{
+			CH_CORE_WARN("UPnP: Failed to add port mapping {}:{} ({})", intClient, port, protocol);
+			return false;
+		}
+
+		CH_CORE_INFO("UPnP: Port mapping added — {}:{} ({})", intClient, port, protocol);
+		return true;
+	}
+
+	bool UpnpPortMapper::RemoveMapping(uint16_t port, const char* protocol)
+	{
+		if (!m_Available || !m_ControlURL || !m_ServiceType)
+		{
+			return false;
+		}
+
+		char portStr[8] = {};
+		std::snprintf(portStr, sizeof(portStr), "%u", port);
+
+		int result = UPNP_DeletePortMapping(static_cast<char*>(m_ControlURL), static_cast<char*>(m_ServiceType),
+											portStr, protocol, nullptr);
+
+		if (result != UPNPCOMMAND_SUCCESS)
+		{
+			CH_CORE_WARN("UPnP: Failed to remove port mapping {}:{}", port, protocol);
+			return false;
+		}
+
+		CH_CORE_INFO("UPnP: Port mapping removed — {}:{}", port, protocol);
+		return true;
+	}
+
+	std::string UpnpPortMapper::GetPublicIP()
+	{
+		if (!m_Available)
+		{
+			return {};
+		}
+
+		if (m_PublicIPFetched)
+		{
+			return std::string(m_CachedPublicIP);
+		}
+
+		if (!m_ControlURL || !m_ServiceType)
+		{
+			return {};
+		}
+
+		char publicIP[64] = {};
+		int result =
+			UPNP_GetExternalIPAddress(static_cast<char*>(m_ControlURL), static_cast<char*>(m_ServiceType), publicIP);
+
+		m_PublicIPFetched = true;
+		if (result == UPNPCOMMAND_SUCCESS && publicIP[0] != '\0')
+		{
+			std::strncpy(m_CachedPublicIP, publicIP, sizeof(m_CachedPublicIP) - 1);
+			return std::string(publicIP);
+		}
+
+		CH_CORE_WARN("UPnP: Failed to get external IP address");
+		return {};
+	}
+
+} // namespace Chained
diff --git a/engine/networking/upnp_port_mapper.h b/engine/networking/upnp_port_mapper.h
new file mode 100644
index 000000000..a142d9cd9
--- /dev/null
+++ b/engine/networking/upnp_port_mapper.h
@@ -0,0 +1,50 @@
+#ifndef CH_UPNP_PORT_MAPPER_H
+#define CH_UPNP_PORT_MAPPER_H
+
+#include <cstdint>
+#include <string>
+
+namespace Chained
+{
+
+	class UpnpPortMapper
+	{
+	public:
+		UpnpPortMapper() = default;
+		~UpnpPortMapper();
+
+		UpnpPortMapper(const UpnpPortMapper&) = delete;
+		UpnpPortMapper& operator=(const UpnpPortMapper&) = delete;
+
+		bool Initialize();
+		void Shutdown();
+
+		bool AddMapping(uint16_t port, const char* protocol = "UDP", const char* description = "Chained Engine");
+		bool RemoveMapping(uint16_t port, const char* protocol = "UDP");
+		std::string GetPublicIP();
+		const char* GetLanIP() const
+		{
+			return m_LanAddress;
+		}
+		bool IsAvailable() const
+		{
+			return m_Available;
+		}
+
+	private:
+		void CleanupDiscovery();
+
+		void* m_DevList = nullptr;
+		void* m_URLs = nullptr;
+		void* m_IgdData = nullptr;
+		void* m_ControlURL = nullptr;
+		void* m_ServiceType = nullptr;
+		bool m_Available = false;
+		char m_LanAddress[64] = {};
+		char m_CachedPublicIP[64] = {};
+		bool m_PublicIPFetched = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_UPNP_PORT_MAPPER_H
diff --git a/engine/physics/CMakeLists.txt b/engine/physics/CMakeLists.txt
index 61af9282e..b67c8075b 100644
--- a/engine/physics/CMakeLists.txt
+++ b/engine/physics/CMakeLists.txt
@@ -1,43 +1,26 @@
-add_library(engine_physics ${SUBMODULE_LIB_TYPE}
-        physics.cpp
-        dynamics.cpp
-    collision_core.cpp
-    raycast_query.cpp
-        bvh/bvh_cache.cpp
-        bvh/bvh.cpp
-        collision/collision_triangle.cpp
-
-        physics.h
-        dynamics.h
-    collision_core.h
-    raycast_query.h
-        bvh/bvh_cache.h
-        bvh/bvh.h
-        bvh/bvh_node.h
-        collision/collision.h
-        collision/collision_triangle.h
-        raycast_result.h
+add_library(engine_physics STATIC
+    physics.h
+    physics.cpp
+    iphysics_world.h
+    physics_types.h
+    raycast_result.h
+    jolt_physics_world.h
+    jolt_physics_world.cpp
 )
 
 target_include_directories(engine_physics PUBLIC
-    ${ENGINE_INCLUDE_DIRS}
-    ${assimp_SOURCE_DIR}/include
-    ${assimp_BINARY_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/entt/src
-    ${CMAKE_SOURCE_DIR}/include/glfw/include
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
 )
 
-target_link_libraries(engine_physics PUBLIC 
+target_link_libraries(engine_physics PUBLIC
     engine_core
-    EnTT::EnTT
+    engine_project
+    engine_external_entt
+    glm
+    Jolt
 )
 
-if(MSVC)
-    target_compile_options(engine_physics PRIVATE /bigobj)
-elseif(MINGW)
-    target_compile_options(engine_physics PRIVATE -Wa,-mbig-obj)
-endif()
-
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(engine_physics)
+if(TARGET engine_pch)
+    target_link_libraries(engine_physics PRIVATE engine_pch)
 endif()
diff --git a/engine/physics/bvh/bvh.cpp b/engine/physics/bvh/bvh.cpp
deleted file mode 100644
index 9e052cedf..000000000
--- a/engine/physics/bvh/bvh.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-#include "bvh.h"
-#include <algorithm>
-#include <cfloat>
-#include <cmath>
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
-namespace CHEngine
-{
-
-static bool RayAABBTest(const Ray& ray, const BoundingBox& box, float& t)
-{
-    glm::vec3 invDir = 1.0f / ray.direction;
-    glm::vec3 t0 = (box.Min - ray.position) * invDir;
-    glm::vec3 t1 = (box.Max - ray.position) * invDir;
-
-    glm::vec3 tMin = glm::min(t0, t1);
-    glm::vec3 tMax = glm::max(t0, t1);
-
-    float minVal = std::max(std::max(tMin.x, tMin.y), tMin.z);
-    float maxVal = std::min(std::min(tMax.x, tMax.y), tMax.z);
-
-    if (maxVal >= std::max(0.0f, minVal))
-    {
-        t = minVal;
-        return true;
-    }
-    return false;
-}
-
-std::shared_ptr<BVH> BVH::Build(std::vector<CollisionTriangle>&& triangles)
-{
-    if (triangles.empty()) return nullptr;
-
-    auto bvh = std::make_shared<BVH>();
-    bvh->m_Triangles = std::move(triangles);
-    
-    bvh->m_Nodes.reserve(bvh->m_Triangles.size() * 2);
-    bvh->m_Nodes.emplace_back(); // Root
-
-    BuildContext ctx(bvh->m_Triangles);
-    bvh->BuildIterative(ctx, bvh->m_Triangles.size());
-
-    std::vector<CollisionTriangle> reorderedTris;
-    reorderedTris.reserve(bvh->m_Triangles.size());
-    for (uint32_t idx : ctx.TriIndices)
-    {
-        reorderedTris.push_back(bvh->m_Triangles[idx]);
-    }
-    bvh->m_Triangles = std::move(reorderedTris);
-
-    return bvh;
-}
-
-void BVH::BuildIterative(BuildContext& ctx, size_t totalTriCount)
-{
-    m_Nodes.clear();
-    m_Nodes.reserve(totalTriCount * 2); 
-    m_Nodes.emplace_back(); // Root (index 0)
-
-    std::vector<WorkItem> stack;
-    stack.push_back({0, 0, totalTriCount});
-
-    while (!stack.empty())
-    {
-        auto [nodeIdx, triStart, triCount] = stack.back();
-        stack.pop_back();
-
-        glm::vec3 nodeMin = {FLT_MAX, FLT_MAX, FLT_MAX};
-        glm::vec3 nodeMax = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
-        glm::vec3 cMin = {FLT_MAX, FLT_MAX, FLT_MAX};
-        glm::vec3 cMax = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
-
-        for (size_t i = 0; i < triCount; ++i)
-        {
-            const auto& tri = ctx.AllTriangles[ctx.TriIndices[triStart + i]];
-            nodeMin = glm::min(nodeMin, tri.min);
-            nodeMax = glm::max(nodeMax, tri.max);
-            cMin = glm::min(cMin, tri.center);
-            cMax = glm::max(cMax, tri.center);
-        }
-
-        m_Nodes[nodeIdx].Min = nodeMin;
-        m_Nodes[nodeIdx].Max = nodeMax;
-
-        if (triCount <= 4)
-        {
-            m_Nodes[nodeIdx].LeftOrFirst = (uint32_t)triStart;
-            m_Nodes[nodeIdx].TriangleCount = (uint16_t)triCount;
-            continue;
-        }
-
-        glm::vec3 extent = cMax - cMin;
-        int axis = 0;
-        if (extent.y > extent.x && extent.y > extent.z) axis = 1;
-        else if (extent.z > extent.x && extent.z > extent.y) axis = 2;
-
-        float splitPos = 0;
-        if (axis == 0) splitPos = cMin.x + extent.x * 0.5f;
-        else if (axis == 1) splitPos = cMin.y + extent.y * 0.5f;
-        else splitPos = cMin.z + extent.z * 0.5f;
-
-        auto startIt = ctx.TriIndices.begin() + triStart;
-        auto endIt = startIt + triCount;
-        
-        auto midIt = std::partition(startIt, endIt, [&](uint32_t idx) {
-            const auto& tri = ctx.AllTriangles[idx];
-            float val = (axis == 0) ? tri.center.x : (axis == 1) ? tri.center.y : tri.center.z;
-            return val < splitPos;
-        });
-
-        size_t leftCount = std::distance(startIt, midIt);
-
-        if (leftCount == 0 || leftCount == triCount)
-        {
-            leftCount = triCount / 2;
-            std::nth_element(startIt, startIt + leftCount, endIt, [&](uint32_t a, uint32_t b) {
-                const auto& triA = ctx.AllTriangles[a];
-                const auto& triB = ctx.AllTriangles[b];
-                float valA = (axis == 0) ? triA.center.x : (axis == 1) ? triA.center.y : triA.center.z;
-                float valB = (axis == 0) ? triB.center.x : (axis == 1) ? triB.center.y : triB.center.z;
-                return valA < valB;
-            });
-        }
-
-        uint32_t leftIdx = (uint32_t)m_Nodes.size();
-        m_Nodes.emplace_back();
-        m_Nodes.emplace_back();
-
-        m_Nodes[nodeIdx].LeftOrFirst = leftIdx;
-        m_Nodes[nodeIdx].TriangleCount = 0;
-        m_Nodes[nodeIdx].Axis = (uint16_t)axis;
-
-        stack.push_back({leftIdx + 1, triStart + leftCount, triCount - leftCount});
-        stack.push_back({leftIdx, triStart, leftCount});
-    }
-}
-
-bool BVH::Raycast(const Ray& ray, float& t, glm::vec3& normal, int& meshIndex) const
-{
-    if (m_Nodes.empty()) return false;
-
-    uint32_t stack[64];
-    uint32_t stackPtr = 0;
-    stack[stackPtr++] = 0;
-
-    bool hit = false;
-    while (stackPtr > 0)
-    {
-        const BVHNode& node = m_Nodes[stack[--stackPtr]];
-
-        float boxT = 0;
-        if (!RayAABBTest(ray, {node.Min, node.Max}, boxT) || boxT >= t) continue;
-
-        if (node.IsLeaf())
-        {
-            for (uint32_t i = 0; i < node.TriangleCount; ++i)
-            {
-                const auto& tri = m_Triangles[node.LeftOrFirst + i];
-                float triT = t;
-                glm::vec3 triNormal;
-                if (tri.IntersectsRay(ray, triT, triNormal) && triT < t)
-                {
-                    t = triT;
-                    normal = triNormal;
-                    meshIndex = tri.meshIndex;
-                    hit = true;
-                }
-            }
-        }
-        else
-        {
-            uint32_t left = node.LeftOrFirst;
-            uint32_t right = left + 1;
-
-            float leftT = FLT_MAX, rightT = FLT_MAX;
-            bool leftValid = RayAABBTest(ray, {m_Nodes[left].Min, m_Nodes[left].Max}, leftT) && leftT < t;
-            bool rightValid = RayAABBTest(ray, {m_Nodes[right].Min, m_Nodes[right].Max}, rightT) && rightT < t;
-
-            if (leftValid && rightValid)
-            {
-                if (leftT < rightT)
-                {
-                    stack[stackPtr++] = right;
-                    stack[stackPtr++] = left;
-                }
-                else
-                {
-                    stack[stackPtr++] = left;
-                    stack[stackPtr++] = right;
-                }
-            }
-            else if (leftValid) stack[stackPtr++] = left;
-            else if (rightValid) stack[stackPtr++] = right;
-        }
-    }
-    return hit;
-}
-
-bool BVH::TestAxis(const glm::vec3& axis, const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
-                   const glm::vec3& boxCenter, const glm::vec3& boxHalfSize)
-{
-    float p0 = glm::dot(v0, axis);
-    float p1 = glm::dot(v1, axis);
-    float p2 = glm::dot(v2, axis);
-
-    float r = boxHalfSize.x * std::abs(axis.x) +
-              boxHalfSize.y * std::abs(axis.y) +
-              boxHalfSize.z * std::abs(axis.z);
-
-    float triMin = std::min(std::min(p0, p1), p2);
-    float triMax = std::max(std::max(p0, p1), p2);
-
-    float boxProj = glm::dot(boxCenter, axis);
-    float boxMin = boxProj - r;
-    float boxMax = boxProj + r;
-
-    return !(triMin > boxMax || triMax < boxMin);
-}
-
-bool BVH::TriangleIntersectAABB(const CollisionTriangle& tri, const BoundingBox& box)
-{
-    glm::vec3 boxCenter = (box.Min + box.Max) * 0.5f;
-    glm::vec3 boxHalfSize = (box.Max - box.Min) * 0.5f;
-
-    glm::vec3 v0 = tri.v0 - boxCenter;
-    glm::vec3 v1 = tri.v1 - boxCenter;
-    glm::vec3 v2 = tri.v2 - boxCenter;
-
-    glm::vec3 e0 = v1 - v0;
-    glm::vec3 e1 = v2 - v1;
-    glm::vec3 e2 = v0 - v2;
-
-    if (!BVH::TestAxis({1, 0, 0}, v0, v1, v2, {0, 0, 0}, boxHalfSize)) return false;
-    if (!BVH::TestAxis({0, 1, 0}, v0, v1, v2, {0, 0, 0}, boxHalfSize)) return false;
-    if (!BVH::TestAxis({0, 0, 1}, v0, v1, v2, {0, 0, 0}, boxHalfSize)) return false;
-
-    glm::vec3 normal = glm::cross(e0, e1);
-    if (!BVH::TestAxis(normal, v0, v1, v2, {0, 0, 0}, boxHalfSize)) return false;
-
-    glm::vec3 axes[9] = {
-        glm::cross(glm::vec3(1, 0, 0), e0), glm::cross(glm::vec3(1, 0, 0), e1), glm::cross(glm::vec3(1, 0, 0), e2),
-        glm::cross(glm::vec3(0, 1, 0), e0), glm::cross(glm::vec3(0, 1, 0), e1), glm::cross(glm::vec3(0, 1, 0), e2),
-        glm::cross(glm::vec3(0, 0, 1), e0), glm::cross(glm::vec3(0, 0, 1), e1), glm::cross(glm::vec3(0, 0, 1), e2)};
-
-    for (int i = 0; i < 9; i++)
-    {
-        if (glm::length(axes[i]) < 0.0001f) continue;
-        if (!BVH::TestAxis(axes[i], v0, v1, v2, {0, 0, 0}, boxHalfSize)) return false;
-    }
-
-    return true;
-}
-
-bool BVH::IntersectAABB(const BoundingBox& box, glm::vec3& outNormal, float& outDepth) const
-{
-    if (m_Nodes.empty()) return false;
-
-    uint32_t stack[64];
-    uint32_t stackPtr = 0;
-    stack[stackPtr++] = 0;
-
-    bool hit = false;
-    while (stackPtr > 0)
-    {
-        const BVHNode& node = m_Nodes[stack[--stackPtr]];
-
-        if (!(node.Min.x <= box.Max.x && node.Max.x >= box.Min.x && node.Min.y <= box.Max.y &&
-              node.Max.y >= box.Min.y && node.Min.z <= box.Max.z && node.Max.z >= box.Min.z))
-        {
-            continue;
-        }
-
-        if (node.IsLeaf())
-        {
-            for (uint32_t i = 0; i < node.TriangleCount; ++i)
-            {
-                const auto& tri = m_Triangles[node.LeftOrFirst + i];
-                if (BVH::TriangleIntersectAABB(tri, box))
-                {
-                    glm::vec3 triNormal = tri.normal;
-                    glm::vec3 boxCenter = (box.Min + box.Max) * 0.5f;
-                    float dist = glm::dot(tri.v0 - boxCenter, triNormal);
-                    float radius = 0.5f * (std::abs(triNormal.x * (box.Max.x - box.Min.x)) +
-                                           std::abs(triNormal.y * (box.Max.y - box.Min.y)) +
-                                           std::abs(triNormal.z * (box.Max.z - box.Min.z)));
-
-                    float depth = radius - std::abs(dist);
-                    if (depth > outDepth)
-                    {
-                        outDepth = depth;
-                        outNormal = (dist > 0) ? -triNormal : triNormal;
-                        hit = true;
-                    }
-                }
-            }
-        }
-        else
-        {
-            stack[stackPtr++] = node.LeftOrFirst;
-            stack[stackPtr++] = node.LeftOrFirst + 1;
-        }
-    }
-    return hit;
-}
-
-void BVH::QueryAABB(const BoundingBox& box, std::vector<const CollisionTriangle*>& outTriangles) const
-{
-    if (m_Nodes.empty()) return;
-
-    uint32_t stack[64];
-    uint32_t stackPtr = 0;
-    stack[stackPtr++] = 0;
-
-    while (stackPtr > 0)
-    {
-        const BVHNode& node = m_Nodes[stack[--stackPtr]];
-
-        if (!(node.Min.x <= box.Max.x && node.Max.x >= box.Min.x && node.Min.y <= box.Max.y &&
-              node.Max.y >= box.Min.y && node.Min.z <= box.Max.z && node.Max.z >= box.Min.z))
-        {
-            continue;
-        }
-
-        if (node.IsLeaf())
-        {
-            for (uint32_t i = 0; i < node.TriangleCount; ++i)
-            {
-                const auto& tri = m_Triangles[node.LeftOrFirst + i];
-                if (BVH::TriangleIntersectAABB(tri, box))
-                {
-                    outTriangles.push_back(&tri);
-                }
-            }
-        }
-        else
-        {
-            stack[stackPtr++] = node.LeftOrFirst;
-            stack[stackPtr++] = node.LeftOrFirst + 1;
-        }
-    }
-}
-
-} // namespace CHEngine
\ No newline at end of file
diff --git a/engine/physics/bvh/bvh.h b/engine/physics/bvh/bvh.h
deleted file mode 100644
index eaf124c7d..000000000
--- a/engine/physics/bvh/bvh.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef CH_PHYSICS_BVH_H
-#define CH_PHYSICS_BVH_H
-
-#include <vector>
-#include <memory>
-#include <glm/glm.hpp>
-
-#include "bvh_node.h"
-#include "engine/physics/collision/collision_triangle.h"
-#include "engine/core/ch_math.h"
-
-namespace CHEngine
-{
-
-struct BuildContext
-{
-    std::vector<CollisionTriangle>& AllTriangles;
-    std::vector<uint32_t> TriIndices;
-
-    BuildContext(std::vector<CollisionTriangle>& tris)
-        : AllTriangles(tris)
-    {
-        TriIndices.resize(tris.size());
-        for (uint32_t i = 0; i < tris.size(); ++i)
-        {
-            TriIndices[i] = i;
-        }
-    }
-};
-
-struct WorkItem
-{
-    uint32_t nodeIdx;
-    size_t triStart;
-    size_t triCount;
-};
-
-class BVH
-{
-public:
-    BVH() = default;
-
-    static std::shared_ptr<BVH> Build(std::vector<CollisionTriangle>&& triangles);
-
-    bool Raycast(const Ray& ray, float& t, glm::vec3& normal, int& meshIndex) const;
-    bool IntersectAABB(const BoundingBox& box, glm::vec3& outOverlapNormal, float& outOverlapDepth) const;
-
-    void QueryAABB(const BoundingBox& box, std::vector<const CollisionTriangle*>& outTriangles) const;
-
-    const std::vector<BVHNode>& GetNodes() const
-    {
-        return m_Nodes;
-    }
-    const std::vector<CollisionTriangle>& GetTriangles() const
-    {
-        return m_Triangles;
-    }
-
-private:
-    void BuildIterative(BuildContext& ctx, size_t totalTriCount);
-
-    static bool TestAxis(const glm::vec3& axis, const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
-                        const glm::vec3& boxCenter, const glm::vec3& boxHalfSize);
-    static bool TriangleIntersectAABB(const CollisionTriangle& tri, const BoundingBox& box);
-
-private:
-    std::vector<BVHNode> m_Nodes;
-    std::vector<CollisionTriangle> m_Triangles;
-};
-} // namespace CHEngine
-
-#endif // CH_PHYSICS_BVH_H
diff --git a/engine/physics/bvh/bvh_cache.cpp b/engine/physics/bvh/bvh_cache.cpp
deleted file mode 100644
index ee7a0adab..000000000
--- a/engine/physics/bvh/bvh_cache.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "bvh_cache.h"
-
-#include "bvh.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/log.h"
-#include "engine/graphics/assets/model_asset.h"
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-void BVHCache::Init()
-{
-    if (m_Initialized)
-    {
-        return;
-    }
-
-    m_Initialized = true;
-}
-
-void BVHCache::Shutdown()
-{
-    if (!m_Initialized)
-    {
-        return;
-    }
-
-    std::lock_guard<std::mutex> lock(m_Mutex);
-    m_ByPath.clear();
-    m_Stats = {};
-    m_Initialized = false;
-}
-
-bool BVHCache::IsInitialized() const
-{
-    return m_Initialized;
-}
-
-std::shared_ptr<BVH> BVHCache::GetOrBuild(const std::string& path)
-{
-    if (!m_Initialized || path.empty())
-    {
-        return nullptr;
-    }
-
-    auto asset = AssetManager::Get().Get<ModelAsset>(path);
-    if (!asset || asset->GetState() != AssetState::Ready)
-    {
-        return nullptr;
-    }
-
-    {
-        std::lock_guard<std::mutex> lock(m_Mutex);
-        auto it = m_ByPath.find(path);
-        if (it != m_ByPath.end())
-        {
-            ++m_Stats.Hits;
-            return it->second;
-        }
-        ++m_Stats.Misses;
-    }
-
-    auto built = BuildFromModelAsset(asset);
-    if (!built)
-    {
-        return nullptr;
-    }
-
-    std::lock_guard<std::mutex> lock(m_Mutex);
-    auto [it, inserted] = m_ByPath.emplace(path, built);
-    if (inserted)
-    {
-        ++m_Stats.Builds;
-        return built;
-    }
-
-    ++m_Stats.Hits;
-    return it->second;
-}
-
-void BVHCache::Put(const std::string& path, std::shared_ptr<BVH> bvh)
-{
-    if (!m_Initialized || path.empty() || !bvh)
-    {
-        return;
-    }
-
-    std::lock_guard<std::mutex> lock(m_Mutex);
-    m_ByPath[path] = std::move(bvh);
-}
-
-void BVHCache::Invalidate(const std::string& path)
-{
-    if (!m_Initialized || path.empty())
-    {
-        return;
-    }
-
-    std::lock_guard<std::mutex> lock(m_Mutex);
-    m_ByPath.erase(path);
-}
-
-void BVHCache::Clear()
-{
-    if (!m_Initialized)
-    {
-        return;
-    }
-
-    std::lock_guard<std::mutex> lock(m_Mutex);
-    m_ByPath.clear();
-}
-
-BVHCache::Stats BVHCache::GetStats() const
-{
-    std::lock_guard<std::mutex> lock(m_Mutex);
-    return m_Stats;
-}
-
-std::shared_ptr<BVH> BVHCache::BuildFromModelAsset(const std::shared_ptr<ModelAsset>& asset)
-{
-    if (!asset)
-    {
-        return nullptr;
-    }
-
-    CH_CORE_INFO("Physics: Building BVH for '{}'", asset->GetPath());
-
-    const auto& instances = asset->GetInstances();
-    const auto& rawMeshes = asset->GetRawMeshes();
-
-    std::vector<CollisionTriangle> allTris;
-    for (const auto& inst : instances)
-    {
-        if (inst.meshIndex < 0 || inst.meshIndex >= (int)rawMeshes.size())
-        {
-            continue;
-        }
-
-        const RawMesh& raw = rawMeshes[inst.meshIndex];
-        if (raw.indices.size() < 3)
-        {
-            continue;
-        }
-
-        for (size_t i = 0; i + 2 < raw.indices.size(); i += 3)
-        {
-            uint32_t i0 = raw.indices[i];
-            uint32_t i1 = raw.indices[i + 1];
-            uint32_t i2 = raw.indices[i + 2];
-
-            size_t v0Idx = (size_t)i0 * 3;
-            size_t v1Idx = (size_t)i1 * 3;
-            size_t v2Idx = (size_t)i2 * 3;
-            if (v0Idx + 2 >= raw.vertices.size() || v1Idx + 2 >= raw.vertices.size() || v2Idx + 2 >= raw.vertices.size())
-            {
-                continue;
-            }
-
-            glm::vec3 v0 = {raw.vertices[v0Idx], raw.vertices[v0Idx + 1], raw.vertices[v0Idx + 2]};
-            glm::vec3 v1 = {raw.vertices[v1Idx], raw.vertices[v1Idx + 1], raw.vertices[v1Idx + 2]};
-            glm::vec3 v2 = {raw.vertices[v2Idx], raw.vertices[v2Idx + 1], raw.vertices[v2Idx + 2]};
-
-            v0 = glm::vec3(inst.localTransform * glm::vec4(v0, 1.0f));
-            v1 = glm::vec3(inst.localTransform * glm::vec4(v1, 1.0f));
-            v2 = glm::vec3(inst.localTransform * glm::vec4(v2, 1.0f));
-
-            allTris.emplace_back(v0, v1, v2, inst.meshIndex);
-        }
-    }
-
-    if (allTris.empty())
-    {
-        return nullptr;
-    }
-
-    return BVH::Build(std::move(allTris));
-}
-} // namespace CHEngine
diff --git a/engine/physics/bvh/bvh_cache.h b/engine/physics/bvh/bvh_cache.h
deleted file mode 100644
index 206790eab..000000000
--- a/engine/physics/bvh/bvh_cache.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef CH_PHYSICS_BVH_CACHE_H
-#define CH_PHYSICS_BVH_CACHE_H
-
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
-namespace CHEngine
-{
-class BVH;
-class ModelAsset;
-
-class BVHCache
-{
-public:
-    struct Stats
-    {
-        uint64_t Hits = 0;
-        uint64_t Misses = 0;
-        uint64_t Builds = 0;
-    };
-
-    void Init();
-    void Shutdown();
-    bool IsInitialized() const;
-
-    std::shared_ptr<BVH> GetOrBuild(const std::string& path);
-    void Put(const std::string& path, std::shared_ptr<BVH> bvh);
-    void Invalidate(const std::string& path);
-    void Clear();
-
-    Stats GetStats() const;
-
-private:
-    static std::shared_ptr<BVH> BuildFromModelAsset(const std::shared_ptr<ModelAsset>& asset);
-
-private:
-    std::unordered_map<std::string, std::shared_ptr<BVH>> m_ByPath;
-    mutable std::mutex m_Mutex;
-    Stats m_Stats{};
-    bool m_Initialized = false;
-};
-} // namespace CHEngine
-
-#endif // CH_PHYSICS_BVH_CACHE_H
diff --git a/engine/physics/bvh/bvh_node.h b/engine/physics/bvh/bvh_node.h
deleted file mode 100644
index 7115f6d80..000000000
--- a/engine/physics/bvh/bvh_node.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CH_BVH_NODE_H
-#define CH_BVH_NODE_H
-
-#include <cstdint>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-struct BVHNode
-{
-    glm::vec3 Min;
-    glm::vec3 Max;
-    uint32_t LeftOrFirst; // Index of left child or first triangle
-    uint32_t TriangleCount;
-    uint32_t Axis; // 0=X, 1=Y, 2=Z for internal nodes
-
-    bool IsLeaf() const
-    {
-        return TriangleCount > 0;
-    }
-};
-} // namespace CHEngine
-
-#endif // CH_BVH_NODE_H
diff --git a/engine/physics/collision/collision.h b/engine/physics/collision/collision.h
deleted file mode 100644
index a487a9043..000000000
--- a/engine/physics/collision/collision.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef CH_COLLISION_H
-#define CH_COLLISION_H
-
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-namespace Collision
-{
-static bool CheckAABB(const glm::vec3& minA, const glm::vec3& maxA, const glm::vec3& minB, const glm::vec3& maxB)
-{
-    return (minA.x <= maxB.x && maxA.x >= minB.x) && (minA.y <= maxB.y && maxA.y >= minB.y) &&
-           (minA.z <= maxB.z && maxA.z >= minB.z);
-}
-} // namespace Collision
-} // namespace CHEngine
-
-#endif // CH_COLLISION_H
diff --git a/engine/physics/collision/collision_triangle.cpp b/engine/physics/collision/collision_triangle.cpp
deleted file mode 100644
index 9ef4bf5fb..000000000
--- a/engine/physics/collision/collision_triangle.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "collision_triangle.h"
-#include <cmath>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-CollisionTriangle::CollisionTriangle(const glm::vec3& a, const glm::vec3& b, const glm::vec3& c, int index)
-    : v0(a),
-      v1(b),
-      v2(c),
-      meshIndex(index)
-{
-    min = glm::min(glm::min(v0, v1), v2);
-    max = glm::max(glm::max(v0, v1), v2);
-    center = (v0 + v1 + v2) / 3.0f;
-    normal = glm::normalize(glm::cross(v1 - v0, v2 - v0));
-}
-
-bool CollisionTriangle::IntersectsRay(const Ray& ray, float& t, glm::vec3& normal) const
-{
-    glm::vec3 edge1 = v1 - v0;
-    glm::vec3 edge2 = v2 - v0;
-    glm::vec3 pvec = glm::cross(ray.direction, edge2);
-    float det = glm::dot(edge1, pvec);
-
-    if (std::abs(det) < 1e-7f) return false;
-
-    float invDet = 1.0f / det;
-    glm::vec3 tvec = ray.position - v0;
-    float u = glm::dot(tvec, pvec) * invDet;
-
-    if (u < 0.0f || u > 1.0f) return false;
-
-    glm::vec3 qvec = glm::cross(tvec, edge1);
-    float v = glm::dot(ray.direction, qvec) * invDet;
-
-    if (v < 0.0f || u + v > 1.0f) return false;
-
-    float tempT = glm::dot(edge2, qvec) * invDet;
-    if (tempT < 1e-6f) return false;
-
-    t = tempT;
-    normal = this->normal;
-    if (glm::dot(normal, ray.direction) > 0) normal = -normal;
-
-    return true;
-}
-} // namespace CHEngine
diff --git a/engine/physics/collision/collision_triangle.h b/engine/physics/collision/collision_triangle.h
deleted file mode 100644
index d788125b3..000000000
--- a/engine/physics/collision/collision_triangle.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef CH_COLLISION_TRIANGLE_H
-#define CH_COLLISION_TRIANGLE_H
-
-#include "engine/core/ch_math.h"
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-struct CollisionTriangle
-{
-    glm::vec3 v0, v1, v2;
-    glm::vec3 min, max;
-    glm::vec3 center;
-    glm::vec3 normal;
-    int meshIndex = -1;
-
-    CollisionTriangle(const glm::vec3& a, const glm::vec3& b, const glm::vec3& c, int index = -1);
-    bool IntersectsRay(const Ray& ray, float& t, glm::vec3& normal) const;
-};
-} // namespace CHEngine
-
-#endif // CH_COLLISION_TRIANGLE_H
diff --git a/engine/physics/collision_core.cpp b/engine/physics/collision_core.cpp
deleted file mode 100644
index a4fccb502..000000000
--- a/engine/physics/collision_core.cpp
+++ /dev/null
@@ -1,524 +0,0 @@
-#include "collision_core.h"
-
-#include "bvh/bvh.h"
-#include "collision/collision.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/scene/project.h"
-#include "physics.h"
-#include <algorithm>
-#include <cfloat>
-#include <cmath>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-void CollisionCore::ApplyResponse(entt::registry& registry,
-                                  entt::entity rbEntity,
-                                  entt::entity otherEntity,
-                                  TransformComponent& tc,
-                                  RigidBodyComponent& rb,
-                                  ColliderComponent& other,
-                                  glm::vec3 normal,
-                                  float depth)
-{
-    // Baumgarte-style positional correction keeps bodies from sinking into each other.
-    const float kBaumgarte = 0.8f;
-    const float kSlop = 0.005f;
-    const float kMaxCorrection = 1.5f;
-
-    float correctionDepth = std::max(depth - kSlop, 0.0f) * kBaumgarte;
-    float correction = std::min(correctionDepth, kMaxCorrection);
-
-    if (correction > 0.0f)
-    {
-        tc.Translation += normal * correction;
-        tc.IsDirty = true;
-
-        auto hc = registry.try_get<HierarchyComponent>(rbEntity);
-        if (!hc || hc->Parent == entt::null || !registry.valid(hc->Parent))
-        {
-            tc.WorldTransform = tc.GetTransform();
-        }
-        else
-        {
-            tc.WorldTransform = registry.get<TransformComponent>(hc->Parent).WorldTransform * tc.GetTransform();
-        }
-    }
-
-    // Treat mostly-upward contacts as ground contact.
-    if (normal.y > 0.45f)
-    {
-        rb.IsGrounded = true;
-        if (rb.Velocity.y < 0.1f)
-        {
-            rb.Velocity.y = 0;
-        }
-        if (std::abs(rb.Velocity.x) < 0.05f) rb.Velocity.x = 0;
-        if (std::abs(rb.Velocity.z) < 0.05f) rb.Velocity.z = 0;
-    }
-    else if (normal.y < -0.45f)
-    {
-        if (rb.Velocity.y > 0)
-        {
-            rb.Velocity.y = 0;
-        }
-    }
-
-    float vDotN = glm::dot(rb.Velocity, normal);
-    if (vDotN < 0.0f)
-    {
-        rb.Velocity -= normal * vDotN;
-    }
-
-    // Mark the collider so gameplay code can react later in the frame.
-    other.IsColliding = true;
-
-    if (auto* context = registry.ctx().find<PhysicsContext>())
-    {
-        if (context->CollisionCallback)
-        {
-            context->CollisionCallback(rbEntity, otherEntity);
-        }
-    }
-}
-
-glm::vec3 CollisionCore::ClosestPointOnSegment(glm::vec3 p, glm::vec3 a, glm::vec3 b)
-{
-    // Standard closest-point helper used by capsule and mesh contact tests.
-    glm::vec3 ab = b - a;
-    float denom = glm::dot(ab, ab);
-    if (denom < 0.0001f)
-    {
-        return a;
-    }
-    float segmentT = std::max(0.0f, std::min(1.0f, glm::dot(p - a, ab) / denom));
-    return a + ab * segmentT;
-}
-
-glm::vec3 CollisionCore::ClosestPointTriangle(glm::vec3 p, glm::vec3 a, glm::vec3 b, glm::vec3 c)
-{
-    // Standard closest-point-on-triangle test from Real-Time Collision Detection.
-    glm::vec3 ab = b - a;
-    glm::vec3 ac = c - a;
-    glm::vec3 ap = p - a;
-    float abDotAp = glm::dot(ab, ap);
-    float acDotAp = glm::dot(ac, ap);
-    if (abDotAp <= 0.0f && acDotAp <= 0.0f) return a;
-
-    glm::vec3 bp = p - b;
-    float abDotBp = glm::dot(ab, bp);
-    float acDotBp = glm::dot(ac, bp);
-    if (abDotBp >= 0.0f && acDotBp <= abDotBp) return b;
-
-    float edgeVC = abDotAp * acDotBp - abDotBp * acDotAp;
-    if (edgeVC <= 0.0f && abDotAp >= 0.0f && abDotBp <= 0.0f)
-    {
-        float barycentricV = abDotAp / (abDotAp - abDotBp);
-        return a + ab * barycentricV;
-    }
-
-    glm::vec3 cp = p - c;
-    float abDotCp = glm::dot(ab, cp);
-    float acDotCp = glm::dot(ac, cp);
-    if (acDotCp >= 0.0f && abDotCp <= acDotCp) return c;
-
-    float edgeVB = abDotCp * acDotAp - abDotAp * acDotCp;
-    if (edgeVB <= 0.0f && acDotAp >= 0.0f && acDotCp <= 0.0f)
-    {
-        float barycentricW = acDotAp / (acDotAp - acDotCp);
-        return a + ac * barycentricW;
-    }
-
-    float edgeVA = abDotBp * acDotCp - abDotCp * acDotBp;
-    if (edgeVA <= 0.0f && (acDotBp - abDotBp) >= 0.0f && (abDotCp - acDotCp) >= 0.0f)
-    {
-        float barycentricW = (acDotBp - abDotBp) / ((acDotBp - abDotBp) + (abDotCp - acDotCp));
-        return b + (c - b) * barycentricW;
-    }
-
-    float inverseDenominator = 1.0f / (edgeVA + edgeVB + edgeVC);
-    float barycentricV = edgeVB * inverseDenominator;
-    float barycentricW = edgeVC * inverseDenominator;
-    return a + ab * barycentricV + ac * barycentricW;
-}
-
-CollisionCore::CapsuleSegment CollisionCore::GetCapsuleSegment(const TransformComponent& tc, const ColliderComponent& cc)
-{
-    // Scale the capsule with the world transform so non-uniform scaling stays consistent.
-    glm::vec3 worldUp = glm::normalize(glm::vec3(tc.WorldTransform[1]));
-    glm::vec3 finalPos = glm::vec3(tc.WorldTransform * glm::vec4(cc.Offset, 1.0f));
-
-    float scaleY = glm::length(glm::vec3(tc.WorldTransform[1]));
-    float halfSeg = std::max(0.0f, (cc.Height * 0.5f - cc.Radius) * scaleY);
-
-    glm::vec3 a = finalPos - worldUp * halfSeg;
-    glm::vec3 b = finalPos + worldUp * halfSeg;
-
-    float worldScaleXZ = std::max(glm::length(glm::vec3(tc.WorldTransform[0])),
-                                  glm::length(glm::vec3(tc.WorldTransform[2])));
-
-    return {a, b, cc.Radius * worldScaleXZ};
-}
-
-CollisionCore::WorldAABB CollisionCore::GetWorldAABB(const TransformComponent& tc, const ColliderComponent& cc)
-{
-    // Build a world-space AABB from the transformed local corners.
-    glm::vec3 minLocal = cc.Offset;
-    glm::vec3 maxLocal = cc.Offset + cc.Size;
-
-    glm::vec3 corners[8] = {
-        {minLocal.x, minLocal.y, minLocal.z},
-        {maxLocal.x, minLocal.y, minLocal.z},
-        {minLocal.x, maxLocal.y, minLocal.z},
-        {maxLocal.x, maxLocal.y, minLocal.z},
-        {minLocal.x, minLocal.y, maxLocal.z},
-        {maxLocal.x, minLocal.y, maxLocal.z},
-        {minLocal.x, maxLocal.y, maxLocal.z},
-        {maxLocal.x, maxLocal.y, maxLocal.z}};
-
-    glm::vec3 worldMin = {FLT_MAX, FLT_MAX, FLT_MAX};
-    glm::vec3 worldMax = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
-
-    for (int i = 0; i < 8; i++)
-    {
-        glm::vec3 worldPt = glm::vec3(tc.WorldTransform * glm::vec4(corners[i], 1.0f));
-        worldMin = glm::min(worldMin, worldPt);
-        worldMax = glm::max(worldMax, worldPt);
-    }
-
-    return {worldMin, worldMax};
-}
-
-void CollisionCore::ResolveCollisions(entt::registry& registry, const std::vector<entt::entity>& entities)
-{
-    const int kResolveIterations = 4;
-    auto colliders = registry.view<TransformComponent, ColliderComponent>();
-
-    // A small fixed number of passes is usually enough to settle stacked bodies.
-    for (int iter = 0; iter < kResolveIterations; iter++)
-    {
-        for (auto rbEntity : entities)
-        {
-            if (!registry.all_of<TransformComponent, RigidBodyComponent, ColliderComponent>(rbEntity)) continue;
-
-            if (iter == 0) registry.get<RigidBodyComponent>(rbEntity).IsGrounded = false;
-
-            auto& rbCollider = registry.get<ColliderComponent>(rbEntity);
-            colliders.each([&](auto otherEntity, auto&, auto& otherCollider)
-            {
-                if (rbEntity == otherEntity) return;
-                if (!otherCollider.Enabled) return;
-
-                if (otherCollider.Type == ColliderType::Box)
-                {
-                    if (rbCollider.Type == ColliderType::Box) ResolveBoxBox(registry, rbEntity, otherEntity);
-                    else if (rbCollider.Type == ColliderType::Capsule) ResolveCapsuleBox(registry, rbEntity, otherEntity);
-                    else if (rbCollider.Type == ColliderType::Sphere) ResolveSphereBox(registry, rbEntity, otherEntity);
-                }
-                else if (otherCollider.Type == ColliderType::Mesh)
-                {
-                    if (rbCollider.Type == ColliderType::Box) ResolveBoxMesh(registry, rbEntity, otherEntity);
-                    else if (rbCollider.Type == ColliderType::Capsule) ResolveCapsuleMesh(registry, rbEntity, otherEntity);
-                    else if (rbCollider.Type == ColliderType::Sphere) ResolveSphereMesh(registry, rbEntity, otherEntity);
-                }
-                else if (otherCollider.Type == ColliderType::Sphere)
-                {
-                    if (rbCollider.Type == ColliderType::Sphere) ResolveSphereSphere(registry, rbEntity, otherEntity);
-                }
-            });
-        }
-    }
-}
-
-void CollisionCore::ResolveBoxBox(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& rbc = registry.get<ColliderComponent>(rbEntity);
-    auto& otherCollider = registry.get<ColliderComponent>(otherEntity);
-
-    WorldAABB a = GetWorldAABB(tc, rbc);
-    WorldAABB b = GetWorldAABB(registry.get<TransformComponent>(otherEntity), otherCollider);
-
-    if (!Collision::CheckAABB(a.Min, a.Max, b.Min, b.Max)) return;
-
-    float depths[6] = {b.Max.x - a.Min.x,
-                       a.Max.x - b.Min.x,
-                       b.Max.y - a.Min.y,
-                       a.Max.y - b.Min.y,
-                       b.Max.z - a.Min.z,
-                       a.Max.z - b.Min.z};
-
-    int axis = 0;
-    float minDepth = depths[0];
-    for (int d = 1; d < 6; d++)
-    {
-        if (depths[d] < minDepth)
-        {
-            minDepth = depths[d];
-            axis = d;
-        }
-    }
-
-    if (minDepth <= 0) return;
-
-    const glm::vec3 dirs[6] = {{1, 0, 0}, {-1, 0, 0}, {0, 1, 0}, {0, -1, 0}, {0, 0, 1}, {0, 0, -1}};
-    ApplyResponse(registry, rbEntity, otherEntity, tc, rb, otherCollider, dirs[axis], minDepth);
-}
-
-void CollisionCore::ResolveBoxMesh(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& rbc = registry.get<ColliderComponent>(rbEntity);
-    auto& otherCollider = registry.get<ColliderComponent>(otherEntity);
-    auto& otherTc = registry.get<TransformComponent>(otherEntity);
-
-    if (otherCollider.ModelPath.empty()) return;
-    if (!Project::GetActive()) return;
-
-    auto bvh = Physics::GetBVH(otherCollider.ModelPath);
-    if (!bvh) return;
-
-    glm::mat4 meshMatrix = otherTc.WorldTransform;
-    glm::mat4 invMeshMatrix = glm::inverse(meshMatrix);
-    glm::mat4 localToOtherLocal = invMeshMatrix * tc.WorldTransform;
-
-    glm::vec3 minLocal = rbc.Offset;
-    glm::vec3 maxLocal = rbc.Offset + rbc.Size;
-    glm::vec3 corners[8] = {
-        {minLocal.x, minLocal.y, minLocal.z},
-        {maxLocal.x, minLocal.y, minLocal.z},
-        {minLocal.x, maxLocal.y, minLocal.z},
-        {maxLocal.x, maxLocal.y, minLocal.z},
-        {minLocal.x, minLocal.y, maxLocal.z},
-        {maxLocal.x, minLocal.y, maxLocal.z},
-        {minLocal.x, maxLocal.y, maxLocal.z},
-        {maxLocal.x, maxLocal.y, maxLocal.z}};
-
-    BoundingBox localBox = {{1e30f, 1e30f, 1e30f}, {-1e30f, -1e30f, -1e30f}};
-    for (int k = 0; k < 8; k++)
-    {
-        glm::vec3 lc = glm::vec3(localToOtherLocal * glm::vec4(corners[k], 1.0f));
-        localBox.Min = glm::min(localBox.Min, lc);
-        localBox.Max = glm::max(localBox.Max, lc);
-    }
-
-    glm::vec3 localNormal;
-    float overlapDepth = -1.0f;
-    if (!bvh->IntersectAABB(localBox, localNormal, overlapDepth)) return;
-    if (overlapDepth <= 0.0001f) return;
-
-    glm::vec3 worldMTV = glm::vec3(meshMatrix * glm::vec4(localNormal * overlapDepth, 0.0f));
-    glm::mat4 normalMatrix = glm::transpose(invMeshMatrix);
-    glm::vec3 worldNormal = glm::normalize(glm::vec3(normalMatrix * glm::vec4(localNormal, 0.0f)));
-
-    ApplyResponse(registry, rbEntity, otherEntity, tc, rb, otherCollider, worldNormal, glm::length(worldMTV));
-}
-
-void CollisionCore::ResolveCapsuleBox(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& capsule = registry.get<ColliderComponent>(rbEntity);
-    auto& box = registry.get<ColliderComponent>(otherEntity);
-    auto& otherTc = registry.get<TransformComponent>(otherEntity);
-
-    CapsuleSegment seg = GetCapsuleSegment(tc, capsule);
-    WorldAABB boxAABB = GetWorldAABB(otherTc, box);
-
-    glm::vec3 boxCenter = (boxAABB.Min + boxAABB.Max) * 0.5f;
-    glm::vec3 closestOnSeg = ClosestPointOnSegment(boxCenter, seg.a, seg.b);
-
-    glm::vec3 closestOnBox = glm::clamp(closestOnSeg, boxAABB.Min, boxAABB.Max);
-
-    glm::vec3 finalOnSeg = ClosestPointOnSegment(closestOnBox, seg.a, seg.b);
-
-    glm::vec3 diff = finalOnSeg - closestOnBox;
-    float distSq = glm::dot(diff, diff);
-
-    if (distSq >= seg.radius * seg.radius) return;
-
-    float dist = std::sqrt(distSq);
-    float penetration = seg.radius - dist;
-    glm::vec3 normal = (dist > 0.0001f) ? (diff / dist) : glm::vec3(0, 1, 0);
-
-    ApplyResponse(registry, rbEntity, otherEntity, tc, rb, box, normal, penetration);
-}
-
-void CollisionCore::ResolveCapsuleMesh(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& capsule = registry.get<ColliderComponent>(rbEntity);
-    auto& otherCollider = registry.get<ColliderComponent>(otherEntity);
-    auto& otherTc = registry.get<TransformComponent>(otherEntity);
-
-    if (otherCollider.ModelPath.empty()) return;
-    auto bvh = Physics::GetBVH(otherCollider.ModelPath);
-    if (!bvh) return;
-
-    glm::mat4 meshMatrix = otherTc.WorldTransform;
-    glm::mat4 invMeshMatrix = glm::inverse(meshMatrix);
-
-    CapsuleSegment seg = GetCapsuleSegment(tc, capsule);
-
-    glm::vec3 localA = glm::vec3(invMeshMatrix * glm::vec4(seg.a, 1.0f));
-    glm::vec3 localB = glm::vec3(invMeshMatrix * glm::vec4(seg.b, 1.0f));
-
-    float scaleX = glm::length(glm::vec3(meshMatrix[0]));
-    float scaleY = glm::length(glm::vec3(meshMatrix[1]));
-    float scaleZ = glm::length(glm::vec3(meshMatrix[2]));
-
-    glm::vec3 localExtents = {(scaleX > 0.0001f) ? seg.radius / scaleX : seg.radius,
-                              (scaleY > 0.0001f) ? seg.radius / scaleY : seg.radius,
-                              (scaleZ > 0.0001f) ? seg.radius / scaleZ : seg.radius};
-
-    BoundingBox queryBox = {glm::min(localA, localB) - localExtents, glm::max(localA, localB) + localExtents};
-
-    std::vector<const CollisionTriangle*> candidates;
-    bvh->QueryAABB(queryBox, candidates);
-    if (candidates.empty()) return;
-
-    for (const auto* tri : candidates)
-    {
-        glm::vec3 v0 = glm::vec3(meshMatrix * glm::vec4(tri->v0, 1.0f));
-        glm::vec3 v1 = glm::vec3(meshMatrix * glm::vec4(tri->v1, 1.0f));
-        glm::vec3 v2 = glm::vec3(meshMatrix * glm::vec4(tri->v2, 1.0f));
-
-        glm::vec3 triCenter = (v0 + v1 + v2) / 3.0f;
-        glm::vec3 segPoint = ClosestPointOnSegment(triCenter, seg.a, seg.b);
-        glm::vec3 triPoint = ClosestPointTriangle(segPoint, v0, v1, v2);
-        glm::vec3 finalSeg = ClosestPointOnSegment(triPoint, seg.a, seg.b);
-
-        glm::vec3 diff = finalSeg - triPoint;
-        float distSq = glm::dot(diff, diff);
-
-        if (distSq >= seg.radius * seg.radius) continue;
-
-        float dist = std::sqrt(distSq);
-        float penetration = seg.radius - dist;
-        glm::vec3 normal = (dist > 0.0001f) ? (diff / dist) : tri->normal;
-
-        if (penetration > 0.0f) ApplyResponse(registry, rbEntity, otherEntity, tc, rb, otherCollider, normal, penetration);
-    }
-}
-
-void CollisionCore::ResolveSphereBox(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& sphere = registry.get<ColliderComponent>(rbEntity);
-    auto& box = registry.get<ColliderComponent>(otherEntity);
-    auto& otherTc = registry.get<TransformComponent>(otherEntity);
-
-    WorldAABB boxAABB = GetWorldAABB(otherTc, box);
-    glm::vec3 sphereWorldPos = glm::vec3(tc.WorldTransform * glm::vec4(sphere.Offset, 1.0f));
-
-    glm::vec3 closestOnBox = glm::clamp(sphereWorldPos, boxAABB.Min, boxAABB.Max);
-
-    glm::vec3 diff = sphereWorldPos - closestOnBox;
-    float distSq = glm::dot(diff, diff);
-
-    if (distSq >= sphere.Radius * sphere.Radius) return;
-
-    float dist = std::sqrt(distSq);
-    float penetration = sphere.Radius - dist;
-    glm::vec3 normal = (dist > 0.0001f) ? (diff / dist) : glm::vec3(0, 1, 0);
-
-    ApplyResponse(registry, rbEntity, otherEntity, tc, rb, box, normal, penetration);
-}
-
-void CollisionCore::ResolveSphereMesh(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& sphere = registry.get<ColliderComponent>(rbEntity);
-    auto& otherCollider = registry.get<ColliderComponent>(otherEntity);
-    auto& otherTc = registry.get<TransformComponent>(otherEntity);
-
-    if (otherCollider.ModelPath.empty()) return;
-    auto bvh = Physics::GetBVH(otherCollider.ModelPath);
-    if (!bvh) return;
-
-    glm::mat4 meshMatrix = otherTc.WorldTransform;
-    glm::mat4 invMeshMatrix = glm::inverse(meshMatrix);
-
-    glm::vec3 sphereWorldPos = glm::vec3(tc.WorldTransform * glm::vec4(sphere.Offset, 1.0f));
-    glm::vec3 sphereLocalPos = glm::vec3(invMeshMatrix * glm::vec4(sphereWorldPos, 1.0f));
-
-    float scaleX = glm::length(glm::vec3(meshMatrix[0]));
-    float scaleY = glm::length(glm::vec3(meshMatrix[1]));
-    float scaleZ = glm::length(glm::vec3(meshMatrix[2]));
-
-    glm::vec3 localExtents = {(scaleX > 0.0001f) ? sphere.Radius / scaleX : sphere.Radius,
-                              (scaleY > 0.0001f) ? sphere.Radius / scaleY : sphere.Radius,
-                              (scaleZ > 0.0001f) ? sphere.Radius / scaleZ : sphere.Radius};
-
-    BoundingBox queryBox = {sphereLocalPos - localExtents, sphereLocalPos + localExtents};
-
-    std::vector<const CollisionTriangle*> candidates;
-    bvh->QueryAABB(queryBox, candidates);
-    if (candidates.empty()) return;
-
-    glm::vec3 bestNormal = {0.0f, 1.0f, 0.0f};
-    float maxPenetration = -1.0f;
-    bool anyContact = false;
-
-    for (const auto* tri : candidates)
-    {
-        glm::vec3 v0 = glm::vec3(meshMatrix * glm::vec4(tri->v0, 1.0f));
-        glm::vec3 v1 = glm::vec3(meshMatrix * glm::vec4(tri->v1, 1.0f));
-        glm::vec3 v2 = glm::vec3(meshMatrix * glm::vec4(tri->v2, 1.0f));
-
-        glm::vec3 triPoint = ClosestPointTriangle(sphereWorldPos, v0, v1, v2);
-        glm::vec3 diff = sphereWorldPos - triPoint;
-        float distSq = glm::dot(diff, diff);
-
-        if (distSq >= sphere.Radius * sphere.Radius) continue;
-
-        float dist = std::sqrt(distSq);
-        float penetration = sphere.Radius - dist;
-        glm::vec3 normal = (dist > 0.0001f) ? (diff / dist) : tri->normal;
-
-        if (penetration > maxPenetration)
-        {
-            maxPenetration = penetration;
-            bestNormal = normal;
-        }
-        anyContact = true;
-    }
-
-    if (anyContact && maxPenetration > 0.0f)
-    {
-        ApplyResponse(registry, rbEntity, otherEntity, tc, rb, otherCollider, bestNormal, maxPenetration);
-    }
-}
-
-void CollisionCore::ResolveSphereSphere(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity)
-{
-    auto& tc1 = registry.get<TransformComponent>(rbEntity);
-    auto& rb = registry.get<RigidBodyComponent>(rbEntity);
-    auto& s1 = registry.get<ColliderComponent>(rbEntity);
-    auto& s2 = registry.get<ColliderComponent>(otherEntity);
-    auto& tc2 = registry.get<TransformComponent>(otherEntity);
-
-    glm::vec3 p1 = glm::vec3(tc1.WorldTransform * glm::vec4(s1.Offset, 1.0f));
-    glm::vec3 p2 = glm::vec3(tc2.WorldTransform * glm::vec4(s2.Offset, 1.0f));
-
-    glm::vec3 diff = p1 - p2;
-    float distSq = glm::dot(diff, diff);
-    float radiusSum = (s1.Radius * glm::length(glm::vec3(tc1.WorldTransform[0]))) +
-                      (s2.Radius * glm::length(glm::vec3(tc2.WorldTransform[0])));
-
-    if (distSq >= radiusSum * radiusSum) return;
-
-    float dist = std::sqrt(distSq);
-    float penetration = radiusSum - dist;
-    glm::vec3 normal = (dist > 0.0001f) ? (diff / dist) : glm::vec3(0, 1, 0);
-
-    ApplyResponse(registry, rbEntity, otherEntity, tc1, rb, s2, normal, penetration);
-}
-
-} // namespace CHEngine
diff --git a/engine/physics/collision_core.h b/engine/physics/collision_core.h
deleted file mode 100644
index c387ec943..000000000
--- a/engine/physics/collision_core.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef CH_COLLISION_CORE_H
-#define CH_COLLISION_CORE_H
-
-#include "engine/scene/components.h"
-#include "entt/entt.hpp"
-#include <glm/glm.hpp>
-#include <vector>
-
-namespace CHEngine
-{
-// Narrow-phase collision response helpers for the physics step.
-class CollisionCore
-{
-public:
-    static void ResolveCollisions(entt::registry& registry, const std::vector<entt::entity>& entities);
-
-private:
-    struct CapsuleSegment
-    {
-        glm::vec3 a, b;
-        float radius;
-    };
-
-    struct WorldAABB
-    {
-        glm::vec3 Min, Max;
-    };
-
-    static void ApplyResponse(entt::registry& registry,
-                              entt::entity rbEntity,
-                              entt::entity otherEntity,
-                              TransformComponent& tc,
-                              RigidBodyComponent& rb,
-                              ColliderComponent& other,
-                              glm::vec3 normal,
-                              float depth);
-
-    static glm::vec3 ClosestPointOnSegment(glm::vec3 p, glm::vec3 a, glm::vec3 b);
-    static glm::vec3 ClosestPointTriangle(glm::vec3 p, glm::vec3 a, glm::vec3 b, glm::vec3 c);
-    static CapsuleSegment GetCapsuleSegment(const TransformComponent& tc, const ColliderComponent& cc);
-    static WorldAABB GetWorldAABB(const TransformComponent& tc, const ColliderComponent& cc);
-
-    static void ResolveBoxBox(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-    static void ResolveBoxMesh(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-    static void ResolveCapsuleBox(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-    static void ResolveCapsuleMesh(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-    static void ResolveSphereBox(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-    static void ResolveSphereMesh(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-    static void ResolveSphereSphere(entt::registry& registry, entt::entity rbEntity, entt::entity otherEntity);
-};
-} // namespace CHEngine
-
-#endif // CH_COLLISION_CORE_H
diff --git a/engine/physics/dynamics.cpp b/engine/physics/dynamics.cpp
deleted file mode 100644
index 07e91e759..000000000
--- a/engine/physics/dynamics.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "dynamics.h"
-#include "engine/core/log.h"
-#include "engine/scene/components.h"
-#include "engine/scene/project.h"
-#include "engine/scene/scene.h"
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
-namespace CHEngine
-{
-void Dynamics::Update(::entt::registry& registry, const std::vector<entt::entity>& entities, float deltaTime)
-{
-
-    float gravity = 9.8f;
-    if (Project::GetActive())
-    {
-        gravity = Project::GetActive()->GetConfig().Physics.Gravity;
-    }
-
-    for (auto entity : entities)
-    {
-        if (!registry.all_of<TransformComponent, RigidBodyComponent>(entity))
-        {
-            continue;
-        }
-
-        ApplyGravity(registry, entity, gravity, deltaTime);
-        IntegrateVelocity(registry, entity, deltaTime);
-    }
-}
-
-void Dynamics::ApplyGravity(entt::registry& registry, entt::entity entity, float gravity, float deltaTime)
-{
-    auto& rigidBody = registry.get<RigidBodyComponent>(entity);
-    if (rigidBody.UseGravity && !rigidBody.IsGrounded && !rigidBody.IsKinematic)
-    {
-        rigidBody.Velocity.y -= gravity * deltaTime;
-    }
-}
-
-void Dynamics::IntegrateVelocity(entt::registry& registry, entt::entity entity, float deltaTime)
-{
-    auto& entityTransform = registry.get<TransformComponent>(entity);
-    auto& rigidBody = registry.get<RigidBodyComponent>(entity);
-
-    // Kinematic bodies are moved entirely by scripts; skip physics-driven integration
-    if (rigidBody.IsKinematic)
-        return;
-
-    // Dampen velocity slightly (Air resistance)
-    float damping = 1.0f - (0.5f * deltaTime);
-    rigidBody.Velocity *= damping;
-
-    // Clamp absolute velocity to avoid "explosive" launches
-    const float kMaxVelocity = 100.0f;
-    float speed = glm::length(rigidBody.Velocity);
-    if (speed > kMaxVelocity)
-    {
-        rigidBody.Velocity = glm::normalize(rigidBody.Velocity) * kMaxVelocity;
-    }
-
-    entityTransform.Translation += rigidBody.Velocity * deltaTime;
-    entityTransform.IsDirty = true;
-}
-
-} // namespace CHEngine
diff --git a/engine/physics/dynamics.h b/engine/physics/dynamics.h
deleted file mode 100644
index 8a22b51f2..000000000
--- a/engine/physics/dynamics.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CH_DYNAMICS_H
-#define CH_DYNAMICS_H
-
-#include "entt/entt.hpp"
-#include <vector>
-
-namespace CHEngine
-{
-class Dynamics
-{
-public:
-    static void Update(::entt::registry& registry, const std::vector<entt::entity>& entities, float deltaTime);
-
-private:
-    static void ApplyGravity(entt::registry& registry, entt::entity entity, float gravity, float deltaTime);
-    static void IntegrateVelocity(entt::registry& registry, entt::entity entity, float deltaTime);
-};
-} // namespace CHEngine
-
-#endif // CH_DYNAMICS_H
diff --git a/engine/physics/iphysics_world.h b/engine/physics/iphysics_world.h
new file mode 100644
index 000000000..082b20d34
--- /dev/null
+++ b/engine/physics/iphysics_world.h
@@ -0,0 +1,108 @@
+#ifndef CH_IPHYSICS_WORLD_H
+#define CH_IPHYSICS_WORLD_H
+
+#include "physics_types.h"
+#include "raycast_result.h"
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <vector>
+
+namespace Chained
+{
+
+	// A single triangle for building a MeshShape collider.
+	struct PhysicsTriangle
+	{
+		glm::vec3 V0, V1, V2;
+	};
+
+	// Description used to create a single physics body.
+	struct PhysicsBodyDesc
+	{
+		glm::vec3 Position = {0.0f, 0.0f, 0.0f};
+		glm::quat Rotation = {1.0f, 0.0f, 0.0f, 0.0f};
+		glm::vec3 InitialVelocity = {0.0f, 0.0f, 0.0f};
+		glm::vec3 Offset = {0.0f, 0.0f, 0.0f};
+		uint64_t UserData = 0;
+
+		// Shape
+		ColliderType Shape = ColliderType::Box;
+		glm::vec3 Dimensions = {1.0f, 1.0f,
+								1.0f}; // Box: half-extents. Sphere: x=radius. Capsule: x=radius, y=half-height.
+		std::vector<PhysicsTriangle> Triangles; // Only used when Shape == ColliderType::Mesh.
+		glm::vec3 MeshScale = {
+			1.0f, 1.0f, 1.0f}; // Mesh only: scale applied via ScaledShape so the cached BVH stays scale-independent.
+							   // Triangles must therefore be supplied in unscaled model-local space.
+		std::string
+			CacheKey; // Optional: enables mesh shape caching. With MeshScale decoupled this can be just the model path.
+
+		// Body properties
+		float Mass = 1.0f;
+		float LinearDamping = 0.01f;
+		float AngularDamping = 0.05f;
+		float Friction = 0.5f;
+		float Restitution = 0.0f;
+
+		bool IsKinematic = false;
+		bool IsStatic = false;
+		bool UseGravity = true;
+		bool IsFixedRotation = false;
+		bool UseFastBuildQuality = true;
+	};
+
+	class IPhysicsWorld
+	{
+	public:
+		virtual ~IPhysicsWorld() = default;
+
+		virtual PhysicsBodyHandle CreateBody(const PhysicsBodyDesc& desc) = 0;
+
+		/// Creates multiple bodies in one batch.
+		/// Each backend implements its own optimized path (e.g. Jolt's CreateBodies/AddBodies).
+		virtual std::vector<PhysicsBodyHandle> CreateBodies(const std::vector<PhysicsBodyDesc>& descs) = 0;
+
+		virtual void DestroyBody(PhysicsBodyHandle handle) = 0;
+
+		/// Returns true if a mesh shape with the given cache key already exists.
+		/// Use to skip triangle extraction on cache hits.
+		virtual bool HasCachedMeshShape(const std::string& key) const = 0;
+
+		/// Returns true if a shape is currently being built in the background.
+		virtual bool IsShapeBaking(const std::string& key) const = 0;
+
+		/// Returns true if any background shape bakes are in flight.
+		virtual bool HasPendingShapeBakes() const = 0;
+
+		/// Pre-builds and caches a collision shape (BVH or Convex Hull) thread-safely on a worker thread.
+		virtual void PrebuildShape(const PhysicsBodyDesc& desc) = 0;
+
+		/// Queues non-blocking background baking of a shape via ThreadPool if not already cached or baking.
+		virtual void QueuePrebuildShape(const PhysicsBodyDesc& desc) = 0;
+
+		virtual void SetTransform(PhysicsBodyHandle handle, const glm::vec3& pos, const glm::quat& rot) = 0;
+		virtual void GetTransform(PhysicsBodyHandle handle, glm::vec3& pos, glm::quat& rot) = 0;
+
+		virtual void SetVelocity(PhysicsBodyHandle handle, const glm::vec3& velocity) = 0;
+		virtual glm::vec3 GetVelocity(PhysicsBodyHandle handle) const = 0;
+
+		virtual RaycastResult Raycast(const glm::vec3& origin, const glm::vec3& direction, float maxDistance) = 0;
+
+		virtual void Step(float fixedDt) = 0;
+
+		virtual void SetGravity(float gravity) = 0;
+
+		/// Returns true if the body identified by @p handle is currently resting on a surface
+		/// whose contact normal points upward (i.e. the body is "grounded").
+		virtual bool IsBodyGrounded(PhysicsBodyHandle handle) const = 0;
+
+		/// Returns true if the body is awake (actively simulated). Sleeping bodies retain
+		/// their last grounded state and do not produce fresh contact callbacks.
+		virtual bool IsBodyActive(PhysicsBodyHandle handle) const = 0;
+
+		/// Clears the grounded-state tracker so it can be rebuilt from contacts during the next Step().
+		virtual void ClearGroundedState() = 0;
+	};
+
+} // namespace Chained
+
+#endif // CH_IPHYSICS_WORLD_H
diff --git a/engine/physics/jolt_physics_world.cpp b/engine/physics/jolt_physics_world.cpp
new file mode 100644
index 000000000..e4b28f959
--- /dev/null
+++ b/engine/physics/jolt_physics_world.cpp
@@ -0,0 +1,875 @@
+#include "jolt_physics_world.h"
+
+#include "engine/core/service_locator.h"
+#include "engine/common/thread_pool.h"
+
+#include <Jolt/Core/Factory.h>
+#include <Jolt/Geometry/Triangle.h>
+#include <Jolt/Physics/Body/MassProperties.h>
+#include <Jolt/Physics/Collision/CastResult.h>
+#include <Jolt/Physics/Collision/RayCast.h>
+#include <Jolt/Physics/Collision/Shape/BoxShape.h>
+#include <Jolt/Physics/Collision/Shape/CapsuleShape.h>
+#include <Jolt/Physics/Collision/Shape/ConvexHullShape.h>
+#include <Jolt/Physics/Collision/Shape/MeshShape.h>
+#include <Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h>
+#include <Jolt/Physics/Collision/Shape/ScaledShape.h>
+#include <Jolt/Physics/Collision/Shape/SphereShape.h>
+#include <Jolt/Physics/PhysicsSettings.h>
+#include <Jolt/RegisterTypes.h>
+
+#include <cmath>
+#include <cstdarg>
+#include <future>
+#include <mutex>
+#include "engine/core/log.h"
+
+namespace Chained
+{
+
+	// ─────────────────────────────────────────────────────────────────────────────
+	// Layer setup — two layers: NON_MOVING (static) and MOVING (dynamic/kinematic)
+	// ─────────────────────────────────────────────────────────────────────────────
+	namespace Layers
+	{
+		static constexpr JPH::ObjectLayer NON_MOVING = 0;
+		static constexpr JPH::ObjectLayer MOVING = 1;
+		static constexpr JPH::ObjectLayer NUM_LAYERS = 2;
+	} // namespace Layers
+
+	class ObjectLayerPairFilterImpl : public JPH::ObjectLayerPairFilter
+	{
+	public:
+		bool ShouldCollide(JPH::ObjectLayer a, JPH::ObjectLayer b) const override
+		{
+			switch (a)
+			{
+			case Layers::NON_MOVING:
+				return b == Layers::MOVING;
+			case Layers::MOVING:
+				return true;
+			default:
+				return false;
+			}
+		}
+	};
+
+	namespace BroadPhaseLayers
+	{
+		static constexpr JPH::BroadPhaseLayer NON_MOVING(0);
+		static constexpr JPH::BroadPhaseLayer MOVING(1);
+		static constexpr uint32_t NUM_LAYERS = 2;
+	} // namespace BroadPhaseLayers
+
+	class BPLayerInterfaceImpl final : public JPH::BroadPhaseLayerInterface
+	{
+	public:
+		BPLayerInterfaceImpl()
+		{
+			m_Map[Layers::NON_MOVING] = BroadPhaseLayers::NON_MOVING;
+			m_Map[Layers::MOVING] = BroadPhaseLayers::MOVING;
+		}
+		uint32_t GetNumBroadPhaseLayers() const override
+		{
+			return BroadPhaseLayers::NUM_LAYERS;
+		}
+		JPH::BroadPhaseLayer GetBroadPhaseLayer(JPH::ObjectLayer layer) const override
+		{
+			return m_Map[layer];
+		}
+#if defined(JPH_EXTERNAL_PROFILE) || defined(JPH_PROFILE_ENABLED)
+		const char* GetBroadPhaseLayerName(JPH::BroadPhaseLayer layer) const override
+		{
+			return (JPH::BroadPhaseLayer::Type)layer == 0 ? "NON_MOVING" : "MOVING";
+		}
+#endif
+	private:
+		JPH::BroadPhaseLayer m_Map[Layers::NUM_LAYERS];
+	};
+
+	class ObjectVsBroadPhaseLayerFilterImpl : public JPH::ObjectVsBroadPhaseLayerFilter
+	{
+	public:
+		bool ShouldCollide(JPH::ObjectLayer layer, JPH::BroadPhaseLayer bpLayer) const override
+		{
+			switch (layer)
+			{
+			case Layers::NON_MOVING:
+				return bpLayer == BroadPhaseLayers::MOVING;
+			case Layers::MOVING:
+				return true;
+			default:
+				return false;
+			}
+		}
+	};
+
+	// ─────────────────────────────────────────────────────────────────────────────
+	// File-scope singletons — survive JoltPhysicsWorld::ResetWorld() rebuilds
+	// ─────────────────────────────────────────────────────────────────────────────
+	static BPLayerInterfaceImpl s_BPLayerInterface;
+	static ObjectVsBroadPhaseLayerFilterImpl s_ObjVsBPFilter;
+	static ObjectLayerPairFilterImpl s_ObjVsObjFilter;
+
+	static void JoltTraceImpl(const char* inFMT, ...)
+	{
+		va_list list;
+		va_start(list, inFMT);
+		char buffer[1024];
+		vsnprintf(buffer, sizeof(buffer), inFMT, list);
+		va_end(list);
+		CH_CORE_INFO("[Jolt] {}", buffer);
+	}
+
+#ifdef JPH_ENABLE_ASSERTS
+	static bool JoltAssertFailedImpl(const char* inExpression, const char* inMessage, const char* inFile,
+									 JPH::uint inLine)
+	{
+		CH_CORE_ERROR("[Jolt Assert] {}:{} ({}) {}", inFile, inLine, inExpression, inMessage ? inMessage : "");
+		return false;
+	}
+#endif
+
+	// ─────────────────────────────────────────────────────────────────────────────
+	// JoltPhysicsWorld
+	// ─────────────────────────────────────────────────────────────────────────────
+	JoltPhysicsWorld::JoltPhysicsWorld()
+	{
+		JPH::Trace = JoltTraceImpl;
+#ifdef JPH_ENABLE_ASSERTS
+		JPH::AssertFailed = JoltAssertFailedImpl;
+#endif
+
+		// Jolt factory + type registration (owned by this world instance)
+		JPH::RegisterDefaultAllocator();
+		m_Factory = std::make_unique<JPH::Factory>();
+		JPH::Factory::sInstance = m_Factory.get();
+		JPH::RegisterTypes();
+
+		m_TempAllocator = std::make_unique<JPH::TempAllocatorImpl>(32 * 1024 * 1024);
+		unsigned int hwThreads = std::thread::hardware_concurrency();
+		int numThreads = std::max(1, (int)hwThreads - 1);
+		m_JobSystem =
+			std::make_unique<JPH::JobSystemThreadPool>(JPH::cMaxPhysicsJobs, JPH::cMaxPhysicsBarriers, numThreads);
+
+		m_PhysicsSystem.Init(65536, 0, 65536, 65536, s_BPLayerInterface, s_ObjVsBPFilter, s_ObjVsObjFilter);
+
+		m_PhysicsSystem.SetGravity(JPH::Vec3(0.0f, -9.81f, 0.0f));
+
+		m_ContactListener.SetGroundedTracker(&m_GroundedBodies, &m_GroundedMutex);
+		m_PhysicsSystem.SetContactListener(&m_ContactListener);
+
+		CH_CORE_INFO("Jolt Physics World Initialized with ContactListener.");
+	}
+
+	JoltPhysicsWorld::~JoltPhysicsWorld()
+	{
+		// PhysicsSystem destroyed automatically (member variable).
+		// Factory is destroyed last due to declaration order.
+		JPH::Factory::sInstance = nullptr;
+	}
+
+	JPH::ShapeRefC JoltPhysicsWorld::FallbackUnitBox(const std::string& reason)
+	{
+		CH_CORE_WARN("Physics: {} — falling back to unit box.", reason);
+		auto shape = JPH::BoxShapeSettings(JPH::Vec3(0.5f, 0.5f, 0.5f)).Create().Get();
+		if (!shape)
+		{
+			CH_CORE_ERROR("Physics: unit-box fallback shape creation failed.");
+		}
+		return shape;
+	}
+
+	void JoltPhysicsWorld::ClearShapeCache()
+	{
+		std::lock_guard<std::mutex> lock(m_CacheMutex);
+		m_MeshShapeCache.clear();
+		m_ConvexHullCache.clear();
+	}
+
+	void JoltPhysicsWorld::PrebuildShape(const PhysicsBodyDesc& desc)
+	{
+		BuildShape(desc);
+	}
+
+	void JoltPhysicsWorld::QueuePrebuildShape(const PhysicsBodyDesc& desc)
+	{
+		if (desc.CacheKey.empty())
+		{
+			return;
+		}
+
+		{
+			std::lock_guard lock(m_CacheMutex);
+			if (m_MeshShapeCache.count(desc.CacheKey) > 0 || m_ConvexHullCache.count(desc.CacheKey) > 0 ||
+				m_ConvexHullCache.count(desc.CacheKey + "_convex") > 0 || m_InFlightMeshBakes.count(desc.CacheKey) > 0)
+			{
+				return;
+			}
+			m_InFlightMeshBakes.insert(desc.CacheKey);
+		}
+
+		if (auto* tp = ServiceLocator::TryGet<ThreadPool>())
+		{
+			tp->QueueTask([this, desc]() {
+				PrebuildShape(desc);
+				std::lock_guard lock(m_CacheMutex);
+				m_InFlightMeshBakes.erase(desc.CacheKey);
+			});
+		}
+		else
+		{
+			PrebuildShape(desc);
+			std::lock_guard lock(m_CacheMutex);
+			m_InFlightMeshBakes.erase(desc.CacheKey);
+		}
+	}
+
+	JPH::ShapeRefC JoltPhysicsWorld::BuildShape(const PhysicsBodyDesc& desc)
+	{
+		JPH::ShapeRefC shape;
+
+		switch (desc.Shape)
+		{
+		case ColliderType::Box: {
+			JPH::BoxShapeSettings boxSettings(JPH::Vec3(desc.Dimensions.x, desc.Dimensions.y, desc.Dimensions.z));
+			shape = boxSettings.Create().Get();
+			if (!shape)
+			{
+				shape = FallbackUnitBox("Box shape creation failed");
+			}
+			break;
+		}
+		case ColliderType::Sphere: {
+			JPH::SphereShapeSettings sphereSettings(desc.Dimensions.x);
+			shape = sphereSettings.Create().Get();
+			if (!shape)
+			{
+				shape = FallbackUnitBox("Sphere shape creation failed");
+			}
+			break;
+		}
+		case ColliderType::Capsule: {
+			JPH::CapsuleShapeSettings capsuleSettings(desc.Dimensions.y, desc.Dimensions.x);
+			shape = capsuleSettings.Create().Get();
+			if (!shape)
+			{
+				shape = FallbackUnitBox("Capsule shape creation failed");
+			}
+			break;
+		}
+		case ColliderType::Mesh: {
+			if (!desc.IsStatic)
+			{
+				// Convex hull path for dynamic meshes — check cache first
+				std::string convexKey = desc.CacheKey.empty() ? "" : desc.CacheKey + "_convex";
+				if (!convexKey.empty())
+				{
+					std::lock_guard<std::mutex> lock(m_CacheMutex);
+					auto it = m_ConvexHullCache.find(convexKey);
+					if (it != m_ConvexHullCache.end())
+					{
+						shape = it->second;
+						if (desc.MeshScale != glm::vec3(1.0f))
+						{
+							JPH::ScaledShapeSettings scaledSettings(
+								shape, JPH::Vec3(desc.MeshScale.x, desc.MeshScale.y, desc.MeshScale.z));
+							auto scaledResult = scaledSettings.Create();
+							if (!scaledResult.HasError())
+							{
+								shape = scaledResult.Get();
+							}
+						}
+						CH_CORE_TRACE("Physics: Reused cached convex hull [key='{}']", convexKey);
+						break;
+					}
+				}
+
+				if (desc.Triangles.empty())
+				{
+					shape = FallbackUnitBox("Dynamic MeshShape requested but no triangles provided and not in cache");
+					break;
+				}
+
+				constexpr float kGridCell = 0.05f;
+				std::unordered_set<uint64_t> seen;
+				JPH::Array<JPH::Vec3> points;
+
+				auto tryAdd = [&](const glm::vec3& p) {
+					auto quant = [](float v) { return (int64_t)std::floor(v / kGridCell); };
+					uint64_t key = (uint64_t)(quant(p.x) & 0x1FFFFF) | ((uint64_t)(quant(p.y) & 0x1FFFFF) << 21) |
+								   ((uint64_t)(quant(p.z) & 0x1FFFFF) << 42);
+					if (seen.insert(key).second)
+					{
+						points.push_back(JPH::Vec3(p.x, p.y, p.z));
+					}
+				};
+
+				for (const auto& t : desc.Triangles)
+				{
+					tryAdd(t.V0);
+					tryAdd(t.V1);
+					tryAdd(t.V2);
+				}
+
+				if (points.size() > 4096)
+				{
+					CH_CORE_WARN("Physics: Dynamic mesh has {} unique points after dedup ({} raw tris) — this looks "
+								 "like static level geometry marked non-static. A convex hull will be a crude blob; "
+								 "consider making this body Static or Kinematic instead.",
+								 points.size(), desc.Triangles.size());
+				}
+
+				// Cap convex hull at 256 points — Jolt's hull builder struggles above this.
+				// Downsample uniformly if needed.
+				constexpr size_t kMaxConvexPoints = 256;
+				if (points.size() > kMaxConvexPoints)
+				{
+					CH_CORE_WARN("Physics: Convex hull downsampled from {} to {} points.", points.size(),
+								 kMaxConvexPoints);
+					JPH::Array<JPH::Vec3> downsampled;
+					downsampled.reserve(kMaxConvexPoints);
+					size_t step = points.size() / kMaxConvexPoints;
+					for (size_t i = 0; i < points.size() && downsampled.size() < kMaxConvexPoints; i += step)
+					{
+						downsampled.push_back(points[i]);
+					}
+					points = std::move(downsampled);
+				}
+
+				JPH::ConvexHullShapeSettings hullSettings(points);
+				auto hullResult = hullSettings.Create();
+				if (hullResult.HasError())
+				{
+					std::string err = hullResult.GetError().c_str();
+					shape = FallbackUnitBox("ConvexHull build for dynamic mesh failed: " + err);
+					break;
+				}
+
+				JPH::ShapeRefC hull = hullResult.Get();
+				if (!convexKey.empty())
+				{
+					std::lock_guard<std::mutex> lock(m_CacheMutex);
+					m_ConvexHullCache[convexKey] = hull;
+				}
+
+				shape = hull;
+				if (desc.MeshScale != glm::vec3(1.0f))
+				{
+					JPH::ScaledShapeSettings scaledSettings(
+						hull, JPH::Vec3(desc.MeshScale.x, desc.MeshScale.y, desc.MeshScale.z));
+					auto scaledResult = scaledSettings.Create();
+					if (!scaledResult.HasError())
+					{
+						shape = scaledResult.Get();
+					}
+					else
+					{
+						CH_CORE_WARN("Physics: ScaledShape build failed: {} — using unscaled hull.",
+									 scaledResult.GetError().c_str());
+					}
+				}
+				CH_CORE_INFO("Physics: Dynamic mesh body approximated with ConvexHull ({} points, {} raw tris).",
+							 points.size(), desc.Triangles.size());
+				break;
+			}
+
+			// Static mesh: BVH cache keyed by model path
+			JPH::ShapeRefC baseShape;
+			bool cached = false;
+			if (!desc.CacheKey.empty())
+			{
+				std::lock_guard<std::mutex> lock(m_CacheMutex);
+				auto it = m_MeshShapeCache.find(desc.CacheKey);
+				if (it != m_MeshShapeCache.end())
+				{
+					baseShape = it->second;
+					cached = true;
+					CH_CORE_TRACE("Physics: Reused cached mesh BVH [key='{}']", desc.CacheKey);
+				}
+			}
+
+			if (cached)
+			{
+				shape = baseShape;
+				if (desc.MeshScale != glm::vec3(1.0f))
+				{
+					JPH::ScaledShapeSettings scaledSettings(
+						baseShape, JPH::Vec3(desc.MeshScale.x, desc.MeshScale.y, desc.MeshScale.z));
+					auto scaledResult = scaledSettings.Create();
+					if (!scaledResult.HasError())
+					{
+						shape = scaledResult.Get();
+					}
+					else
+					{
+						CH_CORE_WARN(
+							"Physics: ScaledShape build failed for cached shape: {} — using unscaled base shape.",
+							scaledResult.GetError().c_str());
+					}
+				}
+				break;
+			}
+
+			if (desc.Triangles.empty())
+			{
+				shape = FallbackUnitBox("Static MeshShape requested but no triangles provided and not in cache");
+				break;
+			}
+			{
+				const auto buildStart = std::chrono::steady_clock::now();
+				JPH::TriangleList joltTris;
+				joltTris.reserve(desc.Triangles.size());
+				for (const auto& t : desc.Triangles)
+				{
+					JPH::Triangle tri(JPH::Float3(t.V0.x, t.V0.y, t.V0.z), JPH::Float3(t.V1.x, t.V1.y, t.V1.z),
+									  JPH::Float3(t.V2.x, t.V2.y, t.V2.z));
+					JPH::Vec3 v0 = JPH::Vec3::sLoadFloat3Unsafe(tri.mV[0]);
+					JPH::Vec3 v1 = JPH::Vec3::sLoadFloat3Unsafe(tri.mV[1]);
+					JPH::Vec3 v2 = JPH::Vec3::sLoadFloat3Unsafe(tri.mV[2]);
+					JPH::Vec3 e1 = v1 - v0;
+					JPH::Vec3 e2 = v2 - v0;
+					if (e1.Cross(e2).LengthSq() < 1e-20f)
+					{
+						continue;
+					}
+					joltTris.push_back(tri);
+				}
+
+				if (joltTris.empty())
+				{
+					shape = FallbackUnitBox("All mesh triangles degenerate");
+					break;
+				}
+
+				JPH::MeshShapeSettings s(std::move(joltTris));
+				s.mBuildQuality = desc.UseFastBuildQuality
+									  ? JPH::MeshShapeSettings::EBuildQuality::FavorBuildSpeed
+									  : JPH::MeshShapeSettings::EBuildQuality::FavorRuntimePerformance;
+				auto result = s.Create();
+				if (result.HasError())
+				{
+					std::string err = result.GetError().c_str();
+					shape = FallbackUnitBox("MeshShape build failed: " + err);
+					break;
+				}
+
+				baseShape = result.Get();
+				if (!desc.CacheKey.empty())
+				{
+					std::lock_guard<std::mutex> lock(m_CacheMutex);
+					m_MeshShapeCache[desc.CacheKey] = baseShape;
+				}
+
+				const auto buildEnd = std::chrono::steady_clock::now();
+				const double buildMs = std::chrono::duration<double, std::milli>(buildEnd - buildStart).count();
+				CH_CORE_INFO("Physics: Built mesh BVH ({} tris) in {:.2f} ms{} [key='{}']", joltTris.size(), buildMs,
+							 desc.CacheKey.empty() ? " (uncached)" : " (freshly built, cached for reuse)",
+							 desc.CacheKey);
+			}
+
+			shape = baseShape;
+			if (desc.MeshScale != glm::vec3(1.0f))
+			{
+				JPH::ScaledShapeSettings scaledSettings(
+					baseShape, JPH::Vec3(desc.MeshScale.x, desc.MeshScale.y, desc.MeshScale.z));
+				auto scaledResult = scaledSettings.Create();
+				if (!scaledResult.HasError())
+				{
+					shape = scaledResult.Get();
+				}
+				else
+				{
+					CH_CORE_WARN("Physics: ScaledShape build failed: {} — using unscaled mesh.",
+								 scaledResult.GetError().c_str());
+				}
+			}
+			break;
+		}
+		default: {
+			shape = FallbackUnitBox("Unknown ColliderType");
+			break;
+		}
+		}
+
+		// Apply Offset if present
+		if (shape && desc.Offset != glm::vec3(0.0f))
+		{
+			JPH::RotatedTranslatedShapeSettings offsetSettings(JPH::Vec3(desc.Offset.x, desc.Offset.y, desc.Offset.z),
+															   JPH::Quat::sIdentity(), shape);
+			auto offsetResult = offsetSettings.Create();
+			if (!offsetResult.HasError())
+			{
+				shape = offsetResult.Get();
+			}
+		}
+
+		return shape;
+	}
+
+	JPH::BodyCreationSettings JoltPhysicsWorld::BuildBodySettings(const PhysicsBodyDesc& desc, JPH::ShapeRefC shape)
+	{
+		JPH::EMotionType motionType;
+		JPH::ObjectLayer objectLayer;
+
+		if (desc.IsStatic)
+		{
+			motionType = JPH::EMotionType::Static;
+			objectLayer = Layers::NON_MOVING;
+		}
+		else if (desc.IsKinematic)
+		{
+			motionType = JPH::EMotionType::Kinematic;
+			objectLayer = Layers::MOVING;
+		}
+		else
+		{
+			motionType = JPH::EMotionType::Dynamic;
+			objectLayer = Layers::MOVING;
+		}
+
+		JPH::BodyCreationSettings bodySettings(
+			shape, JPH::RVec3(desc.Position.x, desc.Position.y, desc.Position.z),
+			JPH::Quat(desc.Rotation.x, desc.Rotation.y, desc.Rotation.z, desc.Rotation.w), motionType, objectLayer);
+
+		bodySettings.mFriction = desc.Friction;
+		bodySettings.mRestitution = desc.Restitution;
+		bodySettings.mLinearDamping = desc.LinearDamping;
+		bodySettings.mAngularDamping = desc.AngularDamping;
+		bodySettings.mAllowSleeping = true;
+
+		if (desc.Shape == ColliderType::Mesh && !desc.IsStatic && !desc.Triangles.empty())
+		{
+			JPH::Vec3 bbMin(FLT_MAX, FLT_MAX, FLT_MAX), bbMax(-FLT_MAX, -FLT_MAX, -FLT_MAX);
+			for (const auto& tri : desc.Triangles)
+			{
+				const JPH::Vec3 verts[] = {
+					JPH::Vec3(tri.V0.x, tri.V0.y, tri.V0.z),
+					JPH::Vec3(tri.V1.x, tri.V1.y, tri.V1.z),
+					JPH::Vec3(tri.V2.x, tri.V2.y, tri.V2.z),
+				};
+				for (const auto& v : verts)
+				{
+					bbMin = JPH::Vec3::sMin(bbMin, v);
+					bbMax = JPH::Vec3::sMax(bbMax, v);
+				}
+			}
+			JPH::Vec3 boxSize = bbMax - bbMin;
+			if (boxSize.GetX() > 0.0f && boxSize.GetY() > 0.0f && boxSize.GetZ() > 0.0f)
+			{
+				float volume = boxSize.GetX() * boxSize.GetY() * boxSize.GetZ();
+				float density = (volume > 0.0f) ? (desc.Mass / volume) : 1.0f;
+				bodySettings.mMassPropertiesOverride.SetMassAndInertiaOfSolidBox(boxSize, density);
+				bodySettings.mOverrideMassProperties = JPH::EOverrideMassProperties::MassAndInertiaProvided;
+			}
+			else
+			{
+				bodySettings.mMassPropertiesOverride.mMass = desc.Mass;
+				bodySettings.mMassPropertiesOverride.mInertia = JPH::Mat44::sScale(desc.Mass);
+				bodySettings.mOverrideMassProperties = JPH::EOverrideMassProperties::MassAndInertiaProvided;
+			}
+		}
+		else
+		{
+			bodySettings.mOverrideMassProperties = JPH::EOverrideMassProperties::CalculateMassAndInertia;
+		}
+
+		if (desc.IsKinematic)
+		{
+			bodySettings.mGravityFactor = 0.0f;
+		}
+		else
+		{
+			bodySettings.mGravityFactor = desc.UseGravity ? 1.0f : 0.0f;
+		}
+
+		if (desc.IsFixedRotation)
+		{
+			bodySettings.mAllowedDOFs =
+				JPH::EAllowedDOFs::TranslationX | JPH::EAllowedDOFs::TranslationY | JPH::EAllowedDOFs::TranslationZ;
+		}
+
+		bodySettings.mUserData = desc.UserData;
+
+		return bodySettings;
+	}
+
+	PhysicsBodyHandle JoltPhysicsWorld::CreateBody(const PhysicsBodyDesc& desc)
+	{
+		auto shape = BuildShape(desc);
+		if (!shape)
+		{
+			return kInvalidPhysicsBody;
+		}
+
+		auto settings = BuildBodySettings(desc, shape);
+
+		JPH::BodyInterface& bi = m_PhysicsSystem.GetBodyInterface();
+		JPH::Body* body = bi.CreateBody(settings);
+		if (!body)
+		{
+			CH_CORE_ERROR("Physics: Body creation failed (user-data {}).", desc.UserData);
+			return kInvalidPhysicsBody;
+		}
+		bi.AddBody(body->GetID(), JPH::EActivation::Activate);
+
+		return (PhysicsBodyHandle)body->GetID().GetIndexAndSequenceNumber();
+	}
+
+	std::vector<PhysicsBodyHandle> JoltPhysicsWorld::CreateBodies(const std::vector<PhysicsBodyDesc>& descs)
+	{
+		if (descs.empty())
+		{
+			return {};
+		}
+
+		const auto buildStart = std::chrono::steady_clock::now();
+
+		// Build all shapes
+		std::vector<JPH::ShapeRefC> shapes(descs.size());
+		for (size_t i = 0; i < descs.size(); ++i)
+		{
+			shapes[i] = BuildShape(descs[i]);
+			if (!shapes[i])
+			{
+				shapes[i] = FallbackUnitBox("BuildShape returned null in batch");
+			}
+		}
+
+		const auto shapesBuilt = std::chrono::steady_clock::now();
+		const double shapesMs = std::chrono::duration<double, std::milli>(shapesBuilt - buildStart).count();
+		if (shapesMs > 10.0)
+		{
+			CH_CORE_INFO("Physics: Built {} shapes in {:.1f} ms", descs.size(), shapesMs);
+		}
+
+		// Create bodies
+		JPH::BodyInterface& bi = m_PhysicsSystem.GetBodyInterface();
+		std::vector<JPH::BodyID> bodyIds;
+		bodyIds.reserve(descs.size());
+
+		for (size_t i = 0; i < descs.size(); ++i)
+		{
+			auto settings = BuildBodySettings(descs[i], shapes[i]);
+			JPH::Body* body = bi.CreateBody(settings);
+			if (!body)
+			{
+				CH_CORE_ERROR("Physics: Batch body creation failed (user-data {}).", descs[i].UserData);
+				bodyIds.push_back(JPH::BodyID());
+				continue;
+			}
+			bodyIds.push_back(body->GetID());
+		}
+
+		// Batch add to physics system
+		std::vector<JPH::BodyID> validIds;
+		validIds.reserve(bodyIds.size());
+		for (auto& id : bodyIds)
+		{
+			if (!id.IsInvalid())
+			{
+				validIds.push_back(id);
+			}
+		}
+
+		if (!validIds.empty())
+		{
+			auto addState = bi.AddBodiesPrepare(validIds.data(), (int)validIds.size());
+			bi.AddBodiesFinalize(validIds.data(), (int)validIds.size(), addState, JPH::EActivation::Activate);
+		}
+
+		// Convert to handles
+		std::vector<PhysicsBodyHandle> handles;
+		handles.reserve(bodyIds.size());
+		for (auto& id : bodyIds)
+		{
+			handles.push_back(id.IsInvalid() ? kInvalidPhysicsBody : (PhysicsBodyHandle)id.GetIndexAndSequenceNumber());
+		}
+
+		return handles;
+	}
+
+	void JoltPhysicsWorld::DestroyBody(PhysicsBodyHandle handle)
+	{
+		JPH::BodyInterface& bi = m_PhysicsSystem.GetBodyInterface();
+		JPH::BodyID id((JPH::uint32)handle);
+		bi.RemoveBody(id);
+		bi.DestroyBody(id);
+	}
+
+	bool JoltPhysicsWorld::HasCachedMeshShape(const std::string& key) const
+	{
+		if (key.empty())
+		{
+			return false;
+		}
+		std::lock_guard lock(m_CacheMutex);
+		return m_MeshShapeCache.count(key) > 0 || m_ConvexHullCache.count(key) > 0 ||
+			   m_ConvexHullCache.count(key + "_convex") > 0;
+	}
+
+	bool JoltPhysicsWorld::IsShapeBaking(const std::string& key) const
+	{
+		if (key.empty())
+		{
+			return false;
+		}
+		std::lock_guard lock(m_CacheMutex);
+		return m_InFlightMeshBakes.count(key) > 0;
+	}
+
+	bool JoltPhysicsWorld::HasPendingShapeBakes() const
+	{
+		std::lock_guard lock(m_CacheMutex);
+		return !m_InFlightMeshBakes.empty();
+	}
+
+	void JoltPhysicsWorld::SetTransform(PhysicsBodyHandle handle, const glm::vec3& pos, const glm::quat& rot)
+	{
+		m_PhysicsSystem.GetBodyInterface().SetPositionAndRotation((JPH::BodyID)handle, JPH::RVec3(pos.x, pos.y, pos.z),
+																  JPH::Quat(rot.x, rot.y, rot.z, rot.w),
+																  JPH::EActivation::Activate);
+	}
+
+	void JoltPhysicsWorld::GetTransform(PhysicsBodyHandle handle, glm::vec3& pos, glm::quat& rot)
+	{
+		JPH::RVec3 jPos;
+		JPH::Quat jRot;
+		m_PhysicsSystem.GetBodyInterface().GetPositionAndRotation((JPH::BodyID)handle, jPos, jRot);
+		pos = {jPos.GetX(), jPos.GetY(), jPos.GetZ()};
+		rot = {jRot.GetW(), jRot.GetX(), jRot.GetY(), jRot.GetZ()};
+	}
+
+	void JoltPhysicsWorld::SetVelocity(PhysicsBodyHandle handle, const glm::vec3& velocity)
+	{
+		m_PhysicsSystem.GetBodyInterface().SetLinearVelocity((JPH::BodyID)handle,
+															 JPH::Vec3(velocity.x, velocity.y, velocity.z));
+		if (glm::length2(velocity) > 0.0001f)
+		{
+			m_PhysicsSystem.GetBodyInterface().ActivateBody((JPH::BodyID)handle);
+		}
+	}
+
+	glm::vec3 JoltPhysicsWorld::GetVelocity(PhysicsBodyHandle handle) const
+	{
+		JPH::Vec3 v = m_PhysicsSystem.GetBodyInterface().GetLinearVelocity((JPH::BodyID)handle);
+		return {v.GetX(), v.GetY(), v.GetZ()};
+	}
+
+	RaycastResult JoltPhysicsWorld::Raycast(const glm::vec3& origin, const glm::vec3& direction, float maxDistance)
+	{
+		JPH::RRayCast ray{JPH::RVec3(origin.x, origin.y, origin.z),
+						  JPH::Vec3(direction.x, direction.y, direction.z) * maxDistance};
+
+		JPH::RayCastResult result;
+		if (m_PhysicsSystem.GetNarrowPhaseQuery().CastRay(ray, result))
+		{
+			JPH::RVec3 hitPos = ray.GetPointOnRay(result.mFraction);
+			RaycastResult out;
+			out.Hit = true;
+			out.Distance = result.mFraction * maxDistance;
+			out.Position = {hitPos.GetX(), hitPos.GetY(), hitPos.GetZ()};
+			out.Entity = (entt::entity)m_PhysicsSystem.GetBodyInterface().GetUserData(result.mBodyID);
+			return out;
+		}
+		return RaycastResult{false};
+	}
+
+	void JoltPhysicsWorld::Step(float fixedDt)
+	{
+		m_PhysicsSystem.Update(fixedDt, 1, m_TempAllocator.get(), m_JobSystem.get());
+	}
+
+	void JoltPhysicsWorld::SetGravity(float gravity)
+	{
+		m_PhysicsSystem.SetGravity(JPH::Vec3(0.0f, -gravity, 0.0f));
+	}
+
+	// ─────────────────────────────────────────────────────────────────────────────
+	// Ground detection via contact callbacks (O(1) lookup)
+	// ─────────────────────────────────────────────────────────────────────────────
+	bool JoltPhysicsWorld::IsBodyGrounded(PhysicsBodyHandle handle) const
+	{
+		if (handle == 0)
+		{
+			return false;
+		}
+		std::lock_guard lock(m_GroundedMutex);
+		return m_GroundedBodies.count(static_cast<uint32_t>(handle)) > 0;
+	}
+
+	bool JoltPhysicsWorld::IsBodyActive(PhysicsBodyHandle handle) const
+	{
+		if (handle == 0)
+		{
+			return false;
+		}
+		return m_PhysicsSystem.GetBodyInterface().IsActive(JPH::BodyID(static_cast<uint32_t>(handle)));
+	}
+
+	void JoltPhysicsWorld::ClearGroundedState()
+	{
+		std::lock_guard lock(m_GroundedMutex);
+		std::unordered_set<uint32_t> nextGrounded;
+		auto& bi = m_PhysicsSystem.GetBodyInterface();
+		for (uint32_t handle : m_GroundedBodies)
+		{
+			if (!bi.IsActive(JPH::BodyID(handle)))
+			{
+				nextGrounded.insert(handle);
+			}
+		}
+		m_GroundedBodies = std::move(nextGrounded);
+	}
+
+	// ─────────────────────────────────────────────────────────────────────────────
+	// ContactListenerImpl
+	// ─────────────────────────────────────────────────────────────────────────────
+	JPH::ValidateResult JoltPhysicsWorld::ContactListenerImpl::OnContactValidate(const JPH::Body&, const JPH::Body&,
+																				 JPH::RVec3Arg,
+																				 const JPH::CollideShapeResult&)
+	{
+		return JPH::ValidateResult::AcceptAllContactsForThisBodyPair;
+	}
+
+	static void RegisterGroundContact(std::mutex& mutex, std::unordered_set<uint32_t>& tracker, const JPH::Body& body1,
+									  const JPH::Body& body2, const JPH::ContactManifold& manifold)
+	{
+		JPH::Vec3 normal = manifold.mWorldSpaceNormal;
+		uint32_t id1 = body1.GetID().GetIndexAndSequenceNumber();
+		uint32_t id2 = body2.GetID().GetIndexAndSequenceNumber();
+
+		std::lock_guard lock(mutex);
+		// In Jolt, mWorldSpaceNormal points from body1 to body2.
+		// If normal Y > 0.5, body2 is ABOVE body1. Thus body2 is grounded on body1.
+		if (normal.GetY() > 0.5f)
+		{
+			tracker.insert(id2);
+		}
+		// If normal Y < -0.5, body1 is ABOVE body2. Thus body1 is grounded on body2.
+		else if (normal.GetY() < -0.5f)
+		{
+			tracker.insert(id1);
+		}
+	}
+
+	void JoltPhysicsWorld::ContactListenerImpl::OnContactAdded(const JPH::Body& body1, const JPH::Body& body2,
+															   const JPH::ContactManifold& manifold,
+															   JPH::ContactSettings&)
+	{
+		RegisterGroundContact(*m_Mutex, *m_Tracker, body1, body2, manifold);
+	}
+
+	void JoltPhysicsWorld::ContactListenerImpl::OnContactPersisted(const JPH::Body& body1, const JPH::Body& body2,
+																   const JPH::ContactManifold& manifold,
+																   JPH::ContactSettings&)
+	{
+		RegisterGroundContact(*m_Mutex, *m_Tracker, body1, body2, manifold);
+	}
+
+	void JoltPhysicsWorld::ContactListenerImpl::OnContactRemoved(const JPH::SubShapeIDPair&)
+	{
+		// Grounded set is rebuilt each frame by ClearGroundedState() + step contacts.
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/physics/jolt_physics_world.h b/engine/physics/jolt_physics_world.h
new file mode 100644
index 000000000..fd396da2b
--- /dev/null
+++ b/engine/physics/jolt_physics_world.h
@@ -0,0 +1,140 @@
+#ifndef CH_JOLT_PHYSICS_WORLD_H
+#define CH_JOLT_PHYSICS_WORLD_H
+
+#include "iphysics_world.h"
+#include <Jolt/Jolt.h>
+#include <Jolt/RegisterTypes.h>
+#include <Jolt/Core/Factory.h>
+#include <Jolt/Core/TempAllocator.h>
+#include <Jolt/Core/JobSystemThreadPool.h>
+#include <Jolt/Physics/PhysicsSettings.h>
+#include <Jolt/Physics/PhysicsSystem.h>
+#include <Jolt/Physics/Collision/Shape/BoxShape.h>
+#include <Jolt/Physics/Collision/Shape/MeshShape.h>
+#include <Jolt/Physics/Body/BodyCreationSettings.h>
+#include <Jolt/Physics/Body/BodyActivationListener.h>
+#include <Jolt/Physics/Collision/ContactListener.h>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace Chained
+{
+
+	// Jolt Physics backend. Wraps JPH::PhysicsSystem and provides body management,
+	// raycasting, gravity control, and ground detection via contact callbacks.
+	class JoltPhysicsWorld : public IPhysicsWorld
+	{
+	public:
+		JoltPhysicsWorld();
+		virtual ~JoltPhysicsWorld() override;
+
+		virtual PhysicsBodyHandle CreateBody(const PhysicsBodyDesc& desc) override;
+		virtual std::vector<PhysicsBodyHandle> CreateBodies(const std::vector<PhysicsBodyDesc>& descs) override;
+		virtual void DestroyBody(PhysicsBodyHandle handle) override;
+
+		virtual void SetTransform(PhysicsBodyHandle handle, const glm::vec3& pos, const glm::quat& rot) override;
+		virtual void GetTransform(PhysicsBodyHandle handle, glm::vec3& pos, glm::quat& rot) override;
+
+		virtual void SetVelocity(PhysicsBodyHandle handle, const glm::vec3& velocity) override;
+		virtual glm::vec3 GetVelocity(PhysicsBodyHandle handle) const override;
+
+		virtual RaycastResult Raycast(const glm::vec3& origin, const glm::vec3& direction, float maxDistance) override;
+
+		virtual void Step(float fixedDt) override;
+
+		virtual void SetGravity(float gravity) override;
+
+		virtual bool IsBodyGrounded(PhysicsBodyHandle handle) const override;
+		virtual bool IsBodyActive(PhysicsBodyHandle handle) const override;
+
+		/// Clear all grounded state (call before/after world reset).
+		virtual void ClearGroundedState() override;
+
+		virtual bool HasCachedMeshShape(const std::string& key) const override;
+		virtual bool IsShapeBaking(const std::string& key) const override;
+		virtual bool HasPendingShapeBakes() const override;
+		virtual void PrebuildShape(const PhysicsBodyDesc& desc) override;
+		virtual void QueuePrebuildShape(const PhysicsBodyDesc& desc) override;
+
+		/// Clear the cached mesh shapes.
+		void ClearShapeCache();
+
+		/// Preserves the compiled BVH mesh shape cache from a previous world instance.
+		void PreserveShapeCacheFrom(const JoltPhysicsWorld& otherWorld)
+		{
+			std::lock_guard<std::mutex> lock1(m_CacheMutex);
+			std::lock_guard<std::mutex> lock2(otherWorld.m_CacheMutex);
+			m_MeshShapeCache = otherWorld.m_MeshShapeCache;
+			m_ConvexHullCache = otherWorld.m_ConvexHullCache;
+		}
+
+		/// Builds a Jolt shape from a PhysicsBodyDesc (used by CreateBody and CreateBodies).
+		JPH::ShapeRefC BuildShape(const PhysicsBodyDesc& desc);
+
+		/// Builds BodyCreationSettings from a desc + pre-built shape.
+		JPH::BodyCreationSettings BuildBodySettings(const PhysicsBodyDesc& desc, JPH::ShapeRefC shape);
+
+	private:
+		/// Creates a unit-box fallback shape and logs a warning.
+		JPH::ShapeRefC FallbackUnitBox(const std::string& reason);
+
+	private:
+		// ── Jolt subsystems ──────────────────────────────────────────────────────
+		// m_Factory declared first → destroyed last (C++ reverse destruction order).
+		// PhysicsSystem must be destroyed before the factory.
+		std::unique_ptr<JPH::Factory> m_Factory;
+		JPH::PhysicsSystem m_PhysicsSystem;
+		std::unique_ptr<JPH::TempAllocatorImpl> m_TempAllocator;
+		std::unique_ptr<JPH::JobSystemThreadPool> m_JobSystem;
+
+		// ── Ground detection ──────────────────────────────────────────────────────
+		// Set of Jolt body IDs (packed as uint32) that have at least one ground
+		// contact — i.e. a contact whose normal Y component is positive (pointing
+		// upward relative to the body being checked).
+		// Protected by m_GroundedMutex: Jolt calls contact callbacks from worker threads.
+		std::unordered_set<uint32_t> m_GroundedBodies;
+		mutable std::mutex m_GroundedMutex;
+
+		// ── Mesh shape cache ─────────────────────────────────────────────────────
+		// Built MeshShapes are cached per triangle fingerprint (model path + scale)
+		// so that multiple bodies using the same mesh share a single BVH build.
+		mutable std::mutex m_CacheMutex;
+		std::unordered_map<std::string, JPH::RefConst<JPH::Shape>> m_MeshShapeCache;
+		std::unordered_set<std::string> m_InFlightMeshBakes;
+
+		// ── Convex hull shape cache ─────────────────────────────────────────────
+		// For dynamic meshes, a ConvexHull is built from deduped vertices. Cache it
+		// per model path so identical dynamic bodies reuse the same hull.
+		std::unordered_map<std::string, JPH::RefConst<JPH::Shape>> m_ConvexHullCache;
+
+		// Contact listener that populates m_GroundedBodies.
+		class ContactListenerImpl : public JPH::ContactListener
+		{
+		public:
+			JPH::ValidateResult OnContactValidate(const JPH::Body&, const JPH::Body&, JPH::RVec3Arg,
+												  const JPH::CollideShapeResult&) override;
+			void OnContactAdded(const JPH::Body& inBody1, const JPH::Body& inBody2,
+								const JPH::ContactManifold& inManifold, JPH::ContactSettings& inSettings) override;
+			void OnContactPersisted(const JPH::Body& inBody1, const JPH::Body& inBody2,
+									const JPH::ContactManifold& inManifold, JPH::ContactSettings& inSettings) override;
+			void OnContactRemoved(const JPH::SubShapeIDPair& inPair) override;
+
+			/// Set the tracker that receives ground-contact updates.
+			void SetGroundedTracker(std::unordered_set<uint32_t>* tracker, std::mutex* mutex)
+			{
+				m_Tracker = tracker;
+				m_Mutex = mutex;
+			}
+
+		private:
+			std::unordered_set<uint32_t>* m_Tracker = nullptr;
+			std::mutex* m_Mutex = nullptr;
+		};
+
+		ContactListenerImpl m_ContactListener;
+	};
+
+} // namespace Chained
+
+#endif // CH_JOLT_PHYSICS_WORLD_H
diff --git a/engine/physics/physics.cpp b/engine/physics/physics.cpp
index 76b52a9b7..4b4426e99 100644
--- a/engine/physics/physics.cpp
+++ b/engine/physics/physics.cpp
@@ -1,244 +1,321 @@
-#include "engine/core/profiler.h"
 #include "physics.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/log.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/physics/bvh/bvh_cache.h"
+
+#include "engine/core/service_locator.h"
 #include "engine/scene/components.h"
-#include "engine/scene/project.h"
 #include "engine/scene/scene.h"
-#include "collision_core.h"
-#include "raycast_query.h"
-#include "dynamics.h"
-#include <utility>
-#include <vector>
-
-namespace CHEngine
-{
-namespace
-{
-BVHCache& Cache()
-{
-    static BVHCache s_Cache;
-    return s_Cache;
-}
-
-bool& InitializedFlag()
-{
-    static bool s_Initialized = false;
-    return s_Initialized;
-}
-} // namespace
-
-void Physics::Init()
-{
-    if (InitializedFlag())
-    {
-        return;
-    }
-
-    Cache().Init();
-    InitializedFlag() = true;
-    CH_CORE_INFO("Physics initialized.");
-}
-
-void Physics::Shutdown()
-{
-    if (!InitializedFlag())
-    {
-        return;
-    }
-
-    Cache().Shutdown();
-    InitializedFlag() = false;
-    CH_CORE_INFO("Physics shutdown.");
-}
-
-bool Physics::IsInitialized()
-{
-    return InitializedFlag();
-}
-
-std::shared_ptr<BVH> Physics::GetBVH(const std::string& path)
-{
-    if (!InitializedFlag())
-    {
-        return nullptr;
-    }
-
-    return Cache().GetOrBuild(path);
-}
+#include "engine/scene/systems/physics_body_system.h"
+#include "engine/scene/systems/transform_system.h"
+#include "iphysics_world.h"
+#include "jolt_physics_world.h"
 
-void Physics::InvalidateBVH(const std::string& path)
-{
-    if (!InitializedFlag())
-    {
-        return;
-    }
-
-    Cache().Invalidate(path);
-}
-
-void Physics::UpdateBVHCache(const std::string& path, std::shared_ptr<BVH> bvh)
-{
-    if (!InitializedFlag())
-    {
-        return;
-    }
-
-    Cache().Put(path, std::move(bvh));
-}
-
-PhysicsContext& Physics::GetContext(Scene* scene)
-{
-    auto& registry = scene->GetRegistry();
-    auto* ctx = registry.ctx().find<PhysicsContext>();
-    if (!ctx) return registry.ctx().emplace<PhysicsContext>();
-    return *ctx;
-}
-
-void Physics::ResetAccumulator(Scene* scene)
-{
-    if (!scene)
-    {
-        return;
-    }
+#include "engine/project/project.h"
 
-    GetContext(scene).Accumulator = 0.0f;
-}
-
-void Physics::ClearContext(Scene* scene)
+namespace Chained
 {
-    if (!scene)
-    {
-        return;
-    }
-
-    scene->GetRegistry().ctx().erase<PhysicsContext>();
-}
 
-void Physics::SetCollisionCallback(Scene* scene, std::function<void(entt::entity, entt::entity)> callback)
-{
-    GetContext(scene).CollisionCallback = callback;
-}
-
-void Physics::Update(Scene* scene, Timestep deltaTime, bool runtime)
-{
-    CH_PROFILE_FUNCTION();
-    if (!scene) return;
-
-    auto& registry = scene->GetRegistry();
-    auto collView = registry.view<ColliderComponent>();
-    for (auto it = collView.begin(); it != collView.end(); ++it)
-    {
-        auto entity = *it;
-        collView.get<ColliderComponent>(entity).IsColliding = false;
-    }
-
-    UpdateColliders(scene);
-
-    if (!runtime) return;
-
-    float fixedTimestep = 1.0f / 120.0f;
-    if (auto project = Project::GetActive())
-    {
-        float cfg = project->GetConfig().Physics.FixedTimestep;
-        if (cfg > 0.0f) fixedTimestep = cfg;
-    }
-
-    auto& context = GetContext(scene);
-    context.Accumulator += (float)deltaTime;
-
-    const float maxAccumulator = 0.2f;
-    if (context.Accumulator > maxAccumulator) context.Accumulator = maxAccumulator;
-
-    while (context.Accumulator >= fixedTimestep)
-    {
-        ResolveSimulation(scene, fixedTimestep);
-        context.Accumulator -= fixedTimestep;
-    }
-}
-
-RaycastResult Physics::Raycast(Scene* scene, Ray ray)
-{
-    if (!scene) return RaycastResult();
-    return RaycastQuery::Raycast(scene->GetRegistry(), ray);
-}
-
-void Physics::UpdateColliders(Scene* scene)
-{
-    auto& registry = scene->GetRegistry();
-    auto project = Project::GetActive();
-    if (!project) return;
-
-    auto genView = registry.view<ColliderComponent, TransformComponent>();
-
-    for (auto it = genView.begin(); it != genView.end(); ++it)
-    {
-        auto entity = *it;
-        auto& collider = genView.get<ColliderComponent>(entity);
-
-        if (collider.Type == ColliderType::Box && collider.AutoCalculate)
-        {
-            if (!registry.all_of<ModelComponent>(entity)) continue;
-            auto& model = registry.get<ModelComponent>(entity);
-            auto asset = AssetManager::Get().Get<ModelAsset>(model.ModelPath);
-
-            if (asset && asset->GetState() == AssetState::Ready)
-            {
-                BoundingBox box = asset->GetBoundingBox();
-                collider.Size = box.Max - box.Min;
-                collider.Offset = box.Min;
-            }
-        }
-        else if (collider.Type == ColliderType::Sphere && collider.AutoCalculate)
-        {
-            if (!registry.all_of<ModelComponent>(entity)) continue;
-            auto& model = registry.get<ModelComponent>(entity);
-            auto asset = AssetManager::Get().Get<ModelAsset>(model.ModelPath);
-
-            if (asset && asset->GetState() == AssetState::Ready)
-            {
-                BoundingBox box = asset->GetBoundingBox();
-                glm::vec3 sz = box.Max - box.Min;
-                collider.Radius = glm::max(sz.x, glm::max(sz.y, sz.z)) * 0.5f;
-                collider.Offset = (box.Min + box.Max) * 0.5f;
-            }
-        }
-        else if (collider.Type == ColliderType::Mesh && collider.AutoCalculate)
-        {
-            if (!registry.all_of<ModelComponent>(entity)) continue;
-            auto& model = registry.get<ModelComponent>(entity);
-            
-            if (!model.ModelPath.empty())
-            {
-                auto asset = AssetManager::Get().Get<ModelAsset>(model.ModelPath);
-                if (asset && asset->GetState() == AssetState::Ready)
-                {
-                    collider.ModelHandle = asset->GetID();
-                    collider.ModelPath = model.ModelPath;
-                }
-            }
-        }
-    }
-}
-
-void Physics::ResolveSimulation(Scene* scene, Timestep deltaTime)
-{
-    auto& registry = scene->GetRegistry();
-    auto rbView = registry.view<TransformComponent, RigidBodyComponent>();
-    std::vector<entt::entity> rbEntities;
-    rbEntities.reserve(rbView.size_hint());
-
-    for (auto it = rbView.begin(); it != rbView.end(); ++it)
-    {
-        rbEntities.push_back(*it);
-    }
-
-    if (!rbEntities.empty())
-    {
-        Dynamics::Update(registry, rbEntities, deltaTime);
-        CollisionCore::ResolveCollisions(registry, rbEntities);
-    }
-}
-} // namespace CHEngine
+	// Named constants replacing magic numbers
+	static constexpr float kFixedDtDefault = 1.0f / 60.0f;
+	static constexpr int kMaxStepsPerFrame = 8;
+	static constexpr float kVelocityYThreshold = 0.5f;
+	static constexpr float kDefaultRaycastDistance = 1000.0f;
+
+	Physics::Physics() = default;
+	Physics::~Physics() = default;
+
+	void Physics::Initialize()
+	{
+		CH_CORE_INFO("Physics initialized (Jolt backend).");
+	}
+
+	void Physics::Shutdown()
+	{
+		m_World.reset();
+		CH_CORE_INFO("Physics shutdown.");
+	}
+
+	IPhysicsWorld* Physics::GetWorld()
+	{
+		if (!m_World)
+		{
+			m_World = std::make_unique<JoltPhysicsWorld>();
+		}
+		return m_World.get();
+	}
+
+	void Physics::ResetWorld(Scene* scene)
+	{
+		auto oldJoltWorld = dynamic_cast<JoltPhysicsWorld*>(m_World.get());
+
+		// Invalidate all rigid body handles before destroying the world
+		if (scene)
+		{
+			auto& registry = scene->GetRegistry();
+			auto view = registry.view<RigidBodyComponent>();
+			for (auto entity : view)
+			{
+				auto& rb = view.get<RigidBodyComponent>(entity);
+				rb.Handle = kInvalidPhysicsBody;
+			}
+			registry.ctx().erase<Physics*>();
+		}
+
+		auto newWorld = std::make_unique<JoltPhysicsWorld>();
+		if (oldJoltWorld)
+		{
+			newWorld->PreserveShapeCacheFrom(*oldJoltWorld);
+		}
+		m_World = std::move(newWorld);
+
+		if (auto project = Project::GetActive())
+		{
+			float gravity = project->GetConfig().Physics.Gravity;
+			m_World->SetGravity(gravity);
+		}
+
+		CH_CORE_INFO("Physics: World reset — fresh Jolt world created (shape cache preserved).");
+	}
+
+	void Physics::InitializeBodies(Scene* scene)
+	{
+		// Use m_World directly — ResetWorld() already created the world.
+		// GetWorld() would lazily create a new one without gravity/contact listener.
+		auto world = m_World.get();
+		if (!world)
+		{
+			return;
+		}
+
+		auto& registry = scene->GetRegistry();
+		if (!registry.ctx().contains<Physics*>())
+		{
+			registry.ctx().emplace<Physics*>(this);
+		}
+
+		PhysicsBodySystem::BatchInitializeBodies(registry, world);
+
+		CH_CORE_INFO("Physics::InitializeBodies — bodies initialized for scene '{}'.", scene->GetSettings().Name);
+	}
+
+	void Physics::Update(Scene* scene, Timestep deltaTime, bool runtime)
+	{
+		if (!runtime)
+		{
+			return;
+		}
+
+		float& accumulator = m_Accumulators[scene];
+		accumulator += deltaTime;
+
+		float fixedDt = kFixedDtDefault;
+		if (auto project = Project::GetActive())
+		{
+			fixedDt = project->GetConfig().Physics.FixedTimestep;
+		}
+		bool stepped = false;
+
+		auto world = GetWorld();
+		if (!world)
+		{
+			return;
+		}
+
+		auto& registry = scene->GetRegistry();
+		auto view = registry.view<TransformComponent, RigidBodyComponent>();
+
+		for (auto entity : view)
+		{
+			auto& rb = view.get<RigidBodyComponent>(entity);
+			auto& transform = view.get<TransformComponent>(entity);
+
+			if (rb.Handle == kInvalidPhysicsBody)
+			{
+				continue;
+			}
+
+			// Network-driven bodies are controlled by NetworkSystem::InterpolateEntities.
+			// Do not let Jolt overwrite their transform or apply simulated velocity.
+			if (rb.IsNetworkDriven)
+			{
+				continue;
+			}
+
+			if (rb.Type == RigidBodyComponent::BodyType::Dynamic)
+			{
+				// 1. Apply transform update FIRST (if script changed it)
+				if (transform.TransformChanged)
+				{
+					glm::vec3 currentPos;
+					glm::quat currentRot;
+					world->GetTransform(rb.Handle, currentPos, currentRot);
+
+					bool posChanged = glm::distance2(transform.Translation, currentPos) > 0.0001f;
+					glm::quat targetRot = rb.IsFixedRotation ? currentRot : transform.RotationQuat;
+
+					bool rotChanged = false;
+					if (!rb.IsFixedRotation)
+					{
+						float dot = glm::abs(glm::dot(currentRot, targetRot));
+						rotChanged = dot < 0.9999f;
+					}
+
+					if (posChanged || rotChanged)
+					{
+						glm::vec3 preVel = world->GetVelocity(rb.Handle);
+						world->SetTransform(rb.Handle, transform.Translation, targetRot);
+						world->SetVelocity(rb.Handle, preVel);
+					}
+					transform.TransformChanged = false;
+				}
+
+				// 2. Apply script-requested velocity
+				glm::vec3 currentJoltVelocity = world->GetVelocity(rb.Handle);
+				glm::vec3 finalVelocity = rb.Velocity;
+				if (!rb.VelocityForced && rb.Velocity.y <= kVelocityYThreshold)
+				{
+					finalVelocity.y = currentJoltVelocity.y;
+				}
+				rb.VelocityForced = false;
+				world->SetVelocity(rb.Handle, finalVelocity);
+			}
+			else if (rb.Type == RigidBodyComponent::BodyType::Kinematic)
+			{
+				world->SetTransform(rb.Handle, transform.Translation, transform.RotationQuat);
+				world->SetVelocity(rb.Handle, rb.Velocity);
+				// NOTE: Do NOT clear TransformChanged here.
+				// The script set it via Transform_SetTranslation; the HierarchySystem
+				// PostUpdate pass needs it to propagate Translation → WorldTransform.
+				continue;
+			}
+			else if (transform.TransformChanged)
+			{
+				// Static bodies — just update transform
+				world->SetTransform(rb.Handle, transform.Translation, transform.RotationQuat);
+				transform.TransformChanged = false;
+			}
+		}
+
+		int steps = 0;
+		while (accumulator >= fixedDt && steps < kMaxStepsPerFrame)
+		{
+			world->ClearGroundedState();
+			world->Step(fixedDt);
+			accumulator -= fixedDt;
+			stepped = true;
+			steps++;
+		}
+
+		if (accumulator >= fixedDt)
+		{
+			accumulator = 0.0f;
+		}
+
+		if (stepped)
+		{
+			UpdateColliders(scene);
+		}
+	}
+
+	void Physics::UpdateColliders(Scene* scene)
+	{
+		auto world = GetWorld();
+		auto& registry = scene->GetRegistry();
+		auto view = registry.view<TransformComponent, RigidBodyComponent>();
+
+		for (auto entity : view)
+		{
+			auto& transform = view.get<TransformComponent>(entity);
+			auto& rb = view.get<RigidBodyComponent>(entity);
+
+			if (rb.Handle == kInvalidPhysicsBody)
+			{
+				continue;
+			}
+			if (rb.IsNetworkDriven)
+			{
+				continue;
+			}
+			if (rb.Type == RigidBodyComponent::BodyType::Static)
+			{
+				continue;
+			}
+
+			bool isActive = world->IsBodyActive(rb.Handle);
+
+			if (rb.Type == RigidBodyComponent::BodyType::Kinematic)
+			{
+				// Kinematic: position is controlled by script, but IsGrounded is still needed.
+				// Only update IsGrounded for active bodies; sleeping bodies do not move,
+				// so their grounded state remains correct from the previous frame.
+				if (isActive)
+				{
+					rb.IsGrounded = world->IsBodyGrounded(rb.Handle);
+				}
+				continue;
+			}
+
+			// Dynamic: read position, velocity and grounded state from Jolt
+			// For sleeping bodies - position hasn't changed, IsGrounded is kept from previous frame.
+			if (!isActive)
+			{
+				continue;
+			}
+
+			glm::vec3 pos;
+			glm::quat rot;
+			world->GetTransform(rb.Handle, pos, rot);
+
+			TransformSystem::SetTranslation(transform, pos);
+			if (!rb.IsFixedRotation)
+			{
+				TransformSystem::SetRotationQuat(transform, rot);
+			}
+
+			rb.Velocity = world->GetVelocity(rb.Handle);
+			rb.IsGrounded = world->IsBodyGrounded(rb.Handle);
+		}
+	}
+
+	void Physics::ForceSetVelocity(PhysicsBodyHandle handle, const glm::vec3& velocity)
+	{
+		if (auto world = GetWorld())
+		{
+			world->SetVelocity(handle, velocity);
+		}
+	}
+
+	RaycastResult Physics::Raycast(Ray ray)
+	{
+		if (auto world = GetWorld())
+		{
+			return world->Raycast(ray.position, ray.direction, kDefaultRaycastDistance);
+		}
+		return {};
+	}
+
+	void Physics::ResetAccumulator(Scene* scene)
+	{
+		m_Accumulators[scene] = 0.0f;
+	}
+
+	void Physics::ClearContext(Scene* scene)
+	{
+		auto& registry = scene->GetRegistry();
+
+		if (m_World)
+		{
+			auto view = registry.view<RigidBodyComponent>();
+			for (auto entity : view)
+			{
+				auto& rb = view.get<RigidBodyComponent>(entity);
+				if (rb.Handle != kInvalidPhysicsBody)
+				{
+					m_World->DestroyBody(rb.Handle);
+					rb.Handle = kInvalidPhysicsBody;
+				}
+			}
+		}
+		m_Accumulators.erase(scene);
+		registry.ctx().erase<Physics*>();
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/physics/physics.h b/engine/physics/physics.h
index fe16802d8..373a16094 100644
--- a/engine/physics/physics.h
+++ b/engine/physics/physics.h
@@ -1,68 +1,76 @@
 #ifndef CH_PHYSICS_H
 #define CH_PHYSICS_H
 
-#include "engine/core/base.h"
-#include "engine/core/timestep.h"
-#include "entt/entt.hpp"
-#include <functional>
+#include "engine/core/service.h"
+#include "engine/common/base.h"
+#include "engine/common/timestep.h"
+#include "engine/physics/raycast_result.h"
+#include "engine/scene/components.h"
+#include "iphysics_world.h"
+#include <entt/entt.hpp>
 #include <memory>
 #include <string>
-#include "raycast_result.h"
+#include <unordered_map>
+#include <vector>
 
-// TODO : future refactor (when link Jolt physics)
-namespace CHEngine
+namespace Chained
 {
-class Scene;
-class BVH;
+	class Scene;
+	class IPhysicsWorld;
 
-// Per-scene physics state shared across simulation frames.
-struct PhysicsContext
-{
-    // Accumulates fixed-step simulation time for this scene.
-    float Accumulator = 0.0f;
-    // Optional callback invoked when two entities begin colliding.
-    std::function<void(entt::entity, entt::entity)> CollisionCallback;
-};
-
-// Scene-scoped physics helpers, BVH cache access, and simulation entry points.
-class Physics
-{
-public: // Lifecycle
-    // Initializes the global physics subsystem.
-    static void Init();
-    // Shuts the physics subsystem down and clears global state.
-    static void Shutdown();
-    // Returns true once the physics subsystem has been initialized.
-    static bool IsInitialized();
-
-public: // BVH cache API
-    // Returns the cached BVH for the given asset path, if one exists.
-    static std::shared_ptr<BVH> GetBVH(const std::string& path);
-    // Removes the cached BVH entry for the given asset path.
-    static void InvalidateBVH(const std::string& path);
-    // Replaces or inserts the cached BVH for the given asset path.
-    static void UpdateBVHCache(const std::string& path, std::shared_ptr<BVH> bvh);
-
-public: // Simulation & Queries
-    // Steps the physics simulation and updates collider states for a given scene.
-    static void Update(Scene* scene, Timestep deltaTime, bool runtime = false);
-
-    // Performs a spatial raycast query within the given scene.
-    static RaycastResult Raycast(Scene* scene, Ray ray);
-
-    // Returns the mutable physics context associated with the scene.
-    static PhysicsContext& GetContext(Scene* scene);
-    // Resets the fixed-step accumulator for the scene.
-    static void ResetAccumulator(Scene* scene);
-    // Clears all cached physics context for the scene.
-    static void ClearContext(Scene* scene);
-    // Sets the collision callback invoked by the physics step.
-    static void SetCollisionCallback(Scene* scene, std::function<void(entt::entity, entt::entity)> callback);
-
-private: // Internal Helpers
-    static void UpdateColliders(Scene* scene);
-    static void ResolveSimulation(Scene* scene, Timestep deltaTime);
-};
-} // namespace CHEngine
+	// High-level physics module that owns the Jolt world and orchestrates
+	// body creation, fixed-timestep stepping, and component synchronization.
+	class CH_API Physics : public Service
+	{
+	public:
+		Physics();
+		virtual ~Physics() override;
+
+		// Service lifecycle
+		virtual void Initialize() override;
+		virtual void Shutdown() override;
+
+		// Core API
+
+		/// Returns the Jolt world, creating it lazily on first access.
+		IPhysicsWorld* GetWorld();
+
+		/// Destroys the current world and creates a fresh one, applying
+		/// gravity from the active project configuration.
+		/// If scene is provided, invalidates all RigidBodyComponent handles.
+		void ResetWorld(Scene* scene = nullptr);
+
+		/// Iterates all entities with TransformComponent + RigidBodyComponent
+		/// that don't yet have a physics body, and creates Jolt bodies for them.
+		void InitializeBodies(Scene* scene);
+
+		/// Runs the fixed-timestep physics loop (up to kMaxStepsPerFrame sub-steps),
+		/// then synchronizes dynamic body transforms and velocities back to components.
+		void Update(Scene* scene, Timestep deltaTime, bool runtime = false);
+
+		/// Casts a ray through the Jolt world and returns the closest hit.
+		RaycastResult Raycast(Ray ray);
+
+		/// Sets the velocity on a body unconditionally. Use for respawn teleports.
+		void ForceSetVelocity(PhysicsBodyHandle handle, const glm::vec3& velocity);
+
+		// Scene context helpers
+		void ResetAccumulator(Scene* scene);
+		void ClearContext(Scene* scene);
+
+	private:
+		/// Reads back position, rotation, velocity, and grounded state from Jolt
+		/// for all Dynamic bodies. Static and Kinematic bodies are skipped because
+		/// their transforms are driven by scripts or remain fixed.
+		void UpdateColliders(Scene* scene);
+
+	private:
+		std::unique_ptr<IPhysicsWorld> m_World;
+
+		// Per-scene fixed-timestep accumulator (replaces PhysicsContext in entt ctx)
+		std::unordered_map<Scene*, float> m_Accumulators;
+	};
+
+} // namespace Chained
 
 #endif // CH_PHYSICS_H
diff --git a/engine/physics/physics_types.h b/engine/physics/physics_types.h
new file mode 100644
index 000000000..8cee16c61
--- /dev/null
+++ b/engine/physics/physics_types.h
@@ -0,0 +1,24 @@
+#ifndef CH_PHYSICS_TYPES_H
+#define CH_PHYSICS_TYPES_H
+
+#include <cstdint>
+
+namespace Chained
+{
+	/// Opaque handle identifying a Jolt physics body. Wraps the Jolt BodyID index.
+	using PhysicsBodyHandle = uint64_t;
+
+	/// Sentinel value indicating an invalid/uninitialized body handle.
+	constexpr PhysicsBodyHandle kInvalidPhysicsBody = 0;
+
+	/// Supported collider shape types.
+	enum class ColliderType
+	{
+		Box,	 ///< Axis-aligned box defined by half-extents.
+		Sphere,	 ///< Sphere defined by a single radius.
+		Capsule, ///< Vertical capsule defined by radius + half-height.
+		Mesh	 ///< Triangle mesh (typically for static level geometry).
+	};
+} // namespace Chained
+
+#endif // CH_PHYSICS_TYPES_H
diff --git a/engine/physics/raycast_query.cpp b/engine/physics/raycast_query.cpp
deleted file mode 100644
index e78b820b6..000000000
--- a/engine/physics/raycast_query.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-#include "raycast_query.h"
-
-#include "bvh/bvh.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/scene/components.h"
-#include "engine/scene/project.h"
-#include "physics.h"
-#include <algorithm>
-#include <cfloat>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-bool RaycastQuery::RayAABB(glm::vec3 origin, glm::vec3 dir, glm::vec3 min, glm::vec3 max, float& t, glm::vec3& normal)
-{
-    // Slab test for a ray against an axis-aligned box.
-    glm::vec3 invDir = 1.0f / dir;
-
-    glm::vec3 t0 = (min - origin) * invDir;
-    glm::vec3 t1 = (max - origin) * invDir;
-
-    glm::vec3 tMin = glm::min(t0, t1);
-    glm::vec3 tMax = glm::max(t0, t1);
-
-    float minVal = std::max(std::max(tMin.x, tMin.y), tMin.z);
-    float maxVal = std::min(std::min(tMax.x, tMax.y), tMax.z);
-
-    if (maxVal >= std::max(0.0f, minVal))
-    {
-        t = minVal;
-        if (minVal == tMin.x)
-        {
-            normal = {(float)(dir.x > 0 ? -1 : 1), 0, 0};
-        }
-        else if (minVal == tMin.y)
-        {
-            normal = {0, (float)(dir.y > 0 ? -1 : 1), 0};
-        }
-        else
-        {
-            normal = {0, 0, (float)(dir.z > 0 ? -1 : 1)};
-        }
-        return true;
-    }
-    return false;
-}
-
-RaycastResult RaycastQuery::Raycast(entt::registry& registry, Ray ray)
-{
-    RaycastResult result;
-    result.Hit = false;
-    result.Distance = FLT_MAX;
-    result.Entity = entt::null;
-
-    glm::vec3 rayOrigin = ray.position;
-    glm::vec3 rayDir = glm::normalize(ray.direction);
-
-    // Test every enabled collider in local space, then compare results in world space.
-    auto view = registry.view<TransformComponent, ColliderComponent>();
-    for (auto it = view.begin(); it != view.end(); ++it)
-    {
-        auto entity = *it;
-        auto& entityTransform = view.get<TransformComponent>(entity);
-        auto& colliderComp = view.get<ColliderComponent>(entity);
-
-        if (!colliderComp.Enabled)
-        {
-            continue;
-        }
-
-        glm::mat4 modelMatrix = entityTransform.GetTransform();
-        glm::mat4 invMatrix = glm::inverse(modelMatrix);
-
-        glm::vec3 localOrigin = glm::vec3(invMatrix * glm::vec4(rayOrigin, 1.0f));
-        glm::vec3 localDir = glm::normalize(glm::vec3(invMatrix * glm::vec4(rayDir, 0.0f)));
-
-        if (colliderComp.Type == ColliderType::Box)
-        {
-            float t = 0;
-            glm::vec3 localNormal = {0, 0, 0};
-            glm::vec3 boxMin = colliderComp.Offset;
-            glm::vec3 boxMax = colliderComp.Offset + colliderComp.Size;
-
-            if (RayAABB(localOrigin, localDir, boxMin, boxMax, t, localNormal))
-            {
-                glm::vec3 hitPosLocal = localOrigin + localDir * t;
-                glm::vec3 hitPosWorld = glm::vec3(modelMatrix * glm::vec4(hitPosLocal, 1.0f));
-                float distWorld = glm::distance(rayOrigin, hitPosWorld);
-
-                if (distWorld < result.Distance)
-                {
-                    result.Hit = true;
-                    result.Distance = distWorld;
-                    result.Position = hitPosWorld;
-
-                    glm::vec3 normalWorld = glm::normalize(glm::vec3(modelMatrix * glm::vec4(localNormal, 0.0f)));
-                    result.Normal = normalWorld;
-                    result.Entity = entity;
-                }
-            }
-        }
-        else if (colliderComp.Type == ColliderType::Mesh)
-        {
-            auto modelComp = registry.try_get<ModelComponent>(entity);
-            if (!modelComp || modelComp->ModelPath.empty())
-            {
-                continue;
-            }
-
-            if (!Project::GetActive())
-            {
-                continue;
-            }
-
-            auto bvh = Physics::GetBVH(modelComp->ModelPath);
-            if (!bvh)
-            {
-                continue;
-            }
-
-            Ray localRay = {localOrigin, localDir};
-            float tLocal = FLT_MAX;
-            glm::vec3 localNormal = {0, 0, 0};
-            int localMeshIndex = -1;
-
-            if (bvh->Raycast(localRay, tLocal, localNormal, localMeshIndex))
-            {
-                glm::vec3 hitPosLocal = localOrigin + localDir * tLocal;
-                glm::vec3 hitPosWorld = glm::vec3(modelMatrix * glm::vec4(hitPosLocal, 1.0f));
-                float distWorld = glm::distance(rayOrigin, hitPosWorld);
-
-                if (distWorld < result.Distance)
-                {
-                    result.Hit = true;
-                    result.Distance = distWorld;
-                    result.Position = hitPosWorld;
-
-                    glm::vec3 normalWorld = glm::normalize(glm::vec3(modelMatrix * glm::vec4(localNormal, 0.0f)));
-                    result.Normal = normalWorld;
-                    result.Entity = entity;
-                    result.MeshIndex = localMeshIndex;
-                }
-            }
-        }
-    }
-
-    return result;
-}
-} // namespace CHEngine
diff --git a/engine/physics/raycast_query.h b/engine/physics/raycast_query.h
deleted file mode 100644
index 117c4dad0..000000000
--- a/engine/physics/raycast_query.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CH_RAYCAST_QUERY_H
-#define CH_RAYCAST_QUERY_H
-
-#include "engine/core/ch_math.h"
-#include "raycast_result.h"
-#include <entt/entt.hpp>
-
-namespace CHEngine
-{
-// Editor and gameplay raycasting helpers.
-class RaycastQuery
-{
-public:
-    static RaycastResult Raycast(entt::registry& registry, Ray ray);
-
-private:
-    static bool RayAABB(glm::vec3 origin, glm::vec3 dir, glm::vec3 min, glm::vec3 max, float& t, glm::vec3& normal);
-};
-} // namespace CHEngine
-
-#endif // CH_RAYCAST_QUERY_H
diff --git a/engine/physics/raycast_result.h b/engine/physics/raycast_result.h
index 445fc60cb..2622e7a53 100644
--- a/engine/physics/raycast_result.h
+++ b/engine/physics/raycast_result.h
@@ -1,20 +1,25 @@
 #ifndef CH_RAYCAST_RESULT_H
 #define CH_RAYCAST_RESULT_H
 
-#include "engine/core/base.h"
 #include "entt/entt.hpp"
+#include <glm/glm.hpp>
 
-namespace CHEngine
+namespace Chained
 {
-struct RaycastResult
-{
-    bool Hit = false;
-    float Distance = 0.0f;
-    glm::vec3 Position = {0.0f, 0.0f, 0.0f};
-    glm::vec3 Normal = {0.0f, 0.0f, 0.0f};
-    entt::entity Entity = entt::null;
-    int MeshIndex = -1;
-};
-} // namespace CHEngine
+
+	struct Ray
+	{
+		glm::vec3 position = {0.0f, 0.0f, 0.0f};
+		glm::vec3 direction = {0.0f, 0.0f, 1.0f};
+	};
+
+	struct RaycastResult
+	{
+		bool Hit = false;
+		float Distance = 0.0f;
+		glm::vec3 Position = {0.0f, 0.0f, 0.0f};
+		entt::entity Entity = entt::null;
+	};
+} // namespace Chained
 
 #endif // CH_RAYCAST_RESULT_H
diff --git a/engine/platform/CMakeLists.txt b/engine/platform/CMakeLists.txt
new file mode 100644
index 000000000..17727ca42
--- /dev/null
+++ b/engine/platform/CMakeLists.txt
@@ -0,0 +1,12 @@
+# GLFW is the only supported window backend
+add_subdirectory(backends/glfw)
+set(CH_PLATFORM_BACKEND_TARGET engine_platform_glfw)
+
+add_subdirectory(dialogs)
+
+# Unified platform target: backend + dialogs
+add_library(engine_platform INTERFACE)
+target_link_libraries(engine_platform INTERFACE
+    ${CH_PLATFORM_BACKEND_TARGET}
+    engine_platform_dialogs
+)
diff --git a/engine/platform/backends/glfw/CMakeLists.txt b/engine/platform/backends/glfw/CMakeLists.txt
new file mode 100644
index 000000000..12856a0b0
--- /dev/null
+++ b/engine/platform/backends/glfw/CMakeLists.txt
@@ -0,0 +1,23 @@
+add_library(engine_platform_glfw STATIC
+    glfw_window.h
+    glfw_window.cpp
+    glfw_input_mapper.h
+)
+
+target_include_directories(engine_platform_glfw PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_platform_glfw PUBLIC
+    engine_core
+    glfw
+    engine_external_glad
+    engine_external_imgui
+)
+
+target_compile_definitions(engine_platform_glfw PRIVATE GLFW_INCLUDE_NONE CH_PLATFORM_BACKEND_GLFW)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_platform_glfw PRIVATE engine_pch)
+endif()
diff --git a/engine/platform/backends/glfw/glfw_input_mapper.h b/engine/platform/backends/glfw/glfw_input_mapper.h
new file mode 100644
index 000000000..c6727513e
--- /dev/null
+++ b/engine/platform/backends/glfw/glfw_input_mapper.h
@@ -0,0 +1,221 @@
+#ifndef CH_GLFW_INPUT_MAPPER_H
+#define CH_GLFW_INPUT_MAPPER_H
+
+#include <GLFW/glfw3.h>
+#include "engine/core/key_codes.h"
+#include "engine/core/mouse_codes.h"
+
+namespace Chained
+{
+	class GlfwInputMapper
+	{
+	public:
+		static KeyCode MapKey(int glfwKey)
+		{
+			switch (glfwKey)
+			{
+			case GLFW_KEY_SPACE:
+				return KeyCode::Space;
+			case GLFW_KEY_APOSTROPHE:
+				return KeyCode::Null; // Add mapping if needed
+			case GLFW_KEY_COMMA:
+				return KeyCode::Null;
+			case GLFW_KEY_MINUS:
+				return KeyCode::Null;
+			case GLFW_KEY_PERIOD:
+				return KeyCode::Null;
+			case GLFW_KEY_SLASH:
+				return KeyCode::Null;
+			case GLFW_KEY_0:
+				return KeyCode::D0;
+			case GLFW_KEY_1:
+				return KeyCode::D1;
+			case GLFW_KEY_2:
+				return KeyCode::D2;
+			case GLFW_KEY_3:
+				return KeyCode::D3;
+			case GLFW_KEY_4:
+				return KeyCode::D4;
+			case GLFW_KEY_5:
+				return KeyCode::D5;
+			case GLFW_KEY_6:
+				return KeyCode::D6;
+			case GLFW_KEY_7:
+				return KeyCode::D7;
+			case GLFW_KEY_8:
+				return KeyCode::D8;
+			case GLFW_KEY_9:
+				return KeyCode::D9;
+			case GLFW_KEY_SEMICOLON:
+				return KeyCode::Null;
+			case GLFW_KEY_EQUAL:
+				return KeyCode::Null;
+			case GLFW_KEY_A:
+				return KeyCode::A;
+			case GLFW_KEY_B:
+				return KeyCode::B;
+			case GLFW_KEY_C:
+				return KeyCode::C;
+			case GLFW_KEY_D:
+				return KeyCode::D;
+			case GLFW_KEY_E:
+				return KeyCode::E;
+			case GLFW_KEY_F:
+				return KeyCode::F;
+			case GLFW_KEY_G:
+				return KeyCode::G;
+			case GLFW_KEY_H:
+				return KeyCode::H;
+			case GLFW_KEY_I:
+				return KeyCode::I;
+			case GLFW_KEY_J:
+				return KeyCode::J;
+			case GLFW_KEY_K:
+				return KeyCode::K;
+			case GLFW_KEY_L:
+				return KeyCode::L;
+			case GLFW_KEY_M:
+				return KeyCode::M;
+			case GLFW_KEY_N:
+				return KeyCode::N;
+			case GLFW_KEY_O:
+				return KeyCode::O;
+			case GLFW_KEY_P:
+				return KeyCode::P;
+			case GLFW_KEY_Q:
+				return KeyCode::Q;
+			case GLFW_KEY_R:
+				return KeyCode::R;
+			case GLFW_KEY_S:
+				return KeyCode::S;
+			case GLFW_KEY_T:
+				return KeyCode::T;
+			case GLFW_KEY_U:
+				return KeyCode::U;
+			case GLFW_KEY_V:
+				return KeyCode::V;
+			case GLFW_KEY_W:
+				return KeyCode::W;
+			case GLFW_KEY_X:
+				return KeyCode::X;
+			case GLFW_KEY_Y:
+				return KeyCode::Y;
+			case GLFW_KEY_Z:
+				return KeyCode::Z;
+			case GLFW_KEY_LEFT_BRACKET:
+				return KeyCode::Null;
+			case GLFW_KEY_BACKSLASH:
+				return KeyCode::Null;
+			case GLFW_KEY_RIGHT_BRACKET:
+				return KeyCode::Null;
+			case GLFW_KEY_GRAVE_ACCENT:
+				return KeyCode::Null;
+			case GLFW_KEY_WORLD_1:
+				return KeyCode::Null;
+			case GLFW_KEY_WORLD_2:
+				return KeyCode::Null;
+			case GLFW_KEY_ESCAPE:
+				return KeyCode::Escape;
+			case GLFW_KEY_ENTER:
+				return KeyCode::Enter;
+			case GLFW_KEY_TAB:
+				return KeyCode::Tab;
+			case GLFW_KEY_BACKSPACE:
+				return KeyCode::Backspace;
+			case GLFW_KEY_INSERT:
+				return KeyCode::Insert;
+			case GLFW_KEY_DELETE:
+				return KeyCode::Delete;
+			case GLFW_KEY_RIGHT:
+				return KeyCode::Right;
+			case GLFW_KEY_LEFT:
+				return KeyCode::Left;
+			case GLFW_KEY_DOWN:
+				return KeyCode::Down;
+			case GLFW_KEY_UP:
+				return KeyCode::Up;
+			case GLFW_KEY_PAGE_UP:
+				return KeyCode::PageUp;
+			case GLFW_KEY_PAGE_DOWN:
+				return KeyCode::PageDown;
+			case GLFW_KEY_HOME:
+				return KeyCode::Home;
+			case GLFW_KEY_END:
+				return KeyCode::End;
+			case GLFW_KEY_CAPS_LOCK:
+				return KeyCode::CapsLock;
+			case GLFW_KEY_SCROLL_LOCK:
+				return KeyCode::ScrollLock;
+			case GLFW_KEY_NUM_LOCK:
+				return KeyCode::NumLock;
+			case GLFW_KEY_PRINT_SCREEN:
+				return KeyCode::PrintScreen;
+			case GLFW_KEY_PAUSE:
+				return KeyCode::Pause;
+			case GLFW_KEY_F1:
+				return KeyCode::F1;
+			case GLFW_KEY_F2:
+				return KeyCode::F2;
+			case GLFW_KEY_F3:
+				return KeyCode::F3;
+			case GLFW_KEY_F4:
+				return KeyCode::F4;
+			case GLFW_KEY_F5:
+				return KeyCode::F5;
+			case GLFW_KEY_F6:
+				return KeyCode::F6;
+			case GLFW_KEY_F7:
+				return KeyCode::F7;
+			case GLFW_KEY_F8:
+				return KeyCode::F8;
+			case GLFW_KEY_F9:
+				return KeyCode::F9;
+			case GLFW_KEY_F10:
+				return KeyCode::F10;
+			case GLFW_KEY_F11:
+				return KeyCode::F11;
+			case GLFW_KEY_F12:
+				return KeyCode::F12;
+			case GLFW_KEY_LEFT_SHIFT:
+				return KeyCode::LeftShift;
+			case GLFW_KEY_LEFT_CONTROL:
+				return KeyCode::LeftControl;
+			case GLFW_KEY_LEFT_ALT:
+				return KeyCode::LeftAlt;
+			case GLFW_KEY_RIGHT_SHIFT:
+				return KeyCode::RightShift;
+			case GLFW_KEY_RIGHT_CONTROL:
+				return KeyCode::RightControl;
+			case GLFW_KEY_RIGHT_ALT:
+				return KeyCode::RightAlt;
+			default:
+				return KeyCode::Null;
+			}
+		}
+
+		static MouseCode MapMouseButton(int glfwButton)
+		{
+			switch (glfwButton)
+			{
+			case GLFW_MOUSE_BUTTON_LEFT:
+				return MouseCode::ButtonLeft;
+			case GLFW_MOUSE_BUTTON_RIGHT:
+				return MouseCode::ButtonRight;
+			case GLFW_MOUSE_BUTTON_MIDDLE:
+				return MouseCode::ButtonMiddle;
+			case GLFW_MOUSE_BUTTON_4:
+				return MouseCode::ButtonSide;
+			case GLFW_MOUSE_BUTTON_5:
+				return MouseCode::ButtonExtra;
+			case GLFW_MOUSE_BUTTON_6:
+				return MouseCode::ButtonForward;
+			case GLFW_MOUSE_BUTTON_7:
+				return MouseCode::ButtonBack;
+			default:
+				return MouseCode::ButtonLeft;
+			}
+		}
+	};
+} // namespace Chained
+
+#endif
diff --git a/engine/platform/backends/glfw/glfw_window.cpp b/engine/platform/backends/glfw/glfw_window.cpp
new file mode 100644
index 000000000..0dbf9b824
--- /dev/null
+++ b/engine/platform/backends/glfw/glfw_window.cpp
@@ -0,0 +1,375 @@
+#include "engine/platform/backends/glfw/glfw_window.h"
+#include "engine/common/engine_assert.h"
+#include "engine/common/platform_detection.h"
+#include "engine/core/events/window_events.h"
+#include "engine/core/input.h"
+
+#include "engine/platform/backends/glfw/glfw_input_mapper.h"
+#include "imgui_impl_glfw.h"
+
+#include <GLFW/glfw3.h>
+#include <glad/gl.h>
+#include <stb_image.h>
+
+namespace Chained
+{
+
+	static bool s_GLFWInitialized = false;
+
+	std::unique_ptr<Window> Window::Create(const WindowProperties& properties)
+	{
+
+		return std::make_unique<GlfwWindow>(properties);
+	}
+
+	static void GLFWErrorCallback(int error, const char* description)
+	{
+		CH_CORE_ERROR("GLFW Error ({0}): {1}", error, description);
+	}
+
+	GlfwWindow::GlfwWindow(const WindowProperties& properties)
+	{
+		Init(properties);
+	}
+
+	GlfwWindow::~GlfwWindow()
+	{
+		Shutdown();
+	}
+
+	void GlfwWindow::Init(const WindowProperties& properties)
+	{
+		int initialWidth = properties.Width;
+		int initialHeight = properties.Height;
+		m_Title = properties.Title;
+		m_VSync = properties.VSync;
+		m_TargetFPS = properties.TargetFramesPerSecond;
+		m_ForwardToImGui = (properties.SharedContext == nullptr);
+
+		if (!s_GLFWInitialized)
+		{
+			int success = glfwInit();
+			CH_CORE_ASSERT(success, "Could not initialize GLFW!");
+			glfwSetErrorCallback(GLFWErrorCallback);
+			s_GLFWInitialized = true;
+		}
+
+		// Якщо розміри не вказані, беремо робочу область головного монітора
+		if (initialWidth <= 0 || initialHeight <= 0)
+		{
+			GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+			if (monitor)
+			{
+				int workX = 0, workY = 0, workW = 0, workH = 0;
+				glfwGetMonitorWorkarea(monitor, &workX, &workY, &workW, &workH);
+				initialWidth = (workW > 0) ? workW : 1280;
+				initialHeight = (workH > 0) ? workH : 720;
+			}
+			else
+			{
+				initialWidth = 1280;
+				initialHeight = 720;
+			}
+		}
+
+		constexpr int minimumWidth = 800;
+		constexpr int minimumHeight = 600;
+		initialWidth = (initialWidth < minimumWidth) ? minimumWidth : initialWidth;
+		initialHeight = (initialHeight < minimumHeight) ? minimumHeight : initialHeight;
+
+		m_Width = (uint32_t)initialWidth;
+		m_Height = (uint32_t)initialHeight;
+		CH_CORE_INFO("Initializing Glfw Window: {} ({}x{})", m_Title, m_Width, m_Height);
+
+		glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+
+		m_Samples = properties.Samples;
+		glfwWindowHint(GLFW_SAMPLES, m_Samples > 0 ? m_Samples : 0);
+
+#if CH_PLATFORM_MACOS
+		glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+		glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
+		glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
+#else
+		glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+		glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+#endif
+
+		GLFWwindow* share = static_cast<GLFWwindow*>(properties.SharedContext);
+		m_WindowHandle = glfwCreateWindow((int)m_Width, (int)m_Height, m_Title.c_str(), nullptr, share);
+		CH_CORE_ASSERT(m_WindowHandle, "Failed to create GLFW window!");
+		glfwSetWindowSizeLimits(m_WindowHandle, minimumWidth, minimumHeight, GLFW_DONT_CARE, GLFW_DONT_CARE);
+
+		glfwMakeContextCurrent(m_WindowHandle);
+		glfwSetWindowUserPointer(m_WindowHandle, this);
+
+		int fbWidth, fbHeight;
+		glfwGetFramebufferSize(m_WindowHandle, &fbWidth, &fbHeight);
+		m_FramebufferWidth = (uint32_t)fbWidth;
+		m_FramebufferHeight = (uint32_t)fbHeight;
+
+		glfwSetFramebufferSizeCallback(m_WindowHandle, [](GLFWwindow* window, int width, int height) {
+			auto& glWindow = *(GlfwWindow*)glfwGetWindowUserPointer(window);
+
+			glWindow.m_FramebufferWidth = (uint32_t)width;
+			glWindow.m_FramebufferHeight = (uint32_t)height;
+
+			int winWidth, winHeight;
+			glfwGetWindowSize(window, &winWidth, &winHeight);
+			glWindow.SetSizeDirect(winWidth, winHeight);
+
+			WindowResizeEvent event(width, height);
+			if (glWindow.m_EventCallback)
+			{
+				glWindow.m_EventCallback(event);
+			}
+
+			glViewport(0, 0, width, height);
+		});
+		glfwSetWindowCloseCallback(m_WindowHandle, [](GLFWwindow* window) {
+			auto& glWindow = *(GlfwWindow*)glfwGetWindowUserPointer(window);
+			WindowCloseEvent event;
+			if (glWindow.m_EventCallback)
+			{
+				glWindow.m_EventCallback(event);
+			}
+		});
+
+		glfwSetScrollCallback(m_WindowHandle, [](GLFWwindow* window, double xOffset, double yOffset) {
+			Core::Input::OnMouseScroll((float)xOffset, (float)yOffset);
+			auto* userPtr = glfwGetWindowUserPointer(window);
+			if (userPtr && static_cast<GlfwWindow*>(userPtr)->m_ForwardToImGui)
+			{
+				ImGui_ImplGlfw_ScrollCallback(window, xOffset, yOffset);
+			}
+		});
+
+		glfwSetKeyCallback(m_WindowHandle, [](GLFWwindow* window, int key, int scancode, int action, int mods) {
+			Core::Input::OnKey(GlfwInputMapper::MapKey(key), action != GLFW_RELEASE);
+			auto* userPtr = glfwGetWindowUserPointer(window);
+			if (userPtr && static_cast<GlfwWindow*>(userPtr)->m_ForwardToImGui)
+			{
+				ImGui_ImplGlfw_KeyCallback(window, key, scancode, action, mods);
+			}
+		});
+
+		glfwSetMouseButtonCallback(m_WindowHandle, [](GLFWwindow* window, int button, int action, int mods) {
+			Core::Input::OnMouseButton(GlfwInputMapper::MapMouseButton(button), action != GLFW_RELEASE);
+			auto* userPtr = glfwGetWindowUserPointer(window);
+			if (userPtr && static_cast<GlfwWindow*>(userPtr)->m_ForwardToImGui)
+			{
+				ImGui_ImplGlfw_MouseButtonCallback(window, button, action, mods);
+			}
+		});
+
+		glfwSetCursorPosCallback(m_WindowHandle, [](GLFWwindow* window, double xpos, double ypos) {
+			Core::Input::OnMouseMove((float)xpos, (float)ypos);
+			auto* userPtr = glfwGetWindowUserPointer(window);
+			if (userPtr && static_cast<GlfwWindow*>(userPtr)->m_ForwardToImGui)
+			{
+				ImGui_ImplGlfw_CursorPosCallback(window, xpos, ypos);
+			}
+		});
+
+		glfwSetCharCallback(m_WindowHandle, [](GLFWwindow* window, unsigned int c) {
+			auto* userPtr = glfwGetWindowUserPointer(window);
+			if (userPtr && static_cast<GlfwWindow*>(userPtr)->m_ForwardToImGui)
+			{
+				ImGui_ImplGlfw_CharCallback(window, c);
+			}
+		});
+
+		glfwSetWindowFocusCallback(m_WindowHandle, [](GLFWwindow* window, int focused) {
+			if (!focused)
+			{
+				Core::Input::ResetAll();
+			}
+		});
+
+		int status = gladLoadGL((GLADloadfunc)glfwGetProcAddress);
+		CH_CORE_ASSERT(status, "Failed to initialize Glad!");
+
+		CH_CORE_INFO("OpenGL Info:");
+		CH_CORE_INFO("  Vendor: {0}", (const char*)glGetString(GL_VENDOR));
+		CH_CORE_INFO("  Renderer: {0}", (const char*)glGetString(GL_RENDERER));
+		CH_CORE_INFO("  Version: {0}", (const char*)glGetString(GL_VERSION));
+
+		SetVSync(m_VSync);
+	}
+
+	void GlfwWindow::Shutdown()
+	{
+		if (m_WindowHandle)
+		{
+			glfwSetScrollCallback(m_WindowHandle, nullptr);
+			glfwSetKeyCallback(m_WindowHandle, nullptr);
+			glfwSetMouseButtonCallback(m_WindowHandle, nullptr);
+			glfwSetCursorPosCallback(m_WindowHandle, nullptr);
+			glfwSetCharCallback(m_WindowHandle, nullptr);
+			glfwSetWindowFocusCallback(m_WindowHandle, nullptr);
+			glfwSetFramebufferSizeCallback(m_WindowHandle, nullptr);
+			glfwSetWindowCloseCallback(m_WindowHandle, nullptr);
+
+			glfwMakeContextCurrent(nullptr);
+			glfwDestroyWindow(m_WindowHandle);
+			m_WindowHandle = nullptr;
+		}
+
+		CH_CORE_INFO("Glfw Window Closed");
+	}
+
+	void GlfwWindow::BeginFrame()
+	{
+		glfwPollEvents();
+	}
+
+	void GlfwWindow::EndFrame()
+	{
+		glfwSwapBuffers(m_WindowHandle);
+	}
+
+	bool GlfwWindow::ShouldClose() const
+	{
+		return glfwWindowShouldClose(m_WindowHandle);
+	}
+
+	void GlfwWindow::SetTitle(const std::string& title)
+	{
+		m_Title = title;
+		glfwSetWindowTitle(m_WindowHandle, m_Title.c_str());
+	}
+
+	void GlfwWindow::SetSize(int width, int height)
+	{
+		m_Width = (uint32_t)width;
+		m_Height = (uint32_t)height;
+		glfwSetWindowSize(m_WindowHandle, (int)m_Width, (int)m_Height);
+	}
+
+	void GlfwWindow::SetSizeDirect(int width, int height)
+	{
+		m_Width = (uint32_t)width;
+		m_Height = (uint32_t)height;
+	}
+
+	void GlfwWindow::ToggleFullscreen()
+	{
+		SetFullscreen(!m_IsFullscreen);
+	}
+
+	void GlfwWindow::SetFullscreen(bool enabled)
+	{
+		if (m_IsFullscreen == enabled)
+		{
+			return;
+		}
+
+		if (enabled)
+		{
+			glfwGetWindowPos(m_WindowHandle, &m_WindowedX, &m_WindowedY);
+			glfwGetWindowSize(m_WindowHandle, &m_WindowedWidth, &m_WindowedHeight);
+
+			GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+			const GLFWvidmode* mode = glfwGetVideoMode(monitor);
+			glfwSetWindowMonitor(m_WindowHandle, monitor, 0, 0, mode->width, mode->height, mode->refreshRate);
+			m_IsFullscreen = true;
+		}
+		else
+		{
+			glfwSetWindowMonitor(m_WindowHandle, nullptr, m_WindowedX, m_WindowedY, m_WindowedWidth, m_WindowedHeight,
+								 GLFW_DONT_CARE);
+			m_IsFullscreen = false;
+		}
+	}
+
+	void GlfwWindow::SetWindowIcon(const std::string& path)
+	{
+		GLFWimage image{};
+
+		image.pixels = stbi_load(path.c_str(), &image.width, &image.height, nullptr, 4);
+
+		if (image.pixels)
+		{
+			glfwSetWindowIcon(m_WindowHandle, 1, &image);
+			stbi_image_free(image.pixels);
+		}
+		else
+		{
+			CH_CORE_WARN("Failed to load window icon from {}", path);
+		}
+	}
+
+	void GlfwWindow::SetWindowIconFromMemory(const uint8_t* data, size_t size)
+	{
+		GLFWimage image{};
+
+		image.pixels = stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(data), static_cast<int>(size),
+											 &image.width, &image.height, nullptr, 4);
+
+		if (image.pixels)
+		{
+			glfwSetWindowIcon(m_WindowHandle, 1, &image);
+			stbi_image_free(image.pixels);
+		}
+		else
+		{
+			CH_CORE_WARN("Failed to decode window icon from memory");
+		}
+	}
+
+	void GlfwWindow::SetVSync(bool enabled)
+	{
+		m_VSync = enabled;
+		glfwSwapInterval(m_VSync ? 1 : 0);
+	}
+
+	void GlfwWindow::SetAntialiasing(bool enabled)
+	{
+		// GLFW_SAMPLES only takes effect on the *next* glfwCreateWindow call, so calling
+		// glfwWindowHint here would be a silent no-op for the window that's already open.
+		// If the framebuffer wasn't created with samples, GL_MULTISAMPLE has nothing to
+		// multisample and this call is harmless but ineffective - warn so it's not a silent no-op.
+		if (enabled && m_Samples <= 0)
+		{
+			CH_CORE_WARN("SetAntialiasing(true) requested but the window was created with "
+						 "Samples = 0. MSAA sample count can only be changed by "
+						 "recreating the window; toggling GL_MULTISAMPLE will have no visible effect.");
+		}
+
+		if (enabled)
+		{
+			glEnable(GL_MULTISAMPLE);
+		}
+		else
+		{
+			glDisable(GL_MULTISAMPLE);
+		}
+	}
+
+	void GlfwWindow::SetTargetFramesPerSecond(int framesPerSecond)
+	{
+		m_TargetFPS = framesPerSecond;
+	}
+
+	void GlfwWindow::SetCursorMode(CursorMode mode)
+	{
+		switch (mode)
+		{
+		case CursorMode::Normal:
+			glfwSetInputMode(m_WindowHandle, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+			break;
+		case CursorMode::Hidden:
+			glfwSetInputMode(m_WindowHandle, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
+			break;
+		case CursorMode::Locked:
+			glfwSetInputMode(m_WindowHandle, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+			break;
+		}
+	}
+
+	bool GlfwWindow::IsFocused() const
+	{
+		return glfwGetWindowAttrib(m_WindowHandle, GLFW_FOCUSED) == GLFW_TRUE;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/platform/backends/glfw/glfw_window.h b/engine/platform/backends/glfw/glfw_window.h
new file mode 100644
index 000000000..f6ef7a7d0
--- /dev/null
+++ b/engine/platform/backends/glfw/glfw_window.h
@@ -0,0 +1,99 @@
+#ifndef CH_GLFW_WINDOW_H
+#define CH_GLFW_WINDOW_H
+
+#include "engine/core/window.h"
+#include <string>
+
+struct GLFWwindow;
+
+namespace Chained
+{
+
+	// GLFW-backed window implementation that owns the native window, callbacks, and display settings.
+	class GlfwWindow : public Window
+	{
+	public:
+		GlfwWindow(const WindowProperties& properties);
+		virtual ~GlfwWindow();
+
+		GlfwWindow(const GlfwWindow&) = delete;
+		GlfwWindow& operator=(const GlfwWindow&) = delete;
+
+		virtual void BeginFrame() override;
+		virtual void EndFrame() override;
+
+		virtual bool ShouldClose() const override;
+
+		virtual int GetWidth() const override
+		{
+			return m_Width;
+		}
+		virtual int GetHeight() const override
+		{
+			return m_Height;
+		}
+
+		int GetFramebufferWidth() const
+		{
+			return m_FramebufferWidth;
+		}
+		int GetFramebufferHeight() const
+		{
+			return m_FramebufferHeight;
+		}
+
+		virtual void SetTitle(const std::string& title) override;
+		virtual void SetSize(int width, int height) override;
+		virtual void SetSizeDirect(int width, int height) override;
+
+		virtual void ToggleFullscreen() override;
+		virtual void SetFullscreen(bool enabled) override;
+
+		virtual void SetVSync(bool enabled) override;
+		virtual void SetAntialiasing(bool enabled) override;
+		virtual void SetTargetFramesPerSecond(int framesPerSecond) override;
+		virtual int GetTargetFramesPerSecond() const override
+		{
+			return m_TargetFPS;
+		}
+		virtual void SetWindowIcon(const std::string& path) override;
+		virtual void SetWindowIconFromMemory(const uint8_t* data, size_t size) override;
+		virtual void SetCursorMode(CursorMode mode) override;
+		virtual bool IsFocused() const override;
+
+		virtual void SetEventCallback(const EventCallbackFn& callback) override
+		{
+			m_EventCallback = callback;
+		}
+
+		virtual void* GetNativeWindow() const override
+		{
+			return m_WindowHandle;
+		}
+
+	private:
+		void Init(const WindowProperties& properties);
+		void Shutdown();
+
+	private:
+		GLFWwindow* m_WindowHandle = nullptr;
+
+		int m_Width = 0;
+		int m_Height = 0;
+
+		int m_FramebufferWidth = 0;
+		int m_FramebufferHeight = 0;
+
+		std::string m_Title;
+		bool m_VSync = true;
+		bool m_IsFullscreen = false;
+		int m_WindowedX = 0, m_WindowedY = 0, m_WindowedWidth = 0, m_WindowedHeight = 0;
+		int m_TargetFPS = 60;
+		int m_Samples = 0; // MSAA sample count the window/framebuffer was actually created with (0 = none)
+		bool m_ForwardToImGui = true;
+		EventCallbackFn m_EventCallback;
+	};
+
+} // namespace Chained
+
+#endif // CH_GLFW_WINDOW_H
\ No newline at end of file
diff --git a/engine/platform/dialogs/CMakeLists.txt b/engine/platform/dialogs/CMakeLists.txt
new file mode 100644
index 000000000..7223c8ecc
--- /dev/null
+++ b/engine/platform/dialogs/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_library(engine_platform_dialogs STATIC
+    dialogs.h
+    dialogs.cpp
+)
+
+target_include_directories(engine_platform_dialogs PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_platform_dialogs PUBLIC
+    engine_core
+)
+
+# PFD is a single-header library; keep its include path PRIVATE to avoid
+# pulling <windows.h> (and the UUID typedef) into every translation unit.
+target_include_directories(engine_platform_dialogs PRIVATE
+    "${CMAKE_SOURCE_DIR}"
+    "${CMAKE_SOURCE_DIR}/thirdparty/portable-file-dialogs"
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_platform_dialogs PRIVATE engine_pch)
+endif()
diff --git a/engine/platform/dialogs/dialogs.cpp b/engine/platform/dialogs/dialogs.cpp
new file mode 100644
index 000000000..23eb0edda
--- /dev/null
+++ b/engine/platform/dialogs/dialogs.cpp
@@ -0,0 +1,185 @@
+#include "dialogs.h"
+#include "portable-file-dialogs.h"
+
+namespace Chained
+{
+	namespace
+	{
+		// portable-file-dialogs expects each filter as a pair of
+		// [human-readable name, space-separated glob patterns], e.g. {"Textures", "*.png *.jpg"}.
+		// Our DialogFilter::Spec is authored as a bare, comma-separated extension list
+		// ("png,jpg,tga" or "chscene"), so translate it into the glob form PFD understands.
+		// Already-globbed specs ("*.png", "*") are passed through untouched.
+		std::string NormalizeSpec(const std::string& fileFilterSpec)
+		{
+			if (fileFilterSpec.empty())
+			{
+				return "*";
+			}
+
+			// If the caller already provided wildcard globs, trust them as-is.
+			if (fileFilterSpec.find('*') != std::string::npos)
+			{
+				return fileFilterSpec;
+			}
+
+			std::string result;
+			std::stringstream stream(fileFilterSpec);
+			std::string ext;
+			while (std::getline(stream, ext, ','))
+			{
+				// Trim surrounding whitespace and a leading dot ("."chscene / ".png").
+				size_t start = ext.find_first_not_of(" \t.");
+				size_t end = ext.find_last_not_of(" \t");
+				if (start == std::string::npos)
+				{
+					continue;
+				}
+				ext = ext.substr(start, end - start + 1);
+				if (ext.empty())
+				{
+					continue;
+				}
+
+				if (!result.empty())
+				{
+					result += ' ';
+				}
+				result += "*." + ext;
+			}
+
+			return result.empty() ? "*" : result;
+		}
+
+		// Builds the flat [name, spec, name, spec, ...] vector PFD consumes, converting each
+		// spec to glob form and always appending an "All Files" escape hatch.
+		std::vector<std::string> BuildPfdFilters(const std::vector<DialogFilter>& filters)
+		{
+			std::vector<std::string> pfdFilters;
+			for (const auto& filter : filters)
+			{
+				pfdFilters.push_back(filter.Name);
+				pfdFilters.push_back(NormalizeSpec(filter.Spec));
+			}
+			pfdFilters.push_back("All Files");
+			pfdFilters.push_back("*");
+			return pfdFilters;
+		}
+	} // namespace
+
+	std::optional<std::filesystem::path> Dialogs::OpenFile(const std::vector<DialogFilter>& filters)
+	{
+		pfd::open_file dialog("Open File", "", BuildPfdFilters(filters));
+		auto result = dialog.result();
+
+		if (result.empty())
+		{
+			return std::nullopt;
+		}
+
+		return std::filesystem::path(result[0]);
+	}
+
+	std::optional<std::filesystem::path> Dialogs::SaveFile(const std::vector<DialogFilter>& filters)
+	{
+		pfd::save_file dialog("Save File", "", BuildPfdFilters(filters));
+		auto result = dialog.result();
+
+		if (result.empty())
+		{
+			return std::nullopt;
+		}
+
+		return std::filesystem::path(result);
+	}
+
+	std::optional<std::filesystem::path> Dialogs::PickFolder()
+	{
+		pfd::select_folder dialog("Select Folder");
+		auto result = dialog.result();
+
+		if (result.empty())
+		{
+			return std::nullopt;
+		}
+
+		return std::filesystem::path(result);
+	}
+
+	MessageBoxResult Dialogs::ShowMessage(const std::string& title, const std::string& text, MessageBoxChoice choice,
+										  MessageBoxIcon icon)
+	{
+		pfd::choice pfdChoice;
+		switch (choice)
+		{
+		case MessageBoxChoice::Ok:
+			pfdChoice = pfd::choice::ok;
+			break;
+		case MessageBoxChoice::OkCancel:
+			pfdChoice = pfd::choice::ok_cancel;
+			break;
+		case MessageBoxChoice::YesNo:
+			pfdChoice = pfd::choice::yes_no;
+			break;
+		case MessageBoxChoice::YesNoCancel:
+			pfdChoice = pfd::choice::yes_no_cancel;
+			break;
+		}
+
+		pfd::icon pfdIcon;
+		switch (icon)
+		{
+		case MessageBoxIcon::Info:
+			pfdIcon = pfd::icon::info;
+			break;
+		case MessageBoxIcon::Warning:
+			pfdIcon = pfd::icon::warning;
+			break;
+		case MessageBoxIcon::Error:
+			pfdIcon = pfd::icon::error;
+			break;
+		case MessageBoxIcon::Question:
+			pfdIcon = pfd::icon::question;
+			break;
+		}
+
+		pfd::message dialog(title, text, pfdChoice, pfdIcon);
+		auto result = dialog.result();
+
+		switch (result)
+		{
+		case pfd::button::ok:
+			return MessageBoxResult::Ok;
+		case pfd::button::cancel:
+			return MessageBoxResult::Cancel;
+		case pfd::button::yes:
+			return MessageBoxResult::Yes;
+		case pfd::button::no:
+			return MessageBoxResult::No;
+		default:
+			return MessageBoxResult::Cancel;
+		}
+	}
+
+	void Dialogs::Notify(const std::string& title, const std::string& message, MessageBoxIcon icon)
+	{
+		pfd::icon pfdIcon;
+		switch (icon)
+		{
+		case MessageBoxIcon::Info:
+			pfdIcon = pfd::icon::info;
+			break;
+		case MessageBoxIcon::Warning:
+			pfdIcon = pfd::icon::warning;
+			break;
+		case MessageBoxIcon::Error:
+			pfdIcon = pfd::icon::error;
+			break;
+		case MessageBoxIcon::Question:
+			pfdIcon = pfd::icon::question;
+			break;
+		}
+
+		pfd::notify(title, message, pfdIcon);
+	}
+} // namespace Chained
diff --git a/engine/platform/dialogs/dialogs.h b/engine/platform/dialogs/dialogs.h
new file mode 100644
index 000000000..ad1701681
--- /dev/null
+++ b/engine/platform/dialogs/dialogs.h
@@ -0,0 +1,71 @@
+#ifndef CH_DIALOGS_H
+#define CH_DIALOGS_H
+
+#include "engine/common/base.h"
+#include <filesystem>
+#include <string>
+#include <vector>
+#include <optional>
+
+namespace Chained
+{
+	struct CH_API DialogFilter
+	{
+		std::string Name;
+		std::string Spec;
+	};
+
+	enum class CH_API MessageBoxChoice
+	{
+		Ok,
+		OkCancel,
+		YesNo,
+		YesNoCancel,
+	};
+
+	enum class CH_API MessageBoxIcon
+	{
+		Info,
+		Warning,
+		Error,
+		Question,
+	};
+
+	enum class CH_API MessageBoxResult
+	{
+		Ok,
+		Cancel,
+		Yes,
+		No,
+	};
+
+	class CH_API Dialogs
+	{
+	public:
+		// Opens a file dialog and returns the selected path.
+		static std::optional<std::filesystem::path> OpenFile(const std::vector<DialogFilter>& filters = {});
+
+		// Opens a save file dialog and returns the selected path.
+		static std::optional<std::filesystem::path> SaveFile(const std::vector<DialogFilter>& filters = {});
+
+		// Opens a folder picker dialog and returns the selected path.
+		static std::optional<std::filesystem::path> PickFolder();
+
+		// Shows a modal message box and returns the button the user clicked.
+		static MessageBoxResult ShowMessage(const std::string& title, const std::string& text,
+											MessageBoxChoice choice = MessageBoxChoice::Ok,
+											MessageBoxIcon icon = MessageBoxIcon::Info);
+
+		// Convenience wrapper: shows a blocking error message box (OK button, error icon).
+		static void ShowError(const std::string& title, const std::string& text)
+		{
+			ShowMessage(title, text, MessageBoxChoice::Ok, MessageBoxIcon::Error);
+		}
+
+		// Shows a non-blocking desktop notification.
+		static void Notify(const std::string& title, const std::string& message,
+						   MessageBoxIcon icon = MessageBoxIcon::Info);
+	};
+} // namespace Chained
+
+#endif // CH_DIALOGS_H
diff --git a/engine/platform/glfw/glfw_window.cpp b/engine/platform/glfw/glfw_window.cpp
deleted file mode 100644
index e37c50209..000000000
--- a/engine/platform/glfw/glfw_window.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-#include "glfw_window.h"
-#include "engine/core/log.h"
-#include "engine/core/ch_assert.h"
-#include "engine/core/input.h"
-
-#include <glad/gl.h>
-#include <GLFW/glfw3.h>
-#include <stb/stb_image.h>
-
-#include <algorithm>
-#include <vector>
-
-namespace CHEngine
-{
-
-std::unique_ptr<Window> Window::Create(const WindowProperties& properties)
-{
-    // Currently, all supported platforms (Windows, Linux, MacOS) use GLFW
-    return std::make_unique<GlfwWindow>(properties);
-}
-
-static void GLFWErrorCallback(int error, const char* description)
-{
-    CH_CORE_ERROR("GLFW Error ({0}): {1}", error, description);
-}
-
-GlfwWindow::GlfwWindow(const WindowProperties& properties)
-{
-    Init(properties);
-}
-
-GlfwWindow::~GlfwWindow()
-{
-    Shutdown();
-}
-
-void GlfwWindow::Init(const WindowProperties& properties)
-{
-    int initialWidth = properties.Width;
-    int initialHeight = properties.Height;
-    m_Title = properties.Title;
-    m_VSync = properties.VSync;
-    m_TargetFPS = properties.TargetFramesPerSecond;
-
-    static bool s_GLFWInitialized = false;
-    if (!s_GLFWInitialized)
-    {
-        int success = glfwInit();
-        CH_CORE_ASSERT(success, "Could not initialize GLFW!");
-        glfwSetErrorCallback(GLFWErrorCallback);
-        s_GLFWInitialized = true;
-    }
-
-    if (initialWidth <= 0 || initialHeight <= 0)
-    {
-        GLFWmonitor* monitor = glfwGetPrimaryMonitor();
-        if (monitor)
-        {
-            int workX = 0, workY = 0, workW = 0, workH = 0;
-            glfwGetMonitorWorkarea(monitor, &workX, &workY, &workW, &workH);
-            initialWidth = (workW > 0) ? workW : 1280;
-            initialHeight = (workH > 0) ? workH : 720;
-        }
-        else
-        {
-            initialWidth = 1280;
-            initialHeight = 720;
-        }
-    }
-
-    m_Width = initialWidth;
-    m_Height = initialHeight;
-    CH_CORE_INFO("Initializing Glfw Window: {} ({}x{})", m_Title, m_Width, m_Height);
-
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-
-#ifdef __APPLE__
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
-    glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
-#else
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-#endif
-
-    m_WindowHandle = glfwCreateWindow((int)m_Width, (int)m_Height, m_Title.c_str(), nullptr, nullptr);
-    CH_CORE_ASSERT(m_WindowHandle, "Failed to create GLFW window!");
-
-    glfwMakeContextCurrent(m_WindowHandle);
-    glfwSetWindowUserPointer(m_WindowHandle, this);
-
-    // Initial framebuffer size (crucial for Retina/HiDPI)
-    int fbWidth, fbHeight;
-    glfwGetFramebufferSize(m_WindowHandle, &fbWidth, &fbHeight);
-    m_Width = (uint32_t)fbWidth;
-    m_Height = (uint32_t)fbHeight;
-
-    // Resize Callback
-    glfwSetFramebufferSizeCallback(m_WindowHandle, [](GLFWwindow* window, int width, int height) {
-        auto& glWindow = *(GlfwWindow*)glfwGetWindowUserPointer(window);
-        glWindow.SetSizeDirect(width, height);
-        // Important: Viewport should be updated here or in the renderer
-        glViewport(0, 0, width, height);
-    });
-
-    
-
-    // Scroll Callback for mouse wheel input
-    glfwSetScrollCallback(m_WindowHandle, [](GLFWwindow* window, double xOffset, double yOffset) {
-        Input::OnMouseScroll((float)xOffset, (float)yOffset);
-    });
-    
-    // Platform-neutral GLAD loading
-    int status = gladLoadGL((GLADloadfunc)glfwGetProcAddress);
-    CH_CORE_ASSERT(status, "Failed to initialize Glad!");
-
-    CH_CORE_INFO("OpenGL Info:");
-    CH_CORE_INFO("  Vendor: {0}", (const char*)glGetString(GL_VENDOR));
-    CH_CORE_INFO("  Renderer: {0}", (const char*)glGetString(GL_RENDERER));
-    CH_CORE_INFO("  Version: {0}", (const char*)glGetString(GL_VERSION));
-
-    SetVSync(m_VSync);
-}
-
-void GlfwWindow::Shutdown()
-{
-    if (m_WindowHandle)
-    {
-        glfwDestroyWindow(m_WindowHandle);
-    }
-    CH_CORE_INFO("Glfw Window Closed");
-}
-
-void GlfwWindow::BeginFrame()
-{
-}
-
-void GlfwWindow::EndFrame()
-{
-    glfwSwapBuffers(m_WindowHandle);
-    glfwPollEvents();
-}
-
-bool GlfwWindow::ShouldClose() const
-{
-    return glfwWindowShouldClose(m_WindowHandle);
-}
-
-void GlfwWindow::SetTitle(const std::string& title)
-{
-    m_Title = title;
-    glfwSetWindowTitle(m_WindowHandle, m_Title.c_str());
-}
-
-void GlfwWindow::SetSize(int width, int height)
-{
-    m_Width = width;
-    m_Height = height;
-    glfwSetWindowSize(m_WindowHandle, m_Width, m_Height);
-}
-
-void GlfwWindow::SetSizeDirect(int width, int height)
-{
-    m_Width = width;
-    m_Height = height;
-}
-
-void GlfwWindow::ToggleFullscreen()
-{
-    SetFullscreen(!m_IsFullscreen);
-}
-
-void GlfwWindow::SetFullscreen(bool enabled)
-{
-    if (m_IsFullscreen == enabled)
-        return;
-
-    if (enabled)
-    {
-        glfwGetWindowPos(m_WindowHandle, &m_WindowedX, &m_WindowedY);
-        glfwGetWindowSize(m_WindowHandle, &m_WindowedWidth, &m_WindowedHeight); 
-
-        GLFWmonitor* monitor = glfwGetPrimaryMonitor();
-        const GLFWvidmode* mode = glfwGetVideoMode(monitor);
-        glfwSetWindowMonitor(m_WindowHandle, monitor, 0, 0, mode->width, mode->height, mode->refreshRate);
-        m_IsFullscreen = true;
-    }
-    else
-    {
-        glfwSetWindowMonitor(m_WindowHandle, nullptr, m_WindowedX, m_WindowedY, m_WindowedWidth, m_WindowedHeight, 0);
-        m_IsFullscreen = false;
-    }
-}
-
-void GlfwWindow::SetWindowIcon(const std::string& path)
-{
-    GLFWimage image{};
-
-    // Icon should always be loaded top-down for GLFW
-    stbi_set_flip_vertically_on_load(false);
-    image.pixels = stbi_load(path.c_str(), &image.width, &image.height, nullptr, 4);
-
-    if (image.pixels)
-    {
-        glfwSetWindowIcon(m_WindowHandle, 1, &image);
-        stbi_image_free(image.pixels);
-    }
-    else
-    {
-        CH_CORE_WARN("Failed to load window icon from {}", path);
-    }
-
-    // Restore to typical OpenGL state just in case
-    stbi_set_flip_vertically_on_load(true);
-}
-
-void GlfwWindow::SetVSync(bool enabled)
-{
-    m_VSync = enabled;
-    glfwSwapInterval(m_VSync ? 1 : 0);
-}
-
-void GlfwWindow::SetAntialiasing(bool enabled)
-{
-    if(enabled)
-    {
-        glEnable(GL_MULTISAMPLE); 
-    }
-    else
-    {
-        glDisable(GL_MULTISAMPLE); 
-    }
-}
-
-void GlfwWindow::SetTargetFramesPerSecond(int framesPerSecond)
-{
-    m_TargetFPS = framesPerSecond;
-}
-
-} // namespace CHEngine
diff --git a/engine/platform/glfw/glfw_window.h b/engine/platform/glfw/glfw_window.h
deleted file mode 100644
index 93a5f350f..000000000
--- a/engine/platform/glfw/glfw_window.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef CH_GLFW_WINDOW_H
-#define CH_GLFW_WINDOW_H
-
-#include "engine/core/window.h"
-#include <string>
-
-struct GLFWwindow;
-
-// GLFW-backed window implementation that owns the native window, callbacks, and display settings.
-namespace CHEngine
-{
-class GlfwWindow : public Window
-{
-public:
-    GlfwWindow(const WindowProperties& properties);
-    virtual ~GlfwWindow();
-
-    virtual void BeginFrame() override;
-    virtual void EndFrame() override;
-
-    virtual bool ShouldClose() const override;
-
-    virtual int GetWidth() const override { return m_Width; }
-    virtual int GetHeight() const override { return m_Height; }
-
-    virtual void SetTitle(const std::string& title) override;
-    virtual void SetSize(int width, int height) override;
-    virtual void SetSizeDirect(int width, int height) override;
-
-    virtual void ToggleFullscreen() override;
-    virtual void SetFullscreen(bool enabled) override;
-
-    virtual void SetVSync(bool enabled) override;
-    virtual void SetAntialiasing(bool enabled) override;
-    virtual void SetTargetFramesPerSecond(int framesPerSecond) override;
-    virtual int GetTargetFramesPerSecond() const override { return m_TargetFPS; }
-    virtual void SetWindowIcon(const std::string& path) override;
-
-    virtual void* GetNativeWindow() const override { return m_WindowHandle; }
-
-private:
-    void Init(const WindowProperties& properties);
-    void Shutdown();
-
-private:
-    GLFWwindow* m_WindowHandle = nullptr;
-    int m_Width, m_Height;
-    std::string m_Title;
-    bool m_VSync = true;
-    bool m_IsFullscreen = false;
-    int m_WindowedX = 0, m_WindowedY = 0, m_WindowedWidth = 0, m_WindowedHeight = 0;
-    int m_TargetFPS = 60;
-};
-
-} // namespace CHEngine
-
-#endif // CH_GLFW_WINDOW_H
diff --git a/engine/platform/utils/dialogs.cpp b/engine/platform/utils/dialogs.cpp
deleted file mode 100644
index 0945e7bbd..000000000
--- a/engine/platform/utils/dialogs.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "dialogs.h"
-#include <nfd.h>
-
-namespace CHEngine
-{
-std::optional<std::filesystem::path> Dialogs::OpenFile(const std::vector<FileDialogFilter>& filters)
-{
-    nfdu8char_t* outPath = NULL;
-    std::vector<nfdu8filteritem_t> nfdFilters;
-    for (const auto& filter : filters)
-    {
-        nfdFilters.push_back({filter.Name.c_str(), filter.Spec.c_str()});
-    }
-
-    nfdresult_t result = NFD_OpenDialogU8(&outPath, nfdFilters.data(), (nfdfiltersize_t)nfdFilters.size(), NULL);
-    if (result == NFD_OKAY)
-    {
-        std::filesystem::path path = outPath;
-        NFD_FreePathU8(outPath);
-        return path;
-    }
-    return std::nullopt;
-}
-
-std::optional<std::filesystem::path> Dialogs::SaveFile(const std::vector<FileDialogFilter>& filters)
-{
-    nfdu8char_t* outPath = NULL;
-    std::vector<nfdu8filteritem_t> nfdFilters;
-    for (const auto& filter : filters)
-    {
-        nfdFilters.push_back({filter.Name.c_str(), filter.Spec.c_str()});
-    }
-
-    nfdresult_t result = NFD_SaveDialogU8(&outPath, nfdFilters.data(), (nfdfiltersize_t)nfdFilters.size(), NULL, NULL);
-    if (result == NFD_OKAY)
-    {
-        std::filesystem::path path = outPath;
-        NFD_FreePathU8(outPath);
-        return path;
-    }
-    return std::nullopt;
-}
-
-std::optional<std::filesystem::path> Dialogs::PickFolder()
-{
-    nfdu8char_t* outPath = NULL;
-    nfdresult_t result = NFD_PickFolderU8(&outPath, NULL);
-    if (result == NFD_OKAY)
-    {
-        std::filesystem::path path = outPath;
-        NFD_FreePathU8(outPath);
-        return path;
-    }
-    return std::nullopt;
-}
-} // namespace CHEngine
diff --git a/engine/platform/utils/dialogs.h b/engine/platform/utils/dialogs.h
deleted file mode 100644
index 3117248cb..000000000
--- a/engine/platform/utils/dialogs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CH_DIALOGS_H
-#define CH_DIALOGS_H
-
-#include <string>
-#include <vector>
-#include <optional>
-#include <filesystem>
-
-namespace CHEngine
-{
-struct FileDialogFilter
-{
-    std::string Name;
-    std::string Spec;
-};
-
-class Dialogs
-{
-public:
-    static std::optional<std::filesystem::path> OpenFile(const std::vector<FileDialogFilter>& filters = {});
-    static std::optional<std::filesystem::path> SaveFile(const std::vector<FileDialogFilter>& filters = {});
-    static std::optional<std::filesystem::path> PickFolder();
-};
-} // namespace CHEngine
-
-#endif // CH_DIALOGS_H
diff --git a/engine/project/CMakeLists.txt b/engine/project/CMakeLists.txt
new file mode 100644
index 000000000..fd0107ac8
--- /dev/null
+++ b/engine/project/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_library(engine_project STATIC
+    project.h
+    project.cpp
+)
+
+target_include_directories(engine_project PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_project PUBLIC
+    engine_core
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_project PRIVATE engine_pch)
+endif()
diff --git a/engine/project/project.cpp b/engine/project/project.cpp
new file mode 100644
index 000000000..c13496624
--- /dev/null
+++ b/engine/project/project.cpp
@@ -0,0 +1,427 @@
+// project.cpp
+// Chained Engine — Project configuration loading, path resolution, and environment management.
+// Handles .chproject YAML deserialization and cross-platform path normalization.
+
+#include "project.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "yaml-cpp/yaml.h"
+
+#include <mutex>
+
+namespace Chained
+{
+
+	std::shared_ptr<Project> Project::s_ActiveProject = nullptr;
+	std::mutex Project::s_Mutex;
+
+	Project::~Project() = default;
+
+	std::shared_ptr<Project> Project::Load(const std::filesystem::path& filepath)
+	{
+		auto project = std::make_shared<Project>();
+
+		std::string content;
+
+		// Try reading from pack first (exported builds)
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			if (am->IsPacked())
+			{
+				auto data = am->ReadAssetData("project.chproject");
+				if (!data.empty())
+				{
+					content.assign(data.begin(), data.end());
+				}
+			}
+		}
+
+		// Fallback to disk
+		if (content.empty())
+		{
+			std::ifstream stream(filepath);
+			if (!stream.is_open())
+			{
+				return nullptr;
+			}
+			std::stringstream strStream;
+			strStream << stream.rdbuf();
+			content = strStream.str();
+		}
+
+		YAML::Node data = YAML::Load(content);
+		auto projectNode = data["Project"];
+		if (!projectNode)
+		{
+			return nullptr;
+		}
+
+		auto& config = project->m_Config;
+		if (projectNode["Name"])
+		{
+			config.Name = projectNode["Name"].as<std::string>();
+		}
+		if (projectNode["IconPath"])
+		{
+			config.IconPath = projectNode["IconPath"].as<std::string>();
+		}
+
+		if (projectNode["StartScene"])
+		{
+			config.StartScene = projectNode["StartScene"].as<std::string>();
+		}
+		if (projectNode["AssetDirectory"])
+		{
+			config.AssetDirectory = projectNode["AssetDirectory"].as<std::string>();
+		}
+
+		if (projectNode["ActiveScene"])
+		{
+			config.ActiveScenePath = projectNode["ActiveScene"].as<std::string>();
+		}
+		if (projectNode["Physics"])
+		{
+			config.Physics.Gravity = projectNode["Physics"]["Gravity"].as<float>();
+			if (projectNode["Physics"]["FixedTimestep"])
+			{
+				config.Physics.FixedTimestep = projectNode["Physics"]["FixedTimestep"].as<float>();
+			}
+		}
+
+		if (auto window = projectNode["Window"])
+		{
+			if (window["Width"])
+			{
+				config.Window.Width = window["Width"].as<int>();
+			}
+			if (window["Height"])
+			{
+				config.Window.Height = window["Height"].as<int>();
+			}
+			if (window["VSync"])
+			{
+				config.Window.VSync = window["VSync"].as<bool>();
+			}
+		}
+
+		if (auto runtime = projectNode["Runtime"])
+		{
+			if (runtime["Fullscreen"])
+			{
+				config.Runtime.Fullscreen = runtime["Fullscreen"].as<bool>();
+			}
+			if (runtime["ShowStats"])
+			{
+				config.Runtime.ShowStats = runtime["ShowStats"].as<bool>();
+			}
+			if (runtime["EnableConsole"])
+			{
+				config.Runtime.EnableConsole = runtime["EnableConsole"].as<bool>();
+			}
+			if (runtime["TargetFPS"])
+			{
+				config.Runtime.TargetFPS = runtime["TargetFPS"].as<int>();
+			}
+		}
+
+		if (projectNode["Scripting"])
+		{
+			config.Scripting.ModuleName = projectNode["Scripting"]["ModuleName"].as<std::string>();
+			if (projectNode["Scripting"]["ModuleDirectory"])
+			{
+				config.Scripting.ModuleDirectory = projectNode["Scripting"]["ModuleDirectory"].as<std::string>();
+			}
+			if (projectNode["Scripting"]["AutoLoad"])
+			{
+				config.Scripting.AutoLoad = projectNode["Scripting"]["AutoLoad"].as<bool>();
+			}
+		}
+
+		if (projectNode["Animation"])
+		{
+			if (projectNode["Animation"]["TargetFPS"])
+			{
+				config.Animation.TargetFPS = projectNode["Animation"]["TargetFPS"].as<float>();
+			}
+		}
+
+		if (projectNode["Render"])
+		{
+			if (projectNode["Render"]["ShadowResolution"])
+			{
+				config.Render.ShadowResolution = projectNode["Render"]["ShadowResolution"].as<int>();
+			}
+			if (projectNode["Render"]["EnableShadows"])
+			{
+				config.Render.EnableShadows = projectNode["Render"]["EnableShadows"].as<bool>();
+			}
+			if (projectNode["Render"]["AntiAliasingSamples"])
+			{
+				config.Render.AntiAliasingSamples = projectNode["Render"]["AntiAliasingSamples"].as<int>();
+			}
+		}
+
+		if (projectNode["Mesh"])
+		{
+			if (projectNode["Mesh"]["ImportMaterials"])
+			{
+				config.Mesh.ImportMaterials = projectNode["Mesh"]["ImportMaterials"].as<bool>();
+			}
+			if (projectNode["Mesh"]["CalculateTangents"])
+			{
+				config.Mesh.CalculateTangents = projectNode["Mesh"]["CalculateTangents"].as<bool>();
+			}
+			if (projectNode["Mesh"]["FlipUVs"])
+			{
+				config.Mesh.FlipUVs = projectNode["Mesh"]["FlipUVs"].as<bool>();
+			}
+		}
+
+		if (projectNode["Audio"])
+		{
+			if (projectNode["Audio"]["MasterVolume"])
+			{
+				config.Audio.MasterVolume = projectNode["Audio"]["MasterVolume"].as<float>();
+			}
+			if (projectNode["Audio"]["MusicVolume"])
+			{
+				config.Audio.MusicVolume = projectNode["Audio"]["MusicVolume"].as<float>();
+			}
+			if (projectNode["Audio"]["SFXVolume"])
+			{
+				config.Audio.SFXVolume = projectNode["Audio"]["SFXVolume"].as<float>();
+			}
+		}
+
+		if (projectNode["Export"])
+		{
+			if (projectNode["Export"]["Mode"])
+			{
+				config.Export.Mode = static_cast<PackMode>(projectNode["Export"]["Mode"].as<int>());
+			}
+			if (projectNode["Export"]["ZipThreshold"])
+			{
+				config.Export.ZipThreshold = projectNode["Export"]["ZipThreshold"].as<float>();
+			}
+			if (projectNode["Export"]["DataVersion"])
+			{
+				config.Export.DataVersion = projectNode["Export"]["DataVersion"].as<uint32_t>();
+			}
+			if (projectNode["Export"]["SplitSizeMB"])
+			{
+				config.Export.SplitSizeMB = projectNode["Export"]["SplitSizeMB"].as<uint32_t>();
+			}
+			if (projectNode["Export"]["PackName"])
+			{
+				config.Export.PackName = projectNode["Export"]["PackName"].as<std::string>();
+				if (config.Export.PackName.empty())
+				{
+					config.Export.PackName = "resources";
+				}
+			}
+		}
+
+		config.ProjectDirectory = filepath.parent_path();
+
+		return project;
+	}
+
+	std::shared_ptr<Project> Project::GetActive()
+	{
+		std::lock_guard lock(s_Mutex);
+		return s_ActiveProject;
+	}
+
+	void Project::SetActive(std::shared_ptr<Project> project)
+	{
+		std::lock_guard lock(s_Mutex);
+		s_ActiveProject = std::move(project);
+	}
+
+	std::filesystem::path Project::GetAssetDirectory() const
+	{
+		return m_Config.ProjectDirectory / m_Config.AssetDirectory;
+	}
+
+	std::filesystem::path Project::GetProjectDirectory() const
+	{
+		return m_Config.ProjectDirectory;
+	}
+
+	std::filesystem::path Project::GetAssetPath(const std::filesystem::path& relative) const
+	{
+		return m_Config.ProjectDirectory / m_Config.AssetDirectory / relative;
+	}
+
+	std::string Project::GetRelativePath(const std::filesystem::path& path) const
+	{
+		return GetRelativePathInternal(path);
+	}
+
+	std::filesystem::path Project::GetAbsolutePath(const std::filesystem::path& path) const
+	{
+		return GetAbsolutePathInternal(path);
+	}
+
+	std::vector<std::string> Project::GetAvailableScenes() const
+	{
+		std::vector<std::string> scenes;
+
+		auto assetDir = m_Config.ProjectDirectory / m_Config.AssetDirectory;
+		auto scenesDir = assetDir / "scenes";
+
+		if (std::filesystem::exists(scenesDir))
+		{
+			try
+			{
+				for (auto& entry : std::filesystem::recursive_directory_iterator(scenesDir))
+				{
+					if (entry.path().extension() == ".chscene")
+					{
+						std::string relPath = std::filesystem::relative(entry.path(), assetDir).string();
+						scenes.push_back(relPath);
+					}
+				}
+			} catch (const std::filesystem::filesystem_error& e)
+			{
+				CH_CORE_WARN("Project: Failed to enumerate scenes in '{}': {}", scenesDir.string(), e.what());
+			}
+		}
+		return scenes;
+	}
+
+	std::string Project::GetRelativePathInternal(const std::filesystem::path& path) const
+	{
+		if (path.empty())
+		{
+			return "";
+		}
+
+		if (path.is_relative())
+		{
+			return path.generic_string();
+		}
+
+		auto absolutePath = NormalizePath(path);
+
+		auto assetDir = m_Config.ProjectDirectory / m_Config.AssetDirectory;
+		auto projectDir = m_Config.ProjectDirectory;
+
+		// 1. Try relative to Assets Directory
+		if (auto rel = TryMakeRelative(absolutePath, assetDir))
+		{
+			return *rel;
+		}
+
+		// 2. Try relative to Project Root
+		if (auto rel = TryMakeRelative(absolutePath, projectDir))
+		{
+			return *rel;
+		}
+
+		return absolutePath.generic_string();
+	}
+
+	std::filesystem::path Project::GetAbsolutePathInternal(const std::filesystem::path& path) const
+	{
+		if (path.empty())
+		{
+			return "";
+		}
+
+		if (path.is_absolute())
+		{
+			return NormalizePath(path);
+		}
+
+		std::string pathStr = path.generic_string();
+
+		// Engine resources are referenced with the "engine/" prefix and resolve
+		// against EngineRoot (where the build copies the engine resources).
+		if (pathStr.rfind("engine/", 0) == 0)
+		{
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				return NormalizePath(am->ResolvePath(pathStr));
+			}
+			CH_CORE_WARN("Project: AssetManager unavailable, cannot resolve engine resource '{}'", pathStr);
+			return NormalizePath(pathStr);
+		}
+
+		auto assetDir = m_Config.ProjectDirectory / m_Config.AssetDirectory;
+		auto projectDir = m_Config.ProjectDirectory;
+
+		// For game assets, try asset directory first
+		if (!assetDir.empty())
+		{
+			std::filesystem::path candidate = assetDir / pathStr;
+			if (std::filesystem::exists(candidate))
+			{
+				return NormalizePath(candidate);
+			}
+		}
+
+		// Try project root next
+		if (!projectDir.empty())
+		{
+			std::filesystem::path candidate = projectDir / pathStr;
+			if (std::filesystem::exists(candidate))
+			{
+				return NormalizePath(candidate);
+			}
+		}
+
+		return NormalizePath(projectDir / pathStr);
+	}
+
+	// -------------------------------------------------------------------------------------------------------------------
+	// Path Utility Helpers
+	// -------------------------------------------------------------------------------------------------------------------
+
+	std::filesystem::path Project::NormalizePath(const std::filesystem::path& path)
+	{
+		// Use lexically_normal to handle .. and . and unify slashes
+		std::filesystem::path normalized = std::filesystem::absolute(path).lexically_normal();
+
+#if CH_PLATFORM_WINDOWS
+		// Unify drive letter casing to uppercase to prevent relative path resolution failures
+		std::string s = normalized.string();
+		if (s.length() >= 2 && s[1] == ':' && std::islower(s[0]))
+		{
+			s[0] = (char)std::toupper(s[0]);
+			normalized = s;
+		}
+#endif
+
+		// On Windows, generic_string() will use / which is exactly what we want for cross-platform portability.
+		return normalized;
+	}
+
+	std::optional<std::string> Project::TryMakeRelative(const std::filesystem::path& absolutePath,
+														const std::filesystem::path& basePath)
+	{
+		if (basePath.empty())
+		{
+			return std::nullopt;
+		}
+
+		auto normalizedBase = NormalizePath(basePath);
+		std::filesystem::path rel = std::filesystem::relative(absolutePath, normalizedBase);
+
+		// std::filesystem::relative returns an absolute path if it cannot resolve relativity (e.g., different drives)
+		if (rel.is_relative())
+		{
+			std::string relStr = rel.generic_string();
+
+			// Only return if the path doesn't escape the base directory.
+			// Check the first path component rather than a substring search, so that
+			// legitimately named files/folders (e.g. "..data") are not rejected.
+			if (rel.begin() == rel.end() || *rel.begin() != "..")
+			{
+				return relStr;
+			}
+		}
+
+		return std::nullopt;
+	}
+} // namespace Chained
diff --git a/engine/project/project.h b/engine/project/project.h
new file mode 100644
index 000000000..04963af68
--- /dev/null
+++ b/engine/project/project.h
@@ -0,0 +1,241 @@
+#ifndef CH_PROJECT_H
+#define CH_PROJECT_H
+
+#include "engine/core/window.h"
+#include <filesystem>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <string>
+
+namespace Chained
+{
+	class EnvironmentAsset;
+
+	struct PhysicsSettings
+	{
+		float Gravity = 20.0f;
+		float FixedTimestep = 1.0f / 60.0f;
+	};
+
+	struct AnimationSettings
+	{
+		float TargetFPS = 30.0f;
+	};
+
+	struct RenderSettings
+	{
+		int ShadowResolution = 2048;
+		bool EnableShadows = true;
+		int AntiAliasingSamples = 4; // 0, 2, 4, 8
+	};
+
+	struct MeshSettings
+	{
+		bool ImportMaterials = true;
+		bool CalculateTangents = true;
+		bool FlipUVs = true;
+	};
+
+	struct RuntimeSettings
+	{
+		bool Fullscreen = false;
+		bool ShowStats = true;
+		bool EnableConsole = false;
+		int TargetFPS = 0; // 0 = Uncapped
+	};
+
+	struct AudioSettings
+	{
+		float MasterVolume = 1.0f;
+		float MusicVolume = 1.0f;
+		float SFXVolume = 1.0f;
+	};
+
+	struct ScriptingSettings
+	{
+		std::string ModuleName;
+		std::filesystem::path ModuleDirectory;
+		bool AutoLoad = true;
+	};
+
+	enum class Configuration
+	{
+		Debug = 0,
+		Release = 1
+	};
+
+	enum class PackMode : uint8_t
+	{
+		Fast = 0,	  // LZ4 HC — fast compression, larger file
+		Balanced = 1, // ZSTD — balanced speed/size
+		Max = 2,	  // ZSTD ultra — maximum compression, slowest
+		Raw = 3		  // No compression — stored as-is
+	};
+
+	struct ExportSettings
+	{
+		PackMode Mode = PackMode::Balanced;
+		float ZipThreshold = 0.05f;
+		uint32_t DataVersion = 0;
+		uint32_t SplitSizeMB = 0;			// 0 = Single pack, >0 = Max uncompressed MB per chunk
+		std::string PackName = "resources"; // Base name for .pack files (without extension)
+	};
+
+	struct ProjectConfig
+	{
+		std::string Name = "Untitled";
+		std::string IconPath;
+		std::string StartScene;
+		std::filesystem::path AssetDirectory = "assets";
+		std::filesystem::path ProjectDirectory;
+		std::filesystem::path ActiveScenePath;
+
+		PhysicsSettings Physics;
+		AnimationSettings Animation;
+		RenderSettings Render;
+		MeshSettings Mesh;
+		WindowProperties Window;
+		AudioSettings Audio;
+		RuntimeSettings Runtime;
+		ScriptingSettings Scripting;
+		ExportSettings Export;
+
+		Configuration BuildConfig = Configuration::Debug;
+	};
+
+	/// @brief Owns the active project configuration and environment asset.
+	///
+	/// Projects define the game's settings, asset directories, and scene list.
+	/// A single project is active at any time (set via SetActive).
+	class Project
+	{
+	public:
+		Project() = default;
+		~Project();
+
+		/// @brief Load a project from a .chproject YAML file.
+		static std::shared_ptr<Project> Load(const std::filesystem::path& filepath);
+
+		/// @brief Get the currently active project.
+		static std::shared_ptr<Project> GetActive();
+
+		/// @brief Set the active project (called by RuntimeLayer or Editor after loading).
+		static void SetActive(std::shared_ptr<Project> project);
+
+		// Config access
+		const ProjectConfig& GetConfig() const
+		{
+			return m_Config;
+		}
+		ProjectConfig& GetConfig()
+		{
+			return m_Config;
+		}
+
+		void SetScripting(const std::string& moduleName, const std::filesystem::path& moduleDir, bool autoLoad = true)
+		{
+			m_Config.Scripting.ModuleName = moduleName;
+			m_Config.Scripting.ModuleDirectory = moduleDir;
+			m_Config.Scripting.AutoLoad = autoLoad;
+		}
+
+		// Validation setters
+		void SetName(const std::string& name)
+		{
+			m_Config.Name = name;
+		}
+		void SetStartScene(const std::string& scene)
+		{
+			m_Config.StartScene = scene;
+		}
+		void SetIconPath(const std::string& path)
+		{
+			m_Config.IconPath = path;
+		}
+		void SetPhysicsGravity(float gravity)
+		{
+			m_Config.Physics.Gravity = std::max(0.0f, gravity);
+		}
+		void SetPhysicsFixedTimestep(float timestep)
+		{
+			m_Config.Physics.FixedTimestep = std::max(0.001f, timestep);
+		}
+		void SetShadowResolution(int resolution)
+		{
+			m_Config.Render.ShadowResolution = std::clamp(resolution, 256, 8192);
+		}
+		void SetAntiAliasingSamples(int samples)
+		{
+			m_Config.Render.AntiAliasingSamples = std::clamp(samples, 0, 8);
+		}
+		void SetTargetFPS(int fps)
+		{
+			m_Config.Runtime.TargetFPS = std::max(0, fps);
+		}
+		void SetMasterVolume(float volume)
+		{
+			m_Config.Audio.MasterVolume = std::clamp(volume, 0.0f, 1.0f);
+		}
+		void SetMusicVolume(float volume)
+		{
+			m_Config.Audio.MusicVolume = std::clamp(volume, 0.0f, 1.0f);
+		}
+		void SetSFXVolume(float volume)
+		{
+			m_Config.Audio.SFXVolume = std::clamp(volume, 0.0f, 1.0f);
+		}
+
+		const std::string& GetName() const
+		{
+			return m_Config.Name;
+		}
+		const std::filesystem::path& GetActiveScenePath() const
+		{
+			return m_Config.ActiveScenePath;
+		}
+		void SetActiveScenePath(const std::filesystem::path& path)
+		{
+			m_Config.ActiveScenePath = path;
+		}
+		const std::string& GetStartScene() const
+		{
+			return m_Config.StartScene;
+		}
+		Configuration GetBuildConfig() const
+		{
+			return m_Config.BuildConfig;
+		}
+
+		// Path helpers (instance methods — operate on this project's config)
+		std::filesystem::path GetAssetDirectory() const;
+		std::filesystem::path GetProjectDirectory() const;
+		std::filesystem::path GetAssetPath(const std::filesystem::path& relative) const;
+		std::string GetRelativePath(const std::filesystem::path& path) const;
+		std::filesystem::path GetAbsolutePath(const std::filesystem::path& path) const;
+		std::vector<std::string> GetAvailableScenes() const;
+
+		// Pure static utilities (no project state needed)
+		static std::filesystem::path NormalizePath(const std::filesystem::path& path);
+		static std::optional<std::string> TryMakeRelative(const std::filesystem::path& absolutePath,
+														  const std::filesystem::path& basePath);
+
+		// Environment
+		std::shared_ptr<EnvironmentAsset> GetEnvironment() const
+		{
+			return m_Environment;
+		}
+
+	private:
+		std::string GetRelativePathInternal(const std::filesystem::path& path) const;
+		std::filesystem::path GetAbsolutePathInternal(const std::filesystem::path& path) const;
+
+		static std::shared_ptr<Project> s_ActiveProject;
+		static std::mutex s_Mutex;
+
+		ProjectConfig m_Config;
+		std::shared_ptr<EnvironmentAsset> m_Environment;
+	};
+} // namespace Chained
+
+#endif // CH_PROJECT_H
diff --git a/engine/reflection/CMakeLists.txt b/engine/reflection/CMakeLists.txt
new file mode 100644
index 000000000..0c330dc69
--- /dev/null
+++ b/engine/reflection/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library(engine_reflection INTERFACE)
+
+target_include_directories(engine_reflection INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_reflection INTERFACE
+    engine_common
+    reflectcpp
+    glm
+    engine_external_entt
+)
diff --git a/engine/reflection/properties.h b/engine/reflection/properties.h
new file mode 100644
index 000000000..3b25dd4ba
--- /dev/null
+++ b/engine/reflection/properties.h
@@ -0,0 +1,290 @@
+#ifndef CH_REFLECTION_PROPERTIES_H
+#define CH_REFLECTION_PROPERTIES_H
+
+#include "engine/common/uuid.h"
+#include "engine/reflection/property_archive.h"
+#include "engine/reflection/reflection_traits.h"
+#include <cstdint>
+#include <functional>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+
+namespace Chained
+{
+	// Alias moved to end of file to resolve circular dependencies
+
+	// The "Properties" class is the primary interface for reflection.
+	// It is used by both Serializers (YAML) and Editor UI (ImGui).
+	template <typename T_Archive> class Properties
+	{
+	public:
+		Properties(T_Archive& archive)
+			: m_Archive(archive)
+		{
+		}
+
+		ReflectionMode GetMode() const
+		{
+			return m_Archive.GetReflectionMode();
+		}
+
+		bool Color(const char* name, Chained::Color& value)
+		{
+			return m_Archive.Property(name, value);
+		}
+
+		bool Handle(const char* name, uint64_t& value)
+		{
+			return m_Archive.Handle(name, value);
+		}
+
+		bool Handle(const char* name, Chained::UUID& value)
+		{
+			return m_Archive.Handle(name, (uint64_t&)value);
+		}
+
+		template <typename T> bool Sequence(const char* name, std::vector<T>& values)
+		{
+			size_t size = values.size();
+			m_Archive.BeginSequence(name, size);
+
+			if (GetMode() == ReflectionMode::Deserialize)
+			{
+				values.resize(size);
+			}
+
+			bool changed = false;
+			for (size_t i = 0; i < values.size(); ++i)
+			{
+				std::string label = "[" + std::to_string(i) + "]";
+				if (m_Archive.GetReflectionMode() == ReflectionMode::UI)
+				{
+					if constexpr (std::is_arithmetic_v<T> || std::is_same_v<T, std::string> || is_variant_v<T> ||
+								  std::is_enum_v<T> || (std::is_integral_v<T> && std::is_unsigned_v<T>))
+					{
+						if (Property(label.c_str(), values[i]))
+						{
+							changed = true;
+						}
+					}
+					else if constexpr (is_rfl_component<T>::value)
+					{
+						if (m_Archive.Nested(label.c_str(), [&](IPropertyArchiveBase& archive) {
+								Properties<IPropertyArchiveBase> props(archive);
+								ReflectFromRfl(values[i], props);
+							}))
+						{
+							changed = true;
+						}
+					}
+					else
+					{
+						if (Nested(label.c_str(), values[i]))
+						{
+							changed = true;
+						}
+					}
+				}
+				else
+				{
+					// For serialization/deserialization, we don't want keys for sequence items
+					if constexpr (std::is_arithmetic_v<T> || std::is_same_v<T, std::string> || is_variant_v<T> ||
+								  std::is_enum_v<T> || (std::is_integral_v<T> && std::is_unsigned_v<T>))
+					{
+						if (Property(nullptr, values[i]))
+						{
+							changed = true;
+						}
+					}
+					else if constexpr (is_rfl_component<T>::value)
+					{
+						if (m_Archive.Nested(nullptr, [&](IPropertyArchiveBase& archive) {
+								Properties<IPropertyArchiveBase> props(archive);
+								ReflectFromRfl(values[i], props);
+							}))
+						{
+							changed = true;
+						}
+					}
+					else
+					{
+						if (m_Archive.Nested(nullptr, [&](IPropertyArchiveBase& archive) {
+								Properties<IPropertyArchiveBase> props(archive);
+								values[i].Reflect(props);
+							}))
+						{
+							changed = true;
+						}
+					}
+				}
+			}
+
+			m_Archive.EndSequence();
+			return changed;
+		}
+
+		template <typename T> bool Nested(const char* name, T& value)
+		{
+			return m_Archive.Nested(name, [&](IPropertyArchiveBase& archive) {
+				Properties<IPropertyArchiveBase> props(archive);
+				value.Reflect(props);
+			});
+		}
+
+		template <typename V> bool Map(const char* name, std::unordered_map<std::string, V>& map)
+		{
+			size_t size = map.size();
+			m_Archive.BeginMap(name, size);
+
+			if (GetMode() == ReflectionMode::Serialize)
+			{
+				for (auto& [key, value] : map)
+				{
+					std::string k = key;
+					m_Archive.MapNextKey(k);
+					Property(nullptr, value);
+				}
+			}
+			else if (GetMode() == ReflectionMode::Deserialize)
+			{
+				map.clear();
+				std::string key;
+				for (size_t i = 0; i < size; i++)
+				{
+					m_Archive.MapNextKey(key);
+					V value{};
+					Property(nullptr, value);
+					map[key] = value;
+				}
+			}
+			// UI mode: BeginMap/EndMap are stubs; actual rendering
+			// is done by UIProperties::Map() template when T_Archive = UIProperties
+
+			m_Archive.EndMap();
+			return false;
+		}
+
+		template <typename T> bool Property(const char* name, T& value)
+		{
+			return Property(name, value, {});
+		}
+
+		template <typename T_Enum> bool Enum(const char* name, T_Enum& value, const char** names, int count)
+		{
+			return Enum(name, value, names, count, {});
+		}
+
+		template <typename T_Enum> bool Property(const char* name, T_Enum& value, const char** names, int count)
+		{
+			return Enum(name, value, names, count);
+		}
+
+		bool File(const char* name, std::string& value, const char* extensions = nullptr)
+		{
+			return File(name, value, extensions, {});
+		}
+
+		bool StringEnum(const char* name, std::string& value, const std::vector<std::string>& options,
+						const PropertyMeta& meta = {})
+		{
+			return m_Archive.StringEnum(name, value, options, meta);
+		}
+
+		// --- Property methods with metadata ---
+		template <typename T> bool Property(const char* name, T& value, const PropertyMeta& meta)
+		{
+			if constexpr (is_variant_v<T>)
+			{
+				return std::visit(
+					[&](auto&& v) {
+						if constexpr (requires { m_Archive.Property(name, v, meta); })
+						{
+							return m_Archive.Property(name, v, meta);
+						}
+						else
+						{
+							return false;
+						}
+					},
+					value);
+			}
+			else if constexpr (std::is_enum_v<T>)
+			{
+				int temp = (int)value;
+				bool changed = m_Archive.Property(name, temp, meta);
+				if (changed || m_Archive.GetReflectionMode() == ReflectionMode::Deserialize)
+				{
+					value = (T)temp;
+				}
+				return changed;
+			}
+			else if constexpr (std::is_integral_v<T> && std::is_unsigned_v<T> && !std::is_same_v<T, uint64_t> &&
+							   !std::is_same_v<T, bool>)
+			{
+				uint64_t temp = static_cast<uint64_t>(value);
+				bool changed = m_Archive.Property(name, temp, meta);
+				if (changed || m_Archive.GetReflectionMode() == ReflectionMode::Deserialize)
+				{
+					value = static_cast<T>(temp);
+				}
+				return changed;
+			}
+			else
+			{
+				return m_Archive.Property(name, value, meta);
+			}
+		}
+
+		template <typename T_Enum>
+		bool Enum(const char* name, T_Enum& value, const char** names, int count, const PropertyMeta& meta)
+		{
+			int temp = (int)value;
+			bool changed = m_Archive.Enum(name, temp, names, count, meta);
+			if (changed || m_Archive.GetReflectionMode() == ReflectionMode::Deserialize)
+			{
+				value = (T_Enum)temp;
+			}
+			return changed;
+		}
+
+		bool File(const char* name, std::string& value, const char* extensions, const PropertyMeta& meta)
+		{
+			return m_Archive.File(name, value, extensions, meta);
+		}
+
+		// Post-change hook
+		Properties& OnChange(std::function<void()> func)
+		{
+			if (m_Archive.HasChanged())
+			{
+				func();
+			}
+			return *this;
+		}
+
+		void SetChanged(bool changed)
+		{
+			m_Archive.SetChanged(changed);
+		}
+		bool HasChanged() const
+		{
+			return m_Archive.HasChanged();
+		}
+		T_Archive& GetArchive()
+		{
+			return m_Archive;
+		}
+
+	private:
+		T_Archive& m_Archive;
+	};
+
+	/**
+	 * @brief Specialized properties for when the archive type is erased.
+	 */
+	using GenericProperties = Properties<IPropertyArchiveBase>;
+
+} // namespace Chained
+
+#endif // CH_REFLECTION_PROPERTIES_H
diff --git a/engine/reflection/property_archive.h b/engine/reflection/property_archive.h
new file mode 100644
index 000000000..5ac344fb6
--- /dev/null
+++ b/engine/reflection/property_archive.h
@@ -0,0 +1,70 @@
+#ifndef CH_REFLECTION_PROPERTY_ARCHIVE_H
+#define CH_REFLECTION_PROPERTY_ARCHIVE_H
+
+#include "engine/common/base.h"
+#include "engine/common/color.h"
+#include "engine/reflection/property_meta.h"
+#include "engine/reflection/reflection_mode.h"
+#include <cstdint>
+#include <functional>
+#include <glm/glm.hpp>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+namespace Chained
+{
+	class IPropertyArchiveBase;
+	class IPropertyArchive;
+	template <typename T_Archive> class Properties;
+
+	template <typename T, typename T_Archive> void ReflectFromRfl(T& component, Chained::Properties<T_Archive>& props);
+
+	/**
+	 * @brief Base interface for property archives — data serialization and composition only.
+	 */
+	class CH_API IPropertyArchiveBase
+	{
+	public:
+		virtual ~IPropertyArchiveBase() = default;
+		virtual ReflectionMode GetReflectionMode() const = 0;
+		virtual bool Property(const char* name, int& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, float& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, bool& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, std::string& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, glm::vec2& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, glm::vec3& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, glm::vec4& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, uint64_t& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Property(const char* name, Color& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool Enum(const char* name, int& value, const char** names, int count,
+						  const PropertyMeta& meta = {}) = 0;
+		virtual bool StringEnum(const char* name, std::string& value, const std::vector<std::string>& options,
+								const PropertyMeta& meta = {}) = 0;
+		virtual bool Handle(const char* name, uint64_t& value, const PropertyMeta& meta = {}) = 0;
+		virtual bool File(const char* name, std::string& value, const char* extensions = nullptr,
+						  const PropertyMeta& meta = {}) = 0;
+		virtual void BeginSequence(const char* name, size_t& size) = 0;
+		virtual void EndSequence() = 0;
+		virtual bool Nested(const char* name, std::function<void(IPropertyArchiveBase&)> callback) = 0;
+		virtual void BeginMap(const char* name, size_t& size) = 0;
+		virtual void EndMap() = 0;
+		virtual bool MapNextKey(std::string& key) = 0;
+	};
+
+	/**
+	 * @brief Extended interface adding UI layout and change-tracking methods.
+	 */
+	class CH_API IPropertyArchive : public IPropertyArchiveBase
+	{
+	public:
+		virtual ~IPropertyArchive() = default;
+		virtual void Header(const char* label) = 0;
+		virtual void Separator() = 0;
+		virtual bool HasChanged() const = 0;
+		virtual void SetChanged(bool changed) = 0;
+	};
+
+} // namespace Chained
+
+#endif // CH_REFLECTION_PROPERTY_ARCHIVE_H
diff --git a/engine/reflection/property_meta.h b/engine/reflection/property_meta.h
new file mode 100644
index 000000000..c62b6f1d3
--- /dev/null
+++ b/engine/reflection/property_meta.h
@@ -0,0 +1,47 @@
+#ifndef CH_REFLECTION_PROPERTY_META_H
+#define CH_REFLECTION_PROPERTY_META_H
+
+#include "engine/common/base.h"
+#include <string>
+
+namespace Chained
+{
+	// Widget rendering hints for UI properties
+	struct CH_API PropertyMeta
+	{
+		enum class WidgetHint
+		{
+			Default,	 // Auto-select based on type
+			Slider,		 // Use slider instead of input
+			Input,		 // Use text input
+			Checkbox,	 // Force checkbox
+			ColorPicker, // Color picker
+			FilePicker,	 // File picker
+			Enum		 // Enum dropdown
+		} Hint = WidgetHint::Default;
+
+		float MinValue = 0.0f;
+		float MaxValue = 0.0f;
+		float Speed = 0.1f;
+		std::string Tooltip;
+		bool ReadOnly = false;
+		bool Transient = false;
+		bool Hidden = false;
+
+		// Convenience constructors
+		PropertyMeta() = default;
+		PropertyMeta(WidgetHint h)
+			: Hint(h)
+		{
+		}
+		PropertyMeta(float min, float max, float spd = 0.1f)
+			: Hint(WidgetHint::Slider),
+			  MinValue(min),
+			  MaxValue(max),
+			  Speed(spd)
+		{
+		}
+	};
+} // namespace Chained
+
+#endif // CH_REFLECTION_PROPERTY_META_H
diff --git a/engine/reflection/reflection.h b/engine/reflection/reflection.h
new file mode 100644
index 000000000..571bf1b95
--- /dev/null
+++ b/engine/reflection/reflection.h
@@ -0,0 +1,10 @@
+#ifndef CH_REFLECTION_H
+#define CH_REFLECTION_H
+
+#include "engine/reflection/property_archive.h"
+#include "engine/reflection/property_meta.h"
+#include "engine/reflection/properties.h"
+#include "engine/reflection/reflection_mode.h"
+#include "engine/reflection/reflection_traits.h"
+
+#endif // CH_REFLECTION_H
diff --git a/engine/reflection/reflection_mode.h b/engine/reflection/reflection_mode.h
new file mode 100644
index 000000000..3f5a150e6
--- /dev/null
+++ b/engine/reflection/reflection_mode.h
@@ -0,0 +1,14 @@
+#ifndef CH_REFLECTION_MODE_H
+#define CH_REFLECTION_MODE_H
+
+namespace Chained
+{
+	enum class ReflectionMode
+	{
+		Serialize,
+		Deserialize,
+		UI
+	};
+} // namespace Chained
+
+#endif // CH_REFLECTION_MODE_H
diff --git a/engine/reflection/reflection_rfl.h b/engine/reflection/reflection_rfl.h
new file mode 100644
index 000000000..eab941518
--- /dev/null
+++ b/engine/reflection/reflection_rfl.h
@@ -0,0 +1,58 @@
+#ifndef CH_REFLECTION_RFL_H
+#define CH_REFLECTION_RFL_H
+
+#include <string>
+
+#include "engine/reflection/reflection.h"
+
+namespace Chained
+{
+	struct UIMeta
+	{
+		PropertyMeta::WidgetHint Hint = PropertyMeta::WidgetHint::Default;
+		float Min = 0.0f;
+		float Max = 0.0f;
+		float Speed = 0.1f;
+		bool ReadOnly = false;
+		bool Transient = false;
+		bool Hidden = false;
+		const char* Tooltip = nullptr;
+		const char* Extensions = nullptr;
+	};
+
+	struct AssetPath
+	{
+		std::string Path;
+		const char* Extensions = "*.*";
+
+		AssetPath() = default;
+		AssetPath(const std::string& path, const char* ext = "*.*")
+			: Path(path),
+			  Extensions(ext)
+		{
+		}
+	};
+
+	struct ExtractedFieldMeta
+	{
+		PropertyMeta Meta;
+		const char* Extensions = nullptr;
+	};
+
+	// Per-component field visibility override. Specialise to hide/show fields at runtime.
+	template <typename T> struct FieldVisibilityOverride
+	{
+		static bool IsVisible(std::string_view /*field*/, const T&)
+		{
+			return true;
+		}
+	};
+
+#define CH_MARK_RFL(Type)                                                                                              \
+	template <> struct is_rfl_component<Type> : std::true_type                                                         \
+	{                                                                                                                  \
+	};
+
+} // namespace Chained
+
+#endif // CH_REFLECTION_RFL_H
diff --git a/engine/reflection/reflection_rfl_impl.h b/engine/reflection/reflection_rfl_impl.h
new file mode 100644
index 000000000..b05f810cc
--- /dev/null
+++ b/engine/reflection/reflection_rfl_impl.h
@@ -0,0 +1,272 @@
+#ifndef CH_REFLECTION_RFL_IMPL_H
+#define CH_REFLECTION_RFL_IMPL_H
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <rfl.hpp>
+#include <rfl/to_view.hpp>
+#include <rfl/yaml.hpp>
+#include <rfl/parsing/is_map_like.hpp>
+#include <string>
+#include <string_view>
+#include <type_traits>
+
+#include "engine/common/color.h"
+#include "engine/common/uuid.h"
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	class UIProperties; // forward declaration for if constexpr check
+
+	template <typename T_Component> ExtractedFieldMeta GetMetaForField(std::string_view field_name)
+	{
+		ExtractedFieldMeta result;
+
+		if constexpr (requires { typename T_Component::UI; })
+		{
+			using UI_Struct = typename T_Component::UI;
+			UI_Struct ui_layout{};
+			auto ui_view = rfl::to_view(ui_layout);
+
+			ui_view.apply([&](auto ui_field) {
+				if (ui_field.name() == field_name)
+				{
+					const UIMeta& src = *ui_field.get();
+					result.Meta.Hint = src.Hint;
+					result.Meta.MinValue = src.Min;
+					result.Meta.MaxValue = src.Max;
+					result.Meta.Speed = src.Speed;
+					result.Meta.ReadOnly = src.ReadOnly;
+					result.Meta.Transient = src.Transient;
+					result.Meta.Hidden = src.Hidden;
+					result.Extensions = src.Extensions;
+
+					if (src.Tooltip)
+					{
+						result.Meta.Tooltip = src.Tooltip;
+					}
+
+					if (src.Min != src.Max && src.Hint == PropertyMeta::WidgetHint::Default)
+					{
+						result.Meta.Hint = PropertyMeta::WidgetHint::Slider;
+					}
+				}
+			});
+		}
+		return result;
+	}
+
+	template <typename T, typename T_Archive> void ReflectFromRfl(T& component, Chained::Properties<T_Archive>& props)
+	{
+		auto view = rfl::to_view(component);
+
+		view.apply([&](auto field) {
+			using FieldType = std::decay_t<decltype(*field.get())>;
+			std::string_view name = field.name();
+
+			ExtractedFieldMeta field_meta = GetMetaForField<T>(name);
+			PropertyMeta& meta = field_meta.Meta;
+
+			if (meta.Transient && props.GetMode() != ReflectionMode::UI)
+			{
+				return;
+			}
+
+			if (meta.Hidden && props.GetMode() == ReflectionMode::UI)
+			{
+				return;
+			}
+
+			if (props.GetMode() == ReflectionMode::UI && !FieldVisibilityOverride<T>::IsVisible(name, component))
+			{
+				return;
+			}
+
+			const char* name_cstr = field.name().data();
+
+			if constexpr (is_vector_v<FieldType>)
+			{
+				props.Sequence(name_cstr, *field.get());
+			}
+
+			else if constexpr (rfl::parsing::is_map_like_v<FieldType>)
+			{
+				if constexpr (std::is_same_v<T_Archive, Chained::UIProperties>)
+				{
+					props.GetArchive().Map(name_cstr, *field.get());
+				}
+				else
+				{
+					props.Map(name_cstr, *field.get());
+				}
+			}
+
+			else if constexpr (std::is_same_v<FieldType, Chained::AssetPath>)
+			{
+				props.GetArchive().File(name_cstr, field.get()->Path, field.get()->Extensions, meta);
+			}
+
+			else if constexpr (std::is_same_v<FieldType, std::string>)
+			{
+				if (meta.Hint == PropertyMeta::WidgetHint::FilePicker)
+				{
+
+					props.GetArchive().File(name_cstr, *field.get(), field_meta.Extensions, meta);
+				}
+				else
+				{
+					props.Property(name_cstr, *field.get(), meta);
+				}
+			}
+
+			else if constexpr (std::is_enum_v<FieldType>)
+			{
+				if (props.GetMode() == ReflectionMode::UI && meta.Hint == PropertyMeta::WidgetHint::Enum)
+				{
+					constexpr auto enumerators = rfl::get_enumerator_array<FieldType>();
+					std::vector<std::string> names_str;
+					std::vector<const char*> names_cstr;
+					names_str.reserve(enumerators.size());
+					for (const auto& p : enumerators)
+					{
+						names_str.emplace_back(p.first);
+					}
+					names_cstr.reserve(names_str.size());
+					for (const auto& s : names_str)
+					{
+						names_cstr.push_back(s.c_str());
+					}
+					props.Enum(name_cstr, *field.get(), names_cstr.data(), (int)names_cstr.size(), meta);
+				}
+				else
+				{
+					props.Property(name_cstr, *field.get(), meta);
+				}
+			}
+			else if constexpr (std::is_same_v<FieldType, int> || std::is_same_v<FieldType, float> ||
+							   std::is_same_v<FieldType, bool> || std::is_same_v<FieldType, glm::vec2> ||
+							   std::is_same_v<FieldType, glm::vec3> || std::is_same_v<FieldType, glm::vec4> ||
+							   std::is_same_v<FieldType, Chained::Color> || std::is_same_v<FieldType, uint64_t> ||
+							   is_variant_v<FieldType> ||
+							   (std::is_integral_v<FieldType> && std::is_unsigned_v<FieldType>))
+			{
+				props.Property(name_cstr, *field.get(), meta);
+			}
+
+			else if constexpr (is_rfl_component<FieldType>::value)
+			{
+				props.GetArchive().Nested(name_cstr, [&](IPropertyArchiveBase& archive) {
+					Properties<IPropertyArchiveBase> nested(archive);
+					ReflectFromRfl(*field.get(), nested);
+				});
+			}
+
+			else if constexpr (requires(FieldType& value, Chained::Properties<T_Archive>& p) { value.Reflect(p); })
+			{
+				props.Nested(name_cstr, *field.get());
+			}
+		});
+	}
+
+	struct Vec3Proxy
+	{
+		float x, y, z;
+		static Vec3Proxy from_class(const glm::vec3& v)
+		{
+			return {v.x, v.y, v.z};
+		}
+		glm::vec3 to_class() const
+		{
+			return glm::vec3(x, y, z);
+		}
+	};
+
+	struct QuatProxy
+	{
+		float w, x, y, z;
+		static QuatProxy from_class(const glm::quat& q)
+		{
+			return {q.w, q.x, q.y, q.z};
+		}
+		glm::quat to_class() const
+		{
+			return glm::quat(w, x, y, z);
+		}
+	};
+
+	struct UUIDProxy
+	{
+		uint64_t value;
+		static UUIDProxy from_class(const Chained::UUID& u)
+		{
+			return {static_cast<uint64_t>(u)};
+		}
+		UUID to_class() const
+		{
+			return Chained::UUID(value);
+		}
+	};
+
+	struct ColorProxy
+	{
+		unsigned char r, g, b, a;
+		static ColorProxy from_class(const Chained::Color& c)
+		{
+			return {c.r, c.g, c.b, c.a};
+		}
+		Color to_class() const
+		{
+			return Color(r, g, b, a);
+		}
+	};
+} // namespace Chained
+
+namespace rfl::parsing
+{
+	template <class R, class W, class ProcessorsType>
+	struct Parser<R, W, glm::vec3, ProcessorsType>
+		: public CustomParser<R, W, ProcessorsType, glm::vec3, Chained::Vec3Proxy>
+	{
+	};
+
+	template <class R, class W, class ProcessorsType>
+	struct Parser<R, W, glm::quat, ProcessorsType>
+		: public CustomParser<R, W, ProcessorsType, glm::quat, Chained::QuatProxy>
+	{
+	};
+
+	template <class R, class W, class ProcessorsType>
+	struct Parser<R, W, Chained::UUID, ProcessorsType>
+		: public CustomParser<R, W, ProcessorsType, Chained::UUID, Chained::UUIDProxy>
+	{
+	};
+
+	template <class R, class W, class ProcessorsType>
+	struct Parser<R, W, Chained::Color, ProcessorsType>
+		: public CustomParser<R, W, ProcessorsType, Chained::Color, Chained::ColorProxy>
+	{
+	};
+
+	struct AssetPathProxy
+	{
+		std::string value;
+		static AssetPathProxy from_class(const Chained::AssetPath& p)
+		{
+			return {p.Path};
+		}
+		Chained::AssetPath to_class() const
+		{
+			return {value, "*.*"};
+		}
+	};
+
+	template <class R, class W, class ProcessorsType>
+	struct Parser<R, W, Chained::AssetPath, ProcessorsType>
+		: public CustomParser<R, W, ProcessorsType, Chained::AssetPath, AssetPathProxy>
+	{
+	};
+} // namespace rfl::parsing
+
+#endif // CH_REFLECTION_RFL_IMPL_H
diff --git a/engine/reflection/reflection_traits.h b/engine/reflection/reflection_traits.h
new file mode 100644
index 000000000..ad1128232
--- /dev/null
+++ b/engine/reflection/reflection_traits.h
@@ -0,0 +1,33 @@
+#ifndef CH_REFLECTION_TRAITS_H
+#define CH_REFLECTION_TRAITS_H
+
+#include <type_traits>
+#include <variant>
+
+namespace Chained
+{
+	// Helper to detect std::variant
+	template <typename T> struct is_variant : std::false_type
+	{
+	};
+	template <typename... Args> struct is_variant<std::variant<Args...>> : std::true_type
+	{
+	};
+	template <typename T> inline constexpr bool is_variant_v = is_variant<T>::value;
+
+	template <typename T> struct is_rfl_component : std::false_type
+	{
+	};
+
+	template <typename T> struct is_vector : std::false_type
+	{
+	};
+	template <typename T, typename Alloc> struct is_vector<std::vector<T, Alloc>> : std::true_type
+	{
+		using value_type = T;
+	};
+	template <typename T> inline constexpr bool is_vector_v = is_vector<T>::value;
+
+} // namespace Chained
+
+#endif // CH_REFLECTION_TRAITS_H
diff --git a/engine/runtime/CMakeLists.txt b/engine/runtime/CMakeLists.txt
new file mode 100644
index 000000000..982065876
--- /dev/null
+++ b/engine/runtime/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_library(engine_runtime_core STATIC
+    runtime_layer.h
+    runtime_layer.cpp
+)
+
+target_include_directories(engine_runtime_core PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_runtime_core PUBLIC
+    ChainedEngine::Framework
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_runtime_core PRIVATE engine_pch)
+endif()
diff --git a/engine/runtime/runtime_layer.cpp b/engine/runtime/runtime_layer.cpp
new file mode 100644
index 000000000..4c3d9f2d3
--- /dev/null
+++ b/engine/runtime/runtime_layer.cpp
@@ -0,0 +1,922 @@
+// runtime_layer.cpp
+// Chained Engine — Runtime layer for standalone game execution.
+// Handles project loading, scene transitions, scripting lifecycle, and the main runtime loop.
+
+#include "runtime_layer.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/common/asset_path.h"
+#include "engine/core/events/window_events.h"
+#include "engine/core/platform.h"
+#include "engine/core/service_locator.h"
+#include "engine/core/window.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/ui/ui_font_registry.h"
+#include "engine/ui/widget_renderer.h"
+#include "engine/imgui/imgui_layer.h"
+#include "engine/physics/physics.h"
+#include "engine/project/project.h"
+#include "engine/scene/scene_events.h"
+#include "engine/scene/scene_serializer.h"
+#include "imgui.h"
+#include "engine/scene/systems/asset_resolution_system.h"
+#include "engine/scripting/scene_scripting_manager.h"
+#include "engine/scripting/scriptengine.h"
+
+#include <cctype>
+#include <cmath>
+
+namespace Chained
+{
+
+	RuntimeLayer::RuntimeLayer(const std::string& projectPath)
+		: Layer("RuntimeLayer"),
+		  m_ProjectPath(projectPath)
+	{
+		m_SceneRenderer = std::make_unique<SceneRenderer>();
+
+		m_Renderer = ServiceLocator::TryGet<Renderer>();
+		m_AssetManager = ServiceLocator::TryGet<AssetManager>();
+	}
+
+	RuntimeLayer::~RuntimeLayer() = default;
+
+	void RuntimeLayer::OnAttach()
+	{
+		auto* imguiLayer = Application::Get().GetImGuiLayer();
+		if (imguiLayer)
+		{
+			ImGui::SetCurrentContext(static_cast<ImGuiContext*>(imguiLayer->GetContext()));
+		}
+
+		auto& io = ImGui::GetIO();
+
+		if (io.Fonts->Fonts.Size == 0)
+		{
+			io.Fonts->AddFontDefault();
+			CH_CORE_INFO("RuntimeSystem: Using built-in ImGui default font.");
+		}
+
+		InitProject(m_ProjectPath);
+
+		if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+		{
+			if (ImFont* projectDefaultFont = fontRegistry->EnsureDefaultProjectFont(18.0f, false))
+			{
+				io.FontDefault = projectDefaultFont;
+				CH_CORE_INFO("RuntimeSystem: Switched default UI font to project font.");
+			}
+			else
+			{
+				CH_CORE_WARN(
+					"RuntimeSystem: EnsureDefaultProjectFont returned nullptr — staying with ImGui default font.");
+			}
+		}
+
+		if (imguiLayer)
+		{
+			imguiLayer->RefreshFontAtlasTexture();
+		}
+
+		if (m_Scene)
+		{
+			Window& window = Application::Get().GetWindow();
+			m_Scene->OnViewportResize(window.GetWidth(), window.GetHeight());
+			EnsureRuntimeFramebuffer((uint32_t)window.GetWidth(), (uint32_t)window.GetHeight());
+		}
+	}
+
+	void RuntimeLayer::OnDetach()
+	{
+		StopCurrentScene();
+
+		m_Scene = nullptr;
+		if (auto* se = ServiceLocator::TryGet<ScriptEngine>())
+		{
+			se->SetContextScene(nullptr);
+		}
+		m_LoadState = {};
+	}
+
+	void RuntimeLayer::OnUpdate(Timestep ts)
+	{
+		if (!m_PendingScenePath.empty())
+		{
+			std::string path = std::move(m_PendingScenePath);
+			m_PendingScenePath.clear();
+			LoadScene(path);
+			return;
+		}
+
+		if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+		{
+			if (fontRegistry->NeedsAtlasRebuild())
+			{
+				auto* imguiLayer = Application::Get().GetImGuiLayer();
+				if (imguiLayer)
+				{
+					imguiLayer->ExecuteNextFrame([imguiLayer]() { imguiLayer->RefreshFontAtlasTexture(); });
+				}
+				fontRegistry->ClearRebuildFlag();
+			}
+		}
+
+		if (m_Scene && m_LoadState.State == RuntimeLoadState::LoadingScene)
+		{
+			AssetResolutionSystem::Update(m_Scene->GetRegistry());
+			m_LoadState.OverlayElapsed += (float)ts;
+
+			if (IsSceneReadyToStart() && m_LoadState.OverlayElapsed >= m_LoadState.MinOverlayDuration)
+			{
+				if (auto* wr = ServiceLocator::TryGet<WidgetRenderer>())
+				{
+					wr->ResetButtonStates(m_Scene.get());
+				}
+
+				if (m_Scene->GetSceneState() != SceneState::Play)
+				{
+					m_Scene->TransitionToState(SceneState::Play);
+				}
+
+				// Advance the scene startup while the loading overlay is still active.
+				// PhysicsBodySystem may still be waiting for an async mesh shape bake.
+				m_Scene->OnUpdateRuntime(ts);
+
+				if (!m_Scene->IsStartingUp())
+				{
+					m_LoadState.State = RuntimeLoadState::Running;
+					m_LoadState.SuppressNextUIInput = true;
+					CH_CORE_INFO("RuntimeSystem: Scene assets and physics are ready, entering runtime.");
+					return;
+				}
+			}
+		}
+
+		if (m_Scene && IsRunning())
+		{
+			bool suppress = m_LoadState.SuppressNextUIInput;
+			m_LoadState.SuppressNextUIInput = false;
+			if (auto* wr = ServiceLocator::TryGet<WidgetRenderer>())
+			{
+				wr->ProcessInput(m_Scene.get(), suppress);
+			}
+
+			m_Scene->OnUpdateRuntime(ts);
+
+			if (!m_Scene->GetPendingScenePath().empty())
+			{
+				m_PendingScenePath = m_Scene->GetPendingScenePath();
+				m_Scene->ClearPendingScenePath();
+			}
+		}
+
+		if (m_LoadState.BoostUploadsTimer > 0.0f)
+		{
+			m_LoadState.BoostUploadsTimer -= ts;
+		}
+	}
+
+	void RuntimeLayer::OnRender(Timestep ts)
+	{
+		Window& window = Application::Get().GetWindow();
+		uint32_t width = (uint32_t)window.GetWidth();
+		uint32_t height = (uint32_t)window.GetHeight();
+
+		if (!m_Scene)
+		{
+			m_Renderer->Clear({0.0f, 0.0f, 0.0f, 1.0f});
+			return;
+		}
+
+		if (width == 0 || height == 0)
+		{
+			return;
+		}
+
+		EnsureRuntimeFramebuffer(width, height);
+
+		glm::vec4 bgColor = CalculateBackgroundColor();
+
+		auto camConfig = GetCameraConfig();
+		if (camConfig)
+		{
+			SceneRenderOptions options;
+
+			m_HDRFramebuffer->Bind();
+			m_Renderer->Clear(bgColor);
+			m_SceneRenderer->RenderScene(m_Scene->GetRegistry(), m_Scene->GetSettings(), camConfig->Camera, options);
+			m_HDRFramebuffer->Unbind();
+			m_HDRFramebuffer->Resolve();
+
+			m_Renderer->SetViewport(0, 0, (int)width, (int)height);
+			m_Renderer->Clear(bgColor);
+			m_Renderer->ApplyPostProcessing(m_HDRFramebuffer->GetColorAttachmentRendererID(),
+											m_HDRFramebuffer->GetDepthAttachmentRendererID(), camConfig->Camera,
+											nullptr, {});
+		}
+		else
+		{
+			m_Renderer->Clear(bgColor);
+		}
+	}
+
+	void RuntimeLayer::OnImGuiRender()
+	{
+		if (m_Scene)
+		{
+			ImGuiViewport* viewport = ImGui::GetMainViewport();
+			ImGui::SetNextWindowPos(viewport->WorkPos);
+			ImGui::SetNextWindowSize(viewport->WorkSize);
+			ImGui::SetNextWindowViewport(viewport->ID);
+
+			ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground |
+									 ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
+									 ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBringToFrontOnFocus |
+									 ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoDocking;
+
+			ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, {0, 0});
+			ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+
+			if (ImGui::Begin("RuntimeUI", nullptr, flags))
+			{
+				if (IsRunning())
+				{
+					ImVec2 childSize = ImGui::GetContentRegionAvail();
+					if (ImGui::BeginChild("##RuntimeUICanvas", childSize, false,
+										  ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar |
+											  ImGuiWindowFlags_NoScrollWithMouse))
+					{
+						ImVec2 canvasPos = ImGui::GetCursorScreenPos();
+						ImVec2 canvasSize = ImGui::GetContentRegionAvail();
+						if (auto* wr = ServiceLocator::TryGet<WidgetRenderer>())
+						{
+							wr->DrawCanvas(m_Scene.get(), canvasPos, canvasSize, false);
+						}
+						m_Scene->OnRenderUI();
+					}
+					ImGui::EndChild();
+				}
+			}
+
+			ImGui::End();
+			ImGui::PopStyleVar(2);
+
+			if (m_LoadState.State == RuntimeLoadState::LoadingScene)
+			{
+				DrawLoadingOverlay();
+			}
+		}
+	}
+
+	void RuntimeLayer::OnEvent(Event& e)
+	{
+		EventDispatcher dispatcher(e);
+		dispatcher.Dispatch<WindowResizeEvent>([this](auto& ev) {
+			if (ev.GetWidth() == 0 || ev.GetHeight() == 0)
+			{
+				return false;
+			}
+
+			EnsureRuntimeFramebuffer(ev.GetWidth(), ev.GetHeight());
+			if (m_Scene)
+			{
+				m_Scene->OnViewportResize(ev.GetWidth(), ev.GetHeight());
+			}
+			return false;
+		});
+
+		// Allow C# scripts (and any engine code) to request a scene change at runtime
+		// by firing SceneChangeRequestEvent via Application::Get().OnEvent().
+		dispatcher.Dispatch<SceneChangeRequestEvent>([this](SceneChangeRequestEvent& ev) {
+			std::filesystem::path scenePath = ev.GetPath();
+			if (scenePath.is_relative() && Project::GetActive())
+			{
+				scenePath = Project::GetActive()->GetAssetPath(ev.GetPath());
+			}
+			m_PendingScenePath = scenePath.string();
+			CH_CORE_INFO("RuntimeLayer: Scene change requested → '{}'", m_PendingScenePath);
+			return true;
+		});
+	}
+
+	//-----------------------------------------------------------------------------
+	// Purpose: Load a new scene from file
+	//-----------------------------------------------------------------------------
+	void RuntimeLayer::LoadScene(const std::string& path)
+	{
+		const std::string normalizedPath = NormalizeAssetPath(path);
+		if (normalizedPath.empty())
+		{
+			CH_CORE_WARN("RuntimeSystem: Ignoring empty scene path request.");
+			return;
+		}
+
+		std::filesystem::path scenePath = normalizedPath;
+		if (scenePath.is_relative() && Project::GetActive())
+		{
+			scenePath = Project::GetActive()->GetAssetPath(scenePath);
+		}
+
+		if (!scenePath.is_absolute())
+		{
+			std::error_code ec;
+			scenePath = std::filesystem::absolute(scenePath, ec);
+			if (ec)
+			{
+				CH_CORE_ERROR("RuntimeSystem: Failed to resolve absolute scene path '{}' ({})", normalizedPath,
+							  ec.message());
+				return;
+			}
+		}
+
+		bool sceneAccessible = FileExists(scenePath);
+		if (!sceneAccessible && m_AssetManager && m_AssetManager->IsPacked())
+		{
+			sceneAccessible = !m_AssetManager->ReadProjectAsset(scenePath).empty();
+		}
+		if (!sceneAccessible)
+		{
+			CH_CORE_ERROR("RuntimeSystem: Scene file not found '{}'.", scenePath.string());
+			return;
+		}
+
+		if (!TransitionToScene(scenePath))
+		{
+			CH_CORE_ERROR("RuntimeSystem: Failed to transition to scene '{}'.", scenePath.string());
+		}
+	}
+
+	bool RuntimeLayer::InitProject(const std::string& projectPath)
+	{
+		if (!DiscoverAndLoadProject(projectPath))
+		{
+			return false;
+		}
+
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			CH_CORE_ERROR("Runtime: No active project after DiscoverAndLoadProject - cannot initialize scripting.");
+			return false;
+		}
+		auto assemblyPath =
+			ScriptEngine::ResolveAssemblyPath(project->GetConfig().Scripting, project->GetConfig().ProjectDirectory);
+
+		CH_CORE_INFO("RuntimeSystem: Loading project assembly: {}", assemblyPath.string());
+
+		auto* se = ServiceLocator::TryGet<ScriptEngine>();
+		if (assemblyPath.empty() || !se || !se->ReloadAssembly(assemblyPath.string()))
+		{
+			CH_CORE_WARN(
+				"RuntimeSystem: Script reload failed during project initialization (path: {}). Runtime continues "
+				"without scripts.",
+				assemblyPath.string());
+		}
+
+		if (auto* wr = ServiceLocator::TryGet<WidgetRenderer>())
+		{
+			wr->LoadProjectFonts();
+		}
+
+		ApplyWindowConfiguration();
+		SetupBrandingAndIcon();
+
+		LoadInitialScene();
+
+		return true;
+	}
+
+	bool RuntimeLayer::DiscoverAndLoadProject(const std::string& projectPath)
+	{
+		std::filesystem::path discoveryPath = projectPath;
+
+		if (discoveryPath.empty())
+		{
+			std::filesystem::path exePath = std::filesystem::absolute(
+				std::filesystem::path(Application::Get().GetSpecification().CommandLineArgs.Args[0]));
+			discoveryPath = exePath.parent_path();
+		}
+
+		if (discoveryPath.extension() == ".chproject")
+		{
+			m_ProjectPath = discoveryPath.string();
+		}
+		else
+		{
+			m_ProjectPath = (discoveryPath / (Application::Get().GetSpecification().Name + ".chproject")).string();
+		}
+
+		if (m_ProjectPath.empty())
+		{
+			return false;
+		}
+
+		size_t openedPacks = m_AssetManager->OpenAllPacksInDirectory(Platform::GetExecutableDirectory());
+		if (openedPacks > 0)
+		{
+			CH_CORE_INFO("RuntimeSystem: Mounted {} resource pack(s)", openedPacks);
+		}
+
+		auto project = Project::Load(m_ProjectPath);
+		if (!project)
+		{
+			CH_CORE_ERROR("RuntimeSystem: Failed to load project file at '{}'", m_ProjectPath);
+			return false;
+		}
+
+		Project::SetActive(project);
+
+		CH_CORE_INFO("RuntimeSystem: Project loaded: {}", project->GetName());
+		CH_CORE_INFO("RuntimeSystem: Project Directory: {}", project->GetConfig().ProjectDirectory.string());
+		CH_CORE_INFO("RuntimeSystem: Asset Directory: {}", project->GetAssetDirectory().string());
+
+		m_AssetManager->SetProjectDirectory(project->GetConfig().ProjectDirectory);
+		m_AssetManager->SetAssetDirectory(project->GetAssetDirectory());
+
+#ifdef CH_SOURCE_GAME_DIR
+		{
+			std::filesystem::path srcGameDir(CH_SOURCE_GAME_DIR);
+			std::filesystem::path srcAssetsDir = srcGameDir / "assets";
+			if (std::filesystem::exists(srcAssetsDir))
+			{
+				CH_CORE_INFO("RuntimeSystem: Using source game assets: {}", srcAssetsDir.string());
+				m_AssetManager->SetAssetDirectory(srcAssetsDir);
+			}
+		}
+#endif
+
+		m_Renderer->LoadEngineResources();
+
+		if (auto* se = ServiceLocator::TryGet<ScriptEngine>())
+		{
+			se->TryAutoLoad(project->GetConfig());
+		}
+
+		return true;
+	}
+
+	void RuntimeLayer::ApplyWindowConfiguration()
+	{
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			return;
+		}
+
+		auto& config = project->GetConfig();
+		Window& window = Application::Get().GetWindow();
+
+		bool vsync = config.Window.VSync;
+		int width = config.Window.Width;
+		int height = config.Window.Height;
+		bool fullscreen = config.Runtime.Fullscreen;
+
+		const auto& args = Application::Get().GetSpecification().CommandLineArgs;
+		for (int i = 1; i < args.Count; ++i)
+		{
+			std::string arg = args.Args[i];
+			if (arg == "--width" && i + 1 < args.Count)
+			{
+				width = std::stoi(args.Args[++i]);
+			}
+			else if (arg == "--height" && i + 1 < args.Count)
+			{
+				height = std::stoi(args.Args[++i]);
+			}
+			else if (arg == "--fullscreen")
+			{
+				fullscreen = true;
+			}
+			else if (arg == "--windowed")
+			{
+				fullscreen = false;
+			}
+			else if (arg == "--vsync" && i + 1 < args.Count)
+			{
+				vsync = (std::string(args.Args[++i]) == "on");
+			}
+		}
+
+		window.SetVSync(vsync);
+		if (width != window.GetWidth() || height != window.GetHeight())
+		{
+			window.SetSize(width, height);
+		}
+		window.SetFullscreen(fullscreen);
+	}
+
+	void RuntimeLayer::SetupBrandingAndIcon()
+	{
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			return;
+		}
+
+		auto& config = project->GetConfig();
+		Window& window = Application::Get().GetWindow();
+		window.SetTitle(config.Name);
+
+		if (config.IconPath.empty())
+		{
+			return;
+		}
+
+		// Try resolving via project path first (disk)
+		std::string resolvedIconPath = project->GetAbsolutePath(config.IconPath).string();
+		if (std::filesystem::exists(resolvedIconPath))
+		{
+			CH_CORE_INFO("RuntimeSystem: Setting window icon: {}", resolvedIconPath);
+			window.SetWindowIcon(resolvedIconPath);
+			return;
+		}
+
+		// Try reading from pack (export mode)
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			if (am->IsPacked())
+			{
+				auto data = am->ReadAssetData(config.IconPath);
+				CH_CORE_INFO("RuntimeSystem: Icon pack lookup '{}' → {} bytes", config.IconPath, data.size());
+				if (!data.empty())
+				{
+					CH_CORE_INFO("RuntimeSystem: Setting window icon from pack: {}", config.IconPath);
+					window.SetWindowIconFromMemory(data.data(), data.size());
+					return;
+				}
+			}
+			else
+			{
+				CH_CORE_WARN("RuntimeSystem: AssetManager is NOT packed");
+			}
+		}
+
+		CH_CORE_WARN("RuntimeSystem: Failed to resolve window icon: {}", config.IconPath);
+	}
+
+	void RuntimeLayer::LoadInitialScene()
+	{
+		auto project = Project::GetActive();
+		if (!project)
+		{
+			return;
+		}
+
+		auto& config = project->GetConfig();
+		std::string sceneToLoad = config.StartScene;
+
+		const auto& args = Application::Get().GetSpecification().CommandLineArgs;
+		for (int i = 1; i < args.Count; ++i)
+		{
+			if (std::string(args.Args[i]) == "--scene" && i + 1 < args.Count)
+			{
+				sceneToLoad = args.Args[++i];
+				break;
+			}
+		}
+
+		if (sceneToLoad.empty())
+		{
+			sceneToLoad = config.ActiveScenePath.string();
+		}
+
+		CH_CORE_INFO("RuntimeSystem: Initial scene to load: '{}'", sceneToLoad);
+
+		if (sceneToLoad.empty())
+		{
+			std::filesystem::path scenesDir = project->GetAssetDirectory() / "scenes";
+			if (std::filesystem::exists(scenesDir))
+			{
+				try
+				{
+					for (const auto& entry : std::filesystem::recursive_directory_iterator(scenesDir))
+					{
+						if (entry.path().extension() == ".chscene")
+						{
+							sceneToLoad =
+								std::filesystem::relative(entry.path(), project->GetAssetDirectory()).string();
+							break;
+						}
+					}
+				} catch (const std::filesystem::filesystem_error& e)
+				{
+					CH_CORE_WARN("RuntimeSystem: Failed to enumerate scenes in '{}': {}", scenesDir.string(), e.what());
+				}
+			}
+		}
+
+		if (!sceneToLoad.empty())
+		{
+			LoadScene(sceneToLoad);
+		}
+	}
+
+	void RuntimeLayer::StopCurrentScene()
+	{
+		if (!m_Scene)
+		{
+			return;
+		}
+
+		m_Scene->OnRuntimeStop();
+	}
+
+	void RuntimeLayer::AppendFontRequest(const TextStyle& style, std::vector<std::pair<std::string, float>>& out,
+										 std::unordered_set<std::string>& dedupe) const
+	{
+		std::string fontName = NormalizeAssetPath(style.FontName);
+		if (fontName.empty() || fontName == "Default")
+		{
+			return;
+		}
+
+		const float fontSize = (style.FontSize > 0.0f) ? style.FontSize : 16.0f;
+		const int roundedHalf = static_cast<int>(std::lround(fontSize * 2.0f));
+		const std::string key = fontName + "|" + std::to_string(roundedHalf);
+
+		if (!dedupe.insert(key).second)
+		{
+			return;
+		}
+
+		out.emplace_back(fontName, fontSize);
+	}
+
+	std::vector<std::pair<std::string, float>> RuntimeLayer::CollectSceneFontRequests() const
+	{
+		std::vector<std::pair<std::string, float>> requests;
+		if (!m_Scene)
+		{
+			return requests;
+		}
+
+		std::unordered_set<std::string> dedupe;
+		auto& registry = m_Scene->GetRegistry();
+
+		auto view = registry.view<UIControlComponent>();
+		for (entt::entity id : view)
+		{
+			AppendFontRequest(view.get<UIControlComponent>(id).TextStyle, requests, dedupe);
+		}
+
+		return requests;
+	}
+
+	void RuntimeLayer::PreloadSceneFonts(bool allowRuntimeMutation)
+	{
+		auto requests = CollectSceneFontRequests();
+		if (requests.empty())
+		{
+			return;
+		}
+
+		const int loadedCount = [&]() {
+			if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+			{
+				return fontRegistry->PreloadFonts(requests, allowRuntimeMutation);
+			}
+			return 0;
+		}();
+		if (loadedCount <= 0)
+		{
+			return;
+		}
+
+		CH_CORE_INFO("RuntimeSystem: Preloaded {} scene font tuple(s).", loadedCount);
+
+		if (allowRuntimeMutation && ImGui::GetFrameCount() > 0)
+		{
+			if (auto* imguiLayer = Application::Get().GetImGuiLayer())
+			{
+				if (!imguiLayer->RefreshFontAtlasTexture())
+				{
+					CH_CORE_WARN("RuntimeSystem: Scene fonts were loaded, but font atlas refresh failed.");
+				}
+			}
+		}
+	}
+
+	bool RuntimeLayer::SetupNewScene(const std::filesystem::path& scenePath)
+	{
+		auto nextScene = std::make_shared<Scene>();
+		SceneSerializer serializer(nextScene.get());
+		if (!serializer.Deserialize(scenePath.string()))
+		{
+			m_Scene = nullptr;
+			if (auto* se = ServiceLocator::TryGet<ScriptEngine>())
+			{
+				se->SetContextScene(nullptr);
+			}
+			return false;
+		}
+
+		m_Scene = nextScene;
+		m_Scene->GetSettings().ScenePath = scenePath.string();
+
+		if (auto* se = ServiceLocator::TryGet<ScriptEngine>())
+		{
+			se->SetContextScene(m_Scene.get());
+		}
+
+		Window& window = Application::Get().GetWindow();
+		m_Scene->OnViewportResize(window.GetWidth(), window.GetHeight());
+		EnsureRuntimeFramebuffer((uint32_t)window.GetWidth(), (uint32_t)window.GetHeight());
+
+		return true;
+	}
+
+	void RuntimeLayer::ResetUIState()
+	{
+		if (!m_Scene)
+		{
+			return;
+		}
+
+		auto& registry = m_Scene->GetRegistry();
+		auto view = registry.view<UIControlComponent>();
+		for (entt::entity id : view)
+		{
+			view.get<UIControlComponent>(id).PressedThisFrame = false;
+		}
+	}
+
+	void RuntimeLayer::BeginSceneLoading()
+	{
+		m_LoadState.SuppressNextUIInput = true;
+
+		if (m_Scene)
+		{
+			AssetResolutionSystem::Update(m_Scene->GetRegistry());
+		}
+
+		PreloadSceneFonts(ImGui::GetFrameCount() > 0);
+
+		m_LoadState.BoostUploadsTimer = 5.0f;
+		CH_CORE_INFO("RuntimeSystem: Boosting asset uploads for scene loading...");
+
+		m_LoadState.State = RuntimeLoadState::LoadingScene;
+		m_LoadState.OverlayElapsed = 0.0f;
+		CH_CORE_INFO("RuntimeSystem: Scene loaded, waiting for async assets before runtime start.");
+	}
+
+	bool RuntimeLayer::TransitionToScene(const std::filesystem::path& scenePath)
+	{
+		StopCurrentScene();
+		m_LoadState = {};
+
+		if (!SetupNewScene(scenePath))
+		{
+			return false;
+		}
+
+		ResetUIState();
+		BeginSceneLoading();
+		return true;
+	}
+
+	std::optional<RuntimeLayer::CameraConfig> RuntimeLayer::GetCameraConfig()
+	{
+		auto camera = GetActiveCamera();
+		if (!camera)
+		{
+			return std::nullopt;
+		}
+
+		return CameraConfig{camera.value()};
+	}
+
+	glm::vec4 RuntimeLayer::CalculateBackgroundColor() const
+	{
+		const auto& settings = m_Scene->GetSettings();
+		glm::vec4 bgColor = {settings.BackgroundColor.r / 255.0f, settings.BackgroundColor.g / 255.0f,
+							 settings.BackgroundColor.b / 255.0f, settings.BackgroundColor.a / 255.0f};
+
+		if (settings.Environment && settings.Mode != BackgroundMode::Color)
+		{
+			auto& env = settings.Environment->GetSettings();
+			if (env.Fog.Enabled)
+			{
+				bgColor = glm::vec4(env.Fog.FogColor.r / 255.0f, env.Fog.FogColor.g / 255.0f,
+									env.Fog.FogColor.b / 255.0f, env.Fog.FogColor.a / 255.0f);
+			}
+		}
+
+		return bgColor;
+	}
+
+	std::optional<Camera3D> RuntimeLayer::GetActiveCamera()
+	{
+		if (m_Scene)
+		{
+			return SceneRenderer::GetActiveCamera(m_Scene->GetRegistry());
+		}
+		return std::nullopt;
+	}
+
+	void RuntimeLayer::EnsureRuntimeFramebuffer(uint32_t width, uint32_t height)
+	{
+		if (width == 0 || height == 0)
+		{
+			return;
+		}
+
+		auto project = Project::GetActive();
+		int msaaSampleCount = project ? project->GetConfig().Render.AntiAliasingSamples : 4;
+		uint32_t msaaSamplesClamped = msaaSampleCount > 1 ? (uint32_t)msaaSampleCount : 1u;
+
+		if (m_HDRFramebuffer && msaaSamplesClamped != m_MSAAFramebufferSamples)
+		{
+			m_HDRFramebuffer.reset();
+		}
+
+		if (!m_HDRFramebuffer)
+		{
+			FramebufferSpecification hdrSpec;
+			hdrSpec.Width = width;
+			hdrSpec.Height = height;
+			hdrSpec.Samples = msaaSamplesClamped;
+			hdrSpec.ColorFormat = FramebufferColorFormat::RGBA16F;
+			m_HDRFramebuffer = Framebuffer::Create(hdrSpec);
+			m_MSAAFramebufferSamples = msaaSamplesClamped;
+		}
+		else
+		{
+			const auto& spec = m_HDRFramebuffer->GetSpecification();
+			if (spec.Width != width || spec.Height != height)
+			{
+				m_HDRFramebuffer->Resize(width, height);
+			}
+		}
+	}
+
+	bool RuntimeLayer::IsSceneReadyToStart() const
+	{
+		auto* assetManager = m_AssetManager;
+		if (!assetManager)
+		{
+			return true;
+		}
+		return !assetManager->HasBackgroundWork();
+	}
+
+	void RuntimeLayer::DrawLoadingOverlay()
+	{
+		ImGuiViewport* viewport = ImGui::GetMainViewport();
+		ImGui::SetNextWindowPos(viewport->WorkPos);
+		ImGui::SetNextWindowSize(viewport->WorkSize);
+		ImGui::SetNextWindowViewport(viewport->ID);
+
+		ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+								 ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDocking |
+								 ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;
+
+		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
+		ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.02f, 0.02f, 0.02f, 0.92f));
+
+		if (ImGui::Begin("##RuntimeLoadingOverlay", nullptr, flags))
+		{
+			if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+			{
+				if (ImFont* font = fontRegistry->GetDefaultFont())
+				{
+					ImGui::PushFont(font);
+				}
+			}
+
+			const size_t totalPending = m_AssetManager->GetLoadingAssetCount();
+
+			int dotsCount = (static_cast<int>(ImGui::GetTime() * 2.5f) % 3) + 1;
+			std::string dots(static_cast<size_t>(dotsCount), '.');
+			std::string loadingLine = "Preparing world" + dots;
+			std::string pendingLine = "Pending assets: " + std::to_string(totalPending);
+
+			ImGui::SetCursorPosY(ImGui::GetWindowHeight() * 0.45f);
+
+			const char* title = "Loading scene";
+			ImVec2 titleSize = ImGui::CalcTextSize(title);
+			ImGui::SetCursorPosX((ImGui::GetWindowWidth() - titleSize.x) * 0.5f);
+			ImGui::TextUnformatted(title);
+
+			ImVec2 loadingSize = ImGui::CalcTextSize(loadingLine.c_str());
+			ImGui::SetCursorPosX((ImGui::GetWindowWidth() - loadingSize.x) * 0.5f);
+			ImGui::TextUnformatted(loadingLine.c_str());
+
+			ImVec2 pendingSize = ImGui::CalcTextSize(pendingLine.c_str());
+			ImGui::SetCursorPosX((ImGui::GetWindowWidth() - pendingSize.x) * 0.5f);
+			ImGui::TextUnformatted(pendingLine.c_str());
+
+			if (auto* fontRegistry = ServiceLocator::TryGet<UIFontRegistry>())
+			{
+				if (ImFont* font = fontRegistry->GetDefaultFont())
+				{
+					ImGui::PopFont();
+				}
+			}
+		}
+
+		ImGui::End();
+		ImGui::PopStyleColor();
+		ImGui::PopStyleVar();
+	}
+} // namespace Chained
diff --git a/engine/runtime/runtime_layer.h b/engine/runtime/runtime_layer.h
new file mode 100644
index 000000000..b0bc7c954
--- /dev/null
+++ b/engine/runtime/runtime_layer.h
@@ -0,0 +1,105 @@
+#ifndef CH_RUNTIME_LAYER_H
+#define CH_RUNTIME_LAYER_H
+
+#include "engine/core/layer.h"
+#include "engine/graphics/api/framebuffer.h"
+#include "engine/scene/scene.h"
+#include "engine/graphics/pipeline/scene_renderer.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/assets/asset_manager.h"
+#include <filesystem>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace Chained
+{
+
+	enum class RuntimeLoadState : uint8_t
+	{
+		Idle,
+		LoadingScene,
+		ReadyToPlay,
+		Running
+	};
+
+	struct LoadingState
+	{
+		RuntimeLoadState State = RuntimeLoadState::Idle;
+		float OverlayElapsed = 0.0f;
+		float MinOverlayDuration = 0.35f;
+		bool SuppressNextUIInput = false;
+		float BoostUploadsTimer = 0.0f;
+	};
+
+	// Runs the game/runtime experience, including scene loading and the scene renderer.
+	class RuntimeLayer : public Layer
+	{
+	public:
+		RuntimeLayer(const std::string& projectPath);
+
+		~RuntimeLayer() override;
+
+		void OnAttach() override;
+		void OnDetach() override;
+		void OnUpdate(Timestep ts) override;
+		void OnRender(Timestep ts) override;
+		void OnImGuiRender() override;
+		void OnEvent(Event& e) override;
+
+		// Loads a scene by project-relative or absolute path.
+		void LoadScene(const std::string& path);
+
+		bool IsRunning() const
+		{
+			return m_LoadState.State == RuntimeLoadState::Running;
+		}
+
+	private:
+		bool InitProject(const std::string& projectPath);
+		bool DiscoverAndLoadProject(const std::string& projectPath);
+		void ApplyWindowConfiguration();
+		void SetupBrandingAndIcon();
+		void LoadInitialScene();
+		bool TransitionToScene(const std::filesystem::path& scenePath);
+		void StopCurrentScene();
+		void PreloadSceneFonts(bool allowRuntimeMutation);
+		std::vector<std::pair<std::string, float>> CollectSceneFontRequests() const;
+		void EnsureRuntimeFramebuffer(uint32_t width, uint32_t height);
+		bool IsSceneReadyToStart() const;
+		void DrawLoadingOverlay();
+
+		std::optional<Camera3D> GetActiveCamera();
+
+		struct CameraConfig
+		{
+			Camera3D Camera;
+		};
+		std::optional<CameraConfig> GetCameraConfig();
+		glm::vec4 CalculateBackgroundColor() const;
+
+		bool SetupNewScene(const std::filesystem::path& scenePath);
+		void ResetUIState();
+		void BeginSceneLoading();
+		void AppendFontRequest(const struct TextStyle& style, std::vector<std::pair<std::string, float>>& out,
+							   std::unordered_set<std::string>& dedupe) const;
+
+	private:
+		std::shared_ptr<Scene> m_Scene;
+		std::unique_ptr<SceneRenderer> m_SceneRenderer;
+		Renderer* m_Renderer = nullptr;
+		AssetManager* m_AssetManager = nullptr;
+
+	private:
+		std::string m_ProjectPath;
+		LoadingState m_LoadState;
+
+		std::string m_PendingScenePath;
+		std::shared_ptr<Framebuffer> m_HDRFramebuffer;
+		uint32_t m_MSAAFramebufferSamples = 0;
+	};
+} // namespace Chained
+
+#endif // CH_RUNTIME_LAYER_H
diff --git a/engine/scene/CMakeLists.txt b/engine/scene/CMakeLists.txt
index 8cceebbd0..cb3b7cfd4 100644
--- a/engine/scene/CMakeLists.txt
+++ b/engine/scene/CMakeLists.txt
@@ -1,68 +1,104 @@
-add_library(engine_scene ${SUBMODULE_LIB_TYPE}
-        yaml.h
-        scene.cpp
-        project.cpp
-        project_serializer.cpp
-        scene_serializer.cpp
-        component_serializer.cpp
-        hierarchy_serializer.cpp
-        prefab_serializer.cpp
-        scene_camera.cpp
-        editor_camera.cpp
-        entity.cpp
-        scene_picking.cpp
-        components/mesh_component.cpp
+# 1. Core library (No UI / Graphics dependencies)
+add_library(engine_scene_core STATIC
+    entity.cpp entity.h
+    scene.h
+    scene_events.h scene_settings.h scene_state.h
+    camera.cpp camera.h
+    components.h
+    components/core/transform_component.h
+    components/core/id_component.h
+    components/core/tag_component.h
+    components/core/hierarchy_component.h
+    components/render/camera_component.h
+    components/render/light_component.h
+    components/render/model_component.h
+    components/render/sprite_component.h
+    components/render/shader_component.h
+    components/render/primitive_component.h
+    components/physics/physics_component.h
+    components/audio/audio_component.h
+    components/animation/animation_component.h
+    components/animation/animation_graph_component.h
+    components/ui/control_component.h
+    components/ui/ui_action_component.h
+    components/ui/scene_transition_component.h
+    components/gameplay/player_component.h
+    components/gameplay/spawn_component.h
+    components/gameplay/network_identity_component.h
+    components/scripting/scripting_components.h
+)
+target_include_directories(engine_scene_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR})
+target_link_libraries(engine_scene_core PUBLIC engine_reflection engine_assets engine_external_entt glm)
+if(TARGET engine_pch)
+    target_link_libraries(engine_scene_core PRIVATE engine_pch)
+endif()
+set_target_properties(engine_scene_core PROPERTIES UNITY_BUILD OFF)
 
-        scene.h
-        scene_events.h
-        project.h
-        project_serializer.h
-        scene_serializer.h
-        component_serializer.h
-        hierarchy_serializer.h
-        prefab_serializer.h
-        scene_camera.h
-        editor_camera.h
-        scene_picking.h
-        scene_settings.h
-        components.h
-        components/animation_component.h
-        components/audio_component.h
-        components/camera_component.h
-        components/control_component.h
-        components/game_components.h
-        components/hierarchy_component.h
-        components/id_component.h
-        components/light_component.h
-        components/mesh_component.h
-        components/navigation_component.h
-        components/physics_component.h
-        components/scripting_components.h
-        components/shader_component.h
-        components/tag_component.h
-        components/transform_component.h
-        components/sprite_component.h
-        entity.h
+# 2. Main scene library (Serialization, Registry, UI Components)
+add_library(engine_scene STATIC
+    component_registry.cpp
+    component_registry_core.cpp
+    component_registry_gameplay.cpp
+    component_registry_physics.cpp
+    component_registry_rendering.cpp
+    component_registry_scripting.cpp
+    component_registry_ui.cpp
+    component_ui_control.cpp
+    component_serializer.cpp
+    hierarchy_serializer.cpp
+    prefab_serializer.cpp
+    scene.cpp
+    scene_serializer.cpp
+    async_scene_loader.h
+    async_scene_loader.cpp
+    systems/hierarchy_system.h
+    systems/hierarchy_system.cpp
+    systems/transform_system.h
+    systems/transform_system.cpp
+    systems/animation_system.h
+    systems/animation_system.cpp
+    systems/audio_system.h
+    systems/audio_system.cpp
+    systems/physics_body_system.h
+    systems/physics_body_system.cpp
+    systems/asset_resolution_system.h
+    systems/asset_resolution_system.cpp
+    systems/primitive_system.h
+    systems/primitive_system.cpp
+    systems/scene_transition_system.h
+    systems/scene_transition_system.cpp
+    systems/network_system.h
+    systems/network_system.cpp
+    systems/camera_auto_select_system.h
+    systems/camera_auto_select_system.cpp
+    systems/system_manager.h
+    systems/system_manager.cpp
+    components/scripting/scripting_components.cpp
 )
-set_target_properties(engine_scene PROPERTIES UNITY_BUILD OFF)
 
 target_include_directories(engine_scene PUBLIC
-    ${ENGINE_INCLUDE_DIRS}
-    ${yaml-cpp_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/imgui
-    ${CMAKE_SOURCE_DIR}/include/imgui/backends
-    ${CMAKE_SOURCE_DIR}/include/entt/src
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
 )
 
-target_link_libraries(engine_scene PUBLIC 
+target_link_libraries(engine_scene PUBLIC
+    engine_scene_core
+    engine_reflection
     engine_core
     engine_graphics
+    engine_ui
+    engine_project
     engine_physics
     engine_audio
-    yaml-cpp
-    EnTT::EnTT
+    engine_scripting
+    engine_network
+    engine_external_entt
+    glm
+    engine_external_imgui
 )
 
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(engine_scene)
+if(TARGET engine_pch)
+    target_link_libraries(engine_scene PRIVATE engine_pch)
 endif()
+
+set_target_properties(engine_scene PROPERTIES UNITY_BUILD OFF)
diff --git a/engine/scene/async_scene_loader.cpp b/engine/scene/async_scene_loader.cpp
new file mode 100644
index 000000000..05acd99f5
--- /dev/null
+++ b/engine/scene/async_scene_loader.cpp
@@ -0,0 +1,126 @@
+#include "engine/scene/async_scene_loader.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/common/thread_pool.h"
+
+#include "engine/core/service_locator.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/components.h"
+#include "engine/scene/scene_serializer.h"
+#include "engine/scene/systems/physics_body_system.h"
+
+namespace Chained
+{
+
+	bool AsyncSceneLoader::LoadSceneAsync(const std::filesystem::path& path, SceneLoadCallback onComplete)
+	{
+		if (m_IsLoading)
+		{
+			CH_CORE_WARN("AsyncSceneLoader: A scene load is already in progress.");
+			return false;
+		}
+
+		auto* threadPool = ServiceLocator::TryGet<ThreadPool>();
+		if (!threadPool)
+		{
+			CH_CORE_ERROR("AsyncSceneLoader: ThreadPool service unavailable.");
+			if (onComplete)
+			{
+				onComplete(nullptr, "ThreadPool service unavailable.");
+			}
+			return false;
+		}
+
+		m_IsLoading = true;
+		m_CurrentPath = path;
+		m_OnComplete = std::move(onComplete);
+		SetStatus("Loading scene file...", 0.1f);
+
+		std::filesystem::path scenePath = path;
+
+		m_Future = threadPool->Enqueue([this, scenePath]() -> SceneLoadResult {
+			SetStatus("Deserializing scene YAML...", 0.25f);
+
+			auto newScene = std::make_shared<Scene>();
+			SceneSerializer serializer(newScene.get());
+
+			if (!serializer.Deserialize(scenePath.string()))
+			{
+				return SceneLoadResult{nullptr, serializer.GetLastError()};
+			}
+
+			SetStatus("Pre-building physics shapes & assets...", 0.6f);
+
+			// Pre-build Jolt physics shapes on worker thread if physics service is available
+			if (auto* physicsService = ServiceLocator::TryGet<Physics>())
+			{
+				if (auto* physicsWorld = physicsService->GetWorld())
+				{
+					auto view = newScene->GetRegistry().view<RigidBodyComponent, ColliderComponent>();
+					for (auto entity : view)
+					{
+						PhysicsBodyDesc desc;
+						if (PhysicsBodySystem::BuildBodyDesc(newScene->GetRegistry(), entity, desc))
+						{
+							if (desc.Shape == ColliderType::Mesh && !desc.CacheKey.empty())
+							{
+								physicsWorld->PrebuildShape(desc);
+							}
+						}
+					}
+				}
+			}
+
+			SetStatus("Finalizing staging scene...", 0.9f);
+			return SceneLoadResult{newScene, ""};
+		});
+
+		return true;
+	}
+
+	void AsyncSceneLoader::OnUpdate(Timestep ts)
+	{
+		if (!m_IsLoading || !m_Future.valid())
+		{
+			return;
+		}
+
+		if (m_Future.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
+		{
+			SetStatus("Finalizing GPU buffer uploads...", 0.95f);
+
+			SceneLoadResult result;
+			try
+			{
+				result = m_Future.get();
+			} catch (const std::exception& e)
+			{
+				result.error = std::string("Exception during scene load: ") + e.what();
+			}
+
+			// Finalize GPU uploads on main thread
+			if (auto* assetManager = ServiceLocator::TryGet<AssetManager>())
+			{
+				assetManager->FinalizePendingLoads();
+			}
+
+			m_IsLoading = false;
+			SetStatus("Complete", 1.0f);
+
+			if (m_OnComplete)
+			{
+				m_OnComplete(result.scene, result.error);
+			}
+		}
+	}
+
+	void AsyncSceneLoader::Cancel()
+	{
+		if (m_IsLoading)
+		{
+			m_IsLoading = false;
+			SetStatus("Cancelled", 0.0f);
+			m_OnComplete = nullptr;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scene/async_scene_loader.h b/engine/scene/async_scene_loader.h
new file mode 100644
index 000000000..5cef9f474
--- /dev/null
+++ b/engine/scene/async_scene_loader.h
@@ -0,0 +1,80 @@
+#ifndef CH_ASYNC_SCENE_LOADER_H
+#define CH_ASYNC_SCENE_LOADER_H
+
+#include "engine/common/timestep.h"
+#include "engine/scene/scene.h"
+#include <atomic>
+#include <filesystem>
+#include <functional>
+#include <future>
+#include <memory>
+#include <mutex>
+#include <string>
+
+namespace Chained
+{
+
+	class AsyncSceneLoader
+	{
+	public:
+		using SceneLoadCallback = std::function<void(std::shared_ptr<Scene> newScene, const std::string& error)>;
+
+		struct SceneLoadResult
+		{
+			std::shared_ptr<Scene> scene;
+			std::string error;
+		};
+
+		AsyncSceneLoader() = default;
+		~AsyncSceneLoader() = default;
+
+		/// Starts an asynchronous scene loading task on a worker thread.
+		bool LoadSceneAsync(const std::filesystem::path& path, SceneLoadCallback onComplete);
+
+		/// Call every frame on the main thread to check loading completion and finalize GPU assets.
+		void OnUpdate(Timestep ts);
+
+		/// Returns true if a scene is currently being loaded asynchronously.
+		bool IsLoading() const
+		{
+			return m_IsLoading;
+		}
+
+		/// Returns current loading progress between 0.0f and 1.0f.
+		float GetProgress() const
+		{
+			return m_Progress;
+		}
+
+		/// Returns current human-readable status string.
+		std::string GetStatus() const
+		{
+			std::lock_guard<std::mutex> lock(m_StatusMutex);
+			return m_Status;
+		}
+
+		/// Cancels any in-flight loading operation.
+		void Cancel();
+
+	private:
+		void SetStatus(const std::string& status, float progress)
+		{
+			std::lock_guard<std::mutex> lock(m_StatusMutex);
+			m_Status = status;
+			m_Progress = progress;
+		}
+
+	private:
+		std::atomic<bool> m_IsLoading{false};
+		std::atomic<float> m_Progress{0.0f};
+		mutable std::mutex m_StatusMutex;
+		std::string m_Status;
+
+		std::filesystem::path m_CurrentPath;
+		std::future<SceneLoadResult> m_Future;
+		SceneLoadCallback m_OnComplete;
+	};
+
+} // namespace Chained
+
+#endif // CH_ASYNC_SCENE_LOADER_H
diff --git a/engine/scene/camera.cpp b/engine/scene/camera.cpp
new file mode 100644
index 000000000..42dd8b489
--- /dev/null
+++ b/engine/scene/camera.cpp
@@ -0,0 +1,81 @@
+#include "camera.h"
+
+namespace Chained
+{
+
+	void Camera::SetPerspective(float verticalFov, float nearClip, float farClip)
+	{
+		m_ProjectionType = ProjectionType::Perspective;
+		m_PerspectiveFOV = verticalFov;
+		m_PerspectiveNear = nearClip;
+		m_PerspectiveFar = farClip;
+		RecalculateProjection();
+	}
+
+	void Camera::SetOrthographic(float size, float nearClip, float farClip)
+	{
+		m_ProjectionType = ProjectionType::Orthographic;
+		m_OrthographicSize = size;
+		m_OrthographicNear = nearClip;
+		m_OrthographicFar = farClip;
+		RecalculateProjection();
+	}
+
+	void Camera::SetViewportSize(uint32_t width, uint32_t height)
+	{
+		if (width == 0 || height == 0)
+		{
+			return;
+		}
+		m_AspectRatio = (float)width / (float)height;
+		RecalculateProjection();
+	}
+
+	void Camera::RecalculateProjection()
+	{
+		if (m_ProjectionType == ProjectionType::Perspective)
+		{
+			m_Projection = glm::perspective(m_PerspectiveFOV, m_AspectRatio, m_PerspectiveNear, m_PerspectiveFar);
+		}
+		else
+		{
+			float orthoLeft = -m_OrthographicSize * m_AspectRatio * 0.5f;
+			float orthoRight = m_OrthographicSize * m_AspectRatio * 0.5f;
+			float orthoBottom = -m_OrthographicSize * 0.5f;
+			float orthoTop = m_OrthographicSize * 0.5f;
+			m_Projection =
+				glm::ortho(orthoLeft, orthoRight, orthoBottom, orthoTop, m_OrthographicNear, m_OrthographicFar);
+		}
+	}
+
+	Camera3D Camera::GetCamera3D(const glm::mat4& transform) const
+	{
+		Camera3D camera;
+		camera.Position = transform[3];
+		glm::vec3 forward = -glm::vec3(transform[2]);
+		camera.Target = camera.Position + forward;
+		camera.Up = glm::vec3(transform[1]);
+		camera.Projection = m_ProjectionType;
+		camera.FovDegrees = glm::degrees(m_PerspectiveFOV);
+		camera.OrthographicSize = m_OrthographicSize;
+		camera.NearClip = (m_ProjectionType == ProjectionType::Perspective) ? m_PerspectiveNear : m_OrthographicNear;
+		camera.FarClip = (m_ProjectionType == ProjectionType::Perspective) ? m_PerspectiveFar : m_OrthographicFar;
+		camera.ProjectionMatrix = m_Projection;
+		camera.ViewMatrix = glm::inverse(transform);
+		return camera;
+	}
+
+	Camera2D Camera::GetCamera2D(const glm::mat4& transform) const
+	{
+		Camera2D camera;
+		camera.Position = glm::vec2(transform[3]);
+		camera.Rotation = glm::degrees(glm::atan(transform[0][1], transform[0][0]));
+		camera.Zoom = 1.0f / m_OrthographicSize;
+		camera.NearClip = m_OrthographicNear;
+		camera.FarClip = m_OrthographicFar;
+
+		camera.ViewMatrix = glm::inverse(transform);
+		camera.ProjectionMatrix = m_Projection;
+		return camera;
+	}
+} // namespace Chained
diff --git a/engine/scene/camera.h b/engine/scene/camera.h
new file mode 100644
index 000000000..42cf4c437
--- /dev/null
+++ b/engine/scene/camera.h
@@ -0,0 +1,113 @@
+#ifndef CH_CAMERA_H
+#define CH_CAMERA_H
+
+#include <glm/glm.hpp>
+#include "engine/graphics/camera_types.h"
+
+namespace Chained
+{
+	class Camera
+	{
+	public:
+		using ProjectionType = Chained::ProjectionType;
+
+		Camera()
+		{
+			RecalculateProjection();
+		}
+		virtual ~Camera() = default;
+
+		const glm::mat4& GetProjection() const
+		{
+			return m_Projection;
+		}
+
+		void SetPerspective(float verticalFov, float nearClip, float farClip);
+		void SetOrthographic(float size, float nearClip, float farClip);
+		void SetViewportSize(uint32_t width, uint32_t height);
+
+		ProjectionType GetProjectionType() const
+		{
+			return m_ProjectionType;
+		}
+		void SetProjectionType(ProjectionType type)
+		{
+			m_ProjectionType = type;
+			RecalculateProjection();
+		}
+
+		float GetPerspectiveVerticalFOV() const
+		{
+			return m_PerspectiveFOV;
+		}
+		void SetPerspectiveVerticalFOV(float fov)
+		{
+			m_PerspectiveFOV = fov;
+			RecalculateProjection();
+		}
+		float GetPerspectiveNearClip() const
+		{
+			return m_PerspectiveNear;
+		}
+		void SetPerspectiveNearClip(float nearClip)
+		{
+			m_PerspectiveNear = nearClip;
+			RecalculateProjection();
+		}
+		float GetPerspectiveFarClip() const
+		{
+			return m_PerspectiveFar;
+		}
+		void SetPerspectiveFarClip(float farClip)
+		{
+			m_PerspectiveFar = farClip;
+			RecalculateProjection();
+		}
+
+		float GetOrthographicSize() const
+		{
+			return m_OrthographicSize;
+		}
+		void SetOrthographicSize(float size)
+		{
+			m_OrthographicSize = size;
+			RecalculateProjection();
+		}
+		float GetOrthographicNearClip() const
+		{
+			return m_OrthographicNear;
+		}
+		void SetOrthographicNearClip(float nearClip)
+		{
+			m_OrthographicNear = nearClip;
+			RecalculateProjection();
+		}
+		float GetOrthographicFarClip() const
+		{
+			return m_OrthographicFar;
+		}
+		void SetOrthographicFarClip(float farClip)
+		{
+			m_OrthographicFar = farClip;
+			RecalculateProjection();
+		}
+
+		Camera3D GetCamera3D(const glm::mat4& transform) const;
+		Camera2D GetCamera2D(const glm::mat4& transform) const;
+
+	protected:
+		void RecalculateProjection();
+
+	protected:
+		glm::mat4 m_Projection{1.0f};
+
+		ProjectionType m_ProjectionType = ProjectionType::Perspective;
+		float m_PerspectiveFOV = glm::radians(45.0f);
+		float m_PerspectiveNear = 0.1f, m_PerspectiveFar = 10000.0f;
+
+		float m_OrthographicSize = 10.0f;
+		float m_OrthographicNear = -1.0f, m_OrthographicFar = 1.0f;
+		float m_AspectRatio = 16.0f / 9.0f;
+	};
+} // namespace Chained
+#endif // CH_CAMERA_H
diff --git a/engine/scene/component_registry.cpp b/engine/scene/component_registry.cpp
new file mode 100644
index 000000000..560d8c337
--- /dev/null
+++ b/engine/scene/component_registry.cpp
@@ -0,0 +1,33 @@
+#include "component_registry.h"
+
+namespace Chained
+{
+	std::unordered_map<::entt::id_type, ComponentMetadata> ComponentRegistry::s_Registry;
+
+	void ComponentRegistry::Register(::entt::id_type typeId, const ComponentMetadata& metadata)
+	{
+		s_Registry[typeId] = metadata;
+	}
+
+	// Extern declarations for per-category registries to reduce obj file sizes
+	extern void RegisterCoreComponents();
+	extern void RegisterRenderingComponents();
+	extern void RegisterPhysicsComponents();
+	extern void RegisterGameplayComponents();
+	extern void RegisterScriptingComponents();
+	extern void RegisterUIComponents();
+	extern void RegisterUIControlComponent();
+
+	void ComponentRegistry::RegisterEngineComponents()
+	{
+		RegisterCoreComponents();
+		RegisterRenderingComponents();
+		RegisterPhysicsComponents();
+		RegisterGameplayComponents();
+		RegisterScriptingComponents();
+
+		// UI
+		RegisterUIComponents();
+		RegisterUIControlComponent();
+	}
+} // namespace Chained
diff --git a/engine/scene/component_registry.h b/engine/scene/component_registry.h
new file mode 100644
index 000000000..24d035f67
--- /dev/null
+++ b/engine/scene/component_registry.h
@@ -0,0 +1,260 @@
+#ifndef CH_COMPONENT_REGISTRY_H
+// std::remove/erase used in RegisterReflective
+#include <algorithm>
+#define CH_COMPONENT_REGISTRY_H
+
+#include "engine/scene/entity.h"
+#include "engine/scene/scene.h"
+#include <entt/entt.hpp>
+#include <string>
+#include <vector>
+#include <functional>
+#include <unordered_map>
+#include <yaml-cpp/yaml.h>
+
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	/**
+	 * @brief Metadata required for a component to be integrated into Editor and Serialization.
+	 */
+	struct ComponentMetadata
+	{
+		std::string Name;
+		std::string SerializationKey;
+		const char* Icon = nullptr;
+
+		// UI Drawing callback (Inspector)
+		std::function<void(Entity)> DrawUI;
+
+		// Serialization callbacks
+		std::function<void(YAML::Emitter&, Entity)> Serialize;
+		std::function<void(Entity, YAML::Node)> Deserialize;
+
+		// Lifecycle callbacks
+		std::function<bool(Entity)> Has;
+		std::function<std::vector<uint64_t>(Scene*)> GetAll;
+		std::function<void(Entity)> Add;
+		std::function<void(Entity)> Remove;
+		std::function<void(Entity, Entity)> Copy;
+
+		// Visibility and filters
+		std::string Category = "Other";
+		bool Visible = true;
+		bool AllowAdd = true;
+		bool IsWidget = false;
+		bool IsReflective = false;
+
+		// Type-erased reflection caller.
+		// Used by the Editor (UI mode) and Serializer (Serialize/Deserialize mode).
+		std::function<void(Entity, IPropertyArchiveBase&, ReflectionMode)> ReflectInternal;
+
+		// Notifies EnTT that the component changed (triggers on_update observers).
+		// Called by the inspector after a reflected field is edited.
+		std::function<void(Entity)> NotifyUpdate;
+	};
+
+	/**
+	 * @brief Centralized registry for all components (Engine & Game).
+	 */
+	class ComponentRegistry
+	{
+	public:
+		static void Register(entt::id_type typeId, const ComponentMetadata& metadata);
+		static void RegisterEngineComponents();
+
+		static const std::unordered_map<entt::id_type, ComponentMetadata>& GetRegistry()
+		{
+			return s_Registry;
+		}
+		static bool Exists(entt::id_type typeId)
+		{
+			return s_Registry.contains(typeId);
+		}
+		static const ComponentMetadata& GetMetadata(::entt::id_type typeId)
+		{
+			auto it = s_Registry.find(typeId);
+			CH_CORE_ASSERT(it != s_Registry.end(), "ComponentRegistry::GetMetadata — type not registered!");
+			return it->second;
+		}
+		static ComponentMetadata& GetMetadataMutable(::entt::id_type typeId)
+		{
+			auto it = s_Registry.find(typeId);
+			CH_CORE_ASSERT(it != s_Registry.end(), "ComponentRegistry::GetMetadataMutable — type not registered!");
+			return it->second;
+		}
+
+		static void SetAllowAdd(::entt::id_type typeId, bool allow)
+		{
+			s_Registry.at(typeId).AllowAdd = allow;
+		}
+		static void SetVisible(::entt::id_type typeId, bool visible)
+		{
+			s_Registry.at(typeId).Visible = visible;
+		}
+		static void SetIsWidget(::entt::id_type typeId, bool isWidget)
+		{
+			s_Registry.at(typeId).IsWidget = isWidget;
+		}
+
+		// Editor-specific API: allows overriding metadata for editor-specific behavior
+		// (undo/redo, custom DrawUI, etc.) without exposing mutable access to the full struct.
+		static void OverrideMetadata(::entt::id_type typeId, const ComponentMetadata& override)
+		{
+			auto it = s_Registry.find(typeId);
+			CH_CORE_ASSERT(it != s_Registry.end(), "ComponentRegistry::OverrideMetadata — type not registered!");
+			auto& existing = it->second;
+			if (!override.Name.empty())
+			{
+				existing.Name = override.Name;
+			}
+			if (override.Icon)
+			{
+				existing.Icon = override.Icon;
+			}
+			if (override.DrawUI)
+			{
+				existing.DrawUI = override.DrawUI;
+			}
+			if (override.Add)
+			{
+				existing.Add = override.Add;
+			}
+			if (override.Remove)
+			{
+				existing.Remove = override.Remove;
+			}
+			if (override.Serialize)
+			{
+				existing.Serialize = override.Serialize;
+			}
+			if (override.Deserialize)
+			{
+				existing.Deserialize = override.Deserialize;
+			}
+			if (override.Copy)
+			{
+				existing.Copy = override.Copy;
+			}
+			if (override.NotifyUpdate)
+			{
+				existing.NotifyUpdate = override.NotifyUpdate;
+			}
+			existing.IsWidget = override.IsWidget;
+			existing.Category = override.Category;
+			existing.AllowAdd = override.AllowAdd;
+		}
+
+		/**
+		 * @brief Registers a component that implements 'void Reflect(Properties& props)'.
+		 * Automatically generates UI and Serialization handlers.
+		 *
+		 * SerializationKey strips spaces from the display name before appending "Component"
+		 * so that multi-word names like "Rigid Body" produce the correct YAML key
+		 * "RigidBodyComponent" rather than "Rigid BodyComponent".
+		 */
+		template <typename T>
+		static void RegisterReflective(const std::string& name, const char* icon = nullptr,
+									   const std::string& category = "Game")
+		{
+			ComponentMetadata metadata;
+			metadata.Name = name;
+			// Strip spaces: "Rigid Body" -> "RigidBodyComponent"
+			std::string keyBase = name;
+			keyBase.erase(std::remove(keyBase.begin(), keyBase.end(), ' '), keyBase.end());
+			metadata.SerializationKey = keyBase + "Component";
+			metadata.Icon = icon;
+			metadata.Category = category;
+
+			metadata.Has = [](Entity e) { return e.HasComponent<T>(); };
+			metadata.NotifyUpdate = [](Entity e) {
+				if (e.HasComponent<T>())
+				{
+					e.GetRegistry().template patch<T>(e, [](T&) {});
+				}
+			};
+			metadata.GetAll = [](class Scene* s) {
+				std::vector<uint64_t> ids;
+				for (auto ent : s->GetRegistry().view<T>())
+				{
+					ids.push_back(static_cast<uint64_t>(ent));
+				}
+				return ids;
+			};
+			metadata.Add = [](Entity e) {
+				if (!e.HasComponent<T>())
+				{
+					e.AddComponent<T>();
+				}
+			};
+			metadata.Remove = [](Entity e) {
+				if (e.HasComponent<T>())
+				{
+					e.RemoveComponent<T>();
+				}
+			};
+			metadata.Copy = [](Entity src, Entity dst) {
+				if (src.HasComponent<T>())
+				{
+					dst.AddOrReplaceComponent<T>(src.GetComponent<T>());
+				}
+			};
+
+			metadata.IsReflective = true;
+			metadata.ReflectInternal = [](Entity e, IPropertyArchiveBase& archive, ReflectionMode mode) {
+				if (mode == ReflectionMode::Deserialize)
+				{
+					auto& comp = e.AddOrReplaceComponent<T>();
+					GenericProperties props(archive);
+					if constexpr (is_rfl_component<T>::value)
+					{
+						ReflectFromRfl(comp, props);
+					}
+					else
+					{
+						comp.Reflect(props);
+					}
+					// Fire on_update so observer-driven systems (e.g. PrimitiveSystem)
+					// can react to the fully-populated component after deserialization.
+					// on_construct fired above with default data; on_update carries the real data.
+					e.GetRegistry().template patch<T>(e, [](T&) {});
+				}
+				else if (e.HasComponent<T>())
+				{
+					GenericProperties props(archive);
+					auto& comp = e.GetComponent<T>();
+					if constexpr (is_rfl_component<T>::value)
+					{
+						ReflectFromRfl(comp, props);
+					}
+					else
+					{
+						comp.Reflect(props);
+					}
+				}
+			};
+
+			Register(entt::type_hash<T>::value(), metadata);
+		}
+
+	private:
+		static std::unordered_map<entt::id_type, ComponentMetadata> s_Registry;
+	};
+
+/**
+ * @brief Macro for automatic static registration of components.
+ * Use this in your component's header file, after the closing namespace brace.
+ */
+#define CH_CONCAT_(a, b) a##b
+#define CH_CONCAT(a, b) CH_CONCAT_(a, b)
+#define CH_REGISTER_COMPONENT(type, name, icon, category)                                                              \
+	static bool CH_CONCAT(s_CompReg_, __LINE__) = []() {                                                               \
+		::Chained::ComponentRegistry::RegisterReflective<type>(name, icon, category);                                  \
+		return true;                                                                                                   \
+	}()
+
+} // namespace Chained
+
+#endif // CH_COMPONENT_REGISTRY_H
diff --git a/engine/scene/component_registry_core.cpp b/engine/scene/component_registry_core.cpp
new file mode 100644
index 000000000..4811d1410
--- /dev/null
+++ b/engine/scene/component_registry_core.cpp
@@ -0,0 +1,24 @@
+// Core component registrations (Transform, Tag, Camera, ID, Name, Hierarchy)
+// Split into its own TU to reduce obj file size in MinGW Clang Debug builds.
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/render/camera_component.h"
+#include "components/core/hierarchy_component.h"
+#include "components/core/id_component.h"
+#include "components/core/tag_component.h"
+#include "components/core/transform_component.h"
+#include "thirdparty/IconsFontAwesome6.h"
+
+namespace Chained
+{
+	void RegisterCoreComponents()
+	{
+		ComponentRegistry::RegisterReflective<TransformComponent>("Transform", ICON_FA_ARROWS_UP_DOWN_LEFT_RIGHT,
+																  "Core");
+		ComponentRegistry::RegisterReflective<TagComponent>("Tag", ICON_FA_TAG, "Core");
+		ComponentRegistry::RegisterReflective<CameraComponent>("Camera", ICON_FA_VIDEO, "Core");
+		ComponentRegistry::RegisterReflective<IDComponent>("ID", nullptr, "Core");
+		ComponentRegistry::RegisterReflective<NameComponent>("Name", nullptr, "Core");
+		ComponentRegistry::RegisterReflective<HierarchyComponent>("Hierarchy", nullptr, "Core");
+	}
+} // namespace Chained
diff --git a/engine/scene/component_registry_gameplay.cpp b/engine/scene/component_registry_gameplay.cpp
new file mode 100644
index 000000000..bd76ea5c6
--- /dev/null
+++ b/engine/scene/component_registry_gameplay.cpp
@@ -0,0 +1,23 @@
+// Gameplay & Audio component registrations (Audio, Animation, SceneTransition)
+// Split into its own TU to reduce obj file size in MinGW Clang Debug builds.
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/animation/animation_component.h"
+#include "components/gameplay/player_component.h"
+#include "components/audio/audio_component.h"
+#include "components/ui/scene_transition_component.h"
+#include "components/gameplay/network_identity_component.h"
+#include "thirdparty/IconsFontAwesome6.h"
+
+namespace Chained
+{
+	void RegisterGameplayComponents()
+	{
+		ComponentRegistry::RegisterReflective<AudioComponent>("Audio", ICON_FA_VOLUME_HIGH, "Audio");
+		ComponentRegistry::RegisterReflective<PlayerComponent>("Player", ICON_FA_USER, "Gameplay");
+		ComponentRegistry::RegisterReflective<AnimationComponent>("Animation", ICON_FA_FILM, "Animation");
+		ComponentRegistry::RegisterReflective<SceneTransitionComponent>("Scene Transition", ICON_FA_DOOR_OPEN,
+																		"Gameplay");
+		ComponentRegistry::RegisterReflective<NetworkIdentityComponent>("Network Identity", ICON_FA_LINK, "Networking");
+	}
+} // namespace Chained
diff --git a/engine/scene/component_registry_physics.cpp b/engine/scene/component_registry_physics.cpp
new file mode 100644
index 000000000..274700d10
--- /dev/null
+++ b/engine/scene/component_registry_physics.cpp
@@ -0,0 +1,16 @@
+// Physics component registrations (RigidBody, Collider, Primitive)
+// Split into its own TU to reduce obj file size in MinGW Clang Debug builds.
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/physics/physics_component.h"
+#include "components/render/primitive_component.h"
+#include "thirdparty/IconsFontAwesome6.h"
+
+namespace Chained
+{
+	void RegisterPhysicsComponents()
+	{
+		ComponentRegistry::RegisterReflective<RigidBodyComponent>("Rigid Body", ICON_FA_CUBES, "Physics");
+		ComponentRegistry::RegisterReflective<ColliderComponent>("Collider", ICON_FA_SHIELD, "Physics");
+	}
+} // namespace Chained
diff --git a/engine/scene/component_registry_rendering.cpp b/engine/scene/component_registry_rendering.cpp
new file mode 100644
index 000000000..25953b1e3
--- /dev/null
+++ b/engine/scene/component_registry_rendering.cpp
@@ -0,0 +1,26 @@
+// Rendering component registrations (Model, Light, Sprite, Shader, Spawn, Player)
+// Split into its own TU to reduce obj file size in MinGW Clang Debug builds.
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/render/light_component.h"
+#include "components/render/model_component.h"
+#include "components/render/primitive_component.h"
+#include "components/gameplay/player_component.h"
+#include "components/render/shader_component.h"
+#include "components/gameplay/spawn_component.h"
+#include "components/render/sprite_component.h"
+#include "thirdparty/IconsFontAwesome6.h"
+
+namespace Chained
+{
+	void RegisterRenderingComponents()
+	{
+		ComponentRegistry::RegisterReflective<ModelComponent>("Model", ICON_FA_CUBE, "Rendering");
+		ComponentRegistry::RegisterReflective<PrimitiveComponent>("Primitive", ICON_FA_SHAPES, "Rendering");
+		ComponentRegistry::RegisterReflective<LightComponent>("Light", ICON_FA_LIGHTBULB, "Rendering");
+		ComponentRegistry::RegisterReflective<SpriteComponent>("Sprite", ICON_FA_IMAGE, "Rendering");
+		ComponentRegistry::RegisterReflective<ShaderComponent>("Shader", nullptr, "Rendering");
+		ComponentRegistry::RegisterReflective<SpawnComponent>("Spawn", ICON_FA_LOCATION_DOT);
+		ComponentRegistry::RegisterReflective<PlayerComponent>("Player", ICON_FA_USER);
+	}
+} // namespace Chained
diff --git a/engine/scene/component_registry_scripting.cpp b/engine/scene/component_registry_scripting.cpp
new file mode 100644
index 000000000..e66974e99
--- /dev/null
+++ b/engine/scene/component_registry_scripting.cpp
@@ -0,0 +1,229 @@
+// Scripting component registrations (ManagedScriptComponent)
+// Split into its own TU to reduce obj file size in MinGW Clang Debug builds.
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/scripting/scripting_components.h"
+
+namespace Chained
+{
+	namespace
+	{
+
+		void SerializeManagedScript(YAML::Emitter& out, Entity entity)
+		{
+			if (!entity.HasComponent<ManagedScriptComponent>())
+			{
+				return;
+			}
+
+			auto& managedScript = entity.GetComponent<ManagedScriptComponent>();
+			out << YAML::Key << "ManagedScriptComponent" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Scripts" << YAML::Value << YAML::BeginSeq;
+
+			for (const auto& scriptInstance : managedScript.Scripts)
+			{
+				out << YAML::BeginMap;
+				out << YAML::Key << "ClassName" << YAML::Value << scriptInstance.ClassName;
+
+				if (!scriptInstance.Fields.empty())
+				{
+					out << YAML::Key << "Fields" << YAML::Value << YAML::BeginSeq;
+					for (const auto& [fieldName, field] : scriptInstance.Fields)
+					{
+						out << YAML::BeginMap;
+						out << YAML::Key << "Name" << YAML::Value << fieldName;
+						out << YAML::Key << "Type" << YAML::Value << (int)field.Type;
+
+						std::visit(
+							[&out](auto&& fieldValue) {
+								using T = std::decay_t<decltype(fieldValue)>;
+								if constexpr (std::is_same_v<T, float> || std::is_same_v<T, int> ||
+											  std::is_same_v<T, bool> || std::is_same_v<T, std::string> ||
+											  std::is_same_v<T, uint64_t>)
+								{
+									out << YAML::Key << "Value" << YAML::Value << fieldValue;
+								}
+								else if constexpr (std::is_same_v<T, glm::vec2>)
+								{
+									out << YAML::Key << "Value" << YAML::Value << YAML::Flow << YAML::BeginSeq
+										<< fieldValue.x << fieldValue.y << YAML::EndSeq;
+								}
+								else if constexpr (std::is_same_v<T, glm::vec3>)
+								{
+									out << YAML::Key << "Value" << YAML::Value << YAML::Flow << YAML::BeginSeq
+										<< fieldValue.x << fieldValue.y << fieldValue.z << YAML::EndSeq;
+								}
+								else if constexpr (std::is_same_v<T, glm::vec4>)
+								{
+									out << YAML::Key << "Value" << YAML::Value << YAML::Flow << YAML::BeginSeq
+										<< fieldValue.x << fieldValue.y << fieldValue.z << fieldValue.w << YAML::EndSeq;
+								}
+								else if constexpr (std::is_same_v<T, Chained::Color>)
+								{
+									out << YAML::Key << "Value" << YAML::Value << YAML::Flow << YAML::BeginSeq
+										<< (int)fieldValue.r << (int)fieldValue.g << (int)fieldValue.b
+										<< (int)fieldValue.a << YAML::EndSeq;
+								}
+							},
+							field.Value);
+
+						out << YAML::EndMap;
+					}
+					out << YAML::EndSeq;
+				}
+
+				out << YAML::EndMap;
+			}
+
+			out << YAML::EndSeq;
+			out << YAML::EndMap;
+		}
+
+		void DeserializeManagedScript(Entity entity, YAML::Node node)
+		{
+			if (!node["ManagedScriptComponent"])
+			{
+				return;
+			}
+
+			if (!entity.HasComponent<ManagedScriptComponent>())
+			{
+				entity.AddComponent<ManagedScriptComponent>();
+			}
+
+			auto& managedScript = entity.GetComponent<ManagedScriptComponent>();
+			managedScript.Scripts.clear();
+
+			auto scriptsNode = node["ManagedScriptComponent"]["Scripts"];
+			if (!scriptsNode || !scriptsNode.IsSequence())
+			{
+				return;
+			}
+
+			for (auto scriptNode : scriptsNode)
+			{
+				ManagedScriptInstance scriptInstance;
+				if (scriptNode["ClassName"])
+				{
+					scriptInstance.ClassName = scriptNode["ClassName"].as<std::string>();
+				}
+
+				if (scriptNode["Fields"] && scriptNode["Fields"].IsSequence())
+				{
+					for (auto fieldNode : scriptNode["Fields"])
+					{
+						if (!fieldNode["Name"] || !fieldNode["Type"])
+						{
+							continue;
+						}
+
+						std::string fieldName = fieldNode["Name"].as<std::string>();
+						auto fieldType = (ScriptFieldType)fieldNode["Type"].as<int>(0);
+						auto valueNode = fieldNode["Value"];
+
+						ScriptField field;
+						field.Type = fieldType;
+						field.Name = fieldName;
+
+						if (valueNode)
+						{
+							switch (fieldType)
+							{
+							case ScriptFieldType::Float:
+								field.Value = valueNode.as<float>(0.0f);
+								break;
+							case ScriptFieldType::Int:
+								field.Value = valueNode.as<int>(0);
+								break;
+							case ScriptFieldType::Bool:
+								field.Value = valueNode.as<bool>(false);
+								break;
+							case ScriptFieldType::String:
+								field.Value = valueNode.as<std::string>("");
+								break;
+							case ScriptFieldType::Entity:
+								field.Value = valueNode.as<uint64_t>(0);
+								break;
+							case ScriptFieldType::Vec2:
+								field.Value = (valueNode.IsSequence() && valueNode.size() >= 2)
+												  ? glm::vec2(valueNode[0].as<float>(), valueNode[1].as<float>())
+												  : glm::vec2(0.0f);
+								break;
+							case ScriptFieldType::Vec3:
+								field.Value = (valueNode.IsSequence() && valueNode.size() >= 3)
+												  ? glm::vec3(valueNode[0].as<float>(), valueNode[1].as<float>(),
+															  valueNode[2].as<float>())
+												  : glm::vec3(0.0f);
+								break;
+							case ScriptFieldType::Vec4:
+								field.Value = (valueNode.IsSequence() && valueNode.size() >= 4)
+												  ? glm::vec4(valueNode[0].as<float>(), valueNode[1].as<float>(),
+															  valueNode[2].as<float>(), valueNode[3].as<float>())
+												  : glm::vec4(0.0f);
+								break;
+							case ScriptFieldType::Color:
+								field.Value = (valueNode.IsSequence() && valueNode.size() >= 4)
+												  ? Chained::Color{(unsigned char)valueNode[0].as<int>(),
+																   (unsigned char)valueNode[1].as<int>(),
+																   (unsigned char)valueNode[2].as<int>(),
+																   (unsigned char)valueNode[3].as<int>()}
+												  : Chained::Color{255, 255, 255, 255};
+								break;
+							default:
+								field.Value = 0.0f;
+								break;
+							}
+						}
+
+						scriptInstance.Fields[fieldName] = std::move(field);
+					}
+				}
+
+				managedScript.Scripts.push_back(std::move(scriptInstance));
+			}
+		}
+
+	} // anonymous namespace
+
+	void RegisterScriptingComponents()
+	{
+		ComponentMetadata metadata;
+		metadata.Name = "Managed Script";
+		metadata.SerializationKey = "ManagedScriptComponent";
+		metadata.Category = "Scripting";
+
+		metadata.Serialize = SerializeManagedScript;
+		metadata.Deserialize = DeserializeManagedScript;
+
+		metadata.Copy = [](Entity src, Entity dst) {
+			if (src.HasComponent<ManagedScriptComponent>())
+			{
+				dst.AddOrReplaceComponent<ManagedScriptComponent>(
+					src.GetComponent<ManagedScriptComponent>().ClonePersistent());
+			}
+		};
+		metadata.Has = [](Entity e) { return e.HasComponent<ManagedScriptComponent>(); };
+		metadata.GetAll = [](class Scene* s) {
+			std::vector<uint64_t> ids;
+			for (auto ent : s->GetRegistry().view<ManagedScriptComponent>())
+			{
+				ids.push_back(static_cast<uint64_t>(ent));
+			}
+			return ids;
+		};
+		metadata.Add = [](Entity e) {
+			if (!e.HasComponent<ManagedScriptComponent>())
+			{
+				e.AddComponent<ManagedScriptComponent>();
+			}
+		};
+		metadata.Remove = [](Entity e) {
+			if (e.HasComponent<ManagedScriptComponent>())
+			{
+				e.RemoveComponent<ManagedScriptComponent>();
+			}
+		};
+
+		ComponentRegistry::Register(entt::type_hash<ManagedScriptComponent>::value(), metadata);
+	}
+} // namespace Chained
diff --git a/engine/scene/component_registry_ui.cpp b/engine/scene/component_registry_ui.cpp
new file mode 100644
index 000000000..2c5f52caf
--- /dev/null
+++ b/engine/scene/component_registry_ui.cpp
@@ -0,0 +1,16 @@
+// UI component registrations (Control, UIAction)
+// Split into its own TU to reduce obj file size in MinGW Clang Debug builds.
+// Note: UIControlComponent is massive and registered in ui_control_registry.cpp.
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/ui/control_component.h"
+#include "components/ui/ui_action_component.h"
+
+namespace Chained
+{
+	void RegisterUIComponents()
+	{
+		ComponentRegistry::RegisterReflective<ControlComponent>("Control", nullptr, "UI");
+		ComponentRegistry::RegisterReflective<UIActionComponent>("UI Action", nullptr, "UI");
+	}
+} // namespace Chained
diff --git a/engine/scene/component_serializer.cpp b/engine/scene/component_serializer.cpp
index be302f617..556cbd011 100644
--- a/engine/scene/component_serializer.cpp
+++ b/engine/scene/component_serializer.cpp
@@ -1,204 +1,88 @@
 #include "component_serializer.h"
-#include "components/id_component.h"
-#include "components/ui_action_component.h"
-#include "engine/core/application.h"
-
-#include "scripting_serialization.h"
-
-namespace CHEngine
-{
-static ComponentSerializer* s_Instance = nullptr;
-
-ComponentSerializer::ComponentSerializer()
-{
-    CH_CORE_ASSERT(!s_Instance, "ComponentSerializer already exists!");
-    s_Instance = this;
-}
-
-void ComponentSerializer::Init()
-{
-    if (!s_Instance)
-    {
-        s_Instance = new ComponentSerializer();
-    }
-    s_Instance->InternalInit();
-}
-
-void ComponentSerializer::Shutdown()
-{
-    if (s_Instance)
-    {
-        s_Instance->InternalShutdown();
-        delete s_Instance;
-        s_Instance = nullptr;
-    }
-}
-
-ComponentSerializer::~ComponentSerializer()
-{
-    InternalShutdown();
-    s_Instance = nullptr;
-}
-
-ComponentSerializer& ComponentSerializer::Get()
-{
-    CH_CORE_ASSERT(s_Instance, "ComponentSerializer not initialized!");
-    return *s_Instance;
-}
-
-void ComponentSerializer::RegisterCustom(const ComponentSerializerEntry& entry)
-{
-    m_Registry.push_back(entry);
-}
-
-// --- Special Serialization Helpers ---
-
-void ComponentSerializer::SerializeID(YAML::Emitter& out, Entity entity)
-{
-    if (entity.HasComponent<IDComponent>())
-    {
-        out << YAML::Key << "Entity" << YAML::Value << (uint64_t)entity.GetComponent<IDComponent>().ID;
-    }
-    else
-    {
-        out << YAML::Key << "Entity" << YAML::Value << 0;
-    }
-}
-
-// --- Registry Initialization ---
-
-// ========================================================================
-// Initialize Registry
-// ========================================================================
-
-void ComponentSerializer::InternalInit()
-{
-    if (m_Initialized)
-    {
-        return;
-    }
-
-    m_Registry.clear();
-
-    RegisterCoreComponents();
-    RegisterPhysicsComponents();
-    RegisterAudioComponents();
-    RegisterGameplayComponents();
-    RegisterUIComponents();
-    RegisterScriptingComponents();
-
-    m_Initialized = true;
-}
-
-void ComponentSerializer::InternalShutdown()
-{
-    if (!m_Initialized)
-    {
-        return;
-    }
-
-    m_Registry.clear();
-    m_Initialized = false;
-}
-
-void ComponentSerializer::RegisterCoreComponents()
-{
-    Register<TagComponent>();
-    Register<TransformComponent>();
-    Register<ModelComponent>();
-    Register<MaterialComponent>();
-    Register<LightComponent>();
-    Register<ShaderComponent>();
-    Register<CameraComponent>();
-    Register<SpriteComponent>();
-}
-
-void ComponentSerializer::RegisterPhysicsComponents()
-{
-    Register<ColliderComponent>();
-    Register<PrimitiveComponent>();
-    Register<RigidBodyComponent>();
-}
-
-void ComponentSerializer::RegisterAudioComponents()
-{
-    Register<AudioComponent>();
-}
-
-void ComponentSerializer::RegisterGameplayComponents()
-{
-    Register<PlayerComponent>();
-    Register<SceneTransitionComponent>();
-    Register<AnimationComponent>();
-    Register<NavigationComponent>();
-    Register<SpawnComponent>();
-    Register<RPGStatsComponent>();
-    Register<SkillComponent>();
-    Register<InventoryComponent>();
-}
-
-void ComponentSerializer::RegisterUIComponents()
-{
-    Register<ControlComponent>();
-    Register<ButtonControl>();
-    Register<PanelControl>();
-    Register<LabelControl>();
-    Register<SliderControl>();
-    Register<CheckboxControl>();
-    Register<ImageControl>();
-    Register<ImageButtonControl>();
-    Register<InputTextControl>();
-    Register<ComboBoxControl>();
-    Register<ProgressBarControl>();
-    Register<SeparatorControl>();
-    Register<RadioButtonControl>();
-    Register<ColorPickerControl>();
-    Register<DragFloatControl>();
-    Register<DragIntControl>();
-    Register<TreeNodeControl>();
-    Register<TabBarControl>();
-    Register<TabItemControl>();
-    Register<CollapsingHeaderControl>();
-    Register<VerticalLayoutGroup>();
-    Register<PlotLinesControl>();
-    Register<PlotHistogramControl>();
-    Register<UIActionComponent>();
-}
-
-void ComponentSerializer::RegisterScriptingComponents()
-{
-    Register<ManagedScriptComponent>();
-}
-
-void ComponentSerializer::SerializeAll(YAML::Emitter& out, Entity entity)
-{
-    for (auto& entry : m_Registry)
-    {
-        entry.Serialize(out, entity);
-    }
-    HierarchySerializer::Serialize(out, entity);
-}
-
-void ComponentSerializer::DeserializeAll(Entity entity, YAML::Node node)
-{
-    for (const auto& entry : m_Registry)
-    {
-        if (entry.Deserialize)
-        {
-            entry.Deserialize(entity, node);
-        }
-    }
-}
-
-void ComponentSerializer::CopyAll(Entity source, Entity destination)
-{
-    for (const auto& entry : m_Registry)
-    {
-        if (entry.Copy)
-        {
-            entry.Copy(source, destination);
-        }
-    }
-}
-
-} // namespace CHEngine
+#include "components/core/id_component.h"
+#include "engine/scene/hierarchy_serializer.h"
+#include "engine/scene/serialization.h"
+
+namespace Chained
+{
+
+	// --- Special Serialization Helpers ---
+
+	void ComponentSerializer::SerializeID(YAML::Emitter& out, Entity entity)
+	{
+		if (entity.HasComponent<IDComponent>())
+		{
+			out << YAML::Key << "Entity" << YAML::Value << (uint64_t)entity.GetComponent<IDComponent>().ID;
+		}
+		else
+		{
+			out << YAML::Key << "Entity" << YAML::Value << 0;
+		}
+	}
+
+	// --- Registry Initialization ---
+
+	void ComponentSerializer::SerializeAll(YAML::Emitter& out, Entity entity)
+	{
+		for (auto& [id, metadata] : ComponentRegistry::GetRegistry())
+		{
+			if (metadata.Serialize)
+			{
+				metadata.Serialize(out, entity);
+			}
+			else if (metadata.IsReflective && metadata.ReflectInternal && metadata.Has && metadata.Has(entity))
+			{
+				// Wrap in a YAML key matching SerializationKey so DeserializeAll can find it
+				out << YAML::Key << metadata.SerializationKey << YAML::Value << YAML::BeginMap;
+				Serialization::PropertyArchive archive(out);
+				metadata.ReflectInternal(entity, archive, ReflectionMode::Serialize);
+				out << YAML::EndMap;
+			}
+		}
+
+		HierarchySerializer::Serialize(out, entity);
+	}
+
+	void ComponentSerializer::DeserializeAll(Entity entity, YAML::Node node)
+	{
+		for (auto& [id, metadata] : ComponentRegistry::GetRegistry())
+		{
+			if (metadata.Deserialize)
+			{
+				metadata.Deserialize(entity, node);
+			}
+			else if (metadata.IsReflective && metadata.ReflectInternal)
+			{
+				YAML::Node compNode = node[metadata.SerializationKey];
+				if (!compNode)
+				{
+					// Fallback for scenes saved prior to space-stripping SerializationKey fix
+					// e.g. "Scene TransitionComponent" or "Rigid BodyComponent"
+					std::string legacyKey = metadata.Name + "Component";
+					if (legacyKey != metadata.SerializationKey && node[legacyKey])
+					{
+						compNode = node[legacyKey];
+					}
+				}
+
+				if (compNode)
+				{
+					Serialization::PropertyArchive archive(compNode);
+					metadata.ReflectInternal(entity, archive, ReflectionMode::Deserialize);
+				}
+			}
+		}
+	}
+
+	void ComponentSerializer::CopyAll(Entity source, Entity destination)
+	{
+		for (auto& [id, metadata] : ComponentRegistry::GetRegistry())
+		{
+			if (metadata.Copy)
+			{
+				metadata.Copy(source, destination);
+			}
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scene/component_serializer.h b/engine/scene/component_serializer.h
index 3b8f43b49..d848dbabc 100644
--- a/engine/scene/component_serializer.h
+++ b/engine/scene/component_serializer.h
@@ -1,172 +1,30 @@
 #ifndef CH_COMPONENT_SERIALIZER_H
 #define CH_COMPONENT_SERIALIZER_H
-#include "engine/scene/scene.h"
-#include "engine/scene/serialization_utils.h"
-#include "engine/scene/hierarchy_serializer.h"
-#include "entt/entt.hpp"
-#include <functional>
-#include <unordered_map>
+
+#include "engine/core/service.h"
+#include "engine/scene/component_registry.h"
 #include <vector>
 #include <yaml-cpp/yaml.h>
 
-namespace CHEngine
-{
-// Describes how one component is serialized, deserialized, and copied.
-struct ComponentSerializerEntry
-{
-    std::string Key;
-    std::function<void(YAML::Emitter&, Entity)> Serialize;
-    std::function<void(Entity, YAML::Node)> Deserialize;
-    std::function<void(Entity, Entity)> Copy;
-};
-
-// Central registry for component serializers used by scene save/load/copy.
-class ComponentSerializer
-{
-public:
-    ComponentSerializer();
-    ~ComponentSerializer();
-    static void Init();
-    static void Shutdown();
-
-    void InternalInit();
-    void InternalShutdown();
-
-private:
-    void RegisterCoreComponents();
-    void RegisterPhysicsComponents();
-    void RegisterAudioComponents();
-    void RegisterGameplayComponents();
-    void RegisterUIComponents();
-    void RegisterScriptingComponents();
-
-public:
-    // Registers a component via a PropertyArchive schema.
-    // This path automatically creates serialization, deserialization, and copy logic.
-    template <typename T>
-    void Register(const std::string& key, std::function<void(SerializationUtils::PropertyArchive&, T&)> schema);
-
-    // Registers a component by calling T::Reflect or T::Serialize-style code.
-    template <typename T>
-    void Register(const std::string& key);
-
-    // Registers a component using T::GetStaticName() as the key.
-    template <typename T>
-    void Register();
-
-    // Registers custom serialization logic for special cases.
-    void RegisterCustom(const ComponentSerializerEntry& entry);
-
-    // Serializes all registered components owned by an entity.
-    void SerializeAll(YAML::Emitter& out, Entity entity);
-
-    // Deserializes all registered components from YAML.
-    void DeserializeAll(Entity entity, YAML::Node node);
-
-    // Copies all registered components from source to destination.
-    void CopyAll(Entity source, Entity destination);
-
-    // Serializes the ID component separately.
-    void SerializeID(YAML::Emitter& out, Entity entity);
-
-    static ComponentSerializer& Get();
-
-private:
-    std::vector<ComponentSerializerEntry> m_Registry;
-    bool m_Initialized = false;
-};
-
-// Template implementation
-template <typename T>
-void ComponentSerializer::Register(const std::string& key,
-                                   std::function<void(SerializationUtils::PropertyArchive&, T&)> schema)
-{
-    ComponentSerializerEntry entry;
-    entry.Key = key;
-
-    // Serialization: check for presence and write as a Map
-    entry.Serialize = [key, schema](YAML::Emitter& out, Entity entity) {
-        if (entity.HasComponent<T>())
-        {
-            out << YAML::Key << key << YAML::Value << YAML::BeginMap;
-            SerializationUtils::PropertyArchive archive(out);
-            schema(archive, entity.GetComponent<T>());
-            out << YAML::EndMap;
-        }
-    };
-
-    // Deserialization: add component and populate with data
-    entry.Deserialize = [key, schema](Entity entity, YAML::Node node) {
-        if (node[key])
-        {
-            if (!entity.HasComponent<T>())
-            {
-                entity.AddComponent<T>();
-            }
-
-            entity.Patch<T>([&](auto& component) {
-                SerializationUtils::PropertyArchive archive(node[key]);
-                schema(archive, component);
-            });
-        }
-    };
-
-    // Copying: automatic cloning via EnTT
-    entry.Copy = [](Entity source, Entity destination) {
-        if (source.HasComponent<T>())
-        {
-            destination.AddOrReplaceComponent<T>(source.GetComponent<T>());
-        }
-    };
-
-    RegisterCustom(entry);
-}
-
-template <typename T>
-void ComponentSerializer::Register(const std::string& key)
+namespace Chained
 {
-    ComponentSerializerEntry entry;
-    entry.Key = key;
+	// Central helper for component serialization used by scene save/load/copy.
+	class ComponentSerializer
+	{
+	public:
+		// Serializes all registered components owned by an entity.
+		static void SerializeAll(YAML::Emitter& out, Entity entity);
 
-    entry.Serialize = [key](YAML::Emitter& out, Entity entity) {
-        if (entity.HasComponent<T>())
-        {
-            out << YAML::Key << key << YAML::Value << YAML::BeginMap;
-            SerializationUtils::PropertyArchive archive(out);
-            CHEngine::Properties props(archive);
-            entity.GetComponent<T>().Reflect(props);
-            out << YAML::EndMap;
-        }
-    };
+		// Deserializes all registered components from YAML.
+		static void DeserializeAll(Entity entity, YAML::Node node);
 
-    entry.Deserialize = [key](Entity entity, YAML::Node node) {
-        if (node[key])
-        {
-            if (!entity.HasComponent<T>()) entity.AddComponent<T>();
-            entity.Patch<T>([&](auto& component) {
-                SerializationUtils::PropertyArchive archive(node[key]);
-                CHEngine::Properties props(archive);
-                component.Reflect(props);
-            });
-        }
-    };
+		// Copies all registered components from source to destination.
+		static void CopyAll(Entity source, Entity destination);
 
-    entry.Copy = [](Entity source, Entity destination) {
-        if (source.HasComponent<T>())
-        {
-            destination.AddOrReplaceComponent<T>(source.GetComponent<T>());
-        }
-    };
-
-    RegisterCustom(entry);
-}
-
-template <typename T>
-void ComponentSerializer::Register()
-{
-    Register<T>(T::GetStaticName());
-}
+		// Serializes the ID component separately.
+		static void SerializeID(YAML::Emitter& out, Entity entity);
+	};
 
-} // namespace CHEngine
+} // namespace Chained
 
 #endif // CH_COMPONENT_SERIALIZER_H
diff --git a/engine/scene/component_ui_control.cpp b/engine/scene/component_ui_control.cpp
new file mode 100644
index 000000000..1c8283a74
--- /dev/null
+++ b/engine/scene/component_ui_control.cpp
@@ -0,0 +1,233 @@
+#include "component_registry.h"
+#include "engine/reflection/reflection_rfl_impl.h"
+#include "components/ui/control_component.h"
+#include "engine/ui/ui_data_components.h"
+#include "engine/ui/ui_style.h"
+#include "engine/scene/yaml.h"
+#include "thirdparty/IconsFontAwesome6.h"
+
+namespace Chained
+{
+	void RegisterUIControlComponent()
+	{
+		ComponentMetadata metadata;
+		metadata.Name = "Widget";
+		metadata.SerializationKey = "WidgetComponent";
+		metadata.Icon = ICON_FA_WINDOW_RESTORE;
+		metadata.Category = "UI";
+
+		metadata.Has = [](Entity e) { return e.HasComponent<UIControlComponent>(); };
+		metadata.GetAll = [](class Scene* s) {
+			std::vector<uint64_t> ids;
+			for (auto ent : s->GetRegistry().view<UIControlComponent>())
+			{
+				ids.push_back(static_cast<uint64_t>(ent));
+			}
+			return ids;
+		};
+		metadata.Add = [](Entity e) {
+			if (!e.HasComponent<UIControlComponent>())
+			{
+				e.AddComponent<UIControlComponent>();
+			}
+		};
+		metadata.Remove = [](Entity e) {
+			if (e.HasComponent<UIControlComponent>())
+			{
+				e.RemoveComponent<UIControlComponent>();
+			}
+		};
+		metadata.Copy = [](Entity src, Entity dst) {
+			if (src.HasComponent<UIControlComponent>())
+			{
+				dst.AddOrReplaceComponent<UIControlComponent>(src.GetComponent<UIControlComponent>());
+			}
+		};
+
+		// Custom serialize — delegates to per-type Serialize methods
+		metadata.Serialize = [](YAML::Emitter& out, Entity entity) {
+			if (!entity.HasComponent<UIControlComponent>())
+			{
+				return;
+			}
+			auto& widgetComp = entity.GetComponent<UIControlComponent>();
+
+			out << YAML::Key << "WidgetComponent" << YAML::Value << YAML::BeginMap;
+
+			// Box Style
+			out << YAML::Key << "Box Style" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "BG Color" << YAML::Value << widgetComp.BoxStyle.BackgroundColor;
+			out << YAML::Key << "Hover Color" << YAML::Value << widgetComp.BoxStyle.HoverColor;
+			out << YAML::Key << "Pressed Color" << YAML::Value << widgetComp.BoxStyle.PressedColor;
+			out << YAML::Key << "Rounding" << YAML::Value << widgetComp.BoxStyle.Rounding;
+			out << YAML::Key << "Border Size" << YAML::Value << widgetComp.BoxStyle.BorderSize;
+			out << YAML::Key << "Border Color" << YAML::Value << widgetComp.BoxStyle.BorderColor;
+			out << YAML::Key << "Gradient" << YAML::Value << widgetComp.BoxStyle.UseGradient;
+			out << YAML::Key << "Gradient Color" << YAML::Value << widgetComp.BoxStyle.GradientColor;
+			out << YAML::Key << "Padding" << YAML::Value << widgetComp.BoxStyle.Padding;
+			out << YAML::Key << "Hover Scale" << YAML::Value << widgetComp.BoxStyle.HoverScale;
+			out << YAML::Key << "Pressed Scale" << YAML::Value << widgetComp.BoxStyle.PressedScale;
+			out << YAML::Key << "Transition Speed" << YAML::Value << widgetComp.BoxStyle.TransitionSpeed;
+			out << YAML::EndMap;
+
+			// Text Style
+			out << YAML::Key << "Text Style" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Font Name" << YAML::Value << widgetComp.TextStyle.FontName;
+			out << YAML::Key << "Font Size" << YAML::Value << widgetComp.TextStyle.FontSize;
+			out << YAML::Key << "Text Color" << YAML::Value << widgetComp.TextStyle.TextColor;
+			out << YAML::Key << "Shadow" << YAML::Value << widgetComp.TextStyle.Shadow;
+			out << YAML::Key << "Shadow Offset" << YAML::Value << widgetComp.TextStyle.ShadowOffset;
+			out << YAML::Key << "Shadow Color" << YAML::Value << widgetComp.TextStyle.ShadowColor;
+			out << YAML::Key << "Letter Spacing" << YAML::Value << widgetComp.TextStyle.LetterSpacing;
+			out << YAML::Key << "Line Height" << YAML::Value << widgetComp.TextStyle.LineHeight;
+			out << YAML::Key << "H Align" << YAML::Value << static_cast<int>(widgetComp.TextStyle.Horizontal);
+			out << YAML::Key << "V Align" << YAML::Value << static_cast<int>(widgetComp.TextStyle.Vertical);
+			out << YAML::EndMap;
+
+			// Widget data — delegate to per-type Serialize
+			std::visit(
+				[&](auto& data) {
+					using DataType = std::decay_t<decltype(data)>;
+					if constexpr (!std::is_same_v<DataType, std::monostate>)
+					{
+						data.Serialize(out);
+					}
+				},
+				widgetComp.Data);
+
+			out << YAML::EndMap;
+		};
+
+		// Custom deserialize — delegates to DeserializeControlData
+		metadata.Deserialize = [](Entity entity, YAML::Node node) {
+			if (!node["WidgetComponent"])
+			{
+				return;
+			}
+			auto widgetNode = node["WidgetComponent"];
+			auto& widgetComp = entity.AddComponent<UIControlComponent>();
+
+			// Box Style
+			if (auto boxStyleNode = widgetNode["Box Style"])
+			{
+				if (boxStyleNode["BG Color"])
+				{
+					widgetComp.BoxStyle.BackgroundColor = boxStyleNode["BG Color"].as<Color>();
+				}
+				if (boxStyleNode["Hover Color"])
+				{
+					widgetComp.BoxStyle.HoverColor = boxStyleNode["Hover Color"].as<Color>();
+				}
+				if (boxStyleNode["Pressed Color"])
+				{
+					widgetComp.BoxStyle.PressedColor = boxStyleNode["Pressed Color"].as<Color>();
+				}
+				if (boxStyleNode["Rounding"])
+				{
+					widgetComp.BoxStyle.Rounding = boxStyleNode["Rounding"].as<float>();
+				}
+				if (boxStyleNode["Border Size"])
+				{
+					widgetComp.BoxStyle.BorderSize = boxStyleNode["Border Size"].as<float>();
+				}
+				if (boxStyleNode["Border Color"])
+				{
+					widgetComp.BoxStyle.BorderColor = boxStyleNode["Border Color"].as<Color>();
+				}
+				if (boxStyleNode["Gradient"])
+				{
+					widgetComp.BoxStyle.UseGradient = boxStyleNode["Gradient"].as<bool>();
+				}
+				if (boxStyleNode["Gradient Color"])
+				{
+					widgetComp.BoxStyle.GradientColor = boxStyleNode["Gradient Color"].as<Color>();
+				}
+				if (boxStyleNode["Padding"])
+				{
+					widgetComp.BoxStyle.Padding = boxStyleNode["Padding"].as<float>();
+				}
+				if (boxStyleNode["Hover Scale"])
+				{
+					widgetComp.BoxStyle.HoverScale = boxStyleNode["Hover Scale"].as<float>();
+				}
+				if (boxStyleNode["Pressed Scale"])
+				{
+					widgetComp.BoxStyle.PressedScale = boxStyleNode["Pressed Scale"].as<float>();
+				}
+				if (boxStyleNode["Transition Speed"])
+				{
+					widgetComp.BoxStyle.TransitionSpeed = boxStyleNode["Transition Speed"].as<float>();
+				}
+			}
+
+			// Text Style
+			if (auto textStyleNode = widgetNode["Text Style"])
+			{
+				if (textStyleNode["Font Name"])
+				{
+					widgetComp.TextStyle.FontName = textStyleNode["Font Name"].as<std::string>();
+				}
+				if (textStyleNode["Font Size"])
+				{
+					widgetComp.TextStyle.FontSize = textStyleNode["Font Size"].as<float>();
+				}
+				if (textStyleNode["Text Color"])
+				{
+					widgetComp.TextStyle.TextColor = textStyleNode["Text Color"].as<Color>();
+				}
+				if (textStyleNode["Shadow"])
+				{
+					widgetComp.TextStyle.Shadow = textStyleNode["Shadow"].as<bool>();
+				}
+				if (textStyleNode["Shadow Offset"])
+				{
+					widgetComp.TextStyle.ShadowOffset = textStyleNode["Shadow Offset"].as<float>();
+				}
+				if (textStyleNode["Shadow Color"])
+				{
+					widgetComp.TextStyle.ShadowColor = textStyleNode["Shadow Color"].as<Color>();
+				}
+				if (textStyleNode["Letter Spacing"])
+				{
+					widgetComp.TextStyle.LetterSpacing = textStyleNode["Letter Spacing"].as<float>();
+				}
+				if (textStyleNode["Line Height"])
+				{
+					widgetComp.TextStyle.LineHeight = textStyleNode["Line Height"].as<float>();
+				}
+				if (textStyleNode["H Align"])
+				{
+					widgetComp.TextStyle.Horizontal =
+						static_cast<HorizontalAlignment>(textStyleNode["H Align"].as<int>());
+				}
+				if (textStyleNode["V Align"])
+				{
+					widgetComp.TextStyle.Vertical = static_cast<VerticalAlignment>(textStyleNode["V Align"].as<int>());
+				}
+			}
+
+			// Widget data — delegate to DeserializeControlData
+			int widgetType = widgetNode["Widget Type"] ? widgetNode["Widget Type"].as<int>() : 0;
+			widgetComp.Data = DeserializeControlData(widgetType, widgetNode);
+		};
+
+		// Keep ReflectInternal for editor UI (property panel)
+		metadata.IsReflective = true;
+		metadata.ReflectInternal = [](Entity e, IPropertyArchiveBase& archive, ReflectionMode mode) {
+			if (mode == ReflectionMode::Deserialize)
+			{
+				auto& comp = e.AddOrReplaceComponent<UIControlComponent>();
+				GenericProperties props(archive);
+				ReflectFromRfl(comp, props);
+			}
+			else if (e.HasComponent<UIControlComponent>())
+			{
+				GenericProperties props(archive);
+				auto& comp = e.GetComponent<UIControlComponent>();
+				ReflectFromRfl(comp, props);
+			}
+		};
+
+		ComponentRegistry::Register(entt::type_hash<UIControlComponent>::value(), metadata);
+	}
+} // namespace Chained
diff --git a/engine/scene/components.h b/engine/scene/components.h
index 029bc8e2e..354261418 100644
--- a/engine/scene/components.h
+++ b/engine/scene/components.h
@@ -2,24 +2,26 @@
 #define CH_COMPONENTS_H
 
 // Master header for all components
-#include "engine/core/reflection.h"
-#include "components/animation_component.h"
-#include "components/audio_component.h"
-#include "components/camera_component.h"
-#include "components/control_component.h"
-#include "components/game_components.h"
-#include "components/hierarchy_component.h"
-#include "components/id_component.h"
-#include "components/light_component.h"
-#include "components/mesh_component.h"
-#include "components/navigation_component.h"
-#include "components/physics_component.h"
-#include "components/primitive_component.h"
-#include "components/scripting_components.h"
-#include "components/shader_component.h"
-#include "components/sprite_component.h"
-#include "components/tag_component.h"
-#include "components/transform_component.h"
-#include "components/ui_action_component.h"
+#include "engine/reflection/reflection.h"
+#include "components/core/transform_component.h"
+#include "components/core/id_component.h"
+#include "components/core/tag_component.h"
+#include "components/core/hierarchy_component.h"
+#include "components/render/camera_component.h"
+#include "components/render/light_component.h"
+#include "components/render/model_component.h"
+#include "components/render/sprite_component.h"
+#include "components/render/shader_component.h"
+#include "components/render/primitive_component.h"
+#include "components/physics/physics_component.h"
+#include "components/audio/audio_component.h"
+#include "components/animation/animation_component.h"
+#include "components/ui/control_component.h"
+#include "components/ui/ui_action_component.h"
+#include "components/ui/scene_transition_component.h"
+#include "components/gameplay/player_component.h"
+#include "components/gameplay/spawn_component.h"
+#include "components/gameplay/network_identity_component.h"
+#include "components/scripting/scripting_components.h"
 
 #endif // CH_COMPONENTS_H
diff --git a/engine/scene/components/animation/animation_component.h b/engine/scene/components/animation/animation_component.h
new file mode 100644
index 000000000..2a7333e6a
--- /dev/null
+++ b/engine/scene/components/animation/animation_component.h
@@ -0,0 +1,122 @@
+#ifndef CH_ANIMATION_COMPONENT_H
+#define CH_ANIMATION_COMPONENT_H
+
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+#include "engine/assets/asset.h"
+#include <string>
+#include <unordered_map>
+
+namespace Chained
+{
+	struct AnimationComponent
+	{
+		// --- Config (author-time, serialized) ---
+		std::string GraphPath;
+		uint64_t GraphUUID = 0;
+		float BlendDuration = 0.25f;
+		bool DefaultIsLooping = true;
+		bool PlayOnStart = true;
+
+		// --- Runtime (transient) ---
+		AssetHandle GraphAssetHandle = 0;
+		int CurrentNodeID = -1;
+		int TargetNodeID = -1; // Target node during blend
+		int CurrentAnimationIndex = 0;
+		int TargetAnimationIndex = -1;
+		int StartFrame = 0;
+		int EndFrame = -1;
+		float Speed = 1.0f;
+		bool IsLooping = true;
+
+		// Target node params (captured at transition trigger)
+		int TargetStartFrame = 0;
+		int TargetEndFrame = -1;
+		float TargetSpeed = 1.0f;
+		bool TargetIsLooping = true;
+
+		float FrameTimeCounter = 0.0f;
+		float TargetFrameTimeCounter = 0.0f; // For target animation during blend
+		float BlendTimer = 0.0f;
+		int CurrentFrame = 0;
+		int TargetFrame = 0;
+		bool IsPlaying = true;
+		bool Blending = false;
+		float Duration = 0.0f;
+		float CurrentTime = 0.0f;
+		float NormalizedTime = 0.0f;
+		bool IsFinished = false;
+
+		// --- Graph Variables ---
+		std::unordered_map<std::string, float> Variables;
+
+		// --- API ---
+		void SetFloat(const std::string& name, float value)
+		{
+			Variables[name] = value;
+		}
+
+		void SetBool(const std::string& name, bool value)
+		{
+			Variables[name] = value ? 1.0f : 0.0f;
+		}
+
+		float GetFloat(const std::string& name) const
+		{
+			auto it = Variables.find(name);
+			return (it != Variables.end()) ? it->second : 0.0f;
+		}
+
+		bool IsGraphDriven() const
+		{
+			return !GraphPath.empty();
+		}
+
+		static const char* GetStaticName()
+		{
+			return "AnimationComponent";
+		}
+
+		struct UI
+		{
+			UIMeta GraphPath = {.Hint = PropertyMeta::WidgetHint::FilePicker, .Extensions = ".chag"};
+			UIMeta GraphUUID = {.ReadOnly = true};
+			UIMeta BlendDuration = {
+				.Min = 0.0f, .Max = 2.0f, .Speed = 0.05f, .Tooltip = "Time to blend between animations (in seconds)"};
+			UIMeta DefaultIsLooping = {.Tooltip = "Default loop setting (used when not graph-driven)"};
+			UIMeta PlayOnStart = {.Tooltip = "Whether the animation will play at the start of the scene"};
+
+			UIMeta GraphAssetHandle = {.ReadOnly = true, .Transient = true};
+			UIMeta CurrentNodeID = {.ReadOnly = true, .Transient = true};
+			UIMeta TargetNodeID = {.ReadOnly = true, .Transient = true};
+			UIMeta Variables = {.ReadOnly = false};
+			UIMeta CurrentAnimationIndex = {
+				.Hint = PropertyMeta::WidgetHint::Enum, .ReadOnly = false, .Transient = true};
+			UIMeta TargetAnimationIndex = {.ReadOnly = true, .Transient = true};
+			UIMeta StartFrame = {.ReadOnly = false, .Transient = true};
+			UIMeta EndFrame = {.ReadOnly = false, .Transient = true};
+			UIMeta Speed = {.ReadOnly = false, .Transient = true};
+			UIMeta IsLooping = {.Hint = PropertyMeta::WidgetHint::Checkbox, .ReadOnly = false, .Transient = true};
+			UIMeta TargetStartFrame = {.ReadOnly = true, .Transient = true};
+			UIMeta TargetEndFrame = {.ReadOnly = true, .Transient = true};
+			UIMeta TargetSpeed = {.ReadOnly = true, .Transient = true};
+			UIMeta TargetIsLooping = {.ReadOnly = true, .Transient = true};
+			UIMeta FrameTimeCounter = {.ReadOnly = true, .Transient = true};
+			UIMeta TargetFrameTimeCounter = {.ReadOnly = true, .Transient = true};
+			UIMeta BlendTimer = {.ReadOnly = true, .Transient = true};
+			UIMeta CurrentFrame = {.ReadOnly = true, .Transient = true};
+			UIMeta TargetFrame = {.ReadOnly = true, .Transient = true};
+			UIMeta IsPlaying = {.Hint = PropertyMeta::WidgetHint::Checkbox, .ReadOnly = false, .Transient = true};
+			UIMeta Blending = {.ReadOnly = true, .Transient = true};
+			UIMeta Duration = {.ReadOnly = true, .Transient = true};
+			UIMeta CurrentTime = {.ReadOnly = true, .Transient = true};
+			UIMeta NormalizedTime = {.ReadOnly = true, .Transient = true};
+			UIMeta IsFinished = {.ReadOnly = true, .Transient = true};
+		};
+	};
+
+	CH_MARK_RFL(AnimationComponent);
+
+} // namespace Chained
+
+#endif // CH_ANIMATION_COMPONENT_H
diff --git a/engine/scene/components/animation/animation_graph_component.h b/engine/scene/components/animation/animation_graph_component.h
new file mode 100644
index 000000000..eb6dd318a
--- /dev/null
+++ b/engine/scene/components/animation/animation_graph_component.h
@@ -0,0 +1,4 @@
+#pragma once
+// Deprecated: AnimationGraphComponent has been merged into AnimationComponent.
+// This header is kept for backward compatibility and will be removed.
+#include "components/animation_component.h"
diff --git a/engine/scene/components/animation_component.h b/engine/scene/components/animation_component.h
deleted file mode 100644
index 3af0b92a1..000000000
--- a/engine/scene/components/animation_component.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef CH_ANIMATION_COMPONENT_H
-#define CH_ANIMATION_COMPONENT_H
-
-#include "engine/core/reflection.h"
-#include <string>
-#include <vector>
-
-namespace CHEngine
-{
-struct AnimationComponent
-{
-    std::string AnimationPath;
-    int CurrentAnimationIndex = 0;
-    int TargetAnimationIndex = -1;
-    float FrameTimeCounter = 0.0f;
-    float BlendTimer = 0.0f;
-    float BlendDuration = 0.0f;
-    int CurrentFrame = 0;
-    int TargetFrame = 0;
-    bool IsLooping = true;
-    bool IsPlaying = true;
-    bool Blending = false;
-
-    AnimationComponent() = default;
-    AnimationComponent(const AnimationComponent&) = default;
-    AnimationComponent(const std::string& path)
-        : AnimationPath(path)
-    {
-    }
-
-    void Play(int index, bool loop = true)
-    {
-        if (CurrentAnimationIndex == index && IsPlaying && !Blending)
-        {
-            return;
-        }
-        CurrentAnimationIndex = index;
-        CurrentFrame = 0;
-        FrameTimeCounter = 0.0f;
-        IsLooping = loop;
-        IsPlaying = true;
-        Blending = false;
-        TargetAnimationIndex = -1;
-    }
-
-    void CrossFade(int index, float duration = 0.2f, bool loop = true)
-    {
-        if (CurrentAnimationIndex == index)
-        {
-            return;
-        }
-        if (Blending && TargetAnimationIndex == index)
-        {
-            return;
-        }
-
-        TargetAnimationIndex = index;
-        TargetFrame = 0;
-        BlendTimer = 0.0f;
-        BlendDuration = (duration > 0.0f) ? duration : 0.01f;
-        Blending = true;
-        IsLooping = loop;
-        IsPlaying = true;
-    }
-
-    void Stop()
-    {
-        IsPlaying = false;
-        Blending = false;
-    }
-
-    CH_REFLECT_BEGIN(AnimationComponent)
-        props.File("AnimationPath", AnimationPath, "fbx,gltf,obj");
-        props.Property("CurrentAnimation", CurrentAnimationIndex);
-        props.Property("IsLooping", IsLooping);
-        props.Property("IsPlaying", IsPlaying);
-        props.Property("BlendDuration", BlendDuration, PropertyMeta(0.0f, 5.0f, 0.01f));
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_ANIMATION_COMPONENT_H
diff --git a/engine/scene/components/audio/audio_component.h b/engine/scene/components/audio/audio_component.h
new file mode 100644
index 000000000..af4c1d0d4
--- /dev/null
+++ b/engine/scene/components/audio/audio_component.h
@@ -0,0 +1,56 @@
+#ifndef CH_AUDIO_COMPONENT_H
+#define CH_AUDIO_COMPONENT_H
+
+#include "engine/assets/asset.h"
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+#include <glm/glm.hpp>
+#include <string>
+
+namespace Chained
+{
+	struct AudioComponent
+	{
+		AssetHandle SoundHandle = AssetHandle(0);
+		std::string SoundPath;
+		uint64_t SoundUUID = 0;
+		float Volume = 1.0f;
+		float Pitch = 1.0f;
+		bool Loop = false;
+		bool PlayOnStart = true;
+		bool Spatialized = false;
+		glm::vec3 Position = {0, 0, 0};
+		float MinDistance = 1.0f;
+		float MaxDistance = 100.0f;
+
+		// Runtime — not serialized
+		bool IsPlaying = false;
+		std::string LoadedSoundPath; // tracks the path that was actually loaded, to detect changes
+
+		static const char* GetStaticName()
+		{
+			return "AudioComponent";
+		}
+
+		struct UI
+		{
+			UIMeta SoundHandle = {.ReadOnly = true, .Transient = true};
+			UIMeta SoundPath = {.Hint = PropertyMeta::WidgetHint::FilePicker, .Extensions = ".wav,.mp3,.ogg"};
+			UIMeta SoundUUID = {.ReadOnly = true};
+			UIMeta Volume = {.Min = 0.0f, .Max = 2.0f, .Speed = 0.01f, .Tooltip = "Volume of the audio source"};
+			UIMeta Pitch = {
+				.Min = 0.1f, .Max = 3.0f, .Speed = 0.01f, .Tooltip = "Playback speed/pitch of the audio source"};
+			UIMeta MinDistance = {
+				.Min = 0.0f, .Max = 500.0f, .Speed = 0.5f, .Tooltip = "Radius where the sound starts to fade"};
+			UIMeta MaxDistance = {
+				.Min = 1.0f, .Max = 10000.0f, .Speed = 5.0f, .Tooltip = "Maximum distance for 3D sound visibility"};
+			UIMeta IsPlaying = {.ReadOnly = false, .Transient = false};
+			UIMeta LoadedSoundPath = {.ReadOnly = true, .Transient = true};
+		};
+	};
+
+	CH_MARK_RFL(AudioComponent);
+
+} // namespace Chained
+
+#endif // CH_AUDIO_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/audio_component.h b/engine/scene/components/audio_component.h
deleted file mode 100644
index 9d4277485..000000000
--- a/engine/scene/components/audio_component.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CH_AUDIO_COMPONENT_H
-#define CH_AUDIO_COMPONENT_H
-
-#include "engine/core/reflection.h"
-#include "engine/core/assets/asset.h"
-#include <string>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-struct AudioComponent
-{
-    AssetHandle SoundHandle = 0;
-    std::string SoundPath;
-    float Volume = 1.0f;
-    float Pitch = 1.0f;
-    bool Loop = false;
-    bool PlayOnStart = true;
-    bool Spatialized = false;
-    glm::vec3 Position = {0, 0, 0};
-    float MinDistance = 1.0f;
-    float MaxDistance = 100.0f;
-
-    // Runtime
-    
-    bool IsPlaying = false;
-
-    CH_REFLECT_BEGIN(AudioComponent)
-        props.Handle("SoundHandle", SoundHandle);
-        props.File("SoundPath", SoundPath, "mp3,wav,ogg");
-        props.Property("Volume", Volume, PropertyMeta(0.0f, 1.0f, 0.01f));
-        props.Property("Pitch", Pitch, PropertyMeta(0.5f, 2.0f, 0.05f));
-        props.Property("Loop", Loop);
-        props.Property("PlayOnStart", PlayOnStart);
-        props.Property("Spatialized", Spatialized);
-        // Always serialize spatial fields to preserve values on save/load.
-        // Only skip display in UI mode.
-        if (props.GetMode() != CHEngine::ReflectionMode::UI || Spatialized)
-        {
-            props.Property("Position", Position);
-            props.Property("MinDistance", MinDistance, PropertyMeta(0.1f, 100.0f, 0.5f));
-            props.Property("MaxDistance", MaxDistance, PropertyMeta(0.1f, 500.0f, 1.0f));
-        }
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_AUDIO_COMPONENT_H
diff --git a/engine/scene/components/camera_component.h b/engine/scene/components/camera_component.h
deleted file mode 100644
index 35c4ca0e2..000000000
--- a/engine/scene/components/camera_component.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef CH_CAMERA_COMPONENT_H
-#define CH_CAMERA_COMPONENT_H
-
-#include "engine/scene/scene_camera.h"
-#include "engine/core/reflection.h"
-#include <string>
-
-namespace CHEngine
-{
-struct CameraComponent
-{
-    CHEngine::SceneCamera Camera;
-    bool Primary = true;
-    bool FixedAspectRatio = false;
-
-    // Orbit camera settings
-    bool IsOrbitCamera = false;
-    std::string TargetEntityTag = "Player";
-    float OrbitDistance = 10.0f;
-    float OrbitYaw = 0.0f;
-    float OrbitPitch = 20.0f;
-    float LookSensitivity = 0.9f;
-
-    CameraComponent() = default;
-    CameraComponent(const CameraComponent&) = default;
-
-    CH_REFLECT_BEGIN(CameraComponent)
-        props.Header("General");
-        props.Property("Primary", Primary);
-        props.Property("FixedAspectRatio", FixedAspectRatio);
-
-        props.Nested("Projection", Camera);
-
-        if (props.BeginGroup("OrbitController", IsOrbitCamera))
-        {
-            props.Property("Enabled", IsOrbitCamera);
-            props.Property("TargetTag", TargetEntityTag);
-            props.Property("Distance", OrbitDistance, PropertyMeta(1.0f, 100.0f, 0.5f));
-            props.Property("Yaw", OrbitYaw, PropertyMeta(-360.0f, 360.0f, 1.0f));
-            props.Property("Pitch", OrbitPitch, PropertyMeta(-90.0f, 90.0f, 1.0f));
-            props.Property("Sensitivity", LookSensitivity, PropertyMeta(0.1f, 5.0f, 0.1f));
-            props.EndGroup();
-        }
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_CAMERA_COMPONENT_H
diff --git a/engine/scene/components/control_component.h b/engine/scene/components/control_component.h
deleted file mode 100644
index 69e549259..000000000
--- a/engine/scene/components/control_component.h
+++ /dev/null
@@ -1,624 +0,0 @@
-#ifndef CH_CONTROL_COMPONENT_H
-#define CH_CONTROL_COMPONENT_H
-
-#include "engine/core/reflection.h"
-
-namespace CHEngine
-{
-
-// Typography & Visual Styles
-enum class TextAlignment
-{
-    Left = 0, Center = 1, Right = 2,
-    Top = 0, Bottom = 2
-};
-
-enum class CanvasScaleMode : uint8_t
-{
-    ConstantPixelSize,
-    ScaleWithScreenSize,
-};
-
-struct CanvasSettings
-{
-    glm::vec2 ReferenceResolution = {1920.0f, 1080.0f};
-    CanvasScaleMode ScaleMode = CanvasScaleMode::ConstantPixelSize;
-    float MatchWidthOrHeight = 0.5f;
-};
-
-struct TextStyle
-{
-    std::string FontName = "Default";
-    float FontSize = 18.0f;
-    Color TextColor = { 255, 255, 255, 255 };
-    bool Shadow = false;
-    float ShadowOffset = 2.0f;
-    Color ShadowColor = { 0, 0, 0, 255 };
-    float LetterSpacing = { 1.0f };
-    float LineHeight = 1.2f;
-    TextAlignment HorizontalAlignment = TextAlignment::Center;
-    TextAlignment VerticalAlignment = TextAlignment::Center;
-
-    CH_REFLECT_BEGIN(TextStyle)
-        props.Property("Font Name", FontName);
-        props.Property("Font Size", FontSize, PropertyMeta(6.0f, 128.0f, 1.0f));
-        props.Property("Text Color", TextColor);
-        props.Property("Shadow", Shadow);
-        if (Shadow)
-        {
-            props.Property("Shadow Offset", ShadowOffset, PropertyMeta(0.0f, 20.0f, 0.1f));
-            props.Property("Shadow Color", ShadowColor);
-        }
-        props.Property("Letter Spacing", LetterSpacing, PropertyMeta(0.5f, 4.0f, 0.1f));
-        props.Property("Line Height", LineHeight, PropertyMeta(0.5f, 3.0f, 0.1f));
-        // Alignments as ints for now
-        props.Property("H Align", (int&)HorizontalAlignment);
-        props.Property("V Align", (int&)VerticalAlignment);
-    CH_REFLECT_END()
-};
-
-struct UIStyle
-{
-    Color BackgroundColor = {40, 40, 40, 255};
-    Color HoverColor = {60, 60, 60, 255};
-    Color PressedColor = {30, 30, 30, 255};
-
-    float Rounding = 4.0f;
-    float BorderSize = 0.0f;
-    Color BorderColor = { 255, 255, 255, 255 };
-
-    bool UseGradient = false;
-    Color GradientColor = {20, 20, 20, 255};
-
-    float Padding = 4.0f;
-
-    float HoverScale = 1.0f;
-    float PressedScale = 1.0f;
-    float TransitionSpeed = 0.1f;
-
-    CH_REFLECT_BEGIN(UIStyle)
-        props.Property("BG Color", BackgroundColor);
-        props.Property("Hover Color", HoverColor);
-        props.Property("Pressed Color", PressedColor);
-        props.Property("Rounding", Rounding, PropertyMeta(0.0f, 20.0f, 0.5f));
-        props.Property("Border Size", BorderSize, PropertyMeta(0.0f, 10.0f, 0.1f));
-        props.Property("Border Color", BorderColor);
-        props.Property("Gradient", UseGradient);
-        if (UseGradient)
-            props.Property("Gradient Color", GradientColor);
-        props.Property("Padding", Padding, PropertyMeta(0.0f, 50.0f, 1.0f));
-        props.Property("Hover Scale", HoverScale, PropertyMeta(0.8f, 1.5f, 0.05f));
-        props.Property("Pressed Scale", PressedScale, PropertyMeta(0.8f, 1.5f, 0.05f));
-        props.Property("Transition Speed", TransitionSpeed, PropertyMeta(0.01f, 1.0f, 0.01f));
-    CH_REFLECT_END()
-
-    // Runtime state (not serialized)
-    struct RuntimeState {
-        float AnimationAlpha = 0.0f; // 0 = idle, 1 = hover/pressed
-        float CurrentScale = 1.0f;
-        Color CurrentColor = {255, 255, 255, 255};
-    } State;
-};
-
-struct Rectangle
-{
-    float x, y, width, height;
-};
-
-struct RectTransform
-{
-    glm::vec2 AnchorMin = {0.5f, 0.5f};
-    glm::vec2 AnchorMax = {0.5f, 0.5f};
-    glm::vec2 OffsetMin = {-50.0f, -20.0f};
-    glm::vec2 OffsetMax = {50.0f, 20.0f};
-    glm::vec2 Pivot = {0.5f, 0.5f};
-    float Rotation = 0.0f;
-    glm::vec2 Scale = {1.0f, 1.0f};
-
-    Rectangle CalculateRect(glm::vec2 viewportSize, glm::vec2 viewportOffset = {0.0f, 0.0f}) const
-    {
-        glm::vec2 clAnchMin = glm::clamp(AnchorMin, 0.0f, 1.0f);
-        glm::vec2 clAnchMax = glm::clamp(AnchorMax, 0.0f, 1.0f);
-
-        glm::vec2 anchorMinPos = {viewportSize.x * clAnchMin.x, viewportSize.y * clAnchMin.y};
-        glm::vec2 anchorMaxPos = {viewportSize.x * clAnchMax.x, viewportSize.y * clAnchMax.y};
-
-        glm::vec2 pMin = {anchorMinPos.x + OffsetMin.x, anchorMinPos.y + OffsetMin.y};
-        glm::vec2 pMax = {anchorMaxPos.x + OffsetMax.x, anchorMaxPos.y + OffsetMax.y};
-
-        return Rectangle{viewportOffset.x + pMin.x, viewportOffset.y + pMin.y, pMax.x - pMin.x, pMax.y - pMin.y};
-    }
-
-    glm::vec2 GetCenter(glm::vec2 viewportSize) const
-    {
-        Rectangle rect = CalculateRect(viewportSize);
-        return {rect.x + rect.width * 0.5f, rect.y + rect.height * 0.5f};
-    }
-
-    glm::vec2 GetSize(glm::vec2 viewportSize) const
-    {
-        Rectangle rect = CalculateRect(viewportSize);
-        return {rect.width, rect.height};
-    }
-
-    CH_REFLECT_BEGIN(RectTransform)
-        bool changed = false;
-        bool isFill = (AnchorMin.x == 0.0f && AnchorMax.x == 1.0f && AnchorMin.y == 0.0f && AnchorMax.y == 1.0f);
-        
-        if (props.BeginGroup("Simplified Layout", !isFill))
-        {
-            if (isFill)
-            {
-                props.Header("Fill Mode Active");
-                props.Property("Padding L/R", OffsetMin.x, PropertyMeta(-1000.0f, 1000.0f, 1.0f)); // Simplified view
-                props.Property("Padding T/B", OffsetMin.y, PropertyMeta(-1000.0f, 1000.0f, 1.0f));
-            }
-            else
-            {
-                glm::vec2 pos = (OffsetMin + OffsetMax) * 0.5f;
-                glm::vec2 size = OffsetMax - OffsetMin;
-                
-                if (props.Property("Position", pos, PropertyMeta(-2000.0f, 2000.0f, 1.0f)))
-                {
-                    OffsetMin.x = pos.x - size.x * Pivot.x;
-                    OffsetMin.y = pos.y - size.y * Pivot.y;
-                    OffsetMax.x = pos.x + size.x * (1.0f - Pivot.x);
-                    OffsetMax.y = pos.y + size.y * (1.0f - Pivot.y);
-                    changed = true;
-                }
-                
-                if (props.Property("Size", size, PropertyMeta(1.0f, 2000.0f, 1.0f)))
-                {
-                    OffsetMin.x = pos.x - size.x * Pivot.x;
-                    OffsetMin.y = pos.y - size.y * Pivot.y;
-                    OffsetMax.x = pos.x + size.x * (1.0f - Pivot.x);
-                    OffsetMax.y = pos.y + size.y * (1.0f - Pivot.y);
-                    changed = true;
-                }
-            }
-            props.EndGroup();
-        }
-
-        if (props.BeginGroup("Advanced Settings", isFill))
-        {
-            if (props.Property("Anchor Min", AnchorMin)) changed = true;
-            if (props.Property("Anchor Max", AnchorMax)) changed = true;
-            if (props.Property("Offset Min", OffsetMin, PropertyMeta(-2000.0f, 2000.0f, 1.0f))) changed = true;
-            if (props.Property("Offset Max", OffsetMax, PropertyMeta(-2000.0f, 2000.0f, 1.0f))) changed = true;
-            if (props.Property("Pivot", Pivot)) changed = true;
-            if (props.Property("Rotation", Rotation, PropertyMeta(-360.0f, 360.0f, 1.0f))) changed = true;
-            if (props.Property("Scale", Scale, PropertyMeta(0.1f, 10.0f, 0.1f))) changed = true;
-            props.EndGroup();
-        }
-        
-        if (changed) props.SetChanged(true);
-    CH_REFLECT_END()
-};
-
-struct ControlComponent
-{
-    RectTransform Transform;
-    int32_t ZOrder = 0;
-    bool IsActive = true;
-    bool HiddenInHierarchy = false;
-
-    ControlComponent() = default;
-
-    CH_REFLECT_BEGIN(ControlComponent)
-        props.Nested("Rect Transform", Transform);
-        props.Property("Z Order", ZOrder, PropertyMeta(-1000.0f, 1000.0f, 1.0f));
-        props.Property("Active", IsActive);
-        props.Property("Hidden", HiddenInHierarchy);
-    CH_REFLECT_END()
-};
-
-struct ButtonControl
-{
-    std::string Label = "Button";
-    TextStyle Text;
-    UIStyle Style;
-    bool IsInteractable = true;
-    bool PressedThisFrame = false;
-    bool IsHovered = false;
-    bool IsDown = false;
-    bool AutoSize = false;
-
-    ButtonControl() = default;
-    ButtonControl(const std::string& label) : Label(label) {}
-
-    CH_REFLECT_BEGIN(ButtonControl)
-        props.Property("Label", Label);
-        props.Nested("Text Style", Text);
-        props.Nested("UI Style", Style);
-        props.Property("Interactable", IsInteractable);
-        props.Property("Auto Size", AutoSize);
-    CH_REFLECT_END()
-};
-
-struct PanelControl
-{
-    UIStyle Style;
-    AssetHandle TextureHandle = 0;
-    std::string TexturePath = "";
-    bool FullScreen = false;
-
-    bool IsHovered = false;
-    bool IsDown = false;
-
-    CH_REFLECT_BEGIN(PanelControl)
-        props.Nested("UI Style", Style);
-        props.Handle("Texture Handle", TextureHandle);
-        props.File("Texture Path", TexturePath, "png,jpg,tga");
-        props.Property("Full Screen", FullScreen);
-    CH_REFLECT_END()
-};
-
-struct LabelControl
-{
-    std::string Text = "Text Label";
-    TextStyle Style;
-    bool AutoSize = false;
-
-    LabelControl() = default;
-    LabelControl(const std::string& text) : Text(text) {}
-
-    CH_REFLECT_BEGIN(LabelControl)
-        props.Property("Text", Text);
-        props.Nested("Style", Style);
-        props.Property("Auto Size", AutoSize);
-    CH_REFLECT_END()
-};
-
-struct SliderControl
-{
-    std::string Label = "Slider";
-    TextStyle Text;
-    float Value = 0.5f;
-    float Min = 0.0f;
-    float Max = 1.0f;
-    bool Changed = false;
-    UIStyle Style;
-
-    CH_REFLECT_BEGIN(SliderControl)
-        props.Property("Label", Label);
-        props.Nested("Text Style", Text);
-        props.Property("Value", Value, PropertyMeta(0.0f, 100.0f, 0.1f));
-        props.Property("Min", Min, PropertyMeta(-100.0f, 100.0f, 0.1f));
-        props.Property("Max", Max, PropertyMeta(-100.0f, 100.0f, 0.1f));
-        props.Nested("UI Style", Style);
-    CH_REFLECT_END()
-};
-
-struct CheckboxControl
-{
-    std::string Label = "Checkbox";
-    TextStyle Text;
-    bool Checked = false;
-    bool Changed = false;
-    UIStyle Style;
-
-    CH_REFLECT_BEGIN(CheckboxControl)
-        props.Property("Label", Label);
-        props.Nested("Text Style", Text);
-        props.Property("Checked", Checked);
-        props.Nested("UI Style", Style);
-    CH_REFLECT_END()
-};
-
-struct InputTextControl
-{
-    std::string Label = "Input";
-    std::string Text = "";
-    std::string Placeholder = "Enter text...";
-    int MaxLength = 256;
-    bool Multiline = false;
-    bool ReadOnly = false;
-    bool Password = false;
-    bool Changed = false;
-    std::vector<char> InputBuffer;
-    TextStyle Style;
-    UIStyle BoxStyle;
-
-    CH_REFLECT_BEGIN(InputTextControl)
-        props.Property("Label", Label);
-        props.Property("Text", Text);
-        props.Property("Placeholder", Placeholder);
-        props.Property("MaxLength", MaxLength);
-        props.Property("Multiline", Multiline);
-        props.Property("ReadOnly", ReadOnly);
-        props.Property("Password", Password);
-        props.Nested("Text Style", Style);
-        props.Nested("Box Style", BoxStyle);
-    CH_REFLECT_END()
-};
-
-struct ComboBoxControl
-{
-    std::string Label = "Combo";
-    std::vector<std::string> Items = {"Option 1", "Option 2", "Option 3"};
-    int SelectedIndex = 0;
-    bool Changed = false;
-    TextStyle Style;
-    UIStyle BoxStyle;
-
-    CH_REFLECT_BEGIN(ComboBoxControl)
-        props.Property("Label", Label);
-        props.Sequence("Items", Items);
-        props.Property("Selected Index", SelectedIndex);
-        props.Nested("Style", Style);
-        props.Nested("Box Style", BoxStyle);
-    CH_REFLECT_END()
-};
-
-struct ProgressBarControl
-{
-    float Progress = 0.5f;
-    std::string OverlayText = "";
-    bool ShowPercentage = true;
-    TextStyle Style;
-    UIStyle BarStyle;
-
-    CH_REFLECT_BEGIN(ProgressBarControl)
-        props.Property("Progress", Progress);
-        props.Property("Overlay Text", OverlayText);
-        props.Property("Show Percentage", ShowPercentage);
-        props.Nested("Style", Style);
-        props.Nested("Bar Style", BarStyle);
-    CH_REFLECT_END()
-};
-
-struct ImageControl
-{
-    AssetHandle TextureHandle = 0;
-    std::string TexturePath = "";
-    Color TintColor = {255, 255, 255, 255};
-    Color BorderColor = {0, 0, 0, 0};
-    UIStyle Style;
-
-    bool IsHovered = false;
-    bool IsDown = false;
-
-    CH_REFLECT_BEGIN(ImageControl)
-        props.File("Texture Path", TexturePath, "png,jpg,tga");
-        props.Property("Tint Color", TintColor);
-        props.Property("Border Color", BorderColor);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct ImageButtonControl
-{
-    AssetHandle TextureHandle = 0;
-    std::string TexturePath = "";
-    std::string Label = "ImageButton";
-    Color TintColor = {255, 255, 255, 255};
-    Color BackgroundColor = {0, 0, 0, 0};
-    int FramePadding = -1;
-    bool PressedThisFrame = false;
-    UIStyle Style;
-
-    CH_REFLECT_BEGIN(ImageButtonControl)
-        props.File("Texture Path", TexturePath, "png,jpg,tga");
-        props.Property("Label", Label);
-        props.Property("Tint Color", TintColor);
-        props.Property("Background Color", BackgroundColor);
-        props.Property("Frame Padding", FramePadding);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct SeparatorControl
-{
-    float Thickness = 1.0f;
-    Color LineColor = {127, 127, 127, 255};
-
-    CH_REFLECT_BEGIN(SeparatorControl)
-        props.Property("Thickness", Thickness);
-        props.Property("Line Color", LineColor);
-    CH_REFLECT_END()
-};
-
-struct RadioButtonControl
-{
-    std::string Label = "RadioGroup";
-    std::vector<std::string> Options = {"Option 1", "Option 2", "Option 3"};
-    int SelectedIndex = 0;
-    bool Changed = false;
-    bool Horizontal = false;
-    TextStyle Style;
-
-    CH_REFLECT_BEGIN(RadioButtonControl)
-        props.Property("Label", Label);
-        props.Sequence("Options", Options);
-        props.Property("Selected Index", SelectedIndex);
-        props.Property("Horizontal", Horizontal);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct ColorPickerControl
-{
-    std::string Label = "Color";
-    Color SelectedColor = {255, 255, 255, 255};
-    bool ShowAlpha = true;
-    bool ShowPicker = true;
-    bool Changed = false;
-    UIStyle Style;
-
-    CH_REFLECT_BEGIN(ColorPickerControl)
-        props.Property("Label", Label);
-        props.Property("Color", SelectedColor);
-        props.Property("Show Alpha", ShowAlpha);
-        props.Property("Show Picker", ShowPicker);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct DragFloatControl
-{
-    std::string Label = "DragFloat";
-    float Value = 0.0f;
-    float Speed = 0.1f;
-    float Min = 0.0f;
-    float Max = 100.0f;
-    std::string Format = "%.3f";
-    bool Changed = false;
-    TextStyle Style;
-    UIStyle BoxStyle;
-
-    CH_REFLECT_BEGIN(DragFloatControl)
-        props.Property("Label", Label);
-        props.Property("Value", Value);
-        props.Property("Speed", Speed);
-        props.Property("Min", Min);
-        props.Property("Max", Max);
-        props.Nested("Style", Style);
-        props.Nested("Box Style", BoxStyle);
-    CH_REFLECT_END()
-};
-
-struct DragIntControl
-{
-    std::string Label = "DragInt";
-    int Value = 0;
-    float Speed = 1.0f;
-    int Min = 0;
-    int Max = 100;
-    std::string Format = "%d";
-    bool Changed = false;
-    TextStyle Style;
-    UIStyle BoxStyle;
-
-    CH_REFLECT_BEGIN(DragIntControl)
-        props.Property("Label", Label);
-        props.Property("Value", Value);
-        props.Property("Speed", Speed);
-        props.Property("Min", Min);
-        props.Property("Max", Max);
-        props.Nested("Style", Style);
-        props.Nested("Box Style", BoxStyle);
-    CH_REFLECT_END()
-};
-
-struct TreeNodeControl
-{
-    std::string Label = "TreeNode";
-    bool IsOpen = false;
-    bool DefaultOpen = false;
-    bool IsLeaf = false;
-    TextStyle Style;
-
-    CH_REFLECT_BEGIN(TreeNodeControl)
-        props.Property("Label", Label);
-        props.Property("Is Open", IsOpen);
-        props.Property("Default Open", DefaultOpen);
-        props.Property("Is Leaf", IsLeaf);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct TabBarControl
-{
-    std::string Label = "TabBar";
-    bool Reorderable = true;
-    bool AutoSelectNewTabs = true;
-    UIStyle Style;
-
-    CH_REFLECT_BEGIN(TabBarControl)
-        props.Property("Label", Label);
-        props.Property("Reorderable", Reorderable);
-        props.Property("Auto Select New Tabs", AutoSelectNewTabs);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct TabItemControl
-{
-    std::string Label = "Tab";
-    bool IsOpen = true;
-    bool Selected = false;
-    TextStyle Style;
-
-    CH_REFLECT_BEGIN(TabItemControl)
-        props.Property("Label", Label);
-        props.Property("Is Open", IsOpen);
-        props.Property("Selected", Selected);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct CollapsingHeaderControl
-{
-    std::string Label = "Header";
-    bool IsOpen = false;
-    bool DefaultOpen = false;
-    TextStyle Style;
-
-    CH_REFLECT_BEGIN(CollapsingHeaderControl)
-        props.Property("Label", Label);
-        props.Property("Is Open", IsOpen);
-        props.Property("Default Open", DefaultOpen);
-        props.Nested("Style", Style);
-    CH_REFLECT_END()
-};
-
-struct PlotLinesControl
-{
-    std::string Label = "Plot";
-    std::vector<float> Values = {0.0f, 0.5f, 1.0f, 0.5f, 0.0f};
-    std::string OverlayText = "";
-    float ScaleMin = 0.0f;
-    float ScaleMax = 1.0f;
-    glm::vec2 GraphSize = {0, 80};
-    TextStyle Style;
-    UIStyle BoxStyle;
-
-    CH_REFLECT_BEGIN(PlotLinesControl)
-        props.Property("Label", Label);
-        props.Property("Values", Values);
-        props.Property("Overlay Text", OverlayText);
-        props.Property("Scale Min", ScaleMin);
-        props.Property("Scale Max", ScaleMax);
-        props.Property("Graph Size", GraphSize);
-        props.Nested("Style", Style);
-        props.Nested("Box Style", BoxStyle);
-    CH_REFLECT_END()
-};
-
-struct PlotHistogramControl
-{
-    std::string Label = "Histogram";
-    std::vector<float> Values = {0.2f, 0.5f, 0.8f, 0.4f, 0.6f};
-    std::string OverlayText = "";
-    float ScaleMin = 0.0f;
-    float ScaleMax = 1.0f;
-    glm::vec2 GraphSize = {0, 80};
-    TextStyle Style;
-    UIStyle BoxStyle;
-
-    CH_REFLECT_BEGIN(PlotHistogramControl)
-        props.Property("Label", Label);
-        props.Property("Values", Values);
-        props.Property("Overlay Text", OverlayText);
-        props.Property("Scale Min", ScaleMin);
-        props.Property("Scale Max", ScaleMax);
-        props.Property("Graph Size", GraphSize);
-        props.Nested("Style", Style);
-        props.Nested("Box Style", BoxStyle);
-    CH_REFLECT_END()
-};
-
-struct VerticalLayoutGroup
-{
-    float Spacing = 10.0f;
-    glm::vec2 Padding = {10, 10};
-
-    CH_REFLECT_BEGIN(VerticalLayoutGroup)
-        props.Property("Spacing", Spacing);
-        props.Property("Padding", Padding);
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_CONTROL_COMPONENT_H
diff --git a/engine/scene/components/core/hierarchy_component.h b/engine/scene/components/core/hierarchy_component.h
new file mode 100644
index 000000000..a63c04b7f
--- /dev/null
+++ b/engine/scene/components/core/hierarchy_component.h
@@ -0,0 +1,52 @@
+#ifndef CH_HIERARCHY_COMPONENT_H
+#define CH_HIERARCHY_COMPONENT_H
+
+#include "entt/entt.hpp"
+#include "engine/reflection/reflection_rfl.h"
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+	struct HierarchyComponent
+	{
+		::entt::entity Parent = ::entt::null;
+		std::vector<::entt::entity> Children;
+
+		static const char* GetStaticName()
+		{
+			return "HierarchyComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Parent = {.Tooltip = "ID of the parent entity (entt::entity)"};
+			// Children typically not edited directly via properties, but let's leave it without UIMeta or add a simple
+			// one
+		};
+	};
+
+	CH_MARK_RFL(HierarchyComponent);
+
+	struct NameComponent
+	{
+		std::string Name;
+
+		static const char* GetStaticName()
+		{
+			return "NameComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Name = {.Tooltip = "Name of the entity in the hierarchy"};
+		};
+	};
+
+	CH_MARK_RFL(NameComponent);
+
+} // namespace Chained
+
+// HierarchyComponent and NameComponent use manual registration in RegisterEngineComponents()
+
+#endif // CH_HIERARCHY_COMPONENT_H
diff --git a/engine/scene/components/core/id_component.h b/engine/scene/components/core/id_component.h
new file mode 100644
index 000000000..8225a7b3c
--- /dev/null
+++ b/engine/scene/components/core/id_component.h
@@ -0,0 +1,29 @@
+#ifndef CH_ID_COMPONENT_H
+#define CH_ID_COMPONENT_H
+
+#include "engine/common/uuid.h"
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	struct IDComponent
+	{
+		UUID ID;
+
+		static const char* GetStaticName()
+		{
+			return "IDComponent";
+		}
+
+		struct UI
+		{
+			UIMeta ID = {.Tooltip = "Unique entity identifier (UUID)"};
+		};
+	};
+	CH_MARK_RFL(IDComponent);
+} // namespace Chained
+
+// IDComponent uses manual registration in RegisterEngineComponents()
+// due to circular include dependency (entity.h -> id_component.h -> component_registry.h)
+
+#endif // CH_ID_COMPONENT_H
diff --git a/engine/scene/components/core/tag_component.h b/engine/scene/components/core/tag_component.h
new file mode 100644
index 000000000..67686c684
--- /dev/null
+++ b/engine/scene/components/core/tag_component.h
@@ -0,0 +1,29 @@
+#ifndef CH_TAG_COMPONENT_H
+#define CH_TAG_COMPONENT_H
+
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	struct TagComponent
+	{
+		std::string Tag;
+		static const char* GetStaticName()
+		{
+			return "TagComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Tag = {.Tooltip = "Custom tag for entity lookup and filtering"};
+		};
+	};
+
+	CH_MARK_RFL(TagComponent);
+
+} // namespace Chained
+
+// TagComponent uses manual registration in RegisterEngineComponents()
+// due to circular include dependency (entity.h -> tag_component.h -> component_registry.h)
+
+#endif // CH_TAG_COMPONENT_H
diff --git a/engine/scene/components/core/transform_component.h b/engine/scene/components/core/transform_component.h
new file mode 100644
index 000000000..cf6b7c42e
--- /dev/null
+++ b/engine/scene/components/core/transform_component.h
@@ -0,0 +1,57 @@
+#ifndef CH_TRANSFORM_COMPONENT_H
+#define CH_TRANSFORM_COMPONENT_H
+
+#include "engine/reflection/reflection_rfl.h"
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <glm/gtx/quaternion.hpp>
+
+namespace Chained
+{
+	// Local transform state and cached world matrix.
+	struct TransformComponent
+	{
+		glm::vec3 Translation = {0.0f, 0.0f, 0.0f};
+		glm::vec3 Rotation = {0.0f, 0.0f, 0.0f};		   // Euler angles in radians.
+		glm::quat RotationQuat = {1.0f, 0.0f, 0.0f, 0.0f}; // GLM uses w, x, y, z.
+		glm::vec3 Scale = {1.0f, 1.0f, 1.0f};
+
+		// Cached world transform.
+		glm::mat4 WorldTransform = glm::mat4(1.0f);
+		glm::mat4 InverseWorldTransform = glm::mat4(1.0f);
+		bool TransformChanged = true;
+
+		// Previous state for interpolation.
+		glm::vec3 PrevTranslation = {0, 0, 0};
+		glm::quat PrevRotationQuat = {1.0f, 0.0f, 0.0f, 0.0f};
+		glm::vec3 PrevScale = {1, 1, 1};
+
+		static const char* GetStaticName()
+		{
+			return "TransformComponent";
+		}
+
+		// Declarative UI layout layout metadata for compile-time reflection
+		struct UI
+		{
+			UIMeta Translation = {.Tooltip = "Local position of the entity in world or parent space"};
+			UIMeta Rotation = {.Min = -3.14159f,
+							   .Max = 3.14159f,
+							   .Speed = 0.01f,
+							   .Tooltip = "Local rotation angles specified in radians"};
+			UIMeta Scale = {
+				.Min = 0.1f, .Max = 10.0f, .Speed = 0.1f, .Tooltip = "Local scale multipliers along X, Y, and Z axes"};
+
+			UIMeta TransformChanged = {.ReadOnly = true, .Transient = true};
+			UIMeta PrevTranslation = {.ReadOnly = true, .Transient = true};
+			UIMeta PrevRotationQuat = {.ReadOnly = true, .Transient = true};
+			UIMeta PrevScale = {.ReadOnly = true, .Transient = true};
+		};
+	};
+
+	CH_MARK_RFL(TransformComponent);
+
+} // namespace Chained
+
+#endif // CH_TRANSFORM_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/game_components.h b/engine/scene/components/game_components.h
deleted file mode 100644
index 5994e4944..000000000
--- a/engine/scene/components/game_components.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef CH_GAME_COMPONENTS_H
-#define CH_GAME_COMPONENTS_H
-
-#include "engine/core/reflection.h"
-#include <string>
-
-namespace CHEngine
-{
-struct SpawnComponent
-{
-    bool IsActive = true;
-    AssetHandle TextureHandle = 0;
-    glm::vec3 ZoneSize = {1.0f, 1.0f, 1.0f};
-    bool RenderSpawnZoneInScene = true;
-    glm::vec3 SpawnPoint = {0.0f, 0.0f, 0.0f};
-
-    std::string TexturePath;
-
-    SpawnComponent() = default;
-    SpawnComponent(const SpawnComponent&) = default;
-
-    CH_REFLECT_BEGIN(SpawnComponent)
-        props.Property("Active", IsActive);
-        props.Property("ZoneSize", ZoneSize, PropertyMeta(0.1f, 100.0f, 0.1f));
-        props.Handle("TextureHandle", TextureHandle);
-        props.File("TexturePath", TexturePath, "png,jpg,bmp,tga");
-        props.Property("RenderZone", RenderSpawnZoneInScene);
-        props.Property("SpawnPoint", SpawnPoint);
-    CH_REFLECT_END()
-};
-
-struct PlayerComponent
-{
-    float MovementSpeed = 15.0f;
-    float JumpForce = 10.0f;
-    float LookSensitivity = 0.9f;
-
-    PlayerComponent() = default;
-
-    CH_REFLECT_BEGIN(PlayerComponent)
-        props.Property("MovementSpeed", MovementSpeed, PropertyMeta(0.1f, 100.0f, 0.5f));
-        props.Property("JumpForce", JumpForce, PropertyMeta(0.1f, 50.0f, 0.5f));
-        props.Property("LookSensitivity", LookSensitivity, PropertyMeta(0.1f, 5.0f, 0.1f));
-    CH_REFLECT_END()
-};
-
-enum class SkillBranch
-{
-    Strength,
-    Magic,
-    Economy,
-    Defense
-};
-
-struct RPGStatsComponent
-{
-    int Level = 1;
-    int Experience = 0;
-    int ExperienceToNextLevel = 100;
-    
-    float Health = 100.0f;
-    float MaxHealth = 100.0f;
-    float Mana = 50.0f;
-    float MaxMana = 50.0f;
-    
-    float Strength = 10.0f;
-    float Intelligence = 10.0f;
-    float Dexterity = 10.0f;
-    
-    int Gold = 0;
-    int SkillPoints = 0;
-
-    RPGStatsComponent() = default;
-
-    CH_REFLECT_BEGIN(RPGStatsComponent)
-        props.Property("Level", Level);
-        props.Property("Experience", Experience);
-        props.Property("Exp To Next", ExperienceToNextLevel);
-        props.Property("Health", Health);
-        props.Property("Max Health", MaxHealth);
-        props.Property("Mana", Mana);
-        props.Property("Max Mana", MaxMana);
-        props.Property("Strength", Strength);
-        props.Property("Intelligence", Intelligence);
-        props.Property("Dexterity", Dexterity);
-        props.Property("Gold", Gold);
-        props.Property("Skill Points", SkillPoints);
-    CH_REFLECT_END()
-};
-
-struct SkillComponent
-{
-    SkillBranch Branch = SkillBranch::Strength;
-    std::string SkillName = "Basic Strike";
-    int RequiredLevel = 1;
-    bool IsUnlocked = false;
-    float Cooldown = 0.0f;
-    float MaxCooldown = 5.0f;
-
-    SkillComponent() = default;
-
-    CH_REFLECT_BEGIN(SkillComponent)
-        static const char* branchNames[] = { "Strength", "Magic", "Economy", "Defense" };
-        props.Enum("Branch", Branch, branchNames, 4);
-        props.Property("Skill Name", SkillName);
-        props.Property("Required Level", RequiredLevel);
-        props.Property("Is Unlocked", IsUnlocked);
-        props.Property("Cooldown", Cooldown);
-        props.Property("Max Cooldown", MaxCooldown);
-    CH_REFLECT_END()
-};
-
-struct InventoryComponent
-{
-    int SlotCount = 16;
-    // For simplicity in C++, we just expose basic item count or weight
-    float CurrentWeight = 0.0f;
-    float MaxWeight = 100.0f;
-
-    InventoryComponent() = default;
-
-    CH_REFLECT_BEGIN(InventoryComponent)
-        props.Property("Slots", SlotCount);
-        props.Property("Current Weight", CurrentWeight);
-        props.Property("Max Weight", MaxWeight);
-    CH_REFLECT_END()
-};
-
-struct SceneTransitionComponent
-{
-    std::string TargetScenePath;
-    bool Triggered = false;
-
-    SceneTransitionComponent() = default;
-    SceneTransitionComponent(const std::string& path)
-        : TargetScenePath(path)
-    {
-    }
-
-    CH_REFLECT_BEGIN(SceneTransitionComponent)
-        props.File("TargetScenePath", TargetScenePath, "chscene");
-        props.Property("Triggered", Triggered);
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_GAME_COMPONENTS_H
diff --git a/engine/scene/components/gameplay/network_identity_component.h b/engine/scene/components/gameplay/network_identity_component.h
new file mode 100644
index 000000000..5e17a8a98
--- /dev/null
+++ b/engine/scene/components/gameplay/network_identity_component.h
@@ -0,0 +1,33 @@
+#ifndef CH_NETWORK_IDENTITY_COMPONENT_H
+#define CH_NETWORK_IDENTITY_COMPONENT_H
+
+#include "engine/scene/component_registry.h"
+#include <cstdint>
+#include <string>
+
+namespace Chained
+{
+	struct NetworkIdentityComponent
+	{
+		uint64_t NetworkID = 0;
+		bool IsOwner = true;
+		std::string PrefabPath;		   // track which prefab was used to spawn this entity
+		uint8_t RemoteActionFlags = 0; // replicated from host (sprint/jump state)
+
+		static const char* GetStaticName()
+		{
+			return "NetworkIdentityComponent";
+		}
+
+		struct UI
+		{
+			UIMeta NetworkID = {.ReadOnly = true, .Tooltip = "Unique network entity ID"};
+			UIMeta IsOwner = {.Tooltip = "Whether this client owns this entity"};
+			UIMeta PrefabPath = {.Tooltip = "Prefab asset path used to spawn"};
+			UIMeta RemoteActionFlags = {.ReadOnly = true, .Tooltip = "Replicated action flags (sprint/jump)"};
+		};
+	};
+	CH_MARK_RFL(NetworkIdentityComponent);
+} // namespace Chained
+
+#endif // CH_NETWORK_IDENTITY_COMPONENT_H
diff --git a/engine/scene/components/gameplay/player_component.h b/engine/scene/components/gameplay/player_component.h
new file mode 100644
index 000000000..96206e5dc
--- /dev/null
+++ b/engine/scene/components/gameplay/player_component.h
@@ -0,0 +1,30 @@
+#ifndef CH_PLAYER_COMPONENT_H
+#define CH_PLAYER_COMPONENT_H
+#include "engine/scene/component_registry.h"
+
+#include <glm/glm.hpp>
+
+namespace Chained
+{
+	// --- PLAYER COMPONENT ---
+	struct PlayerComponent
+	{
+		float MovementSpeed = 15.0f;
+		float JumpForce = 10.0f;
+		float LookSensitivity = 0.9f;
+
+		static const char* GetStaticName()
+		{
+			return "PlayerComponent";
+		}
+
+		struct UI
+		{
+			UIMeta MovementSpeed = {.Tooltip = "Movement speed of the player"};
+			UIMeta JumpForce = {.Tooltip = "Jump force upward impulse"};
+			UIMeta LookSensitivity = {.Tooltip = "Mouse or camera look sensitivity"};
+		};
+	};
+	CH_MARK_RFL(PlayerComponent);
+} // namespace Chained
+#endif
diff --git a/engine/scene/components/gameplay/spawn_component.h b/engine/scene/components/gameplay/spawn_component.h
new file mode 100644
index 000000000..d5f04c313
--- /dev/null
+++ b/engine/scene/components/gameplay/spawn_component.h
@@ -0,0 +1,35 @@
+#ifndef CH_SPAWN_COMPONENT_H
+#define CH_SPAWN_COMPONENT_H
+#include "engine/assets/asset.h"
+#include "engine/scene/component_registry.h"
+#include <glm/glm.hpp>
+
+namespace Chained
+{
+	// --- SPAWN COMPONENT ---
+	struct SpawnComponent
+	{
+		bool IsActive = true;
+		bool IsCheckpoint = true;
+		glm::vec3 SpawnPoint = {0.0f, 0.0f, 0.0f};
+		AssetHandle TextureHandle = 0;
+		glm::vec3 ZoneSize = {1.0f, 1.0f, 1.0f};
+		bool RenderSpawnZoneInScene = true;
+
+		static const char* GetStaticName()
+		{
+			return "SpawnComponent";
+		}
+
+		struct UI
+		{
+			UIMeta IsActive = {.Tooltip = "Whether this spawn zone is enabled"};
+			UIMeta IsCheckpoint = {.Tooltip = "Whether the spawn zone is the active checkpoint"};
+			UIMeta SpawnPoint = {.Tooltip = "Offset position relative to entity where player spawns"};
+			UIMeta ZoneSize = {.Tooltip = "Random spawn area dimensions (X, Y, Z) around entity position"};
+			UIMeta RenderSpawnZoneInScene = {.Tooltip = "Render the zone boundaries in the viewport"};
+		};
+	};
+	CH_MARK_RFL(SpawnComponent);
+} // namespace Chained
+#endif // CH_SPAWN_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/hierarchy_component.h b/engine/scene/components/hierarchy_component.h
deleted file mode 100644
index 0997085ab..000000000
--- a/engine/scene/components/hierarchy_component.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef CH_HIERARCHY_COMPONENT_H
-#define CH_HIERARCHY_COMPONENT_H
-
-#include "entt/entt.hpp"
-#include <string>
-#include <vector>
-
-namespace CHEngine
-{
-struct HierarchyComponent
-{
-    entt::entity Parent = entt::null;
-    std::vector<entt::entity> Children;
-
-    HierarchyComponent() = default;
-    HierarchyComponent(const HierarchyComponent&) = default;
-};
-
-struct NameComponent
-{
-    std::string Name;
-
-    NameComponent() = default;
-    NameComponent(const std::string& name)
-        : Name(name)
-    {
-    }
-};
-
-} // namespace CHEngine
-
-#endif // CH_HIERARCHY_COMPONENT_H
diff --git a/engine/scene/components/id_component.h b/engine/scene/components/id_component.h
deleted file mode 100644
index 4af889018..000000000
--- a/engine/scene/components/id_component.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CH_ID_COMPONENT_H
-#define CH_ID_COMPONENT_H
-
-#include "engine/core/uuid.h"
-
-namespace CHEngine
-{
-struct IDComponent
-{
-    UUID ID;
-
-    IDComponent() = default;
-    IDComponent(const IDComponent&) = default;
-    IDComponent(const UUID& id)
-        : ID(id)
-    {
-    }
-};
-} // namespace CHEngine
-
-#endif // CH_ID_COMPONENT_H
diff --git a/engine/scene/components/light_component.h b/engine/scene/components/light_component.h
deleted file mode 100644
index 1d01cebb2..000000000
--- a/engine/scene/components/light_component.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef CH_LIGHT_COMPONENT_H
-#define CH_LIGHT_COMPONENT_H
-
-
-#include "engine/core/reflection.h"
-
-namespace CHEngine
-{
-enum class LightType
-{
-    Point = 0,
-    Spot = 1,
-    Directional = 2
-};
-
-struct LightComponent
-{
-    LightType Type = LightType::Point;
-    Color LightColor = Color::White();
-    float Intensity = 100.0f;
-    float Radius = 100.0f;     // Also used as Range for Spot lights
-    float InnerCutoff = 15.0f; // Spot light only (degrees)
-    float OuterCutoff = 20.0f; // Spot light only (degrees)
-    bool Shadows = false;      // Future proofing
-
-    LightComponent() = default;
-    LightComponent(const LightComponent&) = default;
-
-
-    CH_REFLECT_BEGIN(LightComponent)
-        props.Header("General");
-        static const char* lightTypeStrings[] = { "Point", "Spot", "Directional" };
-        props.Enum("Type", Type, lightTypeStrings, 3);
-        props.Property("Color", LightColor);
-        props.Property("Intensity", Intensity, PropertyMeta(0.0f, 1000.0f, 1.0f));
-        
-        if (props.BeginGroup("Parameters"))
-        {
-            props.Property("Radius", Radius, PropertyMeta(1.0f, 1000.0f, 1.0f));
-            
-            // Always serialize Spot fields to avoid losing values on save/load.
-            // Only skip display in UI mode.
-            if (props.GetMode() != CHEngine::ReflectionMode::UI || Type == LightType::Spot)
-            {
-                props.Property("InnerCutoff", InnerCutoff, PropertyMeta(0.0f, 90.0f, 0.5f));
-                props.Property("OuterCutoff", OuterCutoff, PropertyMeta(0.0f, 90.0f, 0.5f));
-            }
-            props.EndGroup();
-        }
-
-        props.Separator();
-        props.Property("Shadows", Shadows);
-    CH_REFLECT_END()
-};
-} // namespace CHEngine
-
-#endif // CH_LIGHT_COMPONENT_H
diff --git a/engine/scene/components/mesh_component.cpp b/engine/scene/components/mesh_component.cpp
deleted file mode 100644
index 294900158..000000000
--- a/engine/scene/components/mesh_component.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "engine/scene/components/mesh_component.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/model_asset.h"
-
-namespace CHEngine {
-
-void ModelComponent::SyncMaterials(AssetHandle handle)
-{
-    if (MaterialsInitialized || handle == 0) return;
-    
-    auto model = AssetManager::Get().Get<ModelAsset>(handle);
-    if (!model || !model->IsReady()) return;
-
-    auto& modelMaterials = model->GetModel().Materials;
-    Materials.clear();
-    for (size_t i = 0; i < modelMaterials.size(); i++)
-    {
-        const auto& mat = modelMaterials[i];
-        MaterialSlot slot;
-        slot.Name = mat.Name;
-        slot.Index = (int)i;
-        slot.Target = MaterialSlotTarget::MaterialIndex;
-        
-        // Convert Material (float colors) to MaterialInstance (byte colors)
-        slot.Material.AlbedoColor = { 
-            (unsigned char)glm::clamp(mat.AlbedoColor.r * 255.0f, 0.0f, 255.0f),
-            (unsigned char)glm::clamp(mat.AlbedoColor.g * 255.0f, 0.0f, 255.0f),
-            (unsigned char)glm::clamp(mat.AlbedoColor.b * 255.0f, 0.0f, 255.0f),
-            (unsigned char)glm::clamp(mat.AlbedoColor.a * 255.0f, 0.0f, 255.0f)
-        };
-        slot.Material.AlbedoPath = mat.AlbedoPath;
-        slot.Material.OverrideAlbedo = !mat.AlbedoPath.empty();
-        
-        slot.Material.NormalMapPath = mat.NormalPath;
-        slot.Material.OverrideNormal = !mat.NormalPath.empty();
-        
-        slot.Material.MetallicRoughnessPath = mat.MetallicRoughnessPath;
-        slot.Material.OverrideMetallicRoughness = !mat.MetallicRoughnessPath.empty();
-        
-        slot.Material.OcclusionMapPath = mat.OcclusionPath;
-        slot.Material.OverrideOcclusion = !mat.OcclusionPath.empty();
-        
-        slot.Material.EmissivePath = mat.EmissivePath;
-        slot.Material.OverrideEmissive = !mat.EmissivePath.empty();
-        
-        slot.Material.EmissiveColor = {
-            (unsigned char)glm::clamp(mat.EmissiveColor.r * 255.0f, 0.0f, 255.0f),
-            (unsigned char)glm::clamp(mat.EmissiveColor.g * 255.0f, 0.0f, 255.0f),
-            (unsigned char)glm::clamp(mat.EmissiveColor.b * 255.0f, 0.0f, 255.0f),
-            (unsigned char)glm::clamp(mat.EmissiveColor.a * 255.0f, 0.0f, 255.0f)
-        };
-        slot.Material.EmissiveIntensity = mat.EmissiveIntensity;
-        slot.Material.Metalness = mat.Metalness;
-        slot.Material.Roughness = mat.Roughness;
-        
-        Materials.push_back(slot);
-    }
-    MaterialsInitialized = true;
-}
-
-}
diff --git a/engine/scene/components/mesh_component.h b/engine/scene/components/mesh_component.h
deleted file mode 100644
index 2e9cd5409..000000000
--- a/engine/scene/components/mesh_component.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef CH_MESH_COMPONENT_H
-#define CH_MESH_COMPONENT_H
-
-#include "engine/core/reflection.h"
-#include "engine/graphics/pipeline/material.h"
-
-namespace CHEngine
-{
-class ModelAsset;
-
-enum class MaterialSlotTarget : uint8_t
-{
-    MaterialIndex = 0,
-    MeshIndex = 1
-};
-
-struct MaterialSlot
-{
-    std::string Name;
-    int Index = -1;
-    MaterialSlotTarget Target = MaterialSlotTarget::MaterialIndex;
-    MaterialInstance Material;
-
-    MaterialSlot() = default;
-    MaterialSlot(const std::string& name, int index)
-        : Name(name),
-          Index(index)
-    {
-    }
-
-    CH_REFLECT_BEGIN(MaterialSlot)
-        props.Property("Name", Name);
-        props.Property("Index", Index);
-        props.Property("Target", (int&)Target);
-        props.Nested("Material", Material);
-    CH_REFLECT_END()
-};
-
-struct ModelComponent
-{
-    AssetHandle ModelHandle = 0;
-    std::string ModelPath;
-    std::vector<MaterialSlot> Materials;
-    bool MaterialsInitialized = false;
-
-    ModelComponent() = default;
-    ModelComponent(const ModelComponent&) = default;
-    ModelComponent(AssetHandle handle)
-        : ModelHandle(handle)
-    {
-    }
-    ModelComponent(const std::string& path)
-        : ModelPath(path)
-    {
-    }
-
-    void SyncMaterials(AssetHandle handle);
-
-    CH_REFLECT_BEGIN(ModelComponent)
-        props.Handle("ModelHandle", ModelHandle);
-        props.File("ModelPath", ModelPath, "obj,gltf,glb,iqm,m3d");
-        if (props.GetMode() != CHEngine::ReflectionMode::UI)
-            props.Sequence("Materials", Materials);
-    CH_REFLECT_END()
-};
-
-struct MaterialComponent
-{
-    std::vector<MaterialSlot> Materials;
-    bool MaterialsInitialized = false;
-
-    MaterialComponent() = default;
-    MaterialComponent(const MaterialComponent&) = default;
-
-    CH_REFLECT_BEGIN(MaterialComponent)
-        props.Sequence("Materials", Materials);
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_MESH_COMPONENT_H
diff --git a/engine/scene/components/navigation_component.h b/engine/scene/components/navigation_component.h
deleted file mode 100644
index f8ebe84f8..000000000
--- a/engine/scene/components/navigation_component.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CH_NAVIGATION_COMPONENT_H
-#define CH_NAVIGATION_COMPONENT_H
-
-#include <entt/entt.hpp>
-#include "engine/core/reflection.h"
-
-namespace CHEngine
-{
-struct NavigationComponent
-{
-    entt::entity Up = entt::null;
-    entt::entity Down = entt::null;
-    entt::entity Left = entt::null;
-    entt::entity Right = entt::null;
-
-    bool IsDefaultFocus = false;
-
-    CH_REFLECT_BEGIN(NavigationComponent)
-        props.Property("Is Default Focus", IsDefaultFocus);
-        // Navigation targets (entt::entity) are usually handled by Entity picker in UI
-    CH_REFLECT_END()
-};
-} // namespace CHEngine
-
-#endif // CH_NAVIGATION_COMPONENT_H
diff --git a/engine/scene/components/physics/physics_component.h b/engine/scene/components/physics/physics_component.h
new file mode 100644
index 000000000..61b8736c3
--- /dev/null
+++ b/engine/scene/components/physics/physics_component.h
@@ -0,0 +1,126 @@
+#ifndef CH_PHYSICS_COMPONENTS_H
+#define CH_PHYSICS_COMPONENTS_H
+
+#include "engine/assets/asset.h"
+#include "engine/assets/model_data.h"
+#include "engine/physics/physics_types.h"
+#include "engine/reflection/reflection_rfl.h"
+#include <glm/glm.hpp>
+#include <string>
+
+namespace Chained
+{
+
+	struct ColliderComponent
+	{
+		// Serialized fields
+		ColliderType Type = ColliderType::Box;
+
+		glm::vec3 Size = {0.5f, 0.5f, 0.5f};
+		glm::vec3 Offset = {0.0f, 0.0f, 0.0f};
+		float Radius = 0.5f;
+		float Height = 1.0f;
+
+		float Friction = 0.5f;
+		float Restitution = 0.0f;
+
+		bool IsTrigger = false;
+		bool Enabled = true;
+		bool AutoCalculate = false;
+		bool UseFastBuildQuality = true;
+
+		std::string ModelPath;
+		uint64_t ModelUUID = 0;
+		AssetHandle ModelHandle = 0;
+
+		// Runtime state (not serialized - excluded by ReflectBridge)
+		bool IsColliding = false;
+
+		static const char* GetStaticName()
+		{
+			return "ColliderComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Type = {.Hint = PropertyMeta::WidgetHint::Enum, .Tooltip = "Geometric shape of the collider"};
+			UIMeta Size = {.Speed = 0.05f, .Tooltip = "Dimensions of the Box collider"};
+			UIMeta Offset = {.Speed = 0.05f,
+							 .Tooltip = "Offset of the collider's center relative to the entity's local origin"};
+			UIMeta Radius = {.Min = 0.0f, .Max = 500.0f, .Speed = 0.05f, .Tooltip = "Radius for Sphere or Capsule"};
+			UIMeta Height = {.Min = 0.0f, .Max = 500.0f, .Speed = 0.05f, .Tooltip = "Total height of the capsule"};
+			UIMeta Friction = {.Min = 0.0f, .Max = 1.0f, .Speed = 0.01f, .Tooltip = "Material friction coefficient"};
+			UIMeta Restitution = {
+				.Min = 0.0f, .Max = 1.0f, .Speed = 0.01f, .Tooltip = "Material restitution (bounciness on impact)"};
+			UIMeta IsTrigger = {
+				.Tooltip =
+					"If enabled, the collider only registers intersections but does not block physical body movement"};
+			UIMeta AutoCalculate = {.Tooltip =
+										"Automatically calculate collider dimensions based on the ModelComponent"};
+			UIMeta UseFastBuildQuality = {
+				.Tooltip = "Mesh only: faster BVH build but slightly worse runtime collision performance"};
+			UIMeta ModelPath = {.Hint = PropertyMeta::WidgetHint::FilePicker,
+								.Tooltip = "Path to the 3D model for the Mesh collider",
+								.Extensions = ".glb,.gltf,.obj"};
+			UIMeta ModelUUID = {.ReadOnly = true};
+		};
+	};
+
+	CH_MARK_RFL(ColliderComponent);
+
+	struct RigidBodyComponent
+	{
+		// Serialized fields
+		enum class BodyType
+		{
+			Static,
+			Dynamic,
+			Kinematic
+		};
+		BodyType Type = BodyType::Dynamic;
+		float Mass = 1.0f;
+		float LinearDamping = 0.01f;
+		float AngularDamping = 0.05f;
+		bool UseGravity = true;
+		bool IsFixedRotation = false;
+
+		// Runtime state (not serialized - excluded by ReflectBridge)
+		PhysicsBodyHandle Handle = kInvalidPhysicsBody;
+		glm::vec3 Velocity = glm::vec3(0.0f);
+		bool IsGrounded = false;
+		bool VelocityForced = false;
+		// When true, the network system owns this body's position/velocity.
+		// Physics::Update and UpdateColliders must not overwrite the transform
+		// or apply Jolt-simulated velocity — the network interpolation does.
+		bool IsNetworkDriven = false;
+
+		static const char* GetStaticName()
+		{
+			return "RigidBodyComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Type = {
+				.Hint = PropertyMeta::WidgetHint::Enum,
+				.Tooltip =
+					"Body behavior mode: Static (immovable), Dynamic (full physics), Kinematic (controlled by code)"};
+			UIMeta Mass = {.Min = 0.0f, .Max = 100000.0f, .Speed = 0.1f, .Tooltip = "Mass of the physical object"};
+			UIMeta LinearDamping = {.Min = 0.0f,
+									.Max = 1.0f,
+									.Speed = 0.005f,
+									.Tooltip = "Air resistance for linear movement (linear damping)"};
+			UIMeta AngularDamping = {.Min = 0.0f,
+									 .Max = 1.0f,
+									 .Speed = 0.005f,
+									 .Tooltip = "Air resistance for object rotation (angular damping)"};
+			UIMeta UseGravity = {.Tooltip = "Whether global scene gravity affects this body"};
+			UIMeta IsFixedRotation = {.Tooltip = "Blocks any rotation of the object caused by physical forces"};
+		};
+	};
+
+	CH_MARK_RFL(RigidBodyComponent);
+
+} // namespace Chained
+
+#endif // CH_PHYSICS_COMPONENTS_H
\ No newline at end of file
diff --git a/engine/scene/components/physics_component.h b/engine/scene/components/physics_component.h
deleted file mode 100644
index 832973fb9..000000000
--- a/engine/scene/components/physics_component.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef CH_PHYSICS_COMPONENTS_H
-#define CH_PHYSICS_COMPONENTS_H
-
-#include "engine/core/reflection.h"
-#include <glm/glm.hpp>
-#include <string>
-
-namespace CHEngine
-{
-class BVH;
-
-enum class ColliderType : uint8_t
-{
-    Box = 0,
-    Mesh = 1,
-    Capsule = 2,
-    Sphere = 3
-};
-
-struct ColliderComponent
-{
-    ColliderType Type = ColliderType::Box;
-    bool Enabled = true;
-
-    // Common/Box fields
-    glm::vec3 Offset = {0.0f, 0.0f, 0.0f};
-
-    // Box
-    glm::vec3 Size = {1.0f, 1.0f, 1.0f};
-
-    // Capsule
-    float Radius = 0.5f;
-    float Height = 2.0f;
-
-    bool AutoCalculate = true;
-
-    // Mesh (BVH) fields
-    AssetHandle ModelHandle = 0;
-    std::string ModelPath;
-
-    bool IsColliding = false;
-
-    ColliderComponent() = default;
-    ColliderComponent(const ColliderComponent&) = default;
-
-    CH_REFLECT_BEGIN(ColliderComponent)
-        if (props.BeginGroup("General"))
-        {
-            const char* colliderTypes[] = {"Box", "Mesh", "Capsule", "Sphere"};
-            props.Property("Type", Type, colliderTypes, 4);
-            props.Property("Enabled", Enabled);
-            props.Property("Offset", Offset);
-            props.EndGroup();
-        }
-        
-        if (props.BeginGroup("ShapeParameters"))
-        {
-            if (Type == ColliderType::Box)
-            {
-                props.Property("Size", Size, PropertyMeta(0.01f, 100.0f, 0.1f));
-            }
-            else if (Type == ColliderType::Capsule)
-            {
-                props.Property("Radius", Radius, PropertyMeta(0.01f, 50.0f, 0.1f));
-                props.Property("Height", Height, PropertyMeta(0.1f, 100.0f, 0.1f));
-            }
-            else if (Type == ColliderType::Sphere)
-            {
-                props.Property("Radius", Radius, PropertyMeta(0.01f, 50.0f, 0.1f));
-            }
-            else if (Type == ColliderType::Mesh)
-            {
-                props.Handle("ModelHandle", ModelHandle);
-                props.File("ModelPath", ModelPath, "obj,gltf,glb");
-            }
-            props.EndGroup();
-        }
-        
-        props.Property("AutoCalculate", AutoCalculate, PropertyMeta().WithTooltip("Overwrite Offset/Size automatically from model mesh each frame"));
-    CH_REFLECT_END()
-};
-
-struct RigidBodyComponent
-{
-    glm::vec3 Velocity = {0.0f, 0.0f, 0.0f};
-    bool UseGravity = true;
-    bool IsGrounded = false;
-    bool IsKinematic = false;
-    float Mass = 1.0f;
-
-    RigidBodyComponent() = default;
-
-    CH_REFLECT_BEGIN(RigidBodyComponent)
-        props.Header("Dynamics");
-        props.Property("Mass", Mass, PropertyMeta(0.01f, 100.0f, 0.1f));
-        props.Property("Velocity", Velocity);
-        
-        if (props.BeginGroup("State"))
-        {
-            props.Property("UseGravity", UseGravity);
-            props.Property("IsKinematic", IsKinematic);
-            props.Property("IsGrounded", IsGrounded);
-            props.EndGroup();
-        }
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_PHYSICS_COMPONENTS_H
diff --git a/engine/scene/components/primitive_component.h b/engine/scene/components/primitive_component.h
deleted file mode 100644
index 0409997c1..000000000
--- a/engine/scene/components/primitive_component.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef CH_PRIMITIVE_COMPONENT_H
-#define CH_PRIMITIVE_COMPONENT_H
-
-#include "engine/core/reflection.h"
-#include <memory>
-
-namespace CHEngine
-{
-class ModelAsset;
-
-enum class PrimitiveType : uint8_t
-{
-    None = 0,
-    Cube,
-    Sphere,
-    Plane,
-    Cylinder,
-    Cone,
-    Torus,
-    Knot,
-    Hemisphere
-};
-
-struct PrimitiveComponent
-{
-    PrimitiveType Type = PrimitiveType::None;
-
-    // Parameters
-    float Radius = 0.5f;
-    float InnerRadius = 0.2f;
-    float Height = 1.0f;
-    int Slices = 16;
-    int Stacks = 16;
-    glm::vec3 Dimensions = {1.0f, 1.0f, 1.0f};
-
-    // Internal state
-    bool Dirty = false;
-
-    // Runtime-cached asset reference
-    std::shared_ptr<ModelAsset> Asset;
-
-    PrimitiveComponent() = default;
-    PrimitiveComponent(const PrimitiveComponent&) = default;
-    PrimitiveComponent(PrimitiveType type)
-        : Type(type)
-    {
-    }
-
-    CH_REFLECT_BEGIN(PrimitiveComponent)
-        props.Header("Shape Selection");
-        const char* primitiveTypes[] = {"None", "Cube",  "Sphere", "Plane",     "Cylinder",
-                                        "Cone", "Torus", "Knot",   "Hemisphere"};
-        
-        if (props.Enum("Primitive Type", Type, primitiveTypes, (int)CH_ARRAY_SIZE(primitiveTypes)))
-        {
-            Dirty = true;
-            Asset = nullptr;
-        }
-
-        if (Type == PrimitiveType::None) return;
-
-        if (props.BeginGroup("Parameters"))
-        {
-            if (Type == PrimitiveType::Cube || Type == PrimitiveType::Plane)
-            {
-                props.Property("Dimensions", Dimensions, PropertyMeta(0.01f, 100.0f, 0.1f));
-            }
-            else
-            {
-                props.Property("Radius", Radius, PropertyMeta(0.01f, 50.0f, 0.1f));
-                if (Type == PrimitiveType::Torus)
-                    props.Property("Inner Radius", InnerRadius, PropertyMeta(0.01f, 25.0f, 0.1f));
-                
-                if (Type == PrimitiveType::Cylinder || Type == PrimitiveType::Cone)
-                    props.Property("Height", Height, PropertyMeta(0.1f, 100.0f, 0.1f));
-
-                props.Property("Slices", Slices, PropertyMeta(3.0f, 256.0f, 1.0f));
-                props.Property("Stacks", Stacks, PropertyMeta(3.0f, 256.0f, 1.0f));
-            }
-            props.EndGroup();
-        }
-
-        if (props.GetMode() == ReflectionMode::Deserialize && props.HasChanged())
-        {
-            Dirty = true;
-            Asset = nullptr;
-        }
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_PRIMITIVE_COMPONENT_H
diff --git a/engine/scene/components/render/camera_component.h b/engine/scene/components/render/camera_component.h
new file mode 100644
index 000000000..f81ec82f0
--- /dev/null
+++ b/engine/scene/components/render/camera_component.h
@@ -0,0 +1,50 @@
+#ifndef CH_CAMERA_COMPONENT_H
+#define CH_CAMERA_COMPONENT_H
+
+#include "engine/scene/camera.h"
+#include "engine/reflection/reflection_rfl.h"
+#include <glm/glm.hpp>
+#include <string>
+
+namespace Chained
+{
+	struct CameraComponent
+	{
+		Camera Camera;
+		bool Primary = true;
+		bool FixedAspectRatio = false;
+
+		// Orbit camera settings
+		bool IsOrbitCamera = false;
+		std::string TargetEntityTag = "Player";
+		float OrbitDistance = 10.0f;
+		float OrbitYaw = 0.0f;
+		float OrbitPitch = 20.0f;
+		float LookSensitivity = 0.9f;
+
+		// Runtime-only: smoothed pivot position for lag-free tracking (not serialized)
+		glm::vec3 SmoothedPivot = glm::vec3(0.0f);
+		bool PivotInitialized = false;
+
+		static const char* GetStaticName()
+		{
+			return "CameraComponent";
+		}
+
+		struct UI
+		{
+			UIMeta TargetEntityTag = {.Tooltip = "Tag of the entity to follow (Orbit Camera)"};
+			UIMeta OrbitDistance = {.Min = 1.0f, .Max = 500.0f, .Speed = 0.5f};
+			UIMeta OrbitYaw = {.Speed = 1.0f};
+			UIMeta OrbitPitch = {.Min = -89.0f, .Max = 89.0f, .Speed = 1.0f};
+			UIMeta LookSensitivity = {.Min = 0.1f, .Max = 10.0f, .Speed = 0.05f};
+			UIMeta SmoothedPivot = {.Transient = true};
+			UIMeta PivotInitialized = {.Transient = true};
+		};
+	};
+
+	CH_MARK_RFL(CameraComponent);
+
+} // namespace Chained
+
+#endif // CH_CAMERA_COMPONENT_H
diff --git a/engine/scene/components/render/light_component.h b/engine/scene/components/render/light_component.h
new file mode 100644
index 000000000..66ee2acde
--- /dev/null
+++ b/engine/scene/components/render/light_component.h
@@ -0,0 +1,45 @@
+#ifndef CH_LIGHT_COMPONENT_H
+#define CH_LIGHT_COMPONENT_H
+
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	enum class LightType
+	{
+		Point = 0,
+		Spot = 1,
+		Directional = 2
+	};
+
+	struct LightComponent
+	{
+		LightType Type = LightType::Point;
+		Color LightColor = Color::White();
+		float Intensity = 100.0f;
+		float Radius = 100.0f;	   // Also used as Range for Spot lights
+		float InnerCutoff = 15.0f; // Spot light only (degrees)
+		float OuterCutoff = 20.0f; // Spot light only (degrees)
+		bool Shadows = false;	   // Future proofing
+
+		static const char* GetStaticName()
+		{
+			return "LightComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Type = {.Hint = PropertyMeta::WidgetHint::Checkbox};
+			UIMeta LightColor = {.Hint = PropertyMeta::WidgetHint::ColorPicker};
+			UIMeta Intensity = {.Min = 0.0f, .Max = 10000.0f, .Speed = 5.0f};
+			UIMeta Radius = {.Min = 0.0f, .Max = 1000.0f, .Speed = 1.0f};
+			UIMeta InnerCutoff = {.Min = 0.0f, .Max = 90.0f, .Speed = 0.5f};
+			UIMeta OuterCutoff = {.Min = 0.0f, .Max = 90.0f, .Speed = 0.5f};
+		};
+	};
+
+	CH_MARK_RFL(LightComponent);
+
+} // namespace Chained
+
+#endif // CH_LIGHT_COMPONENT_H
diff --git a/engine/scene/components/render/model_component.h b/engine/scene/components/render/model_component.h
new file mode 100644
index 000000000..fa1adbc34
--- /dev/null
+++ b/engine/scene/components/render/model_component.h
@@ -0,0 +1,36 @@
+#ifndef CH_MODEL_COMPONENT_H
+#define CH_MODEL_COMPONENT_H
+
+#include "engine/assets/asset.h"
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+#include <string>
+#include <vector>
+
+namespace Chained
+{
+	struct ModelComponent
+	{
+		AssetHandle ModelHandle = AssetHandle(0);
+		std::string ModelPath;
+		uint64_t ModelUUID = 0;
+		std::vector<std::string> MaterialPaths;
+
+		static const char* GetStaticName()
+		{
+			return "ModelComponent";
+		}
+
+		struct UI
+		{
+			UIMeta ModelHandle = {.ReadOnly = true, .Transient = true};
+			UIMeta ModelPath = {.Hint = PropertyMeta::WidgetHint::FilePicker, .Extensions = ".glb,.gltf,.obj"};
+			UIMeta ModelUUID = {.ReadOnly = true};
+		};
+	};
+
+	CH_MARK_RFL(ModelComponent);
+
+} // namespace Chained
+
+#endif // CH_MODEL_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/render/primitive_component.h b/engine/scene/components/render/primitive_component.h
new file mode 100644
index 000000000..07d585a51
--- /dev/null
+++ b/engine/scene/components/render/primitive_component.h
@@ -0,0 +1,107 @@
+#ifndef CH_PRIMITIVE_COMPONENT_H
+#define CH_PRIMITIVE_COMPONENT_H
+
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+#include "engine/graphics/api/renderer_types.h"
+
+namespace Chained
+{
+
+	enum class PrimitiveType : uint8_t
+	{
+		None = 0,
+		Cube,
+		Sphere,
+		Plane,
+		Cylinder,
+		Cone,
+		Torus,
+		Knot,
+		Hemisphere
+	};
+
+	struct PrimitiveComponent
+	{
+		PrimitiveType Type = PrimitiveType::None;
+
+		// Geometry Parameters
+		float Radius = 0.5f;
+		float InnerRadius = 0.2f;
+		float Height = 1.0f;
+		int Slices = 16;
+		int Stacks = 16;
+		glm::vec3 Dimensions = {1.0f, 1.0f, 1.0f};
+
+		/// Path to the generated .chmesh file (managed by PrimitiveSystem, not edited by user).
+		std::string MeshPath;
+
+		static const char* GetStaticName()
+		{
+			return "PrimitiveComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Type = {.Hint = PropertyMeta::WidgetHint::Enum, .Tooltip = "Geometric shape of the primitive"};
+			UIMeta Radius;
+			UIMeta InnerRadius;
+			UIMeta Height;
+			UIMeta Slices;
+			UIMeta Stacks;
+			UIMeta Dimensions;
+			// MeshPath is managed by PrimitiveSystem — not shown in inspector.
+			UIMeta MeshPath = {.Hidden = true};
+		};
+	};
+
+	template <> struct FieldVisibilityOverride<PrimitiveComponent>
+	{
+		static bool IsVisible(std::string_view field, const PrimitiveComponent& comp)
+		{
+			using PT = PrimitiveType;
+
+			// MeshPath is always hidden (managed internally by PrimitiveSystem)
+			if (field == "MeshPath")
+			{
+				return false;
+			}
+
+			// Dimensions only for Cube / Plane
+			if (field == "Dimensions")
+			{
+				return comp.Type == PT::Cube || comp.Type == PT::Plane;
+			}
+
+			// Radius shown for all except Cube, Plane, None
+			if (field == "Radius")
+			{
+				return comp.Type != PT::None && comp.Type != PT::Cube && comp.Type != PT::Plane;
+			}
+
+			// InnerRadius only for Torus and Knot
+			if (field == "InnerRadius")
+			{
+				return comp.Type == PT::Torus || comp.Type == PT::Knot;
+			}
+
+			// Height only for Cylinder and Cone
+			if (field == "Height")
+			{
+				return comp.Type == PT::Cylinder || comp.Type == PT::Cone;
+			}
+
+			// Slices / Stacks shown for sphere-like and ring shapes (not Cube, Plane, None)
+			if (field == "Slices" || field == "Stacks")
+			{
+				return comp.Type != PT::None && comp.Type != PT::Cube && comp.Type != PT::Plane;
+			}
+
+			return true;
+		}
+	};
+
+	CH_MARK_RFL(PrimitiveComponent);
+} // namespace Chained
+
+#endif // CH_PRIMITIVE_COMPONENT_H
diff --git a/engine/scene/components/render/shader_component.h b/engine/scene/components/render/shader_component.h
new file mode 100644
index 000000000..663fe13f6
--- /dev/null
+++ b/engine/scene/components/render/shader_component.h
@@ -0,0 +1,45 @@
+#ifndef CH_SHADER_COMPONENT_H
+#define CH_SHADER_COMPONENT_H
+
+#include "engine/reflection/reflection_rfl.h"
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/assets/asset.h"
+
+namespace Chained
+{
+	struct ShaderComponent
+	{
+		AssetHandle ShaderHandle = AssetHandle(0);
+		std::string ShaderPath;
+		uint64_t ShaderUUID = 0;
+		std::vector<ShaderUniform> Uniforms;
+		bool Enabled = true;
+
+		static const char* GetStaticName()
+		{
+			return "ShaderComponent";
+		}
+
+		// Declarative UI layout metadata for compile-time reflection
+		struct UI
+		{
+			UIMeta ShaderPath = {.Hint = PropertyMeta::WidgetHint::FilePicker,
+								 .Tooltip = "Path to the source GLSL shader file (vertex, fragment, or unified code)",
+								 .Extensions = ".glsl,.vs,.fs,.vert,.frag"};
+
+			UIMeta ShaderUUID = {.ReadOnly = true};
+
+			UIMeta Enabled = {.Tooltip = "Toggle whether this custom shader is active and applied during rendering"};
+
+			// Runtime/Internal state shown in the UI for debugging purposes
+			UIMeta ShaderHandle = {.ReadOnly = true,
+								   .Transient = true,
+								   .Tooltip = "Internal engine asset handle assigned to the compiled shader program"};
+		};
+	};
+
+	CH_MARK_RFL(ShaderComponent);
+
+} // namespace Chained
+
+#endif // CH_SHADER_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/render/sprite_component.h b/engine/scene/components/render/sprite_component.h
new file mode 100644
index 000000000..824becfe9
--- /dev/null
+++ b/engine/scene/components/render/sprite_component.h
@@ -0,0 +1,39 @@
+#ifndef CH_SPRITE_COMPONENT_H
+#define CH_SPRITE_COMPONENT_H
+
+#include "engine/assets/asset.h"
+#include "engine/reflection/reflection.h"
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	struct SpriteComponent
+	{
+		AssetHandle TextureHandle = 0;
+		std::string TexturePath;
+		uint64_t TextureUUID = 0;
+		Color Tint = Color::White();
+		bool FlipX = false;
+		bool FlipY = false;
+		int ZOrder = 0;
+
+		static const char* GetStaticName()
+		{
+			return "SpriteComponent";
+		}
+
+		struct UI
+		{
+			UIMeta TextureHandle = {.ReadOnly = true, .Transient = true};
+			UIMeta TexturePath = {.Hint = PropertyMeta::WidgetHint::FilePicker,
+								  .Extensions = ".png,.jpg,.jpeg,.tga,.bmp"};
+			UIMeta TextureUUID = {.ReadOnly = true};
+			UIMeta Tint = {.Hint = PropertyMeta::WidgetHint::ColorPicker};
+			UIMeta ZOrder = {.Speed = 1.0f};
+		};
+	};
+
+	CH_MARK_RFL(SpriteComponent);
+} // namespace Chained
+
+#endif // CH_SPRITE_COMPONENT_H
diff --git a/engine/scene/components/scripting/scripting_components.cpp b/engine/scene/components/scripting/scripting_components.cpp
new file mode 100644
index 000000000..7599b047f
--- /dev/null
+++ b/engine/scene/components/scripting/scripting_components.cpp
@@ -0,0 +1,34 @@
+#include "engine/scene/components/scripting/scripting_components.h"
+#include "engine/core/service_locator.h"
+#include "engine/reflection/reflection.h"
+#include "engine/scripting/scriptengine.h"
+
+namespace Chained
+{
+
+	template <typename T_Archive> void ManagedScriptInstance::Reflect(::Chained::Properties<T_Archive>& props)
+	{
+		if (props.GetMode() == ::Chained::ReflectionMode::UI)
+		{
+			std::vector<std::string> options;
+			options.emplace_back("-- Select script --");
+			auto* scriptEngine = ::Chained::ServiceLocator::TryGet<::Chained::ScriptEngine>();
+			if (scriptEngine)
+			{
+				for (const auto& [scriptName, scriptType] : scriptEngine->GetScriptClasses())
+				{
+					options.emplace_back(scriptName);
+				}
+			}
+			std::sort(options.begin() + 1, options.end());
+			props.StringEnum("ClassName", ClassName, options);
+		}
+		else
+		{
+			props.Property("ClassName", ClassName);
+		}
+	}
+
+	template void ManagedScriptInstance::Reflect<IPropertyArchiveBase>(Properties<IPropertyArchiveBase>&);
+
+} // namespace Chained
diff --git a/engine/scene/components/scripting/scripting_components.h b/engine/scene/components/scripting/scripting_components.h
new file mode 100644
index 000000000..ba428fa3d
--- /dev/null
+++ b/engine/scene/components/scripting/scripting_components.h
@@ -0,0 +1,96 @@
+#ifndef CH_SCRIPTING_COMPONENTS_H
+#define CH_SCRIPTING_COMPONENTS_H
+#include "engine/reflection/reflection_rfl.h"
+#include <algorithm>
+#include <glm/glm.hpp>
+#include <map>
+#include <memory>
+#include <string>
+#include <variant>
+#include <vector>
+
+namespace Chained
+{
+
+	class ScriptEngine;
+
+	enum class ScriptFieldType
+	{
+		None = 0,
+		Float,
+		Int,
+		Bool,
+		String,
+		Vec2,
+		Vec3,
+		Vec4,
+		Color,
+		Entity
+	};
+
+	struct ScriptField
+	{
+		ScriptFieldType Type = ScriptFieldType::None;
+		std::string Name;
+		std::variant<float, int, bool, std::string, glm::vec2, glm::vec3, glm::vec4, Chained::Color, uint64_t> Value;
+	};
+
+	CH_MARK_RFL(ScriptField);
+
+	// Represents a single C# script instance attached to an entity.
+	struct ManagedScriptInstance
+	{
+		std::string ClassName;
+		std::map<std::string, ScriptField> Fields; // Persistent fields
+		bool IsInstantiated = false;
+		bool NeedsStart = true;
+		bool InstantiateTried = false; // set once C++ attempted instantiation (success or not)
+
+		ManagedScriptInstance ClonePersistent() const
+		{
+			ManagedScriptInstance copy;
+			copy.ClassName = ClassName;
+			copy.Fields = Fields;
+			return copy;
+		}
+
+		void ResetRuntimeState()
+		{
+			IsInstantiated = false;
+			NeedsStart = true;
+			InstantiateTried = false;
+		}
+
+		bool HasInstance() const
+		{
+			return IsInstantiated;
+		}
+
+		template <typename T_Archive> void Reflect(::Chained::Properties<T_Archive>& props);
+	};
+
+	// ECS component that enables managed (C#) scripting for an entity.
+	struct ManagedScriptComponent
+	{
+		std::vector<ManagedScriptInstance> Scripts;
+
+		ManagedScriptComponent ClonePersistent() const
+		{
+			ManagedScriptComponent copy;
+			copy.Scripts.reserve(Scripts.size());
+			for (const auto& script : Scripts)
+			{
+				copy.Scripts.push_back(script.ClonePersistent());
+			}
+			return copy;
+		}
+
+		static const char* GetStaticName()
+		{
+			return "ManagedScriptComponent";
+		}
+	};
+	CH_MARK_RFL(ManagedScriptComponent)
+} // namespace Chained
+
+#endif // CH_SCRIPTING_COMPONENTS_H
diff --git a/engine/scene/components/scripting_components.h b/engine/scene/components/scripting_components.h
deleted file mode 100644
index 6bb9522ce..000000000
--- a/engine/scene/components/scripting_components.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef CH_SCRIPTING_COMPONENTS_H
-#define CH_SCRIPTING_COMPONENTS_H   
-#include "engine/core/reflection.h"
-#include <vector>
-#include <string>
-#include <map>
-#include <variant>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-
-enum class ScriptFieldType
-{
-    None = 0,
-    Float, Int, Bool, String, Vec2, Vec3, Vec4, Color, Entity
-};
-
-struct ScriptField
-{
-    ScriptFieldType Type = ScriptFieldType::None;
-    std::string Name;
-    std::variant<float, int, bool, std::string, glm::vec2, glm::vec3, glm::vec4, CHEngine::Color, uint64_t> Value;
-
-    CH_REFLECT_BEGIN(ScriptField)
-        props.Property("Name", Name);
-        props.Property("Type", (int&)Type);
-        
-        // Handle variant reflection
-        std::visit([&](auto&& val) {
-            using T = std::decay_t<decltype(val)>;
-            if constexpr (std::is_same_v<T, CHEngine::Color>)
-                props.Color("Value", val);
-            else if constexpr (std::is_same_v<T, uint64_t>)
-                props.Handle("Value", val);
-            else if constexpr (std::is_same_v<T, float>)
-                props.Property("Value", val, PropertyMeta(-100.0f, 100.0f, 0.01f));
-            else
-                props.Property("Value", val);
-        }, Value);
-    CH_REFLECT_END()
-};
-
-// Represents a single C# script instance attached to an entity.
-struct ManagedScriptInstance
-{
-    std::string ClassName;
-    std::map<std::string, ScriptField> Fields; // Persistent fields
-
-    void*       Instance     = nullptr;
-    bool        NeedsStart   = true;
-
-    // High-performance lifecycle delegates
-    void (*OnCreate)()        = nullptr;
-    void (*OnStart)()         = nullptr;
-    void (*OnUpdate)(float)   = nullptr;
-    void (*OnDestroy)()       = nullptr;
-    void (*OnGUI)()           = nullptr;
-    void (*OnCollisionEnter)(uint64_t) = nullptr;
-
-    ManagedScriptInstance() = default;
-    explicit ManagedScriptInstance(const std::string& className)
-        : ClassName(className) {}
-    ManagedScriptInstance(const ManagedScriptInstance& other)
-        : ClassName(other.ClassName), Fields(other.Fields) {}
-    ManagedScriptInstance& operator=(const ManagedScriptInstance& other)
-    {
-        if (this != &other)
-        {
-            ClassName = other.ClassName;
-            Fields = other.Fields;
-            ResetRuntimeState();
-        }
-        return *this;
-    }
-
-    void Destroy();
-    void ResetRuntimeState();
-
-    CH_REFLECT_BEGIN(ManagedScriptInstance)
-        props.Property("ClassName", ClassName, PropertyMeta(PropertyMeta::WidgetHint::Enum));
-        for (auto& [name, field] : Fields)
-        {
-            std::visit([&](auto&& val) {
-                props.Property(name.c_str(), val);
-            }, field.Value);
-        }
-    CH_REFLECT_END()
-};
-
-// ECS component that enables managed (C#) scripting for an entity.
-struct ManagedScriptComponent
-{
-    std::vector<ManagedScriptInstance> Scripts;
-    ManagedScriptComponent() = default;
-
-    CH_REFLECT_BEGIN(ManagedScriptComponent)
-        props.Sequence("Scripts", Scripts);
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_SCRIPTING_COMPONENTS_H
diff --git a/engine/scene/components/shader_component.h b/engine/scene/components/shader_component.h
deleted file mode 100644
index fea7eea5d..000000000
--- a/engine/scene/components/shader_component.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef CH_SHADER_COMPONENT_H
-#define CH_SHADER_COMPONENT_H
-
-
-#include "engine/core/reflection.h"
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <glm/glm.hpp>
-
-namespace CHEngine
-{
-struct ShaderUniform
-{
-    std::string Name;
-    int Type; // 0: Float, 1: Vec2, 2: Vec3, 3: Vec4, 4: Color
-    float Value[4] = {0, 0, 0, 0};
-
-    CH_REFLECT_BEGIN(ShaderUniform)
-        props.Property("Name", Name);
-        static const char* types[] = { "Float", "Vec2", "Vec3", "Vec4", "Color" };
-        props.Enum("Type", Type, types, 5);
-        if (Type == 4) // Color
-        {
-            Color c = { (unsigned char)(Value[0]*255), (unsigned char)(Value[1]*255), (unsigned char)(Value[2]*255), (unsigned char)(Value[3]*255) };
-            if (props.Property("Color", c))
-            {
-                Value[0] = c.r / 255.0f;
-                Value[1] = c.g / 255.0f;
-                Value[2] = c.b / 255.0f;
-                Value[3] = c.a / 255.0f;
-            }
-        }
-        else
-        {
-            // Simple float array for others for now
-            props.Property("Value", Value); 
-        }
-    CH_REFLECT_END()
-};
-
-struct ShaderComponent
-{
-    std::string ShaderPath;
-    std::vector<ShaderUniform> Uniforms;
-    bool Enabled = true;
-
-    ShaderComponent() = default;
-    ShaderComponent(const ShaderComponent&) = default;
-
-    void SetFloat(const std::string& name, float value)
-    {
-        auto it = std::find_if(Uniforms.begin(), Uniforms.end(), [&](const auto& u) { return u.Name == name; });
-        if (it != Uniforms.end())
-        {
-            it->Value[0] = value;
-        }
-        else
-        {
-            Uniforms.push_back({name, 0, {value, 0, 0, 0}});
-        }
-    }
-
-    void SetVec3(const std::string& name, const glm::vec3& value)
-    {
-        auto it = std::find_if(Uniforms.begin(), Uniforms.end(), [&](const auto& u) { return u.Name == name; });
-        if (it != Uniforms.end())
-        {
-            it->Value[0] = value.x;
-            it->Value[1] = value.y;
-            it->Value[2] = value.z;
-        }
-        else
-        {
-            Uniforms.push_back({name, 2, {value.x, value.y, value.z, 0}});
-        }
-    }
-
-    CH_REFLECT_BEGIN(ShaderComponent)
-        props.Header("Shader Asset");
-        props.File("ShaderPath", ShaderPath, "glsl,shader");
-        props.Property("Enabled", Enabled);
-        
-        props.Header("Uniforms");
-        props.Sequence("Uniforms", Uniforms);
-    CH_REFLECT_END()
-};
-} // namespace CHEngine
-
-#endif // CH_SHADER_COMPONENT_H
diff --git a/engine/scene/components/sprite_component.h b/engine/scene/components/sprite_component.h
deleted file mode 100644
index 2bc657573..000000000
--- a/engine/scene/components/sprite_component.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef CH_SPRITE_COMPONENT_H
-#define CH_SPRITE_COMPONENT_H
-
-#include "engine/core/reflection.h"
-#include "engine/graphics/texture_system.h"
-
-namespace CHEngine
-{
-struct SpriteComponent
-{
-    AssetHandle TextureHandle = 0;
-    std::string TexturePath;
-    Color Tint = Color::White();
-    bool FlipX = false;
-    bool FlipY = false;
-    int ZOrder = 0;
-
-    SpriteComponent() = default;
-    SpriteComponent(const SpriteComponent&) = default;
-
-    CH_REFLECT_BEGIN(SpriteComponent)
-        props.Header("Asset");
-        props.Handle("TextureHandle", TextureHandle);
-        props.File("TexturePath", TexturePath, "png,jpg,bmp,tga");
-        
-        props.Header("Appearance");
-        if (props.BeginGroup("Transform"))
-        {
-            props.Property("Tint", Tint);
-            props.Property("FlipX", FlipX);
-            props.Property("FlipY", FlipY);
-            props.Property("ZOrder", ZOrder, PropertyMeta(-1000.0f, 1000.0f, 1.0f));
-            props.EndGroup();
-        }
-    CH_REFLECT_END()
-};
-} // namespace CHEngine
-
-#endif // CH_SPRITE_COMPONENT_H
diff --git a/engine/scene/components/tag_component.h b/engine/scene/components/tag_component.h
deleted file mode 100644
index 16d1b1823..000000000
--- a/engine/scene/components/tag_component.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CH_TAG_COMPONENT_H
-#define CH_TAG_COMPONENT_H
-
-#include "engine/core/reflection.h"
-
-namespace CHEngine
-{
-struct TagComponent
-{
-    std::string Tag;
-
-    TagComponent() = default;
-    TagComponent(const TagComponent&) = default;
-    TagComponent(const std::string& tag)
-        : Tag(tag)
-    {
-    }
-
-    CH_REFLECT_BEGIN(TagComponent)
-        props.Property("Tag", Tag);
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_TAG_COMPONENT_H
diff --git a/engine/scene/components/transform_component.h b/engine/scene/components/transform_component.h
deleted file mode 100644
index 8fdbff808..000000000
--- a/engine/scene/components/transform_component.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef CH_TRANSFORM_COMPONENT_H
-#define CH_TRANSFORM_COMPONENT_H
-
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include "engine/core/reflection.h"
-
-namespace CHEngine
-{
-// Local transform state and cached world matrix.
-struct TransformComponent
-{
-    glm::vec3 Translation = {0.0f, 0.0f, 0.0f};
-    glm::vec3 Rotation = {0.0f, 0.0f, 0.0f}; // Euler angles in radians.
-    glm::quat RotationQuat = {1.0f, 0.0f, 0.0f, 0.0f}; // GLM uses w, x, y, z.
-    glm::vec3 Scale = {1.0f, 1.0f, 1.0f};
-
-    TransformComponent() = default;
-    TransformComponent(const TransformComponent&) = default;
-    TransformComponent(const glm::vec3& translation)
-        : Translation(translation), IsDirty(true)
-    {
-    }
-
-    // Sets translation and marks the transform dirty.
-    void SetTranslation(const glm::vec3& translation)
-    {
-        Translation = translation;
-        IsDirty = true;
-    }
-
-    // Sets scale and marks the transform dirty.
-    void SetScale(const glm::vec3& scale)
-    {
-        Scale = scale;
-        IsDirty = true;
-    }
-
-    // Sets Euler rotation and refreshes the cached quaternion.
-    void SetRotation(const glm::vec3& eulerAngles)
-    {
-        Rotation = eulerAngles;
-        RotationQuat = glm::quat(eulerAngles);
-        IsDirty = true;
-    }
-
-    // Sets the quaternion and refreshes Euler angles.
-    void SetRotationQuat(const glm::quat& rotationQuat)
-    {
-        RotationQuat = rotationQuat;
-        Rotation = glm::eulerAngles(rotationQuat);
-        IsDirty = true;
-    }
-
-    // Returns the current local transform matrix.
-    glm::mat4 GetTransform() const
-    {
-        return GetTransform(Translation, RotationQuat, Scale);
-    }
-
-    // Returns a transform matrix from explicit translation, rotation, and scale.
-    static glm::mat4 GetTransform(const glm::vec3& translation, const glm::quat& rotation, const glm::vec3& scale)
-    {
-        return glm::translate(glm::mat4(1.0f), translation) * 
-               glm::toMat4(rotation) * 
-               glm::scale(glm::mat4(1.0f), scale);
-    }
-
-    // Returns an interpolated transform.
-    glm::mat4 GetInterpolatedTransform(float alpha) const
-    {
-        glm::vec3 interpolatedTranslation = glm::mix(PrevTranslation, Translation, alpha);
-        glm::quat interpolatedRotation = glm::slerp(PrevRotationQuat, RotationQuat, alpha);
-        glm::vec3 interpolatedScale = glm::mix(PrevScale, Scale, alpha);
-
-        return GetTransform(interpolatedTranslation, interpolatedRotation, interpolatedScale);
-    }
-
-    // Cached world transform.
-    glm::mat4 WorldTransform = glm::mat4(1.0f);
-    bool IsDirty = true;
-
-    // Previous state for interpolation.
-    glm::vec3 PrevTranslation = {0, 0, 0};
-    glm::quat PrevRotationQuat = {1.0f, 0.0f, 0.0f, 0.0f};
-    glm::vec3 PrevScale = {1, 1, 1};
-
-    
-    CH_REFLECT_BEGIN(TransformComponent)
-        // Position.
-        props.Property("Translation", Translation);
-        
-        // Rotation in radians.
-        props.Property("Rotation", Rotation, PropertyMeta(-3.14159f, 3.14159f, 0.01f));
-        
-        // Scale.
-        props.Property("Scale", Scale, PropertyMeta(0.1f, 10.0f, 0.1f));
-
-        // Keep the quaternion in sync.
-        if (props.HasChanged() || props.GetMode() == ReflectionMode::Deserialize)
-        {
-             SetRotation(Rotation);
-        }
-    CH_REFLECT_END()
-};
-
-} // namespace CHEngine
-
-#endif // CH_TRANSFORM_COMPONENT_H
diff --git a/engine/scene/components/ui/control_component.h b/engine/scene/components/ui/control_component.h
new file mode 100644
index 000000000..dba3db85c
--- /dev/null
+++ b/engine/scene/components/ui/control_component.h
@@ -0,0 +1,119 @@
+#ifndef CH_CONTROL_COMPONENT_H
+#define CH_CONTROL_COMPONENT_H
+
+#include "engine/common/color.h"
+#include "engine/ui/ui_style.h"
+#include "engine/ui/ui_data_components.h"
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	struct RectTransform
+	{
+		glm::vec2 AnchorMin = {0.5f, 0.5f};
+		glm::vec2 AnchorMax = {0.5f, 0.5f};
+		glm::vec2 OffsetMin = {-50.0f, -20.0f};
+		glm::vec2 OffsetMax = {50.0f, 20.0f};
+		glm::vec2 Pivot = {0.5f, 0.5f};
+		float Rotation = 0.0f;
+		glm::vec2 Scale = {1.0f, 1.0f};
+
+		static const char* GetStaticName()
+		{
+			return "RectTransform";
+		}
+
+		// Declarative UI layout metadata for compile-time reflection
+		struct UI
+		{
+			UIMeta AnchorMin = {.Speed = 0.01f,
+								.Tooltip = "Normalized minimum anchor point (0.0 to 1.0) for UI layout alignment"};
+			UIMeta AnchorMax = {.Speed = 0.01f,
+								.Tooltip = "Normalized maximum anchor point (0.0 to 1.0) for UI layout alignment"};
+			UIMeta OffsetMin = {.Speed = 1.0f, .Tooltip = "Pixel offset from the calculated minimum anchor positions"};
+			UIMeta OffsetMax = {.Speed = 1.0f, .Tooltip = "Pixel offset from the calculated maximum anchor positions"};
+			UIMeta Pivot = {.Speed = 0.01f,
+							.Tooltip = "The center pivot point around which the UI element rotates and scales"};
+			UIMeta Rotation = {.Speed = 0.5f, .Tooltip = "Local rotation angle of the UI control specified in degrees"};
+			UIMeta Scale = {.Speed = 0.05f, .Tooltip = "Local transform multipliers along local X and Y axes"};
+		};
+	};
+
+	CH_MARK_RFL(RectTransform);
+
+	struct ControlComponent
+	{
+		RectTransform Transform;
+		int32_t ZOrder = 0;
+		bool IsActive = true;
+		bool HiddenInHierarchy = false;
+
+		static const char* GetStaticName()
+		{
+			return "ControlComponent";
+		}
+
+		// Declarative UI layout metadata for compile-time reflection
+		struct UI
+		{
+			UIMeta Transform = {.Tooltip = "Hierarchical rect transform configurations for bounding calculations"};
+			UIMeta ZOrder = {.Speed = 1.0f,
+							 .Tooltip = "Rendering layer priority; elements with higher values render on top"};
+			UIMeta IsActive = {
+				.Tooltip = "Determines whether this UI control is updated, rendered, and processes user inputs"};
+			UIMeta HiddenInHierarchy = {
+				.Tooltip = "If enabled, skips showing this specific element inside the editor tree panels"};
+		};
+	};
+
+	CH_MARK_RFL(ControlComponent);
+
+	struct UIControlComponent
+	{
+		UIStyle BoxStyle;
+		TextStyle TextStyle;
+		ControlData Data = std::monostate{};
+
+		// Runtime state flags
+		bool IsHovered = false;
+		bool IsDown = false;
+		bool PrevIsDown = false; // used for self-tracked edge detection
+		bool PressedThisFrame = false;
+		bool ValueChanged = false;
+
+		static const char* GetStaticName()
+		{
+			return "UIControlComponent";
+		}
+
+		// Fixed the truncated struct declaration and fully localized attributes
+		struct UI
+		{
+			UIMeta BoxStyle = {
+				.Tooltip = "Visual appearance, coloring, padding, and corner configurations for the canvas node"};
+			UIMeta TextStyle = {.Tooltip = "Font, alignment, coloring, and styling configurations for label layers"};
+			UIMeta Data = {.Tooltip = "Underlying variant data structure storage managed by this control instance"};
+
+			// Interaction states - visible during runtime for live debugging, ignored by file saves
+			UIMeta IsHovered = {.ReadOnly = true,
+								.Transient = true,
+								.Tooltip = "True if the mouse pointer is currently intersecting this canvas element"};
+			UIMeta IsDown = {.ReadOnly = true,
+							 .Transient = true,
+							 .Tooltip = "True if the user interaction trigger is currently held down on this node"};
+			UIMeta PressedThisFrame = {.ReadOnly = true,
+									   .Transient = true,
+									   .Tooltip =
+										   "Triggers true for a single frame immediately upon interaction click"};
+			UIMeta ValueChanged = {.ReadOnly = true,
+								   .Transient = true,
+								   .Tooltip =
+									   "Internal dirty flag tracking if the variant state payload has been modified"};
+		};
+	};
+
+	CH_MARK_RFL(UIControlComponent);
+
+} // namespace Chained
+
+#endif // CH_CONTROL_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/ui/scene_transition_component.h b/engine/scene/components/ui/scene_transition_component.h
new file mode 100644
index 000000000..649c2aed7
--- /dev/null
+++ b/engine/scene/components/ui/scene_transition_component.h
@@ -0,0 +1,33 @@
+#ifndef CH_SCENE_TRANSITION_COMPONENT_H
+#define CH_SCENE_TRANSITION_COMPONENT_H
+
+#include "engine/reflection/reflection_rfl.h"
+#include <string>
+
+namespace Chained
+{
+	// Component attached to entities (usually buttons) that should trigger a scene load.
+	// This allows us to handle transitions natively without C# script overhead.
+	struct SceneTransitionComponent
+	{
+		std::string TargetScenePath; // The relative path to the .chscene file to load
+		bool Triggered = false;		 // Can be set manually or via automated UI events
+
+		static const char* GetStaticName()
+		{
+			return "SceneTransitionComponent";
+		}
+
+		struct UI
+		{
+			UIMeta TargetScenePath = {.Hint = PropertyMeta::WidgetHint::FilePicker, .Extensions = ".chscene"};
+			UIMeta Triggered = {.Hint = PropertyMeta::WidgetHint::Checkbox,
+								.Tooltip = "Whether the scene transition has been triggered"};
+		};
+	};
+
+	CH_MARK_RFL(SceneTransitionComponent);
+
+} // namespace Chained
+
+#endif // CH_SCENE_TRANSITION_COMPONENT_H
diff --git a/engine/scene/components/ui/ui_action_component.h b/engine/scene/components/ui/ui_action_component.h
new file mode 100644
index 000000000..f13a6f010
--- /dev/null
+++ b/engine/scene/components/ui/ui_action_component.h
@@ -0,0 +1,40 @@
+#ifndef CH_UI_ACTION_COMPONENT_H
+#define CH_UI_ACTION_COMPONENT_H
+
+#include "engine/common/uuid.h"
+#include "engine/reflection/reflection_rfl.h"
+#include <string>
+
+namespace Chained
+{
+	enum class UIActionType
+	{
+		SetParameter,
+		TriggerState
+	};
+
+	struct UIActionComponent
+	{
+		UUID TargetEntityID; // Entity with AnimationGraphComponent
+		std::string ParameterName;
+		float Value;
+		UIActionType Type = UIActionType::SetParameter;
+
+		static const char* GetStaticName()
+		{
+			return "UIActionComponent";
+		}
+
+		struct UI
+		{
+			UIMeta Type = {.Hint = PropertyMeta::WidgetHint::Enum};
+			UIMeta TargetEntityID = {.Tooltip = "ID of the target entity"};
+			UIMeta ParameterName = {.Tooltip = "Name of the parameter to set"};
+			UIMeta Value = {.Speed = 0.1f, .Tooltip = "Value of the parameter"};
+		};
+	};
+
+	CH_MARK_RFL(UIActionComponent);
+} // namespace Chained
+
+#endif // CH_UI_ACTION_COMPONENT_H
\ No newline at end of file
diff --git a/engine/scene/components/ui_action_component.h b/engine/scene/components/ui_action_component.h
deleted file mode 100644
index 73a4fe563..000000000
--- a/engine/scene/components/ui_action_component.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef CH_UI_ACTION_COMPONENT_H
-#define CH_UI_ACTION_COMPONENT_H
-
-#include "engine/core/uuid.h"
-#include <string>
-
-namespace CHEngine
-{
-    enum class UIActionType
-    {
-        SetParameter,
-        TriggerState
-    };
-
-    struct UIActionComponent
-    {
-        UUID TargetEntityID; // Entity with AnimationGraphComponent
-        std::string ParameterName;
-        float Value;
-        UIActionType Type = UIActionType::SetParameter;
-
-        UIActionComponent() = default;
-
-        CH_REFLECT_BEGIN(UIActionComponent)
-            props.Handle("Target Entity", TargetEntityID);
-            props.Property("Parameter", ParameterName);
-            props.Property("Value", Value);
-            const char* typeStrings[] = {"Set Parameter", "Trigger State"};
-            props.Enum("Type", Type, typeStrings, 2);
-        CH_REFLECT_END()
-    };
-}
-
-#endif // CH_UI_ACTION_COMPONENT_H
diff --git a/engine/scene/editor_camera.cpp b/engine/scene/editor_camera.cpp
deleted file mode 100644
index d7099ae80..000000000
--- a/engine/scene/editor_camera.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "editor_camera.h"
-#include <glm/gtc/matrix_transform.hpp>
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/gtx/quaternion.hpp>
-
-namespace CHEngine
-{
-
-EditorCamera::EditorCamera()
-    : SceneCamera()
-{
-    UpdateView();
-}
-
-EditorCamera::EditorCamera(float fov, float aspectRatio, float nearClip, float farClip)
-{
-    SetPerspective(fov, nearClip, farClip);
-    SetViewportSize((uint32_t)(aspectRatio * 1000.0f), 1000);
-    UpdateView();
-}
-
-void EditorCamera::OnUpdate(Timestep ts)
-{
-    UpdateView();
-}
-
-void EditorCamera::UpdateView()
-{
-    glm::vec3 position = CalculatePosition();
-    m_ViewMatrix = glm::lookAt(position, position + GetForwardDirection(), GetUpDirection());
-}
-
-glm::vec3 EditorCamera::GetUpDirection() const
-{
-    return GetOrientation() * glm::vec3(0.0f, 1.0f, 0.0f);
-}
-
-glm::vec3 EditorCamera::GetRightDirection() const
-{
-    return GetOrientation() * glm::vec3(1.0f, 0.0f, 0.0f);
-}
-
-glm::vec3 EditorCamera::GetForwardDirection() const
-{
-    return GetOrientation() * glm::vec3(0.0f, 0.0f, -1.0f);
-}
-
-glm::vec3 EditorCamera::CalculatePosition() const
-{
-    return m_FocalPoint - GetForwardDirection() * m_Distance;
-}
-
-glm::quat EditorCamera::GetOrientation() const
-{
-    return glm::quat(glm::vec3(m_Pitch, m_Yaw, 0.0f));
-}
-
-void EditorCamera::MousePan(const glm::vec2& delta)
-{
-    auto [xSpeed, ySpeed] = PanSpeed();
-    m_FocalPoint += GetRightDirection() * (-delta.x * xSpeed * m_Distance);
-    m_FocalPoint += GetUpDirection() * (delta.y * ySpeed * m_Distance);
-    UpdateView();
-}
-
-void EditorCamera::MouseRotate(const glm::vec2& delta)
-{
-    float yawSign = GetUpDirection().y < 0 ? -1.0f : 1.0f;
-    m_Yaw -= yawSign * delta.x * RotationSpeed();
-    m_Pitch -= delta.y * RotationSpeed();
-    UpdateView();
-}
-
-void EditorCamera::MouseZoom(float delta)
-{
-    m_Distance -= delta * ZoomSpeed();
-    if (m_Distance < 0.1f)
-    {
-        m_FocalPoint += GetForwardDirection();
-        m_Distance = 0.1f;
-    }
-    UpdateView();
-}
-
-std::pair<float, float> EditorCamera::PanSpeed() const
-{
-    float x = fminf(m_ViewportWidth / 1000.0f, 2.4f); 
-    float xFactor = 0.0366f * (x * x) - 0.1778f * x + 0.3021f;
-
-    float y = fminf(m_ViewportHeight / 1000.0f, 2.4f); 
-    float yFactor = 0.0366f * (y * y) - 0.1778f * y + 0.3021f;
-
-    return {xFactor, yFactor};
-}
-
-float EditorCamera::RotationSpeed() const
-{
-    return 0.8f * 0.0174532925f; // DEG2RAD
-}
-
-float EditorCamera::ZoomSpeed() const
-{
-    float distance = m_Distance * 0.2f;
-    distance = fmaxf(distance, 0.0f);
-    float speed = distance * distance;
-    speed = fminf(speed, 100.0f); // max speed = 100
-    return speed;
-}
-
-} // namespace CHEngine
diff --git a/engine/scene/editor_camera.h b/engine/scene/editor_camera.h
deleted file mode 100644
index eea2656f6..000000000
--- a/engine/scene/editor_camera.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef CH_ENGINE_EDITOR_CAMERA_H
-#define CH_ENGINE_EDITOR_CAMERA_H
-
-#include "engine/scene/scene_camera.h"
-#include "engine/core/timestep.h"
-#include "engine/core/ch_math.h"
-
-namespace CHEngine
-{
-
-class EditorCamera : public SceneCamera
-{
-public:
-    EditorCamera();
-    EditorCamera(float fov, float aspectRatio, float nearClip, float farClip);
-
-    void OnUpdate(Timestep ts); 
-    
-    void SetViewportSize(uint32_t width, uint32_t height) 
-    { 
-        m_ViewportWidth = width; m_ViewportHeight = height; 
-        SceneCamera::SetViewportSize(width, height); 
-    }
-
-    const glm::mat4& GetViewMatrix() const { return m_ViewMatrix; }
-    glm::mat4 GetViewProjection() const 
-    { 
-        return GetProjection() * m_ViewMatrix; 
-    }
-
-    glm::vec3 GetUpDirection() const;
-    glm::vec3 GetRightDirection() const;
-    glm::vec3 GetForwardDirection() const;
-    glm::vec3 CalculatePosition() const;
-    glm::quat GetOrientation() const;
-
-    float GetPitch() const { return m_Pitch; }
-    float GetYaw() const { return m_Yaw; }
-    
-    void SetPitch(float pitch) { m_Pitch = pitch; }
-    void SetYaw(float yaw) { m_Yaw = yaw; }
-
-    glm::vec3 GetFocalPoint() const { return m_FocalPoint; }
-    void SetFocalPoint(const glm::vec3& focalPoint) { m_FocalPoint = focalPoint; }
-    
-    float GetDistance() const { return m_Distance; }
-    void SetDistance(float distance) { m_Distance = distance; }
-
-    void MousePan(const glm::vec2& delta);
-    void MouseRotate(const glm::vec2& delta);
-    void MouseZoom(float delta);
-
-    std::pair<float, float> PanSpeed() const;
-    float RotationSpeed() const;
-    float ZoomSpeed() const;
-
-private:
-    void UpdateView();
-
-private:
-    float m_Pitch = 0.0f, m_Yaw = 0.0f;
-    glm::vec3 m_FocalPoint = { 0.0f, 0.0f, 0.0f };
-    float m_Distance = 10.0f;
-
-    glm::mat4 m_ViewMatrix = glm::mat4(1.0f);
-    uint32_t m_ViewportWidth = 1280, m_ViewportHeight = 720;
-};
-
-} // namespace CHEngine
-
-#endif // CH_ENGINE_EDITOR_CAMERA_H
diff --git a/engine/scene/entity.cpp b/engine/scene/entity.cpp
index 960432d8c..406f775e8 100644
--- a/engine/scene/entity.cpp
+++ b/engine/scene/entity.cpp
@@ -1,87 +1,89 @@
 #include "engine/scene/entity.h"
-#include "engine/core/uuid.h"
-#include "engine/scene/component_serializer.h"
 #include "engine/scene/components.h"
-#include <unordered_map>
 
-namespace CHEngine
+namespace Chained
 {
 
-Entity::Entity(entt::entity handle, entt::registry& registry)
-    : m_EntityHandle(handle)
-{
-    auto* sharedPtr = registry.ctx().find<std::shared_ptr<entt::registry>>();
-    if (sharedPtr)
-    {
-        m_Registry = *sharedPtr;
-    }
-    else
-    {
-        // Fallback: Use a non-owning shared_ptr if we're initialized from a raw registry
-        // that doesn't have a shared context (e.g. in stack-allocated test registries).
-        m_Registry = std::shared_ptr<entt::registry>(&registry, [](entt::registry*) {});
-    }
-    CH_CORE_ASSERT(m_Registry, "Entity initialized with null registry!");
-}
+	Entity::Entity(entt::entity handle, entt::registry* registry)
+		: m_EntityHandle(handle),
+		  m_Registry(registry)
+	{
+		CH_CORE_ASSERT(m_Registry, "Entity initialized with null registry!");
+	}
 
-Entity::Entity(entt::entity handle, entt::registry* registry)
-    : m_EntityHandle(handle)
-{
-    if (registry)
-    {
-        auto* sharedPtr = registry->ctx().find<std::shared_ptr<entt::registry>>();
-        if (sharedPtr)
-        {
-            m_Registry = *sharedPtr;
-        }
-        else
-        {
-            // Fallback: Use a non-owning shared_ptr
-            m_Registry = std::shared_ptr<entt::registry>(registry, [](entt::registry*) {});
-        }
-    }
-    CH_CORE_ASSERT(m_Registry, "Entity initialized with null registry!");
-}
+	bool Entity::IsValid() const
+	{
+		return m_EntityHandle != entt::null && m_Registry != nullptr && m_Registry->valid(m_EntityHandle);
+	}
 
-bool Entity::IsValid() const
-{
-    return m_EntityHandle != entt::null && m_Registry != nullptr && m_Registry->valid(m_EntityHandle);
-}
+	// BFS-based recursive destroy: collects all descendants via the hierarchy,
+	// then destroys them in reverse order (children before parents) to avoid
+	// dangling parent references.
+	void Entity::Destroy()
+	{
+		if (!IsValid())
+		{
+			return;
+		}
 
-void Entity::Destroy()
-{
-    if (!IsValid())
-    {
-        return;
-    }
+		// BFS to collect all entities in the subtree
+		std::vector<entt::entity> entitiesToDestroy;
+		entitiesToDestroy.push_back(m_EntityHandle);
+
+		size_t current = 0;
+		while (current < entitiesToDestroy.size())
+		{
+			Entity e(entitiesToDestroy[current++], m_Registry);
+			if (e.HasComponent<HierarchyComponent>())
+			{
+				auto& hc = e.GetComponent<HierarchyComponent>();
+				for (auto child : hc.Children)
+				{
+					if (std::find(entitiesToDestroy.begin(), entitiesToDestroy.end(), child) == entitiesToDestroy.end())
+					{
+						entitiesToDestroy.push_back(child);
+					}
+				}
+			}
+		}
+
+		// Destroy in reverse order: children first, then parents
+		for (auto it = entitiesToDestroy.rbegin(); it != entitiesToDestroy.rend(); ++it)
+		{
+			if (m_Registry->valid(*it))
+			{
+				m_Registry->destroy(*it);
+			}
+		}
+	}
+
+	glm::mat4 Entity::GetWorldTransform()
+	{
+		if (HasComponent<TransformComponent>())
+		{
+			return GetComponent<TransformComponent>().WorldTransform;
+		}
+		return glm::mat4(1.0f);
+	}
+
+	glm::vec3 Entity::GetWorldPosition()
+	{
+		return glm::vec3(GetWorldTransform()[3]);
+	}
 
-    std::vector<entt::entity> entitiesToDestroy;
-    entitiesToDestroy.push_back(m_EntityHandle);
+	glm::vec3 Entity::GetForward()
+	{
+		return glm::normalize(glm::vec3(GetWorldTransform() * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f)));
+	}
 
-    size_t current = 0;
-    while (current < entitiesToDestroy.size())
-    {
-        Entity e(entitiesToDestroy[current++], m_Registry);
-        if (e.HasComponent<HierarchyComponent>())
-        {
-            auto& hc = e.GetComponent<HierarchyComponent>();
-            for (auto child : hc.Children)
-            {
-                if (std::find(entitiesToDestroy.begin(), entitiesToDestroy.end(), child) == entitiesToDestroy.end())
-                {
-                    entitiesToDestroy.push_back(child);
-                }
-            }
-        }
-    }
+	glm::vec3 Entity::GetUp()
+	{
+		return glm::normalize(glm::vec3(GetWorldTransform() * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f)));
+	}
 
-    for (auto it = entitiesToDestroy.rbegin(); it != entitiesToDestroy.rend(); ++it)
-    {
-        if (m_Registry->valid(*it))
-        {
-            m_Registry->destroy(*it);
-        }
-    }
-}
+	glm::vec3 Entity::GetRight()
+	{
+		return glm::normalize(glm::vec3(GetWorldTransform() * glm::vec4(1.0f, 0.0f, 0.0f, 0.0f)));
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/engine/scene/entity.h b/engine/scene/entity.h
index 8e468ac73..91cdab499 100644
--- a/engine/scene/entity.h
+++ b/engine/scene/entity.h
@@ -1,139 +1,140 @@
 #ifndef CH_ENTITY_H
 #define CH_ENTITY_H
 
-#include "engine/core/ch_assert.h"
-#include "engine/core/base.h"
-#include "engine/core/uuid.h"
-#include "engine/scene/components/id_component.h"
-#include "engine/scene/components/tag_component.h"
+#include "engine/common/engine_assert.h"
+#include "engine/common/base.h"
+#include "engine/common/uuid.h"
+#include "engine/scene/components/core/id_component.h"
+#include "engine/scene/components/core/tag_component.h"
 #include "entt/entt.hpp"
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 
-namespace CHEngine
+namespace Chained
 {
 
-// Lightweight handle over an entt registry. Entity objects do not own the registry;
-// validity depends on the backing registry still being alive and the handle still existing.
-struct EntityUUIDMap
-{
-    std::unordered_map<UUID, entt::entity> Map;
-};
-
-class Entity
-{
-public:
-    Entity() = default;
-    // Wraps an existing registry shared handle.
-    Entity(entt::entity handle, std::shared_ptr<entt::registry> registry)
-        : m_EntityHandle(handle),
-          m_Registry(registry)
-    {
-    }
-    // Wraps an existing registry reference without creating ownership.
-    Entity(entt::entity handle, entt::registry& registry);
-    // Wraps an existing registry pointer without creating ownership.
-    Entity(entt::entity handle, entt::registry* registry);
-    Entity(const Entity& other) = default;
-
-    // Adds a component if it is not already present and returns the inserted component.
-    template <typename T, typename... Args> T& AddOrReplaceComponent(Args&&... args)
-    {
-        return m_Registry->emplace_or_replace<T>(m_EntityHandle, std::forward<Args>(args)...);
-    }
-
-    // Adds a component and asserts that the entity does not already own it.
-    template <typename T, typename... Args> T& AddComponent(Args&&... args)
-    {
-        CH_CORE_ASSERT(!HasComponent<T>(), "Entity already has component!");
-        return m_Registry->emplace<T>(m_EntityHandle, std::forward<Args>(args)...);
-    }
-
-    // Returns the requested component and asserts if it is missing.
-    template <typename T> T& GetComponent()
-    {
-        CH_CORE_ASSERT(HasComponent<T>(), "Entity does not have component!");
-        return m_Registry->get<T>(m_EntityHandle);
-    }
-
-    // Returns true when the entity currently owns the requested component.
-    template <typename T> bool HasComponent()
-    {
-        return m_Registry && m_Registry->all_of<T>(m_EntityHandle);
-    }
-
-    // Removes the requested component and asserts if it is missing.
-    template <typename T> void RemoveComponent()
-    {
-        CH_CORE_ASSERT(HasComponent<T>(), "Entity does not have component!");
-        m_Registry->remove<T>(m_EntityHandle);
-    }
-
-    // Applies a patch operation to the component stored on this entity.
-    template <typename T, typename... Func> void Patch(Func&&... func)
-    {
-        m_Registry->patch<T>(m_EntityHandle, std::forward<Func>(func)...);
-    }
-
-    // Fast null check. Use IsValid() to confirm the handle still exists in the registry.
-    operator bool() const
-    {
-        return m_EntityHandle != entt::null && m_Registry != nullptr;
-    }
-    // Returns false if the registry is missing or the entity handle has been destroyed.
-    bool IsValid() const;
-
-    // Destroys the entity and any descendants attached through the hierarchy.
-    void Destroy();
-
-    operator entt::entity() const
-    {
-        return m_EntityHandle;
-    }
-    operator uint32_t() const
-    {
-        return (uint32_t)m_EntityHandle;
-    }
-
-    bool operator==(const Entity& other) const
-    {
-        return m_EntityHandle == other.m_EntityHandle && m_Registry == other.m_Registry;
-    }
-    bool operator!=(const Entity& other) const
-    {
-        return !(*this == other);
-    }
-
-    entt::registry& GetRegistry()
-    {
-        return *m_Registry;
-    }
-    const entt::registry& GetRegistry() const
-    {
-        return *m_Registry;
-    }
-
-    std::shared_ptr<entt::registry> GetRegistryPtr()
-    {
-        return m_Registry;
-    }
-
-    UUID GetUUID()
-    {
-        return GetComponent<IDComponent>().ID;
-    }
-
-    const std::string& GetName()
-    {
-        return GetComponent<TagComponent>().Tag;
-    }
-
-private:
-    entt::entity m_EntityHandle{entt::null};
-    std::shared_ptr<entt::registry> m_Registry = nullptr;
-};
-} // namespace CHEngine
+	// Lightweight handle over an entt registry. Entity objects do not own the registry;
+	// validity depends on the backing registry still being alive and the handle still existing.
+	struct EntityUUIDMap
+	{
+		std::unordered_map<UUID, entt::entity> Map;
+	};
+
+	class Entity
+	{
+	public:
+		Entity() = default;
+		// Wraps an existing registry reference.
+		Entity(entt::entity handle, entt::registry* registry);
+		Entity(const Entity& other) = default;
+
+		// Adds a component if it is not already present and returns the inserted component.
+		template <typename T, typename... Args> T& AddOrReplaceComponent(Args&&... args)
+		{
+			return m_Registry->emplace_or_replace<T>(m_EntityHandle, std::forward<Args>(args)...);
+		}
+
+		// Adds a component and asserts that the entity does not already own it.
+		template <typename T, typename... Args> T& AddComponent(Args&&... args)
+		{
+			CH_CORE_ASSERT(!HasComponent<T>(), "Entity already has component!");
+			return m_Registry->emplace<T>(m_EntityHandle, std::forward<Args>(args)...);
+		}
+
+		// Returns the requested component and asserts if it is missing.
+		template <typename T> T& GetComponent()
+		{
+			CH_CORE_ASSERT(HasComponent<T>(), "Entity does not have component!");
+			return m_Registry->get<T>(m_EntityHandle);
+		}
+
+		// Returns true when the entity currently owns the requested component.
+		template <typename T> bool HasComponent()
+		{
+			return m_Registry && m_Registry->all_of<T>(m_EntityHandle);
+		}
+
+		// Removes the requested component and asserts if it is missing.
+		template <typename T> void RemoveComponent()
+		{
+			CH_CORE_ASSERT(HasComponent<T>(), "Entity does not have component!");
+			m_Registry->remove<T>(m_EntityHandle);
+		}
+
+		// Applies a patch operation to the component stored on this entity.
+		template <typename T, typename... Func> void Patch(Func&&... func)
+		{
+			m_Registry->patch<T>(m_EntityHandle, std::forward<Func>(func)...);
+		}
+
+		// Fast null check. Use IsValid() to confirm the handle still exists in the registry.
+		operator bool() const
+		{
+			return m_EntityHandle != entt::null && m_Registry != nullptr;
+		}
+		// Returns false if the registry is missing or the entity handle has been destroyed.
+		bool IsValid() const;
+
+		// Destroys the entity and any descendants attached through the hierarchy.
+		void Destroy();
+
+		operator entt::entity() const
+		{
+			return m_EntityHandle;
+		}
+		explicit operator uint32_t() const
+		{
+			return static_cast<uint32_t>(m_EntityHandle);
+		}
+
+		bool operator==(const Entity& other) const
+		{
+			return m_EntityHandle == other.m_EntityHandle && m_Registry == other.m_Registry;
+		}
+		bool operator!=(const Entity& other) const
+		{
+			return !(*this == other);
+		}
+
+		/// Returns the underlying EnTT registry for direct access.
+		/// @warning Returns mutable reference — prefer component-specific Entity methods.
+		/// Direct registry manipulation bypasses Entity lifecycle hooks.
+		entt::registry& GetRegistry()
+		{
+			return *m_Registry;
+		}
+		const entt::registry& GetRegistry() const
+		{
+			return *m_Registry;
+		}
+
+		entt::registry* GetRegistryPtr()
+		{
+			return m_Registry;
+		}
+
+		UUID GetUUID()
+		{
+			return GetComponent<IDComponent>().ID;
+		}
+
+		const std::string& GetName()
+		{
+			return GetComponent<TagComponent>().Tag;
+		}
+
+		glm::mat4 GetWorldTransform();
+		glm::vec3 GetWorldPosition();
+		glm::vec3 GetForward();
+		glm::vec3 GetUp();
+		glm::vec3 GetRight();
+
+	private:
+		entt::entity m_EntityHandle{entt::null};
+		entt::registry* m_Registry = nullptr;
+	};
+} // namespace Chained
 
 #endif // CH_ENTITY_H
diff --git a/engine/scene/hierarchy_serializer.cpp b/engine/scene/hierarchy_serializer.cpp
index 4f01c06ae..05930441e 100644
--- a/engine/scene/hierarchy_serializer.cpp
+++ b/engine/scene/hierarchy_serializer.cpp
@@ -1,66 +1,66 @@
 #include "hierarchy_serializer.h"
-#include "components/hierarchy_component.h"
-#include "components/id_component.h"
+#include "components/core/hierarchy_component.h"
+#include "components/core/id_component.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-void HierarchySerializer::Serialize(YAML::Emitter& out, Entity entity)
-{
-    if (entity.HasComponent<HierarchyComponent>())
-    {
-        auto& hc = entity.GetComponent<HierarchyComponent>();
-        out << YAML::Key << "Hierarchy";
-        out << YAML::BeginMap;
+	void HierarchySerializer::Serialize(YAML::Emitter& out, Entity entity)
+	{
+		if (entity.HasComponent<HierarchyComponent>())
+		{
+			auto& hc = entity.GetComponent<HierarchyComponent>();
+			out << YAML::Key << "Hierarchy";
+			out << YAML::BeginMap;
 
-        uint64_t parentUUID = 0;
-        if (hc.Parent != entt::null)
-        {
-            Entity parent{hc.Parent, &entity.GetRegistry()};
-            if (parent.HasComponent<IDComponent>())
-            {
-                parentUUID = (uint64_t)parent.GetComponent<IDComponent>().ID;
-            }
-        }
-        out << YAML::Key << "Parent" << YAML::Value << parentUUID;
+			uint64_t parentUUID = 0;
+			if (hc.Parent != entt::null)
+			{
+				Entity parent{hc.Parent, &entity.GetRegistry()};
+				if (parent.HasComponent<IDComponent>())
+				{
+					parentUUID = (uint64_t)parent.GetComponent<IDComponent>().ID;
+				}
+			}
+			out << YAML::Key << "Parent" << YAML::Value << parentUUID;
 
-        out << YAML::Key << "Children" << YAML::BeginSeq;
-        for (auto childHandle : hc.Children)
-        {
-            Entity child{childHandle, &entity.GetRegistry()};
-            if (child.HasComponent<IDComponent>())
-            {
-                out << (uint64_t)child.GetComponent<IDComponent>().ID;
-            }
-        }
-        out << YAML::EndSeq;
-        out << YAML::EndMap;
-    }
-}
+			out << YAML::Key << "Children" << YAML::BeginSeq;
+			for (auto childHandle : hc.Children)
+			{
+				Entity child{childHandle, &entity.GetRegistry()};
+				if (child.HasComponent<IDComponent>())
+				{
+					out << (uint64_t)child.GetComponent<IDComponent>().ID;
+				}
+			}
+			out << YAML::EndSeq;
+			out << YAML::EndMap;
+		}
+	}
 
-void HierarchySerializer::DeserializeTask(Entity entity, YAML::Node node, HierarchyTask& outTask)
-{
-    if (node["Hierarchy"])
-    {
-        auto h = node["Hierarchy"];
-        outTask.entity = entity;
-        if (h["Parent"])
-        {
-            outTask.parent = h["Parent"].as<uint64_t>();
-        }
-        else
-        {
-            outTask.parent = 0;
-        }
+	void HierarchySerializer::DeserializeTask(Entity entity, YAML::Node node, HierarchyTask& outTask)
+	{
+		if (node["Hierarchy"])
+		{
+			auto h = node["Hierarchy"];
+			outTask.entity = entity;
+			if (h["Parent"])
+			{
+				outTask.parent = h["Parent"].as<uint64_t>();
+			}
+			else
+			{
+				outTask.parent = 0;
+			}
 
-        if (h["Children"] && h["Children"].IsSequence())
-        {
-            for (auto child : h["Children"])
-            {
-                outTask.children.push_back(child.as<uint64_t>());
-            }
-        }
-    }
-}
+			if (h["Children"] && h["Children"].IsSequence())
+			{
+				for (auto child : h["Children"])
+				{
+					outTask.children.push_back(child.as<uint64_t>());
+				}
+			}
+		}
+	}
 
-} // namespace CHEngine
+} // namespace Chained
diff --git a/engine/scene/hierarchy_serializer.h b/engine/scene/hierarchy_serializer.h
index 4591fba8f..b1c6e2a69 100644
--- a/engine/scene/hierarchy_serializer.h
+++ b/engine/scene/hierarchy_serializer.h
@@ -4,22 +4,22 @@
 #include "engine/scene/scene.h"
 #include <yaml-cpp/yaml.h>
 
-namespace CHEngine
+namespace Chained
 {
-struct HierarchyTask
-{
-    Entity entity;
-    uint64_t parent;
-    std::vector<uint64_t> children;
-};
+	struct HierarchyTask
+	{
+		Entity entity;
+		uint64_t parent = 0;
+		std::vector<uint64_t> children;
+	};
 
-class HierarchySerializer
-{
-public:
-    static void Serialize(YAML::Emitter& out, Entity entity);
-    static void DeserializeTask(Entity entity, YAML::Node node, HierarchyTask& outTask);
-};
+	class HierarchySerializer
+	{
+	public:
+		static void Serialize(YAML::Emitter& out, Entity entity);
+		static void DeserializeTask(Entity entity, YAML::Node node, HierarchyTask& outTask);
+	};
 
-} // namespace CHEngine
+} // namespace Chained
 
 #endif // CH_HIERARCHY_SERIALIZER_H
diff --git a/engine/scene/prefab_serializer.cpp b/engine/scene/prefab_serializer.cpp
index 75127899f..85cf75c2c 100644
--- a/engine/scene/prefab_serializer.cpp
+++ b/engine/scene/prefab_serializer.cpp
@@ -2,47 +2,240 @@
 #include "component_serializer.h"
 #include "components.h"
 #include "engine/scene/yaml.h"
+#include "engine/scene/hierarchy_serializer.h"
 #include "engine/scene/scene.h"
-#include <fstream>
-#include <yaml-cpp/yaml.h>
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
 
-namespace CHEngine
+namespace Chained
 {
-// Simplified serialization logic for specific entities
-// Simplified serialization logic for specific entities
-static void SerializeEntityData(YAML::Emitter& out, Entity entity)
-{
-    out << YAML::BeginMap;
+	static void SerializeEntityRecursive(YAML::Emitter& out, Entity entity)
+	{
+		out << YAML::BeginMap;
+		ComponentSerializer::SerializeID(out, entity);
+		ComponentSerializer::SerializeAll(out, entity);
+		out << YAML::EndMap;
 
-    ComponentSerializer::Get().SerializeAll(out, entity);
+		if (entity.HasComponent<HierarchyComponent>())
+		{
+			auto& hc = entity.GetComponent<HierarchyComponent>();
+			for (auto childHandle : hc.Children)
+			{
+				Entity child = {childHandle, &entity.GetRegistry()};
+				if (child)
+				{
+					SerializeEntityRecursive(out, child);
+				}
+			}
+		}
+	}
 
-    out << YAML::EndMap;
-}
+	bool PrefabSerializer::Serialize(Entity entity, const std::string& filepath)
+	{
+		if (!entity)
+		{
+			return false;
+		}
 
-bool PrefabSerializer::Serialize(Entity entity, const std::string& filepath)
-{
-    YAML::Emitter out;
-    out << YAML::BeginMap;
-    out << YAML::Key << "Prefab" << YAML::Value << entity.GetComponent<TagComponent>().Tag;
-    out << YAML::Key << "RootEntity";
-    SerializeEntityData(out, entity);
-    out << YAML::EndMap;
-
-    std::ofstream fout(filepath);
-    fout << out.c_str();
-    return true;
-}
-
-Entity PrefabSerializer::Deserialize(Scene* scene, const std::string& filepath)
-{
-    YAML::Node data = YAML::LoadFile(filepath);
-    if (!data["Prefab"])
-    {
-        return {};
-    }
-
-    Entity entity = scene->CreateEntity(data["Prefab"].as<std::string>());
-    // Simplified loading logic...
-    return entity;
-}
-} // namespace CHEngine
+		YAML::Emitter out;
+		out << YAML::BeginMap;
+		out << YAML::Key << "Prefab" << YAML::Value << entity.GetComponent<TagComponent>().Tag;
+		out << YAML::Key << "RootEntity" << YAML::Value << (uint64_t)entity.GetUUID();
+		out << YAML::Key << "Entities" << YAML::Value << YAML::BeginSeq;
+
+		SerializeEntityRecursive(out, entity);
+
+		out << YAML::EndSeq;
+		out << YAML::EndMap;
+
+		std::ofstream fout(filepath);
+		if (!fout.is_open())
+		{
+			CH_CORE_ERROR("PrefabSerializer: Failed to open file for writing '{}'", filepath);
+			return false;
+		}
+		fout << out.c_str();
+		if (!fout.good())
+		{
+			CH_CORE_ERROR("PrefabSerializer: Failed to write to file '{}'", filepath);
+			return false;
+		}
+		return true;
+	}
+
+	Entity PrefabSerializer::Deserialize(Scene* scene, const std::string& filepath)
+	{
+		if (!scene)
+		{
+			CH_CORE_ERROR("PrefabSerializer::Deserialize: scene is null");
+			return {};
+		}
+
+		// Direct synchronous deserialization (the actual work)
+		YAML::Node prefabRootNode;
+		try
+		{
+			std::string content;
+
+			// Try reading from pack first
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				if (am->IsPacked())
+				{
+					auto packData = am->ReadAssetData(filepath);
+					if (!packData.empty())
+					{
+						content.assign(packData.begin(), packData.end());
+					}
+				}
+			}
+
+			// Fallback to disk
+			if (content.empty())
+			{
+				std::ifstream stream(filepath);
+				if (!stream.is_open())
+				{
+					CH_CORE_ERROR("PrefabSerializer: Failed to load prefab file '{}'", filepath);
+					return {};
+				}
+				std::stringstream ss;
+				ss << stream.rdbuf();
+				content = ss.str();
+			}
+
+			prefabRootNode = YAML::Load(content);
+		} catch (...)
+		{
+			CH_CORE_ERROR("PrefabSerializer: Failed to load prefab file '{}'", filepath);
+			return {};
+		}
+
+		if (!prefabRootNode["Prefab"] || !prefabRootNode["Entities"])
+		{
+			CH_CORE_ERROR("PrefabSerializer: Invalid prefab file format '{}'", filepath);
+			return {};
+		}
+
+		auto entitiesNode = prefabRootNode["Entities"];
+
+		std::unordered_map<uint64_t, Entity> remapTable;
+		std::vector<Entity> createdEntities;
+		std::vector<HierarchyTask> hierarchyTasks;
+
+		// Step 1: Create all entities first
+		for (auto entityNode : entitiesNode)
+		{
+			if (!entityNode["Entity"])
+			{
+				continue;
+			}
+
+			uint64_t oldUUID = entityNode["Entity"].as<uint64_t>();
+			std::string tag = "Entity";
+			if (entityNode["TagComponent"] && entityNode["TagComponent"]["Tag"])
+			{
+				tag = entityNode["TagComponent"]["Tag"].as<std::string>();
+			}
+
+			Entity newEntity = scene->CreateEntity(tag);
+			remapTable[oldUUID] = newEntity;
+			createdEntities.push_back(newEntity);
+		}
+
+		// Step 2: Deserialize components and collect hierarchy tasks
+		int idx = 0;
+		for (auto entityNode : entitiesNode)
+		{
+			if (idx >= createdEntities.size())
+			{
+				break;
+			}
+
+			Entity entity = createdEntities[idx++];
+			ComponentSerializer::DeserializeAll(entity, entityNode);
+
+			if (entity.HasComponent<TransformComponent>())
+			{
+				auto& tc = entity.GetComponent<TransformComponent>();
+				tc.RotationQuat = glm::quat(tc.Rotation);
+				tc.PrevRotationQuat = tc.RotationQuat;
+				tc.PrevTranslation = tc.Translation;
+				tc.PrevScale = tc.Scale;
+			}
+
+			if (entity.HasComponent<RigidBodyComponent>())
+			{
+				entity.GetComponent<RigidBodyComponent>().Handle = kInvalidPhysicsBody;
+			}
+
+			HierarchyTask task;
+			HierarchySerializer::DeserializeTask(entity, entityNode, task);
+			if (task.parent != 0 || !task.children.empty())
+			{
+				hierarchyTasks.push_back(task);
+			}
+		}
+
+		// Step 3: Reconstruct hierarchy using the remap table
+		for (const auto& task : hierarchyTasks)
+		{
+			Entity entity = task.entity;
+			auto& hc = entity.AddOrReplaceComponent<HierarchyComponent>();
+
+			// Fix Parent
+			if (task.parent != 0 && remapTable.count(task.parent))
+			{
+				hc.Parent = (entt::entity)remapTable[task.parent];
+			}
+			else
+			{
+				hc.Parent = entt::null;
+			}
+
+			// Fix Children
+			hc.Children.clear();
+			for (uint64_t oldChildID : task.children)
+			{
+				if (remapTable.count(oldChildID))
+				{
+					hc.Children.push_back((entt::entity)remapTable[oldChildID]);
+				}
+			}
+		}
+
+		// Step 4: Find and return the root entity
+		if (!prefabRootNode["RootEntity"])
+		{
+			CH_CORE_ERROR("PrefabSerializer: Missing 'RootEntity' in '{}'", filepath);
+			return createdEntities.empty() ? Entity{} : createdEntities[0];
+		}
+		uint64_t rootOldUUID = prefabRootNode["RootEntity"].as<uint64_t>();
+		if (remapTable.count(rootOldUUID))
+		{
+			return remapTable[rootOldUUID];
+		}
+
+		return createdEntities.empty() ? Entity{} : createdEntities[0];
+	}
+
+	std::future<Entity> PrefabSerializer::LoadAsync(Scene* scene, const std::string& filepath)
+	{
+		// Launch the deserialization in a background thread using std::thread
+		std::promise<Entity> promise;
+		std::future<Entity> future = promise.get_future();
+
+		std::thread loader([scene, filepath, &promise]() mutable {
+			// Call the synchronous deserialization directly in the background thread
+			Entity result = Deserialize(scene, filepath);
+
+			// Set the result via the promise so the main thread can retrieve it
+			promise.set_value(result);
+		});
+
+		// Detach the thread so it runs independently and delivers the result via the promise
+		loader.detach();
+
+		return future;
+	}
+} // namespace Chained
diff --git a/engine/scene/prefab_serializer.h b/engine/scene/prefab_serializer.h
index e7f315072..dfd5d082b 100644
--- a/engine/scene/prefab_serializer.h
+++ b/engine/scene/prefab_serializer.h
@@ -3,15 +3,18 @@
 
 #include "engine/scene/scene.h"
 #include <string>
+#include <future>
 
-namespace CHEngine
+namespace Chained
 {
-class PrefabSerializer
-{
-public:
-    static bool Serialize(Entity entity, const std::string& filepath);
-    static Entity Deserialize(Scene* scene, const std::string& filepath);
-};
-} // namespace CHEngine
+	class PrefabSerializer
+	{
+	public:
+		static bool Serialize(Entity entity, const std::string& filepath);
+		static Entity Deserialize(Scene* scene, const std::string& filepath);
+		static std::future<Entity> LoadAsync(Scene* scene, const std::string& filepath);
+	};
+
+} // namespace Chained
 
 #endif // CH_PREFAB_SERIALIZER_H
diff --git a/engine/scene/project.cpp b/engine/scene/project.cpp
deleted file mode 100644
index 023240418..000000000
--- a/engine/scene/project.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-#include "project.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/environment.h"
-#include "engine/graphics/pipeline/renderer.h"
-#include "imgui.h"
-#include "project_serializer.h"
-
-
-namespace CHEngine
-{
-std::shared_ptr<Project> Project::s_ActiveProject = nullptr;
-std::filesystem::path Project::s_EngineRoot = "";
-
-std::shared_ptr<Project> Project::New()
-{
-    auto project = std::make_shared<Project>();
-    SetActive(project);
-    return project;
-}
-
-std::shared_ptr<Project> Project::Load(const std::filesystem::path& path)
-{
-    std::shared_ptr<Project> project = std::make_shared<Project>();
-
-    project->m_Config.ProjectDirectory = path.parent_path();
-    // Do not set s_ActiveProject here, will be set in SetActive called later in the function
-
-    // Discover Engine Root if not set or invalid
-    if (s_EngineRoot.empty() || !std::filesystem::exists(s_EngineRoot / "resources"))
-    {
-        // 1. Try development root macro
-#ifdef PROJECT_ROOT_DIR
-        if (std::filesystem::exists(std::filesystem::path(PROJECT_ROOT_DIR) / "resources"))
-        {
-            s_EngineRoot = PROJECT_ROOT_DIR;
-        }
-#endif
-
-        // 2. Try traversing up from project file
-        if (s_EngineRoot.empty())
-        {
-            std::filesystem::path current = path.parent_path();
-            while (current.has_parent_path())
-            {
-                if (std::filesystem::exists(current / "resources"))
-                {
-                    s_EngineRoot = current;
-                    break;
-                }
-                current = current.parent_path();
-            }
-        }
-    }
-
-    ProjectSerializer serializer(project);
-    if (serializer.Deserialize(path))
-    {
-        SetActive(project);
-
-        // Load engine shaders now that paths are set correctly
-        if (Renderer::IsInitialized())
-        {
-            Renderer::LoadEngineResources();
-        }
-
-        // Load environment if specified
-        if (!project->m_Config.EnvironmentPath.empty())
-        {
-            project->m_Environment =
-                AssetManager::Get().Get<EnvironmentAsset>(project->m_Config.EnvironmentPath.string());
-        }
-
-        // --- Automated Shader Discovery ---
-        if (Renderer::IsInitialized())
-        {
-            auto shaderDir = project->m_Config.ProjectDirectory / project->m_Config.AssetDirectory / "shaders";
-            if (std::filesystem::exists(shaderDir))
-            {
-                auto& lib = Renderer::Get().GetShaderLibrary();
-                for (const auto& entry : std::filesystem::recursive_directory_iterator(shaderDir))
-                {
-                    if (entry.path().extension() == ".chshader")
-                    {
-                        std::string name = entry.path().stem().string();
-                        std::string relPath = project->GetRelativePath(entry.path());
-
-                        if (!lib.Exists(name))
-                        {
-                            lib.Load(name, relPath);
-                            CH_CORE_INFO("Project: Discovered and loaded shader: {} ({})", name, relPath);
-                        }
-                    }
-                }
-            }
-        }
-
-        return project;
-    }
-
-    SetActive(nullptr);
-    return nullptr;
-}
-
-void Project::SetActive(std::shared_ptr<Project> project)
-{
-    s_ActiveProject = project;
-    auto& assetManager = AssetManager::Get();
-    if (project)
-    {
-        assetManager.SetAssetDirectory(project->GetAssetDirectory());
-        assetManager.SetProjectDirectory(project->GetProjectDirectory());
-    }
-    else
-    {
-        assetManager.SetAssetDirectory("");
-        assetManager.SetProjectDirectory("");
-    }
-}
-
-void Project::SetEngineRoot(const std::filesystem::path& path)
-{
-    s_EngineRoot = path;
-    AssetManager::Get().SetEngineRoot(path);
-}
-
-std::filesystem::path Project::Discover(const std::filesystem::path& startPath, const std::string& hintName)
-{
-    std::filesystem::path current = startPath.empty() ? std::filesystem::current_path() : startPath;
-    if (std::filesystem::is_regular_file(current))
-    {
-        current = current.parent_path();
-    }
-
-    CH_CORE_INFO("Project: Discovering project starting from: {} (Hint: {})", current.string(), hintName);
-
-    while (true)
-    {
-        CH_CORE_INFO("Project: Checking directory: {}", current.string());
-        std::error_code ec;
-        if (std::filesystem::exists(current, ec))
-        {
-            // 1. Check for {hintName}.chproject (Priority 1)
-            if (!hintName.empty())
-            {
-                std::filesystem::path hintPath = current / (hintName + ".chproject");
-                if (std::filesystem::exists(hintPath, ec))
-                {
-                    CH_CORE_INFO("Project: Found hinted project: {}", hintPath.string());
-                    return hintPath;
-                }
-            }
-
-            // 2. Check for any .chproject (Priority 2)
-            for (const auto& entry : std::filesystem::directory_iterator(current, ec))
-            {
-                if (entry.path().extension() == ".chproject")
-                {
-                    CH_CORE_INFO("Project: Found project: {}", entry.path().string());
-                    return entry.path();
-                }
-            }
-
-            // 3. Check "game" subdirectory for nested structures
-            std::filesystem::path gameDir = current / "game";
-            if (std::filesystem::exists(gameDir, ec))
-            {
-                for (const auto& entry : std::filesystem::recursive_directory_iterator(gameDir, ec))
-                {
-                    const auto& p = entry.path();
-                    if (p.extension() == ".chproject")
-                    {
-                        // Even here, prioritize hintName if found
-                        if (!hintName.empty() && p.stem().string() == hintName)
-                        {
-                            CH_CORE_INFO("Project: Found hinted project in game dir: {}", p.string());
-                            return p;
-                        }
-                    }
-                }
-
-                // If nested search didn't find the hint, return the first found .chproject in gameDir
-                for (const auto& entry : std::filesystem::recursive_directory_iterator(gameDir, ec))
-                {
-                    if (entry.path().extension() == ".chproject")
-                    {
-                        return entry.path();
-                    }
-                }
-            }
-        }
-
-        if (!current.has_parent_path() || current == current.root_path())
-        {
-            break;
-        }
-        current = current.parent_path();
-    }
-
-    return "";
-}
-
-bool Project::SaveActive(const std::filesystem::path& path)
-{
-    ProjectSerializer serializer(s_ActiveProject);
-    if (serializer.Serialize(path))
-    {
-        s_ActiveProject->m_Config.ProjectDirectory = path.parent_path();
-        return true;
-    }
-
-    return false;
-}
-std::vector<std::string> Project::GetAvailableScenes()
-{
-    std::vector<std::string> scenes;
-    if (!s_ActiveProject)
-    {
-        return scenes;
-    }
-
-    auto assetDir = GetAssetDirectory();
-    auto scenesDir = assetDir / "scenes";
-
-    if (std::filesystem::exists(scenesDir))
-    {
-        for (auto& entry : std::filesystem::recursive_directory_iterator(scenesDir))
-        {
-            if (entry.path().extension() == ".chscene")
-            {
-                std::string relPath = std::filesystem::relative(entry.path(), assetDir).string();
-                scenes.push_back(relPath);
-            }
-        }
-    }
-    return scenes;
-}
-
-std::string Project::GetRelativePath(const std::filesystem::path& path)
-{
-    if (path.empty())
-    {
-        return "";
-    }
-
-    if (path.is_relative())
-    {
-        return path.generic_string();
-    }
-
-    auto absolutePath = NormalizePath(path);
-
-    // 1. Try relative to Assets Directory
-    if (auto rel = TryMakeRelative(absolutePath, GetAssetDirectory()))
-    {
-        return *rel;
-    }
-
-    // 2. Try relative to Project Root
-    if (auto rel = TryMakeRelative(absolutePath, GetProjectDirectory()))
-    {
-        return *rel;
-    }
-
-    // 3. Try relative to Engine Root
-    if (!s_EngineRoot.empty())
-    {
-        if (auto rel = TryMakeRelative(absolutePath, s_EngineRoot))
-        {
-            return "engine/" + *rel;
-        }
-    }
-
-    return absolutePath.generic_string();
-}
-
-std::filesystem::path Project::GetAbsolutePath(const std::filesystem::path& path)
-{
-    if (path.empty())
-    {
-        return "";
-    }
-
-    if (path.is_absolute())
-    {
-        return NormalizePath(path);
-    }
-
-    std::string pathStr = path.generic_string();
-
-    // Handle "engine/" prefix (for engine resources)
-    bool isEngineResource = false;
-    if (pathStr.find("engine/") == 0)
-    {
-        pathStr = pathStr.substr(7); // Remove "engine/" prefix
-        isEngineResource = true;
-    }
-
-    if (isEngineResource)
-    {
-        // Look in engine root first
-        if (!s_EngineRoot.empty())
-        {
-            std::filesystem::path candidate = s_EngineRoot / pathStr;
-            if (std::filesystem::exists(candidate))
-            {
-                return NormalizePath(candidate);
-            }
-        }
-    }
-    else
-    {
-        // For game assets, try asset directory first
-        std::filesystem::path assetDir = GetAssetDirectory();
-        if (!assetDir.empty())
-        {
-            std::filesystem::path candidate = assetDir / pathStr;
-            if (std::filesystem::exists(candidate))
-            {
-                return NormalizePath(candidate);
-            }
-        }
-
-        // Try project root next
-        std::filesystem::path projectDir = GetProjectDirectory();
-        if (!projectDir.empty())
-        {
-            std::filesystem::path candidate = projectDir / pathStr;
-            if (std::filesystem::exists(candidate))
-            {
-                return NormalizePath(candidate);
-            }
-        }
-    }
-
-    // Final fallback: return best guess without verifying existence
-    // This allows AssetManager async loading to handle missing files gracefully
-    std::filesystem::path assetDir = GetAssetDirectory();
-    if (!assetDir.empty() && !isEngineResource)
-    {
-        return NormalizePath(assetDir / pathStr);
-    }
-    else if (!s_EngineRoot.empty())
-    {
-        return NormalizePath(s_EngineRoot / pathStr);
-    }
-    else
-    {
-        return NormalizePath(GetProjectDirectory() / pathStr);
-    }
-}
-
-// -------------------------------------------------------------------------------------------------------------------
-// Path Utility Helpers
-// -------------------------------------------------------------------------------------------------------------------
-
-std::filesystem::path Project::NormalizePath(const std::filesystem::path& path)
-{
-    // Use lexically_normal to handle .. and . and unify slashes
-    std::filesystem::path normalized = std::filesystem::absolute(path).lexically_normal();
-
-#if CH_PLATFORM_WINDOWS
-    // Unify drive letter casing to uppercase to prevent relative path resolution failures
-    std::string s = normalized.string();
-    if (s.length() >= 2 && s[1] == ':' && std::islower(s[0]))
-    {
-        s[0] = (char)std::toupper(s[0]);
-        normalized = s;
-    }
-#endif
-
-    // On Windows, generic_string() will use / which is exactly what we want for cross-platform portability.
-    return normalized;
-}
-
-std::optional<std::string> Project::TryMakeRelative(const std::filesystem::path& absolutePath,
-                                                    const std::filesystem::path& basePath)
-{
-    if (basePath.empty())
-    {
-        return std::nullopt;
-    }
-
-    auto normalizedBase = NormalizePath(basePath);
-    std::filesystem::path rel = std::filesystem::relative(absolutePath, normalizedBase);
-    
-    // std::filesystem::relative returns an absolute path if it cannot resolve relativity (e.g., different drives)
-    if (rel.is_relative())
-    {
-        std::string relStr = rel.generic_string();
-
-        // Only return if path doesn't escape the base directory
-        if (relStr.find("..") == std::string::npos)
-        {
-            return relStr;
-        }
-    }
-
-    return std::nullopt;
-}
-} // namespace CHEngine
diff --git a/engine/scene/project.h b/engine/scene/project.h
deleted file mode 100644
index ef0ebe96b..000000000
--- a/engine/scene/project.h
+++ /dev/null
@@ -1,250 +0,0 @@
-#ifndef CH_PROJECT_H
-#define CH_PROJECT_H
-
-#include "engine/core/base.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/environment.h"
-#include "engine/graphics/assets/texture_asset.h"
-#include <filesystem>
-#include <memory>
-#include <optional>
-#include <string>
-
-namespace CHEngine
-{
-// Describes an executable launch profile for a project build.
-struct LaunchProfile
-{
-    std::string Name;
-    std::string BinaryPath;
-    std::string Arguments;
-    bool UseDefaultArgs = true;
-};
-
-struct PhysicsSettings
-{
-    float Gravity = 20.0f;
-    float FixedTimestep = 1.0f / 60.0f;
-};
-
-struct AnimationSettings
-{
-    float TargetFPS = 30.0f;
-};
-
-struct RenderSettings
-{
-    float AmbientIntensity = 0.3f;
-    float DefaultExposure = 1.0f;
-};
-
-struct MeshSettings
-{
-    bool ImportMaterials = true;
-    bool CalculateTangents = true;
-    bool FlipUVs = true;
-};
-
-// 0=None, 1=Bilinear, 2=Trilinear, 3=Anisotropic 4x, 4=Anisotropic 8x, 5=Anisotropic 16x
-enum class TextureFilter : int
-{
-    None        = 0,
-    Bilinear    = 1,
-    Trilinear   = 2,
-    Anisotropic4x  = 3,
-    Anisotropic8x  = 4,
-    Anisotropic16x = 5
-};
-
-struct TextureSettings
-{
-    bool GenerateMipmaps = true;
-    TextureFilter Filter = TextureFilter::Bilinear;
-};
-
-struct WindowSettings
-{
-    int Width = 1280;
-    int Height = 720;
-    bool VSync = true;
-    bool Resizable = true;
-};
-
-struct RuntimeSettings
-{
-    bool Fullscreen = false;
-    bool ShowStats = true;
-    bool EnableConsole = false;
-};
-
-struct ScriptingSettings
-{
-    std::string ModuleName;
-    std::filesystem::path ModuleDirectory;
-    bool AutoLoad = true;
-};
-
-enum class Configuration
-{
-    Debug = 0,
-    Release = 1
-};
-
-struct EditorSettings
-{
-    float CameraMoveSpeed = 10.0f;
-    float CameraRotationSpeed = 0.1f;
-    float CameraBoostMultiplier = 5.0f;
-};
-
-struct ProjectConfig
-{
-    std::string Name = "Untitled";
-    std::string IconPath;
-    std::string StartScene;
-    std::filesystem::path AssetDirectory = "assets";
-    std::filesystem::path ProjectDirectory;
-    std::filesystem::path ActiveScenePath;
-    std::filesystem::path EnvironmentPath;
-
-    std::vector<std::string> BuildScenes; // List of scenes included in build
-
-    PhysicsSettings Physics;
-    AnimationSettings Animation;
-    RenderSettings Render;
-    TextureSettings Texture;
-    MeshSettings Mesh;
-    WindowSettings Window;
-    RuntimeSettings Runtime;
-    EditorSettings Editor;
-    ScriptingSettings Scripting;
-
-    std::vector<LaunchProfile> LaunchProfiles;
-    int ActiveLaunchProfileIndex = 0;
-
-    Configuration BuildConfig = Configuration::Debug;
-};
-
-// Owns the active project configuration and environment asset, plus path helpers
-// rooted at the process-wide active project.
-class Project
-{
-public:
-    Project() = default;
-    ~Project() = default;
-
-    // Returns the active project configuration.
-    [[nodiscard]] const ProjectConfig& GetConfig() const
-    {
-        return m_Config;
-    }
-    // Returns the active project configuration for mutation.
-    [[nodiscard]] ProjectConfig& GetConfig()
-    {
-        return m_Config;
-    }
-
-    // Returns the process-wide active project, or null if none is loaded.
-    [[nodiscard]] static std::shared_ptr<Project> GetActive()
-    {
-        return s_ActiveProject;
-    }
-
-    // Sets the process-wide active project.
-    static void SetActive(std::shared_ptr<Project> project);
-
-    // Creates a new in-memory project with default settings.
-    [[nodiscard]] static std::shared_ptr<Project> New();
-    // Loads a project from disk.
-    [[nodiscard]] static std::shared_ptr<Project> Load(const std::filesystem::path& path);
-    // Discovers a project file by walking from a starting directory.
-    [[nodiscard]] static std::filesystem::path Discover(const std::filesystem::path& startPath = "",
-                                                         const std::string& hintName = "");
-
-    // Returns the engine root used for resolving engine-relative paths.
-    [[nodiscard]] static std::filesystem::path GetEngineRoot()
-    {
-        return s_EngineRoot;
-    }
-    // Sets the engine root used for resolving engine-relative paths.
-    static void SetEngineRoot(const std::filesystem::path& path);
-
-    // Saves the active project to disk.
-    static bool SaveActive(const std::filesystem::path& path);
-
-    // Returns the scenes that are available to the active project.
-    [[nodiscard]] static std::vector<std::string> GetAvailableScenes();
-
-    // Returns the active project's asset directory.
-    [[nodiscard]] static std::filesystem::path GetAssetDirectory()
-    {
-        if (s_ActiveProject)
-        {
-            return s_ActiveProject->m_Config.ProjectDirectory / s_ActiveProject->m_Config.AssetDirectory;
-        }
-        return "";
-    }
-
-    // Returns the active project's directory.
-    [[nodiscard]] static std::filesystem::path GetProjectDirectory()
-    {
-        if (s_ActiveProject)
-        {
-            return s_ActiveProject->m_Config.ProjectDirectory;
-        }
-        return "";
-    }
-
-    [[nodiscard]] static std::filesystem::path GetAssetPath(const std::filesystem::path& relative)
-    {
-        return GetAssetDirectory() / relative;
-    }
-
-    // Converts a path to a project-relative string when possible.
-    [[nodiscard]] static std::string GetRelativePath(const std::filesystem::path& path);
-    // Converts a path to an absolute path under the active project or engine root.
-    [[nodiscard]] static std::filesystem::path GetAbsolutePath(const std::filesystem::path& path);
-
-    // Path utility helpers.
-    [[nodiscard]] static std::filesystem::path NormalizePath(const std::filesystem::path& path);
-    [[nodiscard]] static std::optional<std::string> TryMakeRelative(const std::filesystem::path& absolutePath,
-                                                                    const std::filesystem::path& basePath);
-
-    void SetActiveScenePath(const std::filesystem::path& path)
-    {
-        m_Config.ActiveScenePath = path;
-    }
-
-    void SetName(const std::string& name)
-    {
-        m_Config.Name = name;
-    }
-
-    void SetProjectDirectory(const std::filesystem::path& path)
-    {
-        m_Config.ProjectDirectory = path;
-    }
-
-    void SetEnvironment(const std::filesystem::path& path)
-    {
-        m_Config.EnvironmentPath = path;
-    }
-
-    // Returns the environment asset associated with this project, if any.
-    std::shared_ptr<EnvironmentAsset> GetEnvironment() const
-    {
-        return m_Environment;
-    }
-
-
-private:
-    ProjectConfig m_Config;
-    std::shared_ptr<EnvironmentAsset> m_Environment;
-    static std::shared_ptr<Project> s_ActiveProject;
-    static std::filesystem::path s_EngineRoot;
-
-    friend class ProjectSerializer;
-};
-} // namespace CHEngine
-
-#endif // CH_PROJECT_H
diff --git a/engine/scene/project_serializer.cpp b/engine/scene/project_serializer.cpp
deleted file mode 100644
index 9d4e02934..000000000
--- a/engine/scene/project_serializer.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-#include "project_serializer.h"
-#include "engine/core/log.h"
-#include "engine/scene/serialization_utils.h"
-#include "fstream"
-#include "yaml-cpp/yaml.h"
-
-namespace CHEngine
-{
-using namespace SerializationUtils;
-ProjectSerializer::ProjectSerializer(std::shared_ptr<Project> project)
-    : m_Project(project)
-{
-}
-
-bool ProjectSerializer::Serialize(const std::filesystem::path& filepath)
-{
-    const auto& config = m_Project->m_Config;
-
-    YAML::Emitter out;
-    out << YAML::BeginMap; // Project
-    out << YAML::Key << "Project" << YAML::Value;
-    {
-        out << YAML::BeginMap;
-        out << YAML::Key << "Name" << YAML::Value << config.Name;
-        out << YAML::Key << "IconPath" << YAML::Value << config.IconPath;
-        out << YAML::Key << "StartScene" << YAML::Value << config.StartScene;
-        out << YAML::Key << "AssetDirectory" << YAML::Value << config.AssetDirectory.string();
-
-        SerializePath(out, "ActiveScene", config.ActiveScenePath.string());
-        SerializePath(out, "Environment", config.EnvironmentPath.string());
-
-        out << YAML::Key << "BuildScenes" << YAML::Value << YAML::BeginSeq;
-        for (const auto& scene : config.BuildScenes)
-        {
-            out << scene;
-        }
-        out << YAML::EndSeq;
-
-        out << YAML::Key << "Physics" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "Gravity" << YAML::Value << config.Physics.Gravity;
-        out << YAML::Key << "FixedTimestep" << YAML::Value << config.Physics.FixedTimestep;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Animation" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "TargetFPS" << YAML::Value << config.Animation.TargetFPS;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Render" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "AmbientIntensity" << YAML::Value << config.Render.AmbientIntensity;
-        out << YAML::Key << "DefaultExposure" << YAML::Value << config.Render.DefaultExposure;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Texture" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "GenerateMipmaps" << YAML::Value << config.Texture.GenerateMipmaps;
-        out << YAML::Key << "Filter" << YAML::Value << (int)config.Texture.Filter;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Mesh" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "ImportMaterials" << YAML::Value << config.Mesh.ImportMaterials;
-        out << YAML::Key << "CalculateTangents" << YAML::Value << config.Mesh.CalculateTangents;
-        out << YAML::Key << "FlipUVs" << YAML::Value << config.Mesh.FlipUVs;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Window" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "Width" << YAML::Value << config.Window.Width;
-        out << YAML::Key << "Height" << YAML::Value << config.Window.Height;
-        out << YAML::Key << "VSync" << YAML::Value << config.Window.VSync;
-        out << YAML::Key << "Resizable" << YAML::Value << config.Window.Resizable;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Runtime" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "Fullscreen" << YAML::Value << config.Runtime.Fullscreen;
-        out << YAML::Key << "ShowStats" << YAML::Value << config.Runtime.ShowStats;
-        out << YAML::Key << "EnableConsole" << YAML::Value << config.Runtime.EnableConsole;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Editor" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "CameraMoveSpeed" << YAML::Value << config.Editor.CameraMoveSpeed;
-        out << YAML::Key << "CameraRotationSpeed" << YAML::Value << config.Editor.CameraRotationSpeed;
-        out << YAML::Key << "CameraBoostMultiplier" << YAML::Value << config.Editor.CameraBoostMultiplier;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Scripting" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "ModuleName" << YAML::Value << config.Scripting.ModuleName;
-        out << YAML::Key << "ModuleDirectory" << YAML::Value << config.Scripting.ModuleDirectory.string();
-        out << YAML::Key << "AutoLoad" << YAML::Value << config.Scripting.AutoLoad;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "LaunchProfiles" << YAML::Value << YAML::BeginSeq;
-        for (const auto& profile : config.LaunchProfiles)
-        {
-            out << YAML::BeginMap;
-            out << YAML::Key << "Name" << YAML::Value << profile.Name;
-            out << YAML::Key << "BinaryPath" << YAML::Value << profile.BinaryPath;
-            out << YAML::Key << "Arguments" << YAML::Value << profile.Arguments;
-            out << YAML::Key << "UseDefaultArgs" << YAML::Value << profile.UseDefaultArgs;
-            out << YAML::EndMap;
-        }
-        out << YAML::EndSeq;
-
-        out << YAML::Key << "ActiveLaunchProfile" << YAML::Value << config.ActiveLaunchProfileIndex;
-        out << YAML::Key << "BuildConfig" << YAML::Value << (int)config.BuildConfig;
-
-        out << YAML::EndMap;
-    }
-    out << YAML::EndMap; // Project
-
-    std::ofstream fout(filepath);
-    if (fout.is_open())
-    {
-        fout << out.c_str();
-        return true;
-    }
-
-    CH_CORE_ERROR("Failed to save project file: {}", filepath.string());
-    return false;
-}
-
-bool ProjectSerializer::Deserialize(const std::filesystem::path& filepath)
-{
-    std::ifstream stream(filepath);
-    if (!stream.is_open())
-    {
-        CH_CORE_ERROR("Failed to open project file: {}", filepath.string());
-        return false;
-    }
-
-    std::stringstream strStream;
-    strStream << stream.rdbuf();
-
-    YAML::Node data = YAML::Load(strStream.str());
-    auto projectNode = data["Project"];
-    if (!projectNode)
-    {
-        return false;
-    }
-
-    auto& config = m_Project->m_Config;
-    config.Name = projectNode["Name"].as<std::string>();
-    if (projectNode["IconPath"])
-    {
-        config.IconPath = projectNode["IconPath"].as<std::string>();
-    }
-    config.StartScene = projectNode["StartScene"].as<std::string>();
-    config.AssetDirectory = projectNode["AssetDirectory"].as<std::string>();
-
-    DeserializePath(projectNode, "Environment", config.EnvironmentPath);
-    DeserializePath(projectNode, "ActiveScene", config.ActiveScenePath);
-
-    auto buildScenes = projectNode["BuildScenes"];
-    if (buildScenes)
-    {
-        for (auto scene : buildScenes)
-        {
-            config.BuildScenes.push_back(scene.as<std::string>());
-        }
-    }
-
-    if (projectNode["Physics"])
-    {
-        config.Physics.Gravity = projectNode["Physics"]["Gravity"].as<float>();
-        if (projectNode["Physics"]["FixedTimestep"])
-        {
-            config.Physics.FixedTimestep = projectNode["Physics"]["FixedTimestep"].as<float>();
-        }
-    }
-
-    if (projectNode["Animation"])
-    {
-        config.Animation.TargetFPS = projectNode["Animation"]["TargetFPS"].as<float>();
-    }
-
-    if (projectNode["Render"])
-    {
-        config.Render.AmbientIntensity = projectNode["Render"]["AmbientIntensity"].as<float>();
-        config.Render.DefaultExposure = projectNode["Render"]["DefaultExposure"].as<float>();
-    }
-
-    if (projectNode["Texture"])
-    {
-        if (projectNode["Texture"]["GenerateMipmaps"])
-        {
-            config.Texture.GenerateMipmaps = projectNode["Texture"]["GenerateMipmaps"].as<bool>();
-        }
-        if (projectNode["Texture"]["Filter"])
-        {
-            config.Texture.Filter = (TextureFilter)projectNode["Texture"]["Filter"].as<int>();
-        }
-    }
-
-    if (projectNode["Mesh"])
-    {
-        if (projectNode["Mesh"]["ImportMaterials"])
-        {
-            config.Mesh.ImportMaterials = projectNode["Mesh"]["ImportMaterials"].as<bool>();
-        }
-        if (projectNode["Mesh"]["CalculateTangents"])
-        {
-            config.Mesh.CalculateTangents = projectNode["Mesh"]["CalculateTangents"].as<bool>();
-        }
-        if (projectNode["Mesh"]["FlipUVs"])
-        {
-            config.Mesh.FlipUVs = projectNode["Mesh"]["FlipUVs"].as<bool>();
-        }
-    }
-
-    if (projectNode["Window"])
-    {
-        config.Window.Width = projectNode["Window"]["Width"].as<int>();
-        config.Window.Height = projectNode["Window"]["Height"].as<int>();
-        config.Window.VSync = projectNode["Window"]["VSync"].as<bool>();
-        config.Window.Resizable = projectNode["Window"]["Resizable"].as<bool>();
-    }
-
-    if (projectNode["Runtime"])
-    {
-        config.Runtime.Fullscreen = projectNode["Runtime"]["Fullscreen"].as<bool>();
-        config.Runtime.ShowStats = projectNode["Runtime"]["ShowStats"].as<bool>();
-        config.Runtime.EnableConsole = projectNode["Runtime"]["EnableConsole"].as<bool>();
-    }
-
-    if (projectNode["Editor"])
-    {
-        config.Editor.CameraMoveSpeed = projectNode["Editor"]["CameraMoveSpeed"].as<float>();
-        config.Editor.CameraRotationSpeed = projectNode["Editor"]["CameraRotationSpeed"].as<float>();
-        config.Editor.CameraBoostMultiplier = projectNode["Editor"]["CameraBoostMultiplier"].as<float>();
-    }
-
-    if (projectNode["Scripting"])
-    {
-        config.Scripting.ModuleName = projectNode["Scripting"]["ModuleName"].as<std::string>();
-        if (projectNode["Scripting"]["ModuleDirectory"])
-        {
-            config.Scripting.ModuleDirectory = projectNode["Scripting"]["ModuleDirectory"].as<std::string>();
-        }
-        if (projectNode["Scripting"]["AutoLoad"])
-        {
-            config.Scripting.AutoLoad = projectNode["Scripting"]["AutoLoad"].as<bool>();
-        }
-    }
-
-    if (projectNode["LaunchProfiles"])
-    {
-        for (auto profileNode : projectNode["LaunchProfiles"])
-        {
-            LaunchProfile profile;
-            profile.Name = profileNode["Name"].as<std::string>();
-            profile.BinaryPath = profileNode["BinaryPath"].as<std::string>();
-            profile.Arguments = profileNode["Arguments"].as<std::string>();
-            if (profileNode["UseDefaultArgs"])
-            {
-                profile.UseDefaultArgs = profileNode["UseDefaultArgs"].as<bool>();
-            }
-
-            config.LaunchProfiles.push_back(profile);
-        }
-    }
-
-    if (projectNode["ActiveLaunchProfile"])
-    {
-        config.ActiveLaunchProfileIndex = projectNode["ActiveLaunchProfile"].as<int>();
-    }
-
-    if (projectNode["BuildConfig"])
-    {
-        config.BuildConfig = (Configuration)projectNode["BuildConfig"].as<int>();
-    }
-
-    config.ProjectDirectory = filepath.parent_path();
-
-    return true;
-}
-} // namespace CHEngine
diff --git a/engine/scene/project_serializer.h b/engine/scene/project_serializer.h
deleted file mode 100644
index ca9650946..000000000
--- a/engine/scene/project_serializer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef CH_PROJECT_SERIALIZER_H
-#define CH_PROJECT_SERIALIZER_H
-
-#include "project.h"
-#include <filesystem>
-
-namespace CHEngine
-{
-// Serializes and deserializes a project configuration; the project is not owned.
-class ProjectSerializer
-{
-public:
-    // Binds the serializer to a project instance.
-    ProjectSerializer(std::shared_ptr<Project> project);
-
-public:
-    // Serializes the bound project to disk.
-    bool Serialize(const std::filesystem::path& filepath);
-    // Deserializes the project from disk.
-    bool Deserialize(const std::filesystem::path& filepath);
-
-private:
-    std::shared_ptr<Project> m_Project;
-};
-} // namespace CHEngine
-
-#endif // CH_PROJECT_SERIALIZER_H
diff --git a/engine/scene/scene.cpp b/engine/scene/scene.cpp
index 60aaa755f..5f2210948 100644
--- a/engine/scene/scene.cpp
+++ b/engine/scene/scene.cpp
@@ -1,609 +1,716 @@
 #include "engine/scene/scene.h"
-#include "engine/audio/audio.h"
-#include "engine/core/assets/asset_manager.h"
 #include "engine/core/profiler.h"
-#include "engine/graphics/assets/model_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/ui/ui_data_components.h"
+#include "engine/ui/widget_renderer.h"
 #include "engine/physics/physics.h"
+#include "engine/scene/components/animation/animation_component.h"
+#include "engine/scene/components/core/hierarchy_component.h"
+#include "engine/scene/components/ui/scene_transition_component.h"
+#include "engine/scene/scene_events.h"
+#include "engine/scene/systems/hierarchy_system.h"
+#include "engine/scene/systems/animation_system.h"
+#include "engine/scene/systems/physics_body_system.h"
+#include "engine/scene/systems/asset_resolution_system.h"
+#include "engine/scene/systems/audio_system.h"
+#include "engine/scene/systems/scene_transition_system.h"
+#include "engine/scene/systems/camera_auto_select_system.h"
+#include "engine/scene/systems/network_system.h"
+#include "engine/scene/systems/transform_system.h"
+#include "engine/scene/systems/primitive_system.h"
 #include "engine/scene/component_serializer.h"
-#include <cmath>
-#include "serialization_utils.h"
-#include <entt/entt.hpp>
-#include <glm/gtx/norm.hpp>
-
-using namespace entt::literals;
-
-namespace CHEngine
-{
-// Scene implementation
-Scene::Scene()
-{
-    // Create registry
-    m_Registry = std::make_shared<entt::registry>();
-
-    auto& reg = *m_Registry;
-    reg.ctx().emplace<Scene*>(this);
-    reg.ctx().emplace<EntityUUIDMap>();
-    reg.ctx().emplace<std::shared_ptr<entt::registry>>(m_Registry);
-
-    // UUID Mapping
-    reg.on_construct<IDComponent>().connect<&Scene::OnIDConstruct>(this);
-    reg.on_destroy<IDComponent>().connect<&Scene::OnIDDestroy>(this);
-
-    // Hierarchy Mapping
-    reg.on_destroy<HierarchyComponent>().connect<&Scene::OnHierarchyDestroy>(this);
-
-    // Every scene must have its own environment to avoid skybox leaking/bugs
-    m_Settings.Environment = std::make_shared<EnvironmentAsset>();
-}
-
-Scene::~Scene()
-{
-    Physics::ClearContext(this);
-    // Clean up active signals
-    GetRegistry().clear();
-    
-    // Break circular dependency to allow registry to be safely deallocated
-    m_Registry->ctx().erase<std::shared_ptr<entt::registry>>();
-}
-
-std::shared_ptr<Scene> Scene::CreateDefault()
-{
-    auto scene = std::make_shared<Scene>();
-
-    // Ensure every scene starts with a Main Camera
-    Entity camera = scene->CreateEntity("Main Camera");
-    auto& cameraEntity = camera.AddComponent<CameraComponent>();
-    cameraEntity.Primary = true;
-    camera.GetComponent<TransformComponent>().Translation = {0, 5, 10};
-
-    return scene;
-}
-
-std::shared_ptr<Scene> Scene::Copy(std::shared_ptr<Scene> other)
-{
-    CH_PROFILE_FUNCTION();
-    CH_CORE_INFO("Scene::Copy - Starting copy of scene '{}'", other->m_Settings.Name);
-
-    std::shared_ptr<Scene> newScene = std::make_shared<Scene>();
-
-    // 1. Copy Scene Settings
-    newScene->m_Settings = other->m_Settings;
-
-    // 2. Copy Entities (Direct Memory Copy)
-    auto& srcRegistry = other->GetRegistry();
-    auto& dstRegistry = newScene->GetRegistry();
-
-    // Copy all entities using ComponentSerializer
-    {
-        CH_PROFILE_SCOPE("Scene::Copy::CopyEntities");
-        int entityCount = 0;
-        srcRegistry.view<IDComponent>().each([&](auto entityHandle, auto& id) {
-            entityCount++;
-            Entity srcEntity = {entityHandle, other->m_Registry};
-            Entity dstEntity = newScene->CreateEntityWithUUID(id.ID);
-
-            ComponentSerializer::Get().CopyAll(srcEntity, dstEntity);
-        });
-
-        CH_CORE_INFO("Scene::Copy - Successfully copied {} entities", entityCount);
-    }
-    return newScene;
-}
-
-void Scene::OnHierarchyDestroy(entt::registry& reg, entt::entity entity)
-{
-    auto& hc = reg.get<HierarchyComponent>(entity);
-
-    // 1. Detach from parent
-    if (hc.Parent != entt::null && reg.valid(hc.Parent) && reg.all_of<HierarchyComponent>(hc.Parent))
-    {
-        auto& phc = reg.get<HierarchyComponent>(hc.Parent);
-        auto it = std::find(phc.Children.begin(), phc.Children.end(), entity);
-        if (it != phc.Children.end())
-        {
-            phc.Children.erase(it);
-        }
-    }
-
-    // Children are handled by recursive DestroyEntity call
-}
-
-void Scene::OnRuntimeStart()
-{
-    Physics::ResetAccumulator(this);
-    m_IsSimulationRunning = true;
-}
-
-void Scene::OnRuntimeStop()
-{
-    m_IsSimulationRunning = false;
-    Physics::ClearContext(this);
-}
-
-void Scene::OnUpdateRuntime(Timestep timestep)
-{
-    CH_PROFILE_FUNCTION();
-
-    UpdateHierarchy();
-    UpdateAnimations(timestep);
-    UpdatePhysics(timestep);
-    UpdateAudio(timestep);
-}
-
-void Scene::OnUpdateEditor(Timestep timestep)
-{
-    CH_PROFILE_FUNCTION();
-
-    UpdateHierarchy();
-    UpdateAnimations(timestep);
-    UpdatePhysics(timestep);
-    UpdateAudio(timestep);
-}
-
-void Scene::OnViewportResize(uint32_t width, uint32_t height)
-{
-    auto& reg = GetRegistry();
-    auto view = reg.view<CameraComponent>();
-    for (auto entity : view)
-    {
-        auto& cameraComponent = view.get<CameraComponent>(entity);
-        if (!cameraComponent.FixedAspectRatio)
-        {
-            cameraComponent.Camera.SetViewportSize(width, height);
-        }
-    }
-}
-
-std::optional<Camera3D> Scene::GetActiveCamera()
-{
-    auto& reg = GetRegistry();
-    auto view = reg.view<CameraComponent, TransformComponent>();
-    for (auto entity : view)
-    {
-        auto [camera, transform] = view.get<CameraComponent, TransformComponent>(entity);
-        if (camera.Primary)
-        {
-            Camera3D activeCamera;
-
-            // Use WorldTransform instead of local translation/rotation for parented cameras
-            const glm::mat4& worldTransform = transform.WorldTransform;
-
-            // Extract position from world transform
-            activeCamera.Position = glm::vec3(worldTransform * glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-            // Calculate world forward and up vectors
-            glm::vec3 worldForward = glm::vec3(worldTransform * glm::vec4(0.0f, 0.0f, -1.0f, 1.0f));
-            glm::vec3 worldUp = glm::vec3(worldTransform * glm::vec4(0.0f, 1.0f, 0.0f, 1.0f));
-
-            glm::vec3 forward = glm::normalize(worldForward - activeCamera.Position);
-
-            // Provide a safe fallback if forward is somehow zero
-            if (glm::length2(forward) < 0.0001f)
-            {
-                forward = glm::vec3(0.0f, 0.0f, -1.0f);
-            }
-
-            activeCamera.Target = activeCamera.Position + forward;
-            activeCamera.Up = glm::normalize(worldUp - activeCamera.Position);
-
-            // SceneCamera stores FOV in radians, raylib expects degrees for Camera3D
-            activeCamera.Fovy = glm::degrees(camera.Camera.GetPerspectiveVerticalFOV());
-            activeCamera.Projection = (int)camera.Camera.GetProjectionType();
-
-            return activeCamera;
-        }
-    }
-    return std::nullopt;
-}
-
-Entity Scene::GetPrimaryCameraEntity()
-{
-    auto& reg = GetRegistry();
-    auto view = reg.view<CameraComponent>();
-    for (auto entity : view)
-    {
-        auto& camera = view.get<CameraComponent>(entity);
-        if (camera.Primary)
-        {
-            return {entity, m_Registry};
-        }
-    }
-    return {};
-}
-
-void Scene::UpdatePhysics(Timestep deltaTime)
-{
-    CH_PROFILE_FUNCTION();
-    Physics::Update(this, deltaTime, m_IsSimulationRunning);
-}
-
-void Scene::UpdateAnimations(Timestep deltaTime)
-{
-    CH_PROFILE_FUNCTION();
-    auto& reg = GetRegistry();
-    auto view = reg.view<AnimationComponent, ModelComponent>();
-
-    for (auto entity : view)
-    {
-        auto& animation = view.get<AnimationComponent>(entity);
-        if (!animation.IsPlaying)
-        {
-            continue;
-        }
-
-        auto& model = view.get<ModelComponent>(entity);
-        auto modelAsset = AssetManager::Get().Get<ModelAsset>(model.ModelPath);
-        if (!modelAsset || modelAsset->GetAnimationCount() == 0)
-        {
-            continue;
-        }
-
-        // Progress timers
-        float dt = deltaTime.GetSeconds();
-        animation.FrameTimeCounter += dt;
-
-        // Get animation frameRate from asset (asset-driven, defaults to 30fps if not available)
-        float targetFPS = 30.0f;
-        const auto& rawAnims = modelAsset->GetAnimations();
-        if (animation.CurrentAnimationIndex >= 0 && animation.CurrentAnimationIndex < (int)rawAnims.size())
-        {
-            targetFPS = rawAnims[animation.CurrentAnimationIndex].frameRate;
-        }
-        float frameTime = 1.0f / targetFPS;
-
-        // Use a while loop to correctly consume elapsed time without dropping fractional MS,
-        // which prevents animation sequence shaking/jittering.
-        while (animation.FrameTimeCounter >= frameTime)
-        {
-            animation.FrameTimeCounter -= frameTime;
-            animation.CurrentFrame++;
-
-            if (animation.CurrentAnimationIndex >= 0 && animation.CurrentAnimationIndex < (int)rawAnims.size())
-            {
-                int totalFrames = rawAnims[animation.CurrentAnimationIndex].frameCount;
-                if (animation.CurrentFrame >= totalFrames)
-                {
-                    if (animation.IsLooping)
-                    {
-                        animation.CurrentFrame = 0;
-                    }
-                    else
-                    {
-                        animation.CurrentFrame = totalFrames - 1;
-                        animation.IsPlaying = false;
-                    }
-                }
-            }
-        }
-
-        // Handle Blending
-        if (animation.Blending)
-        {
-            animation.BlendTimer += dt;
-            if (animation.BlendTimer >= animation.BlendDuration)
-            {
-                // Blend complete
-                animation.CurrentAnimationIndex = animation.TargetAnimationIndex;
-                animation.CurrentFrame = animation.TargetFrame;
-                animation.Blending = false;
-                animation.TargetAnimationIndex = -1;
-            }
-            else
-            {
-                // Progress target frame too
-                const float FRAME_EPSILON = 0.001f;
-                if (std::abs(animation.FrameTimeCounter - 0.0f) < FRAME_EPSILON) // Just advanced a frame
-                {
-                    animation.TargetFrame++;
-                    if (animation.TargetAnimationIndex >= 0 &&
-                        animation.TargetAnimationIndex < modelAsset->GetAnimationCount())
-                    {
-                        int targetTotalFrames =
-                            modelAsset->GetAnimations()[animation.TargetAnimationIndex].frameCount;
-                        if (animation.TargetFrame >= targetTotalFrames)
-                        {
-                            animation.TargetFrame = 0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void Scene::UpdateHierarchy()
-{
-    CH_PROFILE_FUNCTION();
-    auto& reg = GetRegistry();
-    auto view = reg.view<TransformComponent>();
-
-    struct UpdateTask
-    {
-        entt::entity Entity;
-        glm::mat4 ParentTransform;
-        bool ParentChanged;
-    };
-
-    std::vector<UpdateTask> stack;
-    stack.reserve(reg.storage<entt::entity>().size());
-
-    // 1. Find all root entities and push to stack
-    for (auto entity : view)
-    {
-        bool isRoot = true;
-        if (reg.all_of<HierarchyComponent>(entity))
-        {
-            auto& hc = reg.get<HierarchyComponent>(entity);
-            if (hc.Parent != entt::null && reg.valid(hc.Parent) && reg.all_of<TransformComponent>(hc.Parent))
-            {
-                isRoot = false;
-            }
-        }
-
-        if (isRoot)
-        {
-            stack.push_back({entity, glm::mat4(1.0f), false});
-        }
-    }
-
-    // 2. Iterative DFS update with dirty flag propagation
-    while (!stack.empty())
-    {
-        UpdateTask task = stack.back();
-        stack.pop_back();
-
-        auto& tc = view.get<TransformComponent>(task.Entity);
-        
-        // A node needs update if it is explicitly dirty OR its parent's world transform changed
-        bool needsUpdate = task.ParentChanged || tc.IsDirty;
-        
-        if (needsUpdate)
-        {
-            tc.WorldTransform = task.ParentTransform * tc.GetTransform();
-            tc.IsDirty = false;
-        }
-
-        if (reg.all_of<HierarchyComponent>(task.Entity))
-        {
-            auto& hc = reg.get<HierarchyComponent>(task.Entity);
-            for (auto child : hc.Children)
-            {
-                if (reg.valid(child) && reg.all_of<TransformComponent>(child))
-                {
-                    stack.push_back({child, tc.WorldTransform, needsUpdate});
-                }
-            }
-        }
-    }
-}
-
-void Scene::UpdateAudio(Timestep deltaTime)
-{
-    CH_PROFILE_FUNCTION();
-
-    // 1. Sync Listener with Primary Camera
-    auto cameraView = GetRegistry().view<CameraComponent, TransformComponent>();
-    for (auto entity : cameraView)
-    {
-        auto& camera = cameraView.get<CameraComponent>(entity);
-        if (camera.Primary)
-        {
-            auto& transform = cameraView.get<TransformComponent>(entity);
-            glm::vec3 pos = glm::vec3(transform.WorldTransform[3]);
-            glm::mat3 rot = glm::mat3(transform.WorldTransform);
-            glm::vec3 forward = rot * glm::vec3(0, 0, -1);
-            glm::vec3 up = rot * glm::vec3(0, 1, 0);
-
-            Audio::Get().SetListenerPosition(pos, forward, up);
-            break;
-        }
-    }
-
-    // 2. Manage Audio Components
-    auto audioView = GetRegistry().view<AudioComponent, TransformComponent>();
-    for (auto entity : audioView)
-    {
-        auto& audio = audioView.get<AudioComponent>(entity);
-        if (audio.PlayOnStart && !audio.IsPlaying && !audio.SoundPath.empty())
-        {
-            if (audio.SoundHandle == 0 || !Audio::Get().IsSoundLoaded(audio.SoundHandle))
-            {
-                audio.SoundHandle = Audio::Get().LoadSound(audio.SoundPath);
-            }
-            
-            if (audio.SoundHandle != 0)
-            {
-                auto& transform = audioView.get<TransformComponent>(entity);
-                glm::vec3 worldPos = glm::vec3(transform.WorldTransform[3]);
-
-                Audio::Get().Play(audio.SoundHandle, audio.Volume, audio.Pitch, audio.Loop, audio.Spatialized,
-                                  worldPos);
-                audio.IsPlaying = true;
-            }
-        }
-    }
-}
-
-void Scene::OnIDConstruct(entt::registry& reg, entt::entity entity)
-{
-    auto& id = reg.get<IDComponent>(entity);
-    auto& mapStruct = reg.ctx().get<EntityUUIDMap>();
-    mapStruct.Map[id.ID] = entity;
-}
-
-void Scene::OnIDDestroy(entt::registry& reg, entt::entity entity)
-{
-    auto& id = reg.get<IDComponent>(entity);
-    auto& mapStruct = reg.ctx().get<EntityUUIDMap>();
-    mapStruct.Map.erase(id.ID);
-}
-
-std::shared_ptr<entt::registry> Scene::GetRegistryPtr()
-{
-    return m_Registry;
-}
-const entt::registry& Scene::GetRegistry() const
-{
-    return *m_Registry;
-}
-entt::registry& Scene::GetRegistry()
-{
-    return *m_Registry;
-}
-const SceneSettings& Scene::GetSettings() const
-{
-    return m_Settings;
-}
-SceneSettings& Scene::GetSettings()
-{
-    return m_Settings;
-}
-bool Scene::IsSimulationRunning() const
-{
-    return m_IsSimulationRunning;
-}
-void Scene::DestroyEntity(Entity entity)
-{
-    entity.Destroy();
-}
-
-Entity Scene::CopyEntity(entt::entity copyEntity)
-{
-    return CopyEntityInternal(copyEntity, entt::null);
-}
-
-Entity Scene::CopyEntityInternal(entt::entity copyEntity, entt::entity parentEntity)
-{
-    Entity srcEntity(copyEntity, m_Registry);
-    std::string copyName = srcEntity.GetName() + (parentEntity == entt::null ? "_copy" : "");
-    Entity dstEntity = CreateEntity(copyName);
-
-    // CopyAll overwrites TagComponent and IDComponent with the source's values.
-    // We must restore the copy's unique identity afterwards.
-    ComponentSerializer::Get().CopyAll(srcEntity, dstEntity);
-
-    // Restore the name (CopyAll overwrites it with source tag)
-    dstEntity.GetComponent<TagComponent>().Tag = copyName;
-
-    // The IDComponent was copied verbatim from the source, so both entities now share
-    // the same UUID. We must remove it and add a fresh one.
-    dstEntity.RemoveComponent<IDComponent>();
-    dstEntity.AddComponent<IDComponent>(); 
-
-    // Handle Hierarchy
-    if (srcEntity.HasComponent<HierarchyComponent>())
-    {
-        auto& srcHC = srcEntity.GetComponent<HierarchyComponent>();
-        
-        entt::entity targetParent = parentEntity;
-        if (targetParent == entt::null && srcHC.Parent != entt::null)
-        {
-            targetParent = srcHC.Parent;
-        }
-
-        if (targetParent != entt::null)
-        {
-            auto& dstHC = dstEntity.AddOrReplaceComponent<HierarchyComponent>();
-            dstHC.Parent = targetParent;
-            dstHC.Children.clear(); 
-
-            Entity parent(targetParent, m_Registry);
-            if (parent.HasComponent<HierarchyComponent>())
-            {
-                parent.GetComponent<HierarchyComponent>().Children.push_back(dstEntity);
-            }
-        }
-        else
-        {
-            if (dstEntity.HasComponent<HierarchyComponent>())
-            {
-                dstEntity.GetComponent<HierarchyComponent>().Parent = entt::null;
-                dstEntity.GetComponent<HierarchyComponent>().Children.clear();
-            }
-        }
-
-        // Recursively copy all children
-        std::vector<entt::entity> childrenToCopy = srcHC.Children;
-        for (auto child : childrenToCopy)
-        {
-            CopyEntityInternal(child, dstEntity);
-        }
-    }
-
-    return dstEntity;
-}
-
-Entity Scene::CreateUIEntity(const std::string& type, const std::string& name)
-{
-    Entity entity = CreateEntity(name.empty() ? type : name);
-    entity.AddComponent<ControlComponent>();
-    
-    if (type == "Button")                       entity.AddComponent<ButtonControl>();
-    else if (type == "Panel")                  entity.AddComponent<PanelControl>();
-    else if (type == "Label")                  entity.AddComponent<LabelControl>();
-    else if (type == "Slider")                 entity.AddComponent<SliderControl>();
-    else if (type == "CheckBox")               entity.AddComponent<CheckboxControl>();
-    else if (type == "InputText")              entity.AddComponent<InputTextControl>();
-    else if (type == "ComboBox")               entity.AddComponent<ComboBoxControl>();
-    else if (type == "ProgressBar")            entity.AddComponent<ProgressBarControl>();
-    else if (type == "Image")                  entity.AddComponent<ImageControl>();
-    else if (type == "ImageButton")            entity.AddComponent<ImageButtonControl>();
-    else if (type == "Separator")              entity.AddComponent<SeparatorControl>();
-    else if (type == "RadioButton")            entity.AddComponent<RadioButtonControl>();
-    else if (type == "ColorPicker")            entity.AddComponent<ColorPickerControl>();
-    else if (type == "DragFloat")              entity.AddComponent<DragFloatControl>();
-    else if (type == "DragInt")                entity.AddComponent<DragIntControl>();
-    else if (type == "TreeNode")               entity.AddComponent<TreeNodeControl>();
-    else if (type == "TabBar")                 entity.AddComponent<TabBarControl>();
-    else if (type == "TabItem")                entity.AddComponent<TabItemControl>();
-    else if (type == "CollapsingHeader")       entity.AddComponent<CollapsingHeaderControl>();
-    else if (type == "PlotLines")              entity.AddComponent<PlotLinesControl>();
-    else if (type == "PlotHistogram")          entity.AddComponent<PlotHistogramControl>();
-    else if (type == "VerticalLayoutGroup")    entity.AddComponent<VerticalLayoutGroup>();
-    else if (type == "UIAction")               entity.AddComponent<UIActionComponent>();
-
-    return entity;
-}
-
-Entity Scene::CreateEntityWithUUID(UUID uuid, const std::string& name)
-{
-    Entity entity(m_Registry->create(), m_Registry);
-    entity.AddComponent<IDComponent>(uuid);
-    entity.AddComponent<TagComponent>(name.empty() ? "Entity" : name);
-    entity.AddComponent<TransformComponent>();
-    return entity;
-}
-
-Entity Scene::CreateEntity(const std::string& name)
-{
-    Entity entity(m_Registry->create(), m_Registry);
-    entity.AddComponent<IDComponent>();
-    entity.AddComponent<TagComponent>(name.empty() ? "Entity" : name);
-    entity.AddComponent<TransformComponent>();
-    return entity;
-}
-
-Entity Scene::FindEntityByTag(const std::string& tag)
-{
-    auto view = m_Registry->view<TagComponent>();
-    for (auto entity : view)
-    {
-        const auto& tagComp = view.get<TagComponent>(entity);
-        if (tagComp.Tag == tag)
-        {
-            return {entity, m_Registry};
-        }
-    }
-    return {};
-}
-
-Entity Scene::GetEntityByUUID(UUID uuid)
-{
-    auto* mapStruct = m_Registry->ctx().find<EntityUUIDMap>();
-    if (mapStruct && mapStruct->Map.find(uuid) != mapStruct->Map.end())
-    {
-        return {mapStruct->Map.at(uuid), m_Registry};
-    }
-    return {};
-}
-} // namespace CHEngine
+#include "scene_scripting_manager.h"
+#include "engine/scripting/scriptengine.h"
+#include "engine/scene/prefab_serializer.h"
+
+namespace Chained
+{
+
+	Scene::Scene()
+	{
+		m_Registry = std::make_unique<entt::registry>();
+		auto& reg = *m_Registry;
+
+		reg.ctx().emplace<Scene*>(this);
+		reg.ctx().emplace<EntityUUIDMap>();
+
+		reg.on_construct<IDComponent>().connect<&Scene::OnIDConstruct>(this);
+		reg.on_destroy<IDComponent>().connect<&Scene::OnIDDestroy>(this);
+
+		reg.on_construct<HierarchyComponent>().connect<&Scene::OnHierarchyConstruct>(this);
+		reg.on_destroy<HierarchyComponent>().connect<&Scene::OnHierarchyDestroy>(this);
+
+		AssetResolutionSystem::RegisterObservers(reg);
+		PrimitiveSystem::RegisterObservers(reg, "");
+
+		m_Settings.Environment = std::make_shared<EnvironmentAsset>();
+		m_ScriptingManager = std::make_unique<SceneScriptingManager>(this);
+	}
+
+	Scene::~Scene()
+	{
+		auto& reg = *m_Registry;
+		reg.on_destroy<IDComponent>().disconnect();
+		reg.on_destroy<HierarchyComponent>().disconnect();
+		reg.on_construct<IDComponent>().disconnect();
+		reg.on_construct<HierarchyComponent>().disconnect();
+		reg.ctx().erase<Scene*>();
+		GetRegistry().clear();
+	}
+
+	std::shared_ptr<Scene> Scene::CreateDefault()
+	{
+		auto scene = std::make_shared<Scene>();
+
+		Entity camera = scene->CreateEntity("Main Camera");
+		auto& cameraEntity = camera.AddComponent<CameraComponent>();
+		cameraEntity.Primary = true;
+		TransformSystem::SetTranslation(camera.GetComponent<TransformComponent>(), {0, 5, 10});
+
+		return scene;
+	}
+
+	std::shared_ptr<Scene> Scene::Copy(std::shared_ptr<Scene> other)
+	{
+		CH_PROFILE_FUNCTION();
+		CH_CORE_INFO("Scene::Copy - Starting copy of scene '{}'", other->m_Settings.Name);
+
+		std::shared_ptr<Scene> newScene = std::make_shared<Scene>();
+		newScene->m_Settings = other->m_Settings;
+
+		auto& srcRegistry = other->GetRegistry();
+		auto& dstRegistry = newScene->GetRegistry();
+
+		std::unordered_map<entt::entity, entt::entity> entityMap;
+
+		{
+			CH_PROFILE_SCOPE("Scene::Copy::CopyEntities_Pass1");
+			for (auto entityHandle : srcRegistry.view<IDComponent>())
+			{
+				auto& id = srcRegistry.get<IDComponent>(entityHandle);
+				Entity srcEntity = {entityHandle, other->m_Registry.get()};
+				Entity dstEntity = newScene->CreateEntityWithUUID(id.ID);
+				entityMap[entityHandle] = (entt::entity)dstEntity;
+
+				ComponentSerializer::CopyAll(srcEntity, dstEntity);
+
+				if (dstEntity.HasComponent<RigidBodyComponent>())
+				{
+					dstEntity.GetComponent<RigidBodyComponent>().Handle = kInvalidPhysicsBody;
+				}
+			}
+		}
+
+		{
+			CH_PROFILE_SCOPE("Scene::Copy::CopyEntities_Pass2");
+			srcRegistry.view<HierarchyComponent>().each([&](auto entityHandle, auto& srcHC) {
+				if (!entityMap.contains(entityHandle))
+				{
+					return;
+				}
+
+				entt::entity dstHandle = entityMap[entityHandle];
+				auto& dstHC = dstRegistry.get_or_emplace<HierarchyComponent>(dstHandle);
+
+				if (srcHC.Parent != entt::null && entityMap.count(srcHC.Parent))
+				{
+					dstHC.Parent = entityMap[srcHC.Parent];
+				}
+				else
+				{
+					dstHC.Parent = entt::null;
+				}
+
+				dstHC.Children.clear();
+				for (auto child : srcHC.Children)
+				{
+					if (entityMap.count(child))
+					{
+						dstHC.Children.push_back(entityMap[child]);
+					}
+				}
+			});
+		}
+
+		newScene->m_RootsDirty = true;
+		return newScene;
+	}
+
+	void Scene::OnHierarchyConstruct()
+	{
+		m_RootsDirty = true;
+	}
+
+	void Scene::OnHierarchyDestroy(entt::registry& reg, entt::entity entity)
+	{
+		m_RootsDirty = true;
+
+		if (!reg.valid(entity) || !reg.all_of<HierarchyComponent>(entity))
+		{
+			return;
+		}
+
+		auto& hc = reg.get<HierarchyComponent>(entity);
+
+		if (hc.Parent != entt::null && reg.valid(hc.Parent) && reg.all_of<HierarchyComponent>(hc.Parent))
+		{
+			auto& phc = reg.get<HierarchyComponent>(hc.Parent);
+			auto it = std::find(phc.Children.begin(), phc.Children.end(), entity);
+			if (it != phc.Children.end())
+			{
+				phc.Children.erase(it);
+			}
+		}
+	}
+
+	void Scene::OnEvent(Event& e)
+	{
+		if (m_State == SceneState::Play && !m_IsStartingUp)
+		{
+			m_ScriptingManager->OnEvent(e);
+		}
+	}
+
+	void Scene::OnRenderUI()
+	{
+		if (m_State == SceneState::Play && !m_IsStartingUp)
+		{
+			m_ScriptingManager->OnRenderUI();
+		}
+	}
+
+	void Scene::OnRuntimeStart()
+	{
+		CH_CORE_INFO("Scene::OnRuntimeStart - Starting activation for state: {}", (int)m_State);
+		m_IsStartingUp = true;
+		m_PhysicsStartupInitialized = false;
+	}
+
+	void Scene::FinishRuntimeStart()
+	{
+		if (auto* scripting = ServiceLocator::TryGet<ScriptEngine>())
+		{
+			scripting->SetContextScene(this);
+		}
+
+		if (m_State == SceneState::Play)
+		{
+			if (m_ScriptingManager)
+			{
+				m_ScriptingManager->OnRuntimeStart();
+			}
+			else
+			{
+				CH_CORE_ERROR("Scene::OnRuntimeStart - m_ScriptingManager is NULL!");
+			}
+		}
+
+		AudioSystem::OnRuntimeStart(*m_Registry);
+
+		CameraAutoSelectSystem::OnRuntimeStart(*m_Registry);
+
+		auto transitionView = m_Registry->view<SceneTransitionComponent>();
+		for (auto entity : transitionView)
+		{
+			transitionView.get<SceneTransitionComponent>(entity).Triggered = false;
+		}
+
+		auto view = m_Registry->view<AnimationComponent>();
+		for (auto entity : view)
+		{
+			auto& anim = view.get<AnimationComponent>(entity);
+			if (anim.PlayOnStart)
+			{
+				anim.IsPlaying = true;
+			}
+			CH_CORE_INFO("[AnimDebug] FinishRuntimeStart entity={} PlayOnStart={} IsPlaying={} GraphPath='{}' "
+						 "GraphHandle={} NodeID={}",
+						 (uint32_t)entity, anim.PlayOnStart, anim.IsPlaying, anim.GraphPath,
+						 (uint64_t)anim.GraphAssetHandle, anim.CurrentNodeID);
+		}
+	}
+
+	void Scene::OnRuntimeStop()
+	{
+		CH_CORE_INFO("Scene::OnRuntimeStop - Stopping lifecycle...");
+
+		m_IsStartingUp = false;
+		m_PhysicsStartupInitialized = false;
+
+		if (m_ScriptingManager)
+		{
+			m_ScriptingManager->OnRuntimeStop();
+		}
+
+		AudioSystem::OnRuntimeStop(*m_Registry);
+
+		NetworkSystem::GetInstance().Reset();
+
+		if (auto* physics = ServiceLocator::TryGet<Physics>())
+		{
+			physics->ClearContext(this);
+		}
+
+		if (auto* scripting = ServiceLocator::TryGet<ScriptEngine>())
+		{
+			scripting->SetContextScene(nullptr);
+		}
+	}
+
+	void Scene::OnUpdateRuntime(Timestep ts)
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (m_IsStartingUp)
+		{
+			InitializePhysicsStartup();
+			return;
+		}
+
+		auto& netSys = NetworkSystem::GetInstance();
+		netSys.PollNetwork(this, ts);
+
+		// Interpolate remote entities BEFORE scripts so PlayerController
+		// reads the correct velocity/grounded values for animation.
+		if (auto* net = ServiceLocator::TryGet<Network>())
+		{
+			if (net->IsClient())
+			{
+				float dt = static_cast<float>(ts);
+				netSys.InterpolateEntities(*m_Registry, dt);
+			}
+		}
+
+		if (m_ScriptingManager)
+		{
+			m_ScriptingManager->OnUpdate(ts);
+		}
+
+		// 1st world transform — processes entities spawned by SyncPeerAvatars
+		Hierarchy::UpdateWorldTransforms(*m_Registry, GetRootEntities());
+
+		AssetResolutionSystem::Update(*m_Registry);
+		AnimationSystem::Update(*m_Registry, ts);
+		AudioSystem::Update(*m_Registry);
+
+		PhysicsBodySystem::Update(*m_Registry);
+
+		netSys.ApplyHostInputs(*m_Registry, ts);
+
+		if (auto* physics = ServiceLocator::TryGet<Physics>())
+		{
+			physics->Update(this, ts, true);
+		}
+
+		Hierarchy::UpdateWorldTransforms(*m_Registry, GetRootEntities());
+
+		netSys.FinalizeFrame(this, ts);
+
+		if (auto target = SceneTransitionSystem::Update(*m_Registry))
+		{
+			m_PendingScenePath = *target;
+		}
+
+		m_Dispatcher.update();
+	}
+
+	void Scene::OnUpdateSimulation(Timestep ts)
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (m_IsStartingUp)
+		{
+			InitializePhysicsStartup();
+			return;
+		}
+
+		Hierarchy::UpdateWorldTransforms(*m_Registry, GetRootEntities());
+
+		AssetResolutionSystem::Update(*m_Registry);
+		AnimationSystem::Update(*m_Registry, ts);
+		AudioSystem::Update(*m_Registry);
+
+		PhysicsBodySystem::Update(*m_Registry);
+
+		if (auto* physics = ServiceLocator::TryGet<Physics>())
+		{
+			physics->Update(this, ts, true);
+		}
+
+		m_Dispatcher.update();
+	}
+
+	void Scene::InitializePhysicsStartup()
+	{
+		if (auto* physics = ServiceLocator::TryGet<Physics>())
+		{
+			if (!m_PhysicsStartupInitialized)
+			{
+				physics->ResetWorld(this);
+				physics->ResetAccumulator(this);
+				if (!m_Registry->ctx().contains<Physics*>())
+				{
+					m_Registry->ctx().emplace<Physics*>(physics);
+				}
+				m_PhysicsStartupInitialized = true;
+			}
+
+			PhysicsBodySystem::Update(*m_Registry);
+
+			auto* world = physics->GetWorld();
+			if (world && world->HasPendingShapeBakes())
+			{
+				return;
+			}
+
+			auto bodyView = m_Registry->view<RigidBodyComponent, ColliderComponent>();
+			for (auto entity : bodyView)
+			{
+				auto& rigidBody = bodyView.get<RigidBodyComponent>(entity);
+				auto& collider = bodyView.get<ColliderComponent>(entity);
+				if (collider.Enabled && rigidBody.Handle == kInvalidPhysicsBody)
+				{
+					return;
+				}
+			}
+		}
+		m_IsStartingUp = false;
+	}
+
+	void Scene::OnUpdateEditor(Timestep timestep)
+	{
+		CH_PROFILE_FUNCTION();
+
+		Hierarchy::UpdateWorldTransforms(*m_Registry, GetRootEntities());
+
+		CameraAutoSelectSystem::OnSceneUpdate(*m_Registry);
+
+		if (auto* physics = ServiceLocator::TryGet<Physics>())
+		{
+			physics->Update(this, timestep, false);
+		}
+
+		AssetResolutionSystem::Update(*m_Registry);
+		AnimationSystem::Update(*m_Registry, timestep);
+		AudioSystem::Update(*m_Registry);
+
+		m_Dispatcher.update();
+	}
+
+	void Scene::OnViewportResize(uint32_t width, uint32_t height)
+	{
+		auto& reg = GetRegistry();
+		auto view = reg.view<CameraComponent>();
+		for (auto entity : view)
+		{
+			auto& cameraComponent = view.get<CameraComponent>(entity);
+			if (!cameraComponent.FixedAspectRatio)
+			{
+				cameraComponent.Camera.SetViewportSize(width, height);
+			}
+		}
+	}
+
+	void Scene::OnIDConstruct(entt::registry& reg, entt::entity entity)
+	{
+		auto& id = reg.get<IDComponent>(entity);
+		auto& mapStruct = reg.ctx().get<EntityUUIDMap>();
+		mapStruct.Map[id.ID] = entity;
+	}
+
+	void Scene::OnIDDestroy(entt::registry& reg, entt::entity entity)
+	{
+		auto& id = reg.get<IDComponent>(entity);
+		auto& mapStruct = reg.ctx().get<EntityUUIDMap>();
+		mapStruct.Map.erase(id.ID);
+	}
+
+	entt::registry* Scene::GetRegistryPtr()
+	{
+		return m_Registry.get();
+	}
+
+	const entt::registry& Scene::GetRegistry() const
+	{
+		return *m_Registry;
+	}
+
+	entt::registry& Scene::GetRegistry()
+	{
+		return *m_Registry;
+	}
+
+	const SceneSettings& Scene::GetSettings() const
+	{
+		return m_Settings;
+	}
+
+	SceneSettings& Scene::GetSettings()
+	{
+		return m_Settings;
+	}
+
+	const std::vector<entt::entity>& Scene::GetRootEntities() const
+	{
+		if (m_RootsDirty)
+		{
+			RebuildRootCache();
+		}
+		return m_CachedRoots;
+	}
+
+	void Scene::RebuildRootCache() const
+	{
+		m_CachedRoots.clear();
+		auto& reg = GetRegistry();
+
+		auto view = reg.view<TransformComponent>();
+		for (auto entity : view)
+		{
+			if (reg.all_of<HierarchyComponent>(entity))
+			{
+				auto& hc = reg.get<HierarchyComponent>(entity);
+				if (hc.Parent == entt::null)
+				{
+					m_CachedRoots.push_back(entity);
+				}
+			}
+			else
+			{
+				m_CachedRoots.push_back(entity);
+			}
+		}
+		m_RootsDirty = false;
+	}
+
+	bool Scene::IsSimulationRunning() const
+	{
+		return m_State == SceneState::Play || m_State == SceneState::Simulate;
+	}
+
+	void Scene::DestroyEntity(Entity entity)
+	{
+		entity.Destroy();
+	}
+
+	entt::entity Scene::CopyEntity(entt::entity copyEntity)
+	{
+		return (entt::entity)CopyEntityInternal(copyEntity, entt::null);
+	}
+
+	Entity Scene::CopyEntityInternal(entt::entity copyEntity, entt::entity parentEntity)
+	{
+		Entity srcEntity(copyEntity, m_Registry.get());
+		std::string copyName = srcEntity.GetName() + (parentEntity == entt::null ? "_copy" : "");
+		Entity dstEntity = CreateEntity(copyName);
+
+		ComponentSerializer::CopyAll(srcEntity, dstEntity);
+		dstEntity.GetComponent<TagComponent>().Tag = copyName;
+
+		dstEntity.RemoveComponent<IDComponent>();
+		dstEntity.AddComponent<IDComponent>();
+
+		if (dstEntity.HasComponent<RigidBodyComponent>())
+		{
+			dstEntity.GetComponent<RigidBodyComponent>().Handle = kInvalidPhysicsBody;
+		}
+
+		if (srcEntity.HasComponent<HierarchyComponent>())
+		{
+			auto srcHC = srcEntity.GetComponent<HierarchyComponent>();
+
+			entt::entity targetParent = parentEntity;
+			if (targetParent == entt::null && srcHC.Parent != entt::null)
+			{
+				targetParent = srcHC.Parent;
+			}
+
+			if (targetParent != entt::null)
+			{
+				auto& dstHC = dstEntity.AddOrReplaceComponent<HierarchyComponent>();
+				dstHC.Parent = targetParent;
+				dstHC.Children.clear();
+
+				Entity parent(targetParent, m_Registry.get());
+				if (parent.HasComponent<HierarchyComponent>())
+				{
+					parent.GetComponent<HierarchyComponent>().Children.push_back(dstEntity);
+				}
+			}
+			else
+			{
+				if (dstEntity.HasComponent<HierarchyComponent>())
+				{
+					dstEntity.GetComponent<HierarchyComponent>().Parent = entt::null;
+					dstEntity.GetComponent<HierarchyComponent>().Children.clear();
+				}
+			}
+
+			for (auto child : srcHC.Children)
+			{
+				CopyEntityInternal(child, dstEntity);
+			}
+		}
+
+		return dstEntity;
+	}
+
+	Entity Scene::CreateUIEntity(WidgetType type, const std::string& name)
+	{
+		Entity entity = CreateEntity(name.empty() ? WidgetTypeName(type) : name);
+		entity.AddComponent<ControlComponent>();
+		auto& comp = entity.AddComponent<UIControlComponent>();
+		comp.Data = CreateDefaultWidgetData(type);
+		return entity;
+	}
+
+	Entity Scene::CreateEntityWithUUID(UUID uuid, const std::string& name)
+	{
+		Entity entity(m_Registry->create(), m_Registry.get());
+		entity.AddComponent<IDComponent>(uuid);
+		entity.AddComponent<TagComponent>(name.empty() ? "Entity" : name);
+		entity.AddComponent<TransformComponent>();
+		m_RootsDirty = true;
+		return entity;
+	}
+
+	Entity Scene::CreateEntity(const std::string& name)
+	{
+		Entity entity(m_Registry->create(), m_Registry.get());
+		entity.AddComponent<IDComponent>();
+		entity.AddComponent<TagComponent>(name.empty() ? "Entity" : name);
+		entity.AddComponent<TransformComponent>();
+		m_RootsDirty = true;
+		return entity;
+	}
+
+	Entity Scene::FindEntityByTag(const std::string& tag)
+	{
+		auto view = m_Registry->view<TagComponent>();
+		for (auto entity : view)
+		{
+			const auto& tagComp = view.get<TagComponent>(entity);
+			if (tagComp.Tag == tag)
+			{
+				return {entity, m_Registry.get()};
+			}
+		}
+		return {};
+	}
+
+	Entity Scene::GetEntityByUUID(UUID uuid)
+	{
+		auto* mapStruct = m_Registry->ctx().find<EntityUUIDMap>();
+		if (mapStruct && mapStruct->Map.find(uuid) != mapStruct->Map.end())
+		{
+			return {mapStruct->Map.at(uuid), m_Registry.get()};
+		}
+		return {};
+	}
+
+	void Scene::TransitionToState(SceneState newState)
+	{
+		if (m_State == newState)
+		{
+			return;
+		}
+
+		OnStateExit(m_State);
+		SceneState oldState = m_State;
+		m_State = newState;
+		OnStateEnter(m_State);
+
+		CH_CORE_TRACE("Scene: Transitioned state from {} to {}", (int)oldState, (int)newState);
+	}
+
+	void Scene::OnStateEnter(SceneState state)
+	{
+		switch (state)
+		{
+		case SceneState::Play:
+		case SceneState::Simulate:
+			OnRuntimeStart();
+			break;
+		case SceneState::Edit:
+			break;
+		}
+	}
+
+	void Scene::OnStateExit(SceneState state)
+	{
+		switch (state)
+		{
+		case SceneState::Play:
+		case SceneState::Simulate:
+			OnRuntimeStop();
+			break;
+		case SceneState::Edit:
+			break;
+		}
+	}
+
+	void Scene::OnUpdate(Timestep timestep)
+	{
+		switch (m_State)
+		{
+		case SceneState::Edit:
+			OnUpdateEditor(timestep);
+			break;
+		case SceneState::Play:
+			OnUpdateRuntime(timestep);
+			break;
+		case SceneState::Simulate:
+			OnUpdateSimulation(timestep);
+			break;
+		}
+	}
+
+	std::future<std::shared_ptr<Scene>> Scene::LoadSceneAsync(const std::string& path)
+	{
+		// Запускаємо завантаження у фоновому потоці.
+		// Всерединьі потоці просто створюємо нову сцену та десиріалізуємо префалб у неї.
+		auto task = std::make_shared<std::packaged_task<std::shared_ptr<Scene>()>>([path]() -> std::shared_ptr<Scene> {
+			auto newScene = std::make_shared<Scene>();
+
+			// Десиріалізуємо префалб у нову сцену (синхронно всередині потоку)
+			if (PrefabSerializer::Deserialize(newScene.get(), path) != Entity{})
+			{
+				return newScene;
+			}
+
+			// Якщо префалб не валідний — повертаємо порожню сцену
+			return nullptr;
+		});
+
+		// Виконуємо задачу в окремому потоці та повертаємо future
+		std::thread t([task]() { (*task)(); });
+		t.detach();
+
+		return task->get_future();
+	}
+
+	void Scene::SwapScene(std::shared_ptr<Scene> newScene)
+	{
+		if (!newScene)
+		{
+			CH_CORE_ERROR("Scene::SwapScene: newScene is null");
+			return;
+		}
+
+		// Swap ownership explicitly instead of stealing fields from another scene object.
+		// This keeps lifecycle ownership clear and avoids leaving a partially-moved scene behind.
+		std::swap(m_Registry, newScene->m_Registry);
+		std::swap(m_ScriptingManager, newScene->m_ScriptingManager);
+		std::swap(m_Settings, newScene->m_Settings);
+		std::swap(m_State, newScene->m_State);
+		std::swap(m_PendingScenePath, newScene->m_PendingScenePath);
+		std::swap(m_IsStartingUp, newScene->m_IsStartingUp);
+		std::swap(m_PhysicsStartupInitialized, newScene->m_PhysicsStartupInitialized);
+		std::swap(m_CachedRoots, newScene->m_CachedRoots);
+		std::swap(m_RootsDirty, newScene->m_RootsDirty);
+
+		CH_CORE_INFO("Scene: Swapped to '{}'", m_Settings.Name);
+	}
+
+} // namespace Chained
diff --git a/engine/scene/scene.h b/engine/scene/scene.h
index d2e3e77bd..a00efd8b3 100644
--- a/engine/scene/scene.h
+++ b/engine/scene/scene.h
@@ -1,96 +1,224 @@
 #ifndef CH_SCENE_H
 #define CH_SCENE_H
 
-#include "components.h"
-#include "engine/core/base.h"
-#include "engine/core/ch_assert.h"
-#include "engine/core/events.h"
-#include "engine/core/timestep.h"
-#include "engine/graphics/api/camera_types.h"
-#include "engine/scene/entity.h"
-#include "engine/scene/scene_settings.h"
-#include "entt/entt.hpp"
+#include <entt/entt.hpp>
 #include <memory>
-#include <optional>
 #include <string>
-#include <unordered_map>
 #include <vector>
+#include <future>
+
+#include "engine/core/events/events.h"
+#include "engine/common/base.h"
+#include "engine/common/timestep.h"
+#include "engine/scene/entity.h"
+#include "engine/scene/scene_settings.h"
+#include "engine/scene/scene_state.h"
 
-namespace CHEngine
+namespace Chained
 {
-// Owns the scene registry, scene settings, and the runtime/editor update bridge.
-class Scene
+	enum WidgetType : int;
+}
+
+namespace Chained
 {
-public:
-    Scene();
-    ~Scene();
-
-public:
-    // Creates a new scene with default entities (e.g. Main Camera).
-    static std::shared_ptr<Scene> CreateDefault();
-    // Creates a deep copy of another scene.
-    static std::shared_ptr<Scene> Copy(std::shared_ptr<Scene> other);
-
-public:
-    Entity CreateEntity(const std::string& name = std::string());
-    Entity CreateEntityWithUUID(UUID uuid, const std::string& name = std::string());
-    Entity CreateUIEntity(const std::string& type, const std::string& name = std::string());
-
-public:
-    Entity CopyEntity(entt::entity copyEntity);
-    void DestroyEntity(Entity entity);
-    Entity FindEntityByTag(const std::string& tag);
-    Entity GetEntityByUUID(UUID uuid);
-
-public: // Life Cycle & Simulation
-    void OnRuntimeStart();
-    void OnRuntimeStop();
-    void OnUpdateRuntime(Timestep timestep);
-    void OnUpdateEditor(Timestep timestep);
-    void OnViewportResize(uint32_t width, uint32_t height);
-
-public:
-    bool IsSimulationRunning() const;
-
-public:
-    SceneSettings& GetSettings();
-    const SceneSettings& GetSettings() const;
-
-public: // Systems & Tools
-    entt::registry& GetRegistry();
-    const entt::registry& GetRegistry() const;
-    std::shared_ptr<entt::registry> GetRegistryPtr();
-
-public:
-    std::optional<Camera3D> GetActiveCamera();
-    Entity GetPrimaryCameraEntity();
-
-private:
-    Camera3D GetCameraFromEntity(entt::entity entityHandle);
-
-private:
-    std::shared_ptr<entt::registry> m_Registry;
-    SceneSettings m_Settings;
-    bool m_IsSimulationRunning = false;
-
-private:
-    void OnIDConstruct(entt::registry& registry, entt::entity entity);
-    void OnIDDestroy(entt::registry& registry, entt::entity entity);
-    // Hierarchy handlers.
-    void OnHierarchyDestroy(entt::registry& registry, entt::entity entity);
-
-private: // Update Logic
-    void UpdatePhysics(Timestep deltaTime);
-    void UpdateAnimations(Timestep deltaTime);
-    void UpdateAudio(Timestep deltaTime);
-    void UpdateHierarchy();
-
-private:
-    Entity CopyEntityInternal(entt::entity copyEntity, entt::entity parentEntity = entt::null);
-
-    friend class Entity;
-};
-
-} // namespace CHEngine
+	class SceneScriptingManager;
+	class Event;
+
+	class CH_API Scene
+	{
+	public:
+		Scene();
+		~Scene();
+
+	public:
+		static std::shared_ptr<Scene> CreateDefault();
+		static std::shared_ptr<Scene> Copy(std::shared_ptr<Scene> other);
+
+		virtual void OnEvent(Event& e);
+		virtual void OnRenderUI();
+
+	public: // Scene State Management
+		void TransitionToState(SceneState newState);
+		SceneState GetSceneState() const
+		{
+			return m_State;
+		}
+
+		void OnUpdate(Timestep timestep);
+		void OnViewportResize(uint32_t width, uint32_t height);
+
+	public: // Entity Management
+		Entity CreateEntity(const std::string& name = std::string());
+		Entity CreateEntityWithUUID(UUID uuid, const std::string& name = std::string());
+		Entity CreateUIEntity(WidgetType type, const std::string& name = std::string());
+
+	public:
+		entt::entity CopyEntity(entt::entity copyEntity);
+		void DestroyEntity(Entity entity);
+		Entity FindEntityByTag(const std::string& tag);
+		Entity GetEntityByUUID(UUID uuid);
+
+	public:
+		SceneSettings& GetSettings();
+		const SceneSettings& GetSettings() const;
+		bool IsSimulationRunning() const;
+		const std::vector<entt::entity>& GetRootEntities() const;
+		bool IsStartingUp() const
+		{
+			return m_IsStartingUp;
+		}
+
+		// Validation setters — prefer these over direct GetSettings() mutation
+		void SetSceneName(const std::string& name)
+		{
+			m_Settings.Name = name;
+		}
+		void SetScenePath(const std::string& path)
+		{
+			m_Settings.ScenePath = path;
+		}
+		void SetEnvironment(std::shared_ptr<EnvironmentAsset> env)
+		{
+			m_Settings.Environment = std::move(env);
+		}
+		void SetBackgroundMode(BackgroundMode mode)
+		{
+			m_Settings.Mode = mode;
+		}
+		void SetBackgroundColor(const Color& color)
+		{
+			m_Settings.BackgroundColor = color;
+		}
+		void SetDebugFlags(const DebugRenderFlags& flags)
+		{
+			m_Settings.DebugFlags = flags;
+		}
+		void SetDiagnosticMode(float mode)
+		{
+			m_Settings.DiagnosticMode = std::clamp(mode, 0.0f, 2.0f);
+		}
+		void SetGridSlices(int slices)
+		{
+			m_Settings.Grid.Slices = std::max(1, slices);
+		}
+		void SetGridSpacing(float spacing)
+		{
+			m_Settings.Grid.Spacing = std::max(0.01f, spacing);
+		}
+
+	public: // Systems & Tools
+		/// Returns the underlying EnTT registry for direct access.
+		/// @deprecated Prefer typed methods below or the Entity API for component access.
+		entt::registry& GetRegistry();
+		const entt::registry& GetRegistry() const;
+		entt::registry* GetRegistryPtr();
+
+		// Registry Facade — prefer these over raw GetRegistry() access
+		Entity GetEntity(entt::entity handle);
+		const Entity GetEntity(entt::entity handle) const;
+
+		template <typename... Components> auto View()
+		{
+			return m_Registry->view<Components...>();
+		}
+
+		template <typename... Components> auto View() const
+		{
+			return m_Registry->view<Components...>();
+		}
+
+		bool IsValid(entt::entity handle) const
+		{
+			return m_Registry && m_Registry->valid(handle);
+		}
+
+		template <typename T> T& GetContext()
+		{
+			return m_Registry->ctx().get<T>();
+		}
+
+		template <typename T> const T& GetContext() const
+		{
+			return m_Registry->ctx().get<T>();
+		}
+
+		template <typename T> T* TryGetContext()
+		{
+			return m_Registry->ctx().find<T>();
+		}
+
+		template <typename T> const T* TryGetContext() const
+		{
+			return m_Registry->ctx().find<T>();
+		}
+
+		void OnRuntimeStop();
+		void OnRuntimeStart();
+		void OnUpdateSimulation(Timestep timestep);
+		void OnUpdateEditor(Timestep timestep);
+		void OnUpdateRuntime(Timestep timestep);
+
+		// Async scene loading
+		std::future<std::shared_ptr<Scene>> LoadSceneAsync(const std::string& path);
+		void SwapScene(std::shared_ptr<Scene> newScene);
+
+		// EnTT Dispatcher for Zero-Allocation Publish/Subscribe
+		entt::dispatcher& GetDispatcher()
+		{
+			return m_Dispatcher;
+		}
+		const entt::dispatcher& GetDispatcher() const
+		{
+			return m_Dispatcher;
+		}
+
+		// Pending scene change (from SceneTransitionSystem)
+		const std::string& GetPendingScenePath() const
+		{
+			return m_PendingScenePath;
+		}
+		void ClearPendingScenePath()
+		{
+			m_PendingScenePath.clear();
+		}
+		void SetPendingScenePath(const std::string& path)
+		{
+			m_PendingScenePath = path;
+		}
+
+	private:
+		void InitializePhysicsStartup();
+		void RebuildRootCache() const;
+
+	private:
+		void OnStateEnter(SceneState state);
+		void OnStateExit(SceneState state);
+		void FinishRuntimeStart();
+
+	private:
+		SceneState m_State = SceneState::Edit;
+
+		std::unique_ptr<entt::registry> m_Registry;
+		entt::dispatcher m_Dispatcher;
+		SceneSettings m_Settings;
+
+		std::unique_ptr<SceneScriptingManager> m_ScriptingManager;
+		std::string m_PendingScenePath;
+
+		bool m_IsStartingUp = false;
+		bool m_PhysicsStartupInitialized = false;
+
+		mutable std::vector<entt::entity> m_CachedRoots;
+		mutable bool m_RootsDirty = true;
+
+	private:
+		void OnIDConstruct(entt::registry& registry, entt::entity entity);
+		void OnIDDestroy(entt::registry& registry, entt::entity entity);
+		void OnHierarchyConstruct();
+		void OnHierarchyDestroy(entt::registry& registry, entt::entity entity);
+		Entity CopyEntityInternal(entt::entity copyEntity, entt::entity parentEntity = entt::null);
+	};
+
+} // namespace Chained
 
 #endif // CH_SCENE_H
diff --git a/engine/scene/scene_camera.cpp b/engine/scene/scene_camera.cpp
deleted file mode 100644
index 54f3c8641..000000000
--- a/engine/scene/scene_camera.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "scene_camera.h"
-#include <glm/gtc/matrix_transform.hpp>
-#include <algorithm>
-
-namespace CHEngine
-{
-
-SceneCamera::SceneCamera()
-{
-    RecalculateProjection();
-}
-
-void SceneCamera::SetPerspective(float verticalFov, float nearClip, float farClip)
-{
-    m_ProjectionType = ProjectionType::Perspective;
-    m_PerspectiveFOV = verticalFov;
-    m_PerspectiveNear = nearClip;
-    m_PerspectiveFar = farClip;
-    RecalculateProjection();
-}
-
-void SceneCamera::SetOrthographic(float size, float nearClip, float farClip)
-{
-    m_ProjectionType = ProjectionType::Orthographic;
-    m_OrthographicSize = size;
-    m_OrthographicNear = nearClip;
-    m_OrthographicFar = farClip;
-    RecalculateProjection();
-}
-
-void SceneCamera::SetViewportSize(uint32_t width, uint32_t height)
-{
-    m_AspectRatio = (float)width / (float)height;
-    RecalculateProjection();
-}
-
-void SceneCamera::RecalculateProjection()
-{
-    if (m_ProjectionType == ProjectionType::Perspective)
-    {
-        m_Projection = glm::perspective(m_PerspectiveFOV, m_AspectRatio, m_PerspectiveNear, m_PerspectiveFar);
-    }
-    else
-    {
-        float orthoLeft = -m_OrthographicSize * m_AspectRatio * 0.5f;
-        float orthoRight = m_OrthographicSize * m_AspectRatio * 0.5f;
-        float orthoBottom = -m_OrthographicSize * 0.5f;
-        float orthoTop = m_OrthographicSize * 0.5f;
-
-        m_Projection = glm::ortho(orthoLeft, orthoRight, orthoBottom, orthoTop, m_OrthographicNear, m_OrthographicFar);
-    }
-}
-
-} // namespace CHEngine
diff --git a/engine/scene/scene_camera.h b/engine/scene/scene_camera.h
deleted file mode 100644
index f3dbc37c6..000000000
--- a/engine/scene/scene_camera.h
+++ /dev/null
@@ -1,173 +0,0 @@
-#ifndef CH_SCENE_CAMERA_H
-#define CH_SCENE_CAMERA_H
-
-#include <glm/glm.hpp>
-#include <cstdint>
-#include "engine/core/reflection.h"
-
-namespace CHEngine
-{
-
-enum class ProjectionType
-{
-    Perspective = 0,
-    Orthographic = 1
-};
-
-class SceneCamera
-{
-public:
-    SceneCamera();
-    virtual ~SceneCamera() = default;
-
-    // Sets a perspective projection using vertical field of view and clip planes.
-    void SetPerspective(float verticalFov, float nearClip, float farClip);
-    // Sets an orthographic projection using size and clip planes.
-    void SetOrthographic(float size, float nearClip, float farClip);
-
-    // Updates the cached projection when the viewport size changes.
-    void SetViewportSize(uint32_t width, uint32_t height);
-
-    // Returns the current perspective vertical field of view in radians.
-    float GetPerspectiveVerticalFOV() const
-    {
-        return m_PerspectiveFOV;
-    }
-    // Updates the perspective vertical field of view in radians.
-    void SetPerspectiveVerticalFOV(float fov)
-    {
-        m_PerspectiveFOV = fov;
-        RecalculateProjection();
-    }
-    // Returns the near clip plane used for perspective projection.
-    float GetPerspectiveNearClip() const
-    {
-        return m_PerspectiveNear;
-    }
-    // Updates the near clip plane used for perspective projection.
-    void SetPerspectiveNearClip(float nearClip)
-    {
-        m_PerspectiveNear = nearClip;
-        RecalculateProjection();
-    }
-    // Returns the far clip plane used for perspective projection.
-    float GetPerspectiveFarClip() const
-    {
-        return m_PerspectiveFar;
-    }
-    // Updates the far clip plane used for perspective projection.
-    void SetPerspectiveFarClip(float farClip)
-    {
-        m_PerspectiveFar = farClip;
-        RecalculateProjection();
-    }
-
-    // Returns the orthographic projection size.
-    float GetOrthographicSize() const
-    {
-        return m_OrthographicSize;
-    }
-    // Updates the orthographic projection size.
-    void SetOrthographicSize(float size)
-    {
-        m_OrthographicSize = size;
-        RecalculateProjection();
-    }
-    // Returns the near clip plane used for orthographic projection.
-    float GetOrthographicNearClip() const
-    {
-        return m_OrthographicNear;
-    }
-    // Updates the near clip plane used for orthographic projection.
-    void SetOrthographicNearClip(float nearClip)
-    {
-        m_OrthographicNear = nearClip;
-        RecalculateProjection();
-    }
-    // Returns the far clip plane used for orthographic projection.
-    float GetOrthographicFarClip() const
-    {
-        return m_OrthographicFar;
-    }
-    // Updates the far clip plane used for orthographic projection.
-    void SetOrthographicFarClip(float farClip)
-    {
-        m_OrthographicFar = farClip;
-        RecalculateProjection();
-    }
-
-    // Returns the active projection type.
-    ProjectionType GetProjectionType() const
-    {
-        return m_ProjectionType;
-    }
-    // Switches between perspective and orthographic projection modes.
-    void SetProjectionType(ProjectionType type)
-    {
-        m_ProjectionType = type;
-        RecalculateProjection();
-    }
-
-    // Returns the cached projection matrix.
-    const glm::mat4& GetProjection() const
-    {
-        return m_Projection;
-    }
-
-    CH_REFLECT_BEGIN(SceneCamera)
-        ProjectionType type = GetProjectionType();
-        static const char* projTypes[] = { "Perspective", "Orthographic" };
-        if (props.Enum("Projection", type, projTypes, 2) || props.GetMode() == ReflectionMode::Deserialize)
-            SetProjectionType(type);
-
-        if (type == ProjectionType::Perspective)
-        {
-            float fov = glm::degrees(m_PerspectiveFOV);
-            if (props.Property("VerticalFOV", fov) || props.GetMode() == ReflectionMode::Deserialize)
-                SetPerspectiveVerticalFOV(glm::radians(fov));
-            
-            float nearClipValue = m_PerspectiveNear;
-            if (props.Property("Near", nearClipValue) || props.GetMode() == ReflectionMode::Deserialize)
-                SetPerspectiveNearClip(nearClipValue);
-            
-            float farClipValue = m_PerspectiveFar;
-            if (props.Property("Far", farClipValue) || props.GetMode() == ReflectionMode::Deserialize)
-                SetPerspectiveFarClip(farClipValue);
-        }
-        else
-        {
-            float size = m_OrthographicSize;
-            if (props.Property("Size", size) || props.GetMode() == ReflectionMode::Deserialize)
-                SetOrthographicSize(size);
-            
-            float nearClipValue = m_OrthographicNear;
-            if (props.Property("Near", nearClipValue) || props.GetMode() == ReflectionMode::Deserialize)
-                SetOrthographicNearClip(nearClipValue);
-            
-            float farClipValue = m_OrthographicFar;
-            if (props.Property("Far", farClipValue) || props.GetMode() == ReflectionMode::Deserialize)
-                SetOrthographicFarClip(farClipValue);
-        }
-    CH_REFLECT_END()
-
-private:
-    void RecalculateProjection();
-
-private:
-    ProjectionType m_ProjectionType = ProjectionType::Perspective;
-
-    float m_PerspectiveFOV = glm::radians(60.0f);
-    float m_PerspectiveNear = 0.01f;
-    float m_PerspectiveFar = 100000.0f;
-
-    float m_OrthographicSize = 10.0f;
-    float m_OrthographicNear = -1.0f;
-    float m_OrthographicFar = 1.0f;
-
-    float m_AspectRatio = 0.0f;
-    glm::mat4 m_Projection = glm::mat4(1.0f);
-};
-
-} // namespace CHEngine
-
-#endif // CH_SCENE_CAMERA_H
diff --git a/engine/scene/scene_events.h b/engine/scene/scene_events.h
index 9604bedb7..bac5c1aab 100644
--- a/engine/scene/scene_events.h
+++ b/engine/scene/scene_events.h
@@ -1,150 +1,178 @@
 #ifndef CH_SCENE_EVENTS_H
 #define CH_SCENE_EVENTS_H
 
-#include "engine/core/events.h"
+#include "engine/core/events/events.h"
 #include "entt/entt.hpp"
 #include <string>
 
-namespace CHEngine
+namespace Chained
 {
 
-// Project Events
-class ProjectCreatedEvent : public Event
-{
-public:
-    ProjectCreatedEvent(const std::string& name, const std::string& path)
-        : m_Name(name),
-          m_Path(path)
-    {
-    }
-
-    const std::string& GetProjectName() const
-    {
-        return m_Name;
-    }
-    const std::string& GetPath() const
-    {
-        return m_Path;
-    }
-
-    EVENT_CLASS_TYPE(ProjectCreated)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-
-private:
-    std::string m_Name;
-    std::string m_Path;
-};
-
-class ProjectOpenedEvent : public Event
-{
-public:
-    ProjectOpenedEvent(const std::string& path)
-        : m_Path(path)
-    {
-    }
-
-    const std::string& GetPath() const
-    {
-        return m_Path;
-    }
-
-    EVENT_CLASS_TYPE(ProjectOpened)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-
-private:
-    std::string m_Path;
-};
-
-class SceneOpenedEvent : public Event
-{
-public:
-    SceneOpenedEvent(const std::string& path)
-        : m_Path(path)
-    {
-    }
-
-    const std::string& GetPath() const
-    {
-        return m_Path;
-    }
-
-    EVENT_CLASS_TYPE(SceneOpened)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-
-private:
-    std::string m_Path;
-};
-
-// Selection Events
-class EntitySelectedEvent : public Event
-{
-public:
-    EntitySelectedEvent(entt::entity entity, class Scene* scene, int meshIndex = -1)
-        : m_Entity(entity),
-          m_Scene(scene),
-          m_MeshIndex(meshIndex)
-    {
-    }
-
-    entt::entity GetEntity() const
-    {
-        return m_Entity;
-    }
-    class Scene* GetScene() const
-    {
-        return m_Scene;
-    }
-    int GetMeshIndex() const
-    {
-        return m_MeshIndex;
-    }
-
-    EVENT_CLASS_TYPE(EntitySelected)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-
-private:
-    entt::entity m_Entity;
-    class Scene* m_Scene;
-    int m_MeshIndex = -1;
-};
-
-class ScenePlayEvent : public Event
-{
-public:
-    ScenePlayEvent() = default;
-    EVENT_CLASS_TYPE(ScenePlay)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-
-class SceneStopEvent : public Event
-{
-public:
-    SceneStopEvent() = default;
-    EVENT_CLASS_TYPE(SceneStop)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-};
-
-class SceneChangeRequestEvent : public Event
-{
-public:
-    SceneChangeRequestEvent(const std::string& path)
-        : m_Path(path)
-    {
-    }
-
-    const std::string& GetPath() const
-    {
-        return m_Path;
-    }
-
-    EVENT_CLASS_TYPE(SceneChangeRequest)
-    EVENT_CLASS_CATEGORY(EventCategoryApplication)
-
-private:
-    std::string m_Path;
-};
-
-} // namespace CHEngine
+	// Project Events
+	class ProjectCreatedEvent : public Event
+	{
+	public:
+		ProjectCreatedEvent(const std::string& name, const std::string& path)
+			: m_Name(name),
+			  m_Path(path)
+		{
+		}
+
+		const std::string& GetProjectName() const
+		{
+			return m_Name;
+		}
+		const std::string& GetPath() const
+		{
+			return m_Path;
+		}
+
+		EVENT_CLASS_TYPE(ProjectCreated)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+
+	private:
+		std::string m_Name;
+		std::string m_Path;
+	};
+
+	class ProjectOpenedEvent : public Event
+	{
+	public:
+		ProjectOpenedEvent(const std::string& path)
+			: m_Path(path)
+		{
+		}
+
+		const std::string& GetPath() const
+		{
+			return m_Path;
+		}
+
+		EVENT_CLASS_TYPE(ProjectOpened)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+
+	private:
+		std::string m_Path;
+	};
+
+	class SceneOpenedEvent : public Event
+	{
+	public:
+		SceneOpenedEvent(const std::string& path)
+			: m_Path(path)
+		{
+		}
+
+		const std::string& GetPath() const
+		{
+			return m_Path;
+		}
+
+		EVENT_CLASS_TYPE(SceneOpened)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+
+	private:
+		std::string m_Path;
+	};
+
+	// Selection Events
+	class EntitySelectedEvent : public Event
+	{
+	public:
+		EntitySelectedEvent(entt::entity entity, class Scene* scene, int meshIndex = -1)
+			: m_Entity(entity),
+			  m_Scene(scene),
+			  m_MeshIndex(meshIndex)
+		{
+		}
+
+		entt::entity GetEntity() const
+		{
+			return m_Entity;
+		}
+		class Scene* GetScene() const
+		{
+			return m_Scene;
+		}
+		int GetMeshIndex() const
+		{
+			return m_MeshIndex;
+		}
+
+		EVENT_CLASS_TYPE(EntitySelected)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+
+	private:
+		entt::entity m_Entity;
+		class Scene* m_Scene;
+		int m_MeshIndex = -1;
+	};
+
+	class ScenePlayEvent : public Event
+	{
+	public:
+		ScenePlayEvent() = default;
+		EVENT_CLASS_TYPE(ScenePlay)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	};
+
+	class SceneSimulateEvent : public Event
+	{
+	public:
+		SceneSimulateEvent() = default;
+		EVENT_CLASS_TYPE(SceneSimulate)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	};
+
+	class SceneStopEvent : public Event
+	{
+	public:
+		SceneStopEvent() = default;
+		EVENT_CLASS_TYPE(SceneStop)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+	};
+
+	class SceneChangeRequestEvent : public Event
+	{
+	public:
+		SceneChangeRequestEvent(const std::string& path)
+			: m_Path(path)
+		{
+		}
+
+		const std::string& GetPath() const
+		{
+			return m_Path;
+		}
+
+		EVENT_CLASS_TYPE(SceneChangeRequest)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication)
+
+	private:
+		std::string m_Path;
+	};
+
+	class SceneModifiedEvent : public Event
+	{
+	public:
+		SceneModifiedEvent() = default;
+		EVENT_CLASS_TYPE(SceneModified)
+		EVENT_CLASS_CATEGORY(EventCategoryApplication | EventCategoryScene)
+	};
+
+	// ── EnTT Dispatcher Event Structs (Zero-allocation / Modern C++) ───
+	struct SceneModifiedData
+	{
+		class Scene* scene = nullptr;
+	};
+
+	struct EntitySelectedData
+	{
+		entt::entity entity = entt::null;
+		class Scene* scene = nullptr;
+		int meshIndex = -1;
+	};
+
+} // namespace Chained
 
 #endif // CH_SCENE_EVENTS_H
diff --git a/engine/scene/scene_picking.cpp b/engine/scene/scene_picking.cpp
deleted file mode 100644
index 957d0a73c..000000000
--- a/engine/scene/scene_picking.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "scene_picking.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/physics/bvh/bvh.h"
-#include "engine/physics/physics.h"
-#include "engine/scene/components.h"
-#include "engine/scene/scene.h"
-#include <float.h>
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
-namespace CHEngine
-{
-
-SceneRaycastResult ScenePicker::Raycast(Scene* scene, const Ray& ray)
-{
-    SceneRaycastResult finalResult;
-    finalResult.Hit = false;
-    finalResult.Distance = FLT_MAX;
-
-    if (!scene)
-    {
-        return finalResult;
-    }
-
-    // 1. Physics Picking
-    RaycastResult physicsResult = Physics::Raycast(scene, ray);
-    if (physicsResult.Hit)
-    {
-        finalResult.Hit = true;
-        finalResult.Distance = physicsResult.Distance;
-        finalResult.HitEntity = Entity(physicsResult.Entity, &scene->GetRegistry());
-        finalResult.Position = physicsResult.Position;
-        finalResult.Normal = physicsResult.Normal;
-    }
-
-    // 2. Visual Picking Fallback
-    auto modelView = scene->GetRegistry().view<TransformComponent, ModelComponent>();
-    modelView.each([&](auto entityID, auto& tc, auto& modelComp)
-    {
-        if (finalResult.Hit && (entt::entity)finalResult.HitEntity == entityID)
-        {
-            return;
-        }
-
-        if (modelComp.ModelPath.empty())
-        {
-            return;
-        }
-
-        auto modelAsset = AssetManager::Get().Get<ModelAsset>(modelComp.ModelPath);
-        if (!modelAsset || !modelAsset->IsReady())
-        {
-            return;
-        }
-
-        glm::mat4 modelTransform = tc.GetTransform();
-        glm::mat4 invTransform = glm::inverse(modelTransform);
-
-        // Transform ray to local space
-        Ray localRay;
-        localRay.position = glm::vec3(invTransform * glm::vec4(ray.position, 1.0f));
-        glm::vec3 localTarget = glm::vec3(invTransform * glm::vec4(ray.position + ray.direction, 1.0f));
-        localRay.direction = glm::normalize(localTarget - localRay.position);
-
-        float t_local = FLT_MAX;
-        glm::vec3 localNormal = {0, 0, 0};
-        int localMeshIndex = -1;
-
-        bool hit = false;
-        auto bvh = Physics::GetBVH(modelComp.ModelPath);
-
-        if (bvh)
-        {
-            hit = bvh->Raycast(localRay, t_local, localNormal, localMeshIndex);
-        }
-        else
-        {
-            const auto& rawMeshes = modelAsset->GetRawMeshes();
-            for (const auto& raw : rawMeshes)
-            {
-                if (raw.indices.size() < 3)
-                {
-                    continue;
-                }
-
-                for (size_t i = 0; i + 2 < raw.indices.size(); i += 3)
-                {
-                    uint32_t i0 = raw.indices[i];
-                    uint32_t i1 = raw.indices[i + 1];
-                    uint32_t i2 = raw.indices[i + 2];
-
-                    size_t v0Idx = (size_t)i0 * 3;
-                    size_t v1Idx = (size_t)i1 * 3;
-                    size_t v2Idx = (size_t)i2 * 3;
-                    if (v0Idx + 2 >= raw.vertices.size() || v1Idx + 2 >= raw.vertices.size() || v2Idx + 2 >= raw.vertices.size())
-                    {
-                        continue;
-                    }
-
-                    glm::vec3 v0 = {raw.vertices[v0Idx], raw.vertices[v0Idx + 1], raw.vertices[v0Idx + 2]};
-                    glm::vec3 v1 = {raw.vertices[v1Idx], raw.vertices[v1Idx + 1], raw.vertices[v1Idx + 2]};
-                    glm::vec3 v2 = {raw.vertices[v2Idx], raw.vertices[v2Idx + 1], raw.vertices[v2Idx + 2]};
-
-                    CollisionTriangle tri(v0, v1, v2, 0);
-                    float triT = FLT_MAX;
-                    glm::vec3 triNormal;
-                    if (tri.IntersectsRay(localRay, triT, triNormal) && triT < t_local)
-                    {
-                        t_local = triT;
-                        hit = true;
-                        localNormal = triNormal;
-                    }
-                }
-            }
-        }
-
-        if (hit)
-        {
-            glm::vec3 hitPosLocal = localRay.position + localRay.direction * t_local;
-            glm::vec3 hitPosWorld = glm::vec3(modelTransform * glm::vec4(hitPosLocal, 1.0f));
-            float distWorld = glm::distance(ray.position, hitPosWorld);
-
-            if (distWorld < finalResult.Distance)
-            {
-                finalResult.Distance = distWorld;
-                finalResult.Hit = true;
-                finalResult.HitEntity = Entity(entityID, &scene->GetRegistry());
-                finalResult.Position = hitPosWorld;
-                finalResult.Normal =
-                    glm::normalize(glm::vec3(glm::transpose(invTransform) * glm::vec4(localNormal, 0.0f)));
-            }
-        }
-        });
-
-    return finalResult;
-}
-
-Ray ScenePicker::CreateRayFromViewport(const CHEngine::Camera3D& camera, const glm::vec2& mousePosition,
-                                       const glm::vec2& viewportSize)
-{
-    float ndc_x = (2.0f * mousePosition.x) / viewportSize.x - 1.0f;
-    float ndc_y = 1.0f - (2.0f * mousePosition.y) / viewportSize.y;
-
-    glm::mat4 projection;
-    if (camera.Projection == 0) // Perspective
-    {
-        projection = glm::perspective(glm::radians(camera.Fovy), viewportSize.x / viewportSize.y, 0.01f, 1000.0f);
-    }
-    else
-    {
-        float aspect = viewportSize.x / viewportSize.y;
-        float h = camera.Fovy * 0.5f;
-        float w = h * aspect;
-        projection = glm::ortho(-w, w, -h, h, 0.01f, 1000.0f);
-    }
-
-    glm::mat4 view = glm::lookAt(camera.Position, camera.Target, camera.Up);
-    glm::mat4 invVP = glm::inverse(projection * view);
-
-    auto Unproject = [&](float x, float y, float z) -> glm::vec3 {
-        glm::vec4 ndc(x, y, z, 1.0f);
-        glm::vec4 world = invVP * ndc;
-        if (std::abs(world.w) > 1e-6f)
-        {
-            return glm::vec3(world) / world.w;
-        }
-        return glm::vec3(0.0f);
-    };
-
-    glm::vec3 nearPoint = Unproject(ndc_x, ndc_y, -1.0f);
-    glm::vec3 farPoint = Unproject(ndc_x, ndc_y, 1.0f);
-
-    Ray ray;
-    ray.position = nearPoint;
-    ray.direction = glm::normalize(farPoint - nearPoint);
-
-    return ray;
-}
-
-} // namespace CHEngine
diff --git a/engine/scene/scene_picking.h b/engine/scene/scene_picking.h
deleted file mode 100644
index 94bf03bc1..000000000
--- a/engine/scene/scene_picking.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef CH_SCENE_PICKING_H
-#define CH_SCENE_PICKING_H
-
-#include "engine/scene/entity.h"
-#include "engine/graphics/api/camera_types.h"
-#include "engine/core/ch_math.h"
-
-namespace CHEngine
-{
-class Scene;
-
-struct SceneRaycastResult
-{
-    Entity HitEntity;
-    float Distance = 0.0f;
-    glm::vec3 Position = {0.0f, 0.0f, 0.0f};
-    glm::vec3 Normal = {0.0f, 0.0f, 0.0f};
-    bool Hit = false;
-};
-
-class ScenePicker
-{
-public:
-    static SceneRaycastResult Raycast(Scene* scene, const Ray& ray);
-
-    // Creates a ray from viewport coordinates
-    static Ray CreateRayFromViewport(const CHEngine::Camera3D& camera, const glm::vec2& mousePosition, const glm::vec2& viewportSize);
-};
-
-} // namespace CHEngine
-
-#endif // CH_SCENE_PICKING_H
diff --git a/engine/scene/scene_serializer.cpp b/engine/scene/scene_serializer.cpp
index 0041a788c..618b1bb95 100644
--- a/engine/scene/scene_serializer.cpp
+++ b/engine/scene/scene_serializer.cpp
@@ -1,485 +1,523 @@
 #include "scene_serializer.h"
 #include "component_serializer.h"
-#include "hierarchy_serializer.h"
-#include "components.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/log.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/environment_asset.h"
+#include "engine/core/service_locator.h"
+#include "engine/project/project.h"
+#include "engine/scene/hierarchy_serializer.h"
 #include "engine/scene/yaml.h"
-#include "engine/graphics/assets/environment.h"
-#include "engine/graphics/assets/model_asset.h"
-#include "engine/physics/bvh/bvh.h"
-#include "engine/scene/project.h"
+#include "engine/scene/components/physics/physics_component.h"
 #include "scene.h"
-#include "yaml-cpp/yaml.h"
-#include <fstream>
-#include <set>
-#include <sstream>
-
-namespace CHEngine
-{
-namespace
-{
-template <typename T>
-T ReadYamlValue(const YAML::Node& node, const char* key, const T& fallback)
-{
-    if (!node || !node[key])
-    {
-        return fallback;
-    }
-
-    return node[key].as<T>(fallback);
-}
-
-static void SerializeBackgroundSettings(YAML::Emitter& out, const SceneSettings& settings)
-{
-    out << YAML::Key << "Background" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "Mode" << YAML::Value << (int)settings.Mode;
-    out << YAML::Key << "Color" << YAML::Value << settings.BackgroundColor;
-    out << YAML::Key << "TexturePath" << YAML::Value << Project::GetRelativePath(settings.BackgroundTexturePath);
-    out << YAML::EndMap;
-}
-
-static void SerializeCanvasSettings(YAML::Emitter& out, const SceneSettings& settings)
-{
-    out << YAML::Key << "Canvas" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "ReferenceResolution" << YAML::Value << settings.Canvas.ReferenceResolution;
-    out << YAML::Key << "ScaleMode" << YAML::Value << (int)settings.Canvas.ScaleMode;
-    out << YAML::Key << "MatchWidthOrHeight" << YAML::Value << settings.Canvas.MatchWidthOrHeight;
-    out << YAML::EndMap;
-}
-
-static void SerializeEnvironmentSettings(YAML::Emitter& out, const SceneSettings& settings)
-{
-    if (!settings.Environment)
-    {
-        return;
-    }
-
-    out << YAML::Key << "EnvironmentPath" << YAML::Value << Project::GetRelativePath(settings.Environment->GetPath());
-
-    // Also serialize the current settings for quick preview/fallback.
-    const auto& envSettings = settings.Environment->GetSettings();
-
-    out << YAML::Key << "Lighting" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "Direction" << YAML::Value << envSettings.Lighting.Direction;
-    out << YAML::Key << "LightColor" << YAML::Value << envSettings.Lighting.LightColor;
-    out << YAML::Key << "Ambient" << YAML::Value << envSettings.Lighting.Ambient;
-    out << YAML::EndMap;
-
-    out << YAML::Key << "Skybox" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "TexturePath" << YAML::Value << Project::GetRelativePath(envSettings.Skybox.TexturePath);
-    out << YAML::Key << "Mode" << YAML::Value << envSettings.Skybox.Mode;
-    out << YAML::Key << "Exposure" << YAML::Value << envSettings.Skybox.Exposure;
-    out << YAML::Key << "Brightness" << YAML::Value << envSettings.Skybox.Brightness;
-    out << YAML::Key << "Contrast" << YAML::Value << envSettings.Skybox.Contrast;
-    out << YAML::EndMap;
-
-    out << YAML::Key << "Fog" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "Enabled" << YAML::Value << envSettings.Fog.Enabled;
-    out << YAML::Key << "Color" << YAML::Value << envSettings.Fog.FogColor;
-    out << YAML::Key << "Density" << YAML::Value << envSettings.Fog.Density;
-    out << YAML::Key << "Start" << YAML::Value << envSettings.Fog.Start;
-    out << YAML::Key << "End" << YAML::Value << envSettings.Fog.End;
-    out << YAML::EndMap;
-}
-
-static void SerializeDebugSettings(YAML::Emitter& out, const SceneSettings& settings)
-{
-    out << YAML::Key << "DebugSettings" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "DiagnosticMode" << YAML::Value << settings.DiagnosticMode;
-    out << YAML::Key << "DrawColliders" << YAML::Value << settings.DebugFlags.DrawColliders;
-    out << YAML::Key << "DrawHierarchy" << YAML::Value << settings.DebugFlags.DrawHierarchy;
-    out << YAML::Key << "DrawCollisionModelBox" << YAML::Value << settings.DebugFlags.DrawCollisionModelBox;
-    out << YAML::Key << "DrawGrid" << YAML::Value << settings.DebugFlags.DrawGrid;
-    out << YAML::Key << "DrawSelection" << YAML::Value << settings.DebugFlags.DrawSelection;
-    out << YAML::Key << "DrawLights" << YAML::Value << settings.DebugFlags.DrawLights;
-    out << YAML::Key << "DrawSpawnZones" << YAML::Value << settings.DebugFlags.DrawSpawnZones;
-    out << YAML::Key << "CollisionWireframeMode" << YAML::Value << settings.DebugFlags.SetCollisionWireframeMode;
-    out << YAML::EndMap;
-}
-
-static void DeserializeBackgroundSettings(const YAML::Node& data, SceneSettings& settings)
-{
-    if (!data["Background"])
-    {
-        return;
-    }
-
-    auto background = data["Background"];
-    settings.Mode = static_cast<BackgroundMode>(ReadYamlValue(background, "Mode", static_cast<int>(settings.Mode)));
-    settings.BackgroundColor = ReadYamlValue(background, "Color", settings.BackgroundColor);
-    if (background["TexturePath"] && background["TexturePath"].IsScalar())
-    {
-        settings.BackgroundTexturePath = ReadYamlValue(background, "TexturePath", settings.BackgroundTexturePath);
-    }
-    // Legacy AmbientIntensity in Background block is silently ignored.
-}
-
-static void DeserializeCanvasSettings(const YAML::Node& data, SceneSettings& settings)
-{
-    if (!data["Canvas"])
-    {
-        return;
-    }
-
-    auto canvas = data["Canvas"];
-    settings.Canvas.ReferenceResolution =
-        ReadYamlValue(canvas, "ReferenceResolution", settings.Canvas.ReferenceResolution);
-    settings.Canvas.ScaleMode = static_cast<CanvasScaleMode>(
-        ReadYamlValue(canvas, "ScaleMode", static_cast<int>(settings.Canvas.ScaleMode)));
-    settings.Canvas.MatchWidthOrHeight =
-        ReadYamlValue(canvas, "MatchWidthOrHeight", settings.Canvas.MatchWidthOrHeight);
-}
-
-static void DeserializeDebugSettings(const YAML::Node& data, SceneSettings& settings)
-{
-    if (!data["DebugSettings"])
-    {
-        return;
-    }
-
-    auto debugNode = data["DebugSettings"];
-    settings.DiagnosticMode = ReadYamlValue(debugNode, "DiagnosticMode", 0.0f);
-    settings.DebugFlags.DrawColliders = ReadYamlValue(debugNode, "DrawColliders", false);
-    settings.DebugFlags.DrawHierarchy = ReadYamlValue(debugNode, "DrawHierarchy", false);
-    settings.DebugFlags.DrawCollisionModelBox = ReadYamlValue(debugNode, "DrawCollisionModelBox", false);
-    settings.DebugFlags.DrawGrid = ReadYamlValue(debugNode, "DrawGrid", false);
-    settings.DebugFlags.DrawSelection = ReadYamlValue(debugNode, "DrawSelection", true);
-    settings.DebugFlags.DrawLights = ReadYamlValue(debugNode, "DrawLights", true);
-    settings.DebugFlags.DrawSpawnZones = ReadYamlValue(debugNode, "DrawSpawnZones", true);
-    settings.DebugFlags.SetCollisionWireframeMode = ReadYamlValue(debugNode, "CollisionWireframeMode", 0);
-}
-
-static void DeserializeEnvironmentSettings(const YAML::Node& data, SceneSettings& settings)
-{
-    if (data["EnvironmentPath"] && data["EnvironmentPath"].IsScalar())
-    {
-        std::string envPath = ReadYamlValue(data, "EnvironmentPath", std::string());
-        if (Project::GetActive())
-        {
-            auto sharedEnv = AssetManager::Get().Get<EnvironmentAsset>(envPath);
-            if (sharedEnv)
-            {
-                // Create a scene-specific instance to avoid modifying the shared asset cache
-                // and to prevent async load from overwriting our scene overrides.
-                settings.Environment = std::make_shared<EnvironmentAsset>();
-                settings.Environment->SetSettings(sharedEnv->GetSettings());
-                settings.Environment->SetPath(sharedEnv->GetPath());
-                
-                // If it's still loading, we might need a better way to sync, 
-                // but for now, we'll assume the scene overrides will be applied after this block.
-            }
-        }
-    }
-
-    if (!data["Skybox"] && !data["Fog"] && !data["LightDirection"])
-    {
-        return;
-    }
-
-    if (!settings.Environment)
-    {
-        settings.Environment = std::make_shared<EnvironmentAsset>();
-    }
-
-    auto& env = settings.Environment;
-    auto& envSettings = env->GetSettings();
-
-    if (data["Lighting"])
-    {
-        auto lighting = data["Lighting"];
-        envSettings.Lighting.Direction = ReadYamlValue(lighting, "Direction", envSettings.Lighting.Direction);
-        envSettings.Lighting.LightColor = ReadYamlValue(lighting, "LightColor", envSettings.Lighting.LightColor);
-        envSettings.Lighting.Ambient = ReadYamlValue(lighting, "Ambient", envSettings.Lighting.Ambient);
-    }
-    else
-    {
-        // Backward compat: old flat field names.
-        envSettings.Lighting.Direction = ReadYamlValue(data, "LightDirection", envSettings.Lighting.Direction);
-        envSettings.Lighting.LightColor = ReadYamlValue(data, "LightColor", envSettings.Lighting.LightColor);
-        envSettings.Lighting.Ambient = ReadYamlValue(data, "AmbientIntensity", envSettings.Lighting.Ambient);
-    }
-
-    if (auto skybox = data["Skybox"])
-    {
-        if (skybox["TexturePath"] && skybox["TexturePath"].IsScalar())
-        {
-            envSettings.Skybox.TexturePath = ReadYamlValue(skybox, "TexturePath", envSettings.Skybox.TexturePath);
-        }
-        envSettings.Skybox.Mode = ReadYamlValue(skybox, "Mode", envSettings.Skybox.Mode);
-        envSettings.Skybox.Exposure = ReadYamlValue(skybox, "Exposure", envSettings.Skybox.Exposure);
-        envSettings.Skybox.Brightness = ReadYamlValue(skybox, "Brightness", envSettings.Skybox.Brightness);
-        envSettings.Skybox.Contrast = ReadYamlValue(skybox, "Contrast", envSettings.Skybox.Contrast);
-    }
-
-    if (auto fog = data["Fog"])
-    {
-        envSettings.Fog.Enabled = ReadYamlValue(fog, "Enabled", envSettings.Fog.Enabled);
-        envSettings.Fog.FogColor = ReadYamlValue(fog, "Color", envSettings.Fog.FogColor);
-        envSettings.Fog.Density = ReadYamlValue(fog, "Density", envSettings.Fog.Density);
-        envSettings.Fog.Start = ReadYamlValue(fog, "Start", envSettings.Fog.Start);
-        envSettings.Fog.End = ReadYamlValue(fog, "End", envSettings.Fog.End);
-    }
-}
-
-static void SerializeSceneSettings(YAML::Emitter& out, const SceneSettings& settings)
-{
-    out << YAML::Key << "Scene" << YAML::Value << settings.Name;
-    SerializeBackgroundSettings(out, settings);
-    SerializeCanvasSettings(out, settings);
-    SerializeEnvironmentSettings(out, settings);
-    SerializeDebugSettings(out, settings);
-}
-
-static bool DeserializeSceneSettings(const YAML::Node& data, SceneSettings& settings, std::string& lastError)
-{
-    if (!data["Scene"] || !data["Scene"].IsScalar())
-    {
-        lastError = "SceneSerializer: missing Scene root key";
-        return false;
-    }
-
-    settings.Name = ReadYamlValue(data, "Scene", settings.Name);
-    DeserializeBackgroundSettings(data, settings);
-    DeserializeCanvasSettings(data, settings);
-    DeserializeDebugSettings(data, settings);
-    DeserializeEnvironmentSettings(data, settings);
-    return true;
-}
-
-static void DeserializeEntities(Scene* scene, const YAML::Node& entities)
-{
-    std::vector<HierarchyTask> hierarchyTasks;
-    std::set<uint64_t> seenUUIDs;
-
-    for (auto entity : entities)
-    {
-        if (!entity["Entity"])
-        {
-            continue;
-        }
-
-        uint64_t uuid = ReadYamlValue(entity, "Entity", uint64_t{0});
-        if (uuid == 0)
-        {
-            uuid = UUID();
-        }
-        else if (seenUUIDs.count(uuid))
-        {
-            uuid = UUID();
-        }
-        seenUUIDs.insert(uuid);
-
-        std::string name;
-        auto tagComponent = entity["Tag"];
-        if (tagComponent && tagComponent["Tag"] && tagComponent["Tag"].IsScalar())
-        {
-            name = ReadYamlValue(tagComponent, "Tag", std::string());
-        }
-
-        Entity deserializedEntity = scene->CreateEntityWithUUID(uuid, name);
-
-        ComponentSerializer::Get().DeserializeAll(deserializedEntity, entity);
-
-        HierarchyTask task;
-        HierarchySerializer::DeserializeTask(deserializedEntity, entity, task);
-        if (task.entity)
-        {
-            hierarchyTasks.push_back(task);
-        }
-    }
-
-    for (auto& task : hierarchyTasks)
-    {
-        if (!task.entity.HasComponent<HierarchyComponent>())
-        {
-            task.entity.AddComponent<HierarchyComponent>();
-        }
-
-        auto& hc = task.entity.GetComponent<HierarchyComponent>();
-        if (task.parent != 0)
-        {
-            CHEngine::Entity parent = scene->GetEntityByUUID(task.parent);
-            if (parent)
-            {
-                hc.Parent = parent;
-            }
-        }
-
-        for (uint64_t childUUID : task.children)
-        {
-            CHEngine::Entity child = scene->GetEntityByUUID(childUUID);
-            if (child)
-            {
-                hc.Children.push_back(child);
-            }
-        }
-    }
-}
-} // namespace
-
-static void SerializeEntity(YAML::Emitter& out, Entity entity)
-{
-    out << YAML::BeginMap; // Entity
 
-    ComponentSerializer::Get().SerializeID(out, entity);
-    ComponentSerializer::Get().SerializeAll(out, entity);
-
-    out << YAML::EndMap; // Entity
-}
-
-std::string SceneSerializer::SerializeToString()
-{
-    if (!m_Scene)
-    {
-        return "";
-    }
-
-    YAML::Emitter out;
-    out << YAML::BeginMap;
-    out << YAML::Key << "Scene" << YAML::Value << m_Scene->GetSettings().Name;
-
-    // Serialize Background Settings
-    out << YAML::Key << "Background" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "Mode" << YAML::Value << (int)m_Scene->GetSettings().Mode;
-    out << YAML::Key << "Color" << YAML::Value << m_Scene->GetSettings().BackgroundColor;
-    out << YAML::Key << "TexturePath" << YAML::Value
-        << Project::GetRelativePath(m_Scene->GetSettings().BackgroundTexturePath);
-    out << YAML::EndMap;
-
-    // Serialize Canvas Settings
-    out << YAML::Key << "Canvas" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "ReferenceResolution" << YAML::Value << m_Scene->GetSettings().Canvas.ReferenceResolution;
-    out << YAML::Key << "ScaleMode" << YAML::Value << (int)m_Scene->GetSettings().Canvas.ScaleMode;
-    out << YAML::Key << "MatchWidthOrHeight" << YAML::Value << m_Scene->GetSettings().Canvas.MatchWidthOrHeight;
-    out << YAML::EndMap;
-
-    // Serialize Environment
-    if (m_Scene->GetSettings().Environment)
-    {
-        out << YAML::Key << "EnvironmentPath" << YAML::Value
-            << Project::GetRelativePath(m_Scene->GetSettings().Environment->GetPath());
-
-        // Also serialize the current settings for quick preview/fallback
-        auto& settings = m_Scene->GetSettings().Environment->GetSettings();
-
-        out << YAML::Key << "Lighting" << YAML::BeginMap;
-        out << YAML::Key << "Direction" << YAML::Value << settings.Lighting.Direction;
-        out << YAML::Key << "LightColor" << YAML::Value << settings.Lighting.LightColor;
-        out << YAML::Key << "Ambient" << YAML::Value << settings.Lighting.Ambient;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Skybox" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "TexturePath" << YAML::Value << Project::GetRelativePath(settings.Skybox.TexturePath);
-        out << YAML::Key << "Mode" << YAML::Value << settings.Skybox.Mode;
-        out << YAML::Key << "Exposure" << YAML::Value << settings.Skybox.Exposure;
-        out << YAML::Key << "Brightness" << YAML::Value << settings.Skybox.Brightness;
-        out << YAML::Key << "Contrast" << YAML::Value << settings.Skybox.Contrast;
-        out << YAML::EndMap;
-
-        out << YAML::Key << "Fog" << YAML::Value << YAML::BeginMap;
-        out << YAML::Key << "Enabled" << YAML::Value << settings.Fog.Enabled;
-        out << YAML::Key << "Color" << YAML::Value << settings.Fog.FogColor;
-        out << YAML::Key << "Density" << YAML::Value << settings.Fog.Density;
-        out << YAML::Key << "Start" << YAML::Value << settings.Fog.Start;
-        out << YAML::Key << "End" << YAML::Value << settings.Fog.End;
-        out << YAML::EndMap;
-    }
-
-    out << YAML::Key << "DebugSettings" << YAML::Value << YAML::BeginMap;
-    out << YAML::Key << "DiagnosticMode" << YAML::Value << m_Scene->GetSettings().DiagnosticMode;
-    out << YAML::Key << "DrawColliders" << YAML::Value << m_Scene->GetSettings().DebugFlags.DrawColliders;
-    out << YAML::Key << "DrawHierarchy" << YAML::Value << m_Scene->GetSettings().DebugFlags.DrawHierarchy;
-    out << YAML::Key << "DrawCollisionModelBox" << YAML::Value
-        << m_Scene->GetSettings().DebugFlags.DrawCollisionModelBox;
-    out << YAML::Key << "DrawGrid" << YAML::Value << m_Scene->GetSettings().DebugFlags.DrawGrid;
-    out << YAML::Key << "DrawSelection" << YAML::Value << m_Scene->GetSettings().DebugFlags.DrawSelection;
-    out << YAML::Key << "DrawLights" << YAML::Value << m_Scene->GetSettings().DebugFlags.DrawLights;
-    out << YAML::Key << "DrawSpawnZones" << YAML::Value << m_Scene->GetSettings().DebugFlags.DrawSpawnZones;
-    out << YAML::Key << "CollisionWireframeMode" << YAML::Value << m_Scene->GetSettings().DebugFlags.SetCollisionWireframeMode;
-    out << YAML::EndMap;
-
-    out << YAML::Key << "Entities" << YAML::Value << YAML::BeginSeq;
-
-    m_Scene->GetRegistry().view<IDComponent>().each([&](auto entityID, auto& id) {
-        Entity entity(entityID, &m_Scene->GetRegistry());
-        SerializeEntity(out, entity);
-    });
-
-    out << YAML::EndSeq;
-    out << YAML::EndMap;
-
-    return std::string(out.c_str());
-}
-
-bool SceneSerializer::Serialize(const std::string& filepath)
-{
-    std::string yaml = SerializeToString();
-    std::ofstream fout(filepath);
-    if (fout.is_open())
-    {
-        fout << yaml;
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-SceneSerializer::SceneSerializer(Scene* scene)
-    : m_Scene(scene)
-{
-}
-
-bool SceneSerializer::Deserialize(const std::string& filepath)
-{
-    m_LastError.clear();
-
-    std::ifstream stream(filepath);
-    if (!stream.is_open())
-    {
-        m_LastError = "SceneSerializer: failed to open scene file '" + filepath + "'";
-        return false;
-    }
-
-    std::stringstream strStream;
-    strStream << stream.rdbuf();
-
-    return DeserializeFromString(strStream.str());
-}
+#include <set>
 
-bool SceneSerializer::DeserializeFromString(const std::string& yaml)
+namespace Chained
 {
-    m_LastError.clear();
-
-    YAML::Node data;
-    try
-    {
-        data = YAML::Load(yaml);
-    }
-    catch (const std::exception& e)
-    {
-        m_LastError = std::string("SceneSerializer: invalid YAML: ") + e.what();
-        return false;
-    }
-    catch (...)
-    {
-        m_LastError = "SceneSerializer: invalid YAML with an unknown exception";
-        return false;
-    }
-
-    if (!DeserializeSceneSettings(data, m_Scene->GetSettings(), m_LastError))
-    {
-        return false;
-    }
-
-    auto entities = data["Entities"];
-    if (entities && entities.IsSequence())
-    {
-        DeserializeEntities(m_Scene, entities);
-    }
-
-    return true;
-}
-} // namespace CHEngine
+	namespace
+	{
+		template <typename T> T ReadYamlValue(const YAML::Node& node, const char* key, const T& fallback)
+		{
+			if (!node || !node[key])
+			{
+				return fallback;
+			}
+
+			return node[key].as<T>(fallback);
+		}
+
+		namespace
+		{
+			static std::string ToProjectRelativePath(const std::string& absPath)
+			{
+				auto project = Project::GetActive();
+				return project ? project->GetRelativePath(absPath) : absPath;
+			}
+		} // namespace
+
+		static void SerializeBackgroundSettings(YAML::Emitter& out, const SceneSettings& settings)
+		{
+			out << YAML::Key << "Background" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Mode" << YAML::Value << (int)settings.Mode;
+			out << YAML::Key << "Color" << YAML::Value << settings.BackgroundColor;
+			out << YAML::Key << "TexturePath" << YAML::Value << settings.BackgroundTexturePath;
+			out << YAML::EndMap;
+		}
+
+		static void SerializeCanvasSettings(YAML::Emitter& out, const SceneSettings& settings)
+		{
+			out << YAML::Key << "Canvas" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "ReferenceResolution" << YAML::Value << settings.Canvas.ReferenceResolution;
+			out << YAML::Key << "ScaleMode" << YAML::Value << (int)settings.Canvas.ScaleMode;
+			out << YAML::Key << "MatchWidthOrHeight" << YAML::Value << settings.Canvas.MatchWidthOrHeight;
+			out << YAML::EndMap;
+		}
+
+		static void SerializeEnvironmentSettings(YAML::Emitter& out, const SceneSettings& settings)
+		{
+			if (settings.Environment)
+			{
+				std::string envPath = ToProjectRelativePath(settings.Environment->GetPath());
+				out << YAML::Key << "EnvironmentPath" << YAML::Value << envPath;
+			}
+
+			// Also serialize the current settings for quick preview/fallback.
+			if (!settings.Environment)
+			{
+				return;
+			}
+
+			const auto& envSettings = settings.Environment->GetSettings();
+
+			out << YAML::Key << "Lighting" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Direction" << YAML::Value << envSettings.Lighting.Direction;
+			out << YAML::Key << "LightColor" << YAML::Value << envSettings.Lighting.LightColor;
+			out << YAML::Key << "Ambient" << YAML::Value << envSettings.Lighting.Ambient;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Skybox" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "TexturePath" << YAML::Value << ToProjectRelativePath(envSettings.Skybox.TexturePath);
+			out << YAML::Key << "Mode" << YAML::Value << envSettings.Skybox.Mode;
+			out << YAML::Key << "Exposure" << YAML::Value << envSettings.Skybox.Exposure;
+			out << YAML::Key << "Brightness" << YAML::Value << envSettings.Skybox.Brightness;
+			out << YAML::Key << "Contrast" << YAML::Value << envSettings.Skybox.Contrast;
+			out << YAML::EndMap;
+
+			out << YAML::Key << "Fog" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Enabled" << YAML::Value << envSettings.Fog.Enabled;
+			out << YAML::Key << "Color" << YAML::Value << envSettings.Fog.FogColor;
+			out << YAML::Key << "Density" << YAML::Value << envSettings.Fog.Density;
+			out << YAML::Key << "Start" << YAML::Value << envSettings.Fog.Start;
+			out << YAML::Key << "End" << YAML::Value << envSettings.Fog.End;
+			out << YAML::EndMap;
+		}
+
+		static void SerializeDebugSettings(YAML::Emitter& out, const SceneSettings& settings)
+		{
+			out << YAML::Key << "DebugSettings" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "DiagnosticMode" << YAML::Value << settings.DiagnosticMode;
+			out << YAML::Key << "DrawColliders" << YAML::Value << settings.DebugFlags.DrawColliders;
+			out << YAML::Key << "DrawHierarchy" << YAML::Value << settings.DebugFlags.DrawHierarchy;
+			out << YAML::Key << "DrawGrid" << YAML::Value << settings.DebugFlags.DrawGrid;
+			out << YAML::Key << "DrawSelection" << YAML::Value << settings.DebugFlags.DrawSelection;
+			out << YAML::Key << "DrawLights" << YAML::Value << settings.DebugFlags.DrawLights;
+			out << YAML::Key << "DrawSpawnZones" << YAML::Value << settings.DebugFlags.DrawSpawnZones;
+			out << YAML::Key << "CollisionWireframeMode" << YAML::Value
+				<< settings.DebugFlags.SetCollisionWireframeMode;
+			out << YAML::EndMap;
+		}
+
+		static void SerializeGridSettings(YAML::Emitter& out, const GridSettings& grid)
+		{
+			out << YAML::Key << "Grid" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "Spacing" << YAML::Value << grid.Spacing;
+			out << YAML::Key << "SecondarySpacing" << YAML::Value << grid.SecondarySpacing;
+			out << YAML::Key << "Color" << YAML::Value << YAML::BeginMap;
+			out << YAML::Key << "r" << YAML::Value << grid.Color.x;
+			out << YAML::Key << "g" << YAML::Value << grid.Color.y;
+			out << YAML::Key << "b" << YAML::Value << grid.Color.z;
+			out << YAML::Key << "a" << YAML::Value << grid.Color.w;
+			out << YAML::EndMap;
+			out << YAML::Key << "FadeStart" << YAML::Value << grid.FadeStart;
+			out << YAML::Key << "FadeEnd" << YAML::Value << grid.FadeEnd;
+			out << YAML::Key << "PlaneSize" << YAML::Value << grid.PlaneSize;
+			out << YAML::EndMap;
+		}
+
+		static void DeserializeBackgroundSettings(const YAML::Node& sceneRoot, SceneSettings& settings)
+		{
+			if (!sceneRoot["Background"])
+			{
+				return;
+			}
+
+			auto background = sceneRoot["Background"];
+			settings.Mode =
+				static_cast<BackgroundMode>(ReadYamlValue(background, "Mode", static_cast<int>(settings.Mode)));
+			settings.BackgroundColor = ReadYamlValue(background, "Color", settings.BackgroundColor);
+			if (background["TexturePath"] && background["TexturePath"].IsScalar())
+			{
+				settings.BackgroundTexturePath =
+					ReadYamlValue(background, "TexturePath", settings.BackgroundTexturePath);
+			}
+			// Legacy AmbientIntensity in Background block is silently ignored.
+		}
+
+		static void DeserializeCanvasSettings(const YAML::Node& sceneRoot, SceneSettings& settings)
+		{
+			if (!sceneRoot["Canvas"])
+			{
+				return;
+			}
+
+			auto canvas = sceneRoot["Canvas"];
+			settings.Canvas.ReferenceResolution =
+				ReadYamlValue(canvas, "ReferenceResolution", settings.Canvas.ReferenceResolution);
+			settings.Canvas.ScaleMode = static_cast<CanvasScaleMode>(
+				ReadYamlValue(canvas, "ScaleMode", static_cast<int>(settings.Canvas.ScaleMode)));
+			settings.Canvas.MatchWidthOrHeight =
+				ReadYamlValue(canvas, "MatchWidthOrHeight", settings.Canvas.MatchWidthOrHeight);
+		}
+
+		static void DeserializeDebugSettings(const YAML::Node& sceneRoot, SceneSettings& settings)
+		{
+			if (!sceneRoot["DebugSettings"])
+			{
+				return;
+			}
+
+			auto debugNode = sceneRoot["DebugSettings"];
+			settings.DiagnosticMode = ReadYamlValue(debugNode, "DiagnosticMode", 0.0f);
+			settings.DebugFlags.DrawColliders = ReadYamlValue(debugNode, "DrawColliders", false);
+			settings.DebugFlags.DrawHierarchy = ReadYamlValue(debugNode, "DrawHierarchy", false);
+			settings.DebugFlags.DrawGrid = ReadYamlValue(debugNode, "DrawGrid", false);
+			settings.DebugFlags.DrawSelection = ReadYamlValue(debugNode, "DrawSelection", true);
+			settings.DebugFlags.DrawLights = ReadYamlValue(debugNode, "DrawLights", true);
+			settings.DebugFlags.DrawSpawnZones = ReadYamlValue(debugNode, "DrawSpawnZones", true);
+			settings.DebugFlags.SetCollisionWireframeMode = ReadYamlValue(debugNode, "CollisionWireframeMode", 0);
+		}
+
+		static void DeserializeGridSettings(const YAML::Node& sceneRoot, GridSettings& grid)
+		{
+			if (!sceneRoot["Grid"])
+			{
+				return;
+			}
+
+			auto gridNode = sceneRoot["Grid"];
+			grid.Spacing = ReadYamlValue(gridNode, "Spacing", grid.Spacing);
+			grid.SecondarySpacing = ReadYamlValue(gridNode, "SecondarySpacing", grid.SecondarySpacing);
+			grid.FadeStart = ReadYamlValue(gridNode, "FadeStart", grid.FadeStart);
+			grid.FadeEnd = ReadYamlValue(gridNode, "FadeEnd", grid.FadeEnd);
+			grid.PlaneSize = ReadYamlValue(gridNode, "PlaneSize", grid.PlaneSize);
+			if (gridNode["Color"])
+			{
+				auto colorNode = gridNode["Color"];
+				grid.Color.x = ReadYamlValue(colorNode, "r", grid.Color.x);
+				grid.Color.y = ReadYamlValue(colorNode, "g", grid.Color.y);
+				grid.Color.z = ReadYamlValue(colorNode, "b", grid.Color.z);
+				grid.Color.w = ReadYamlValue(colorNode, "a", grid.Color.w);
+			}
+		}
+
+		static void DeserializeEnvironmentSettings(const YAML::Node& sceneRoot, SceneSettings& settings)
+		{
+			if (sceneRoot["EnvironmentPath"] && sceneRoot["EnvironmentPath"].IsScalar())
+			{
+				std::string envPath = ReadYamlValue(sceneRoot, "EnvironmentPath", std::string());
+				if (Project::GetActive())
+				{
+					auto* assets = ServiceLocator::TryGet<AssetManager>();
+					if (assets)
+					{
+						auto sharedEnv = assets->Get<EnvironmentAsset>(envPath);
+						if (sharedEnv)
+						{
+							if (!settings.Environment)
+							{
+								settings.Environment = std::make_shared<EnvironmentAsset>();
+							}
+
+							settings.Environment->SetSettings(sharedEnv->GetSettings());
+							settings.Environment->SetPath(sharedEnv->GetPath());
+						}
+					}
+				}
+			}
+
+			if (!sceneRoot["Skybox"] && !sceneRoot["Fog"] && !sceneRoot["LightDirection"])
+			{
+				return;
+			}
+
+			if (!settings.Environment)
+			{
+				settings.Environment = std::make_shared<EnvironmentAsset>();
+			}
+
+			auto& env = settings.Environment;
+			auto& envSettings = env->GetSettings();
+
+			if (sceneRoot["Lighting"])
+			{
+				auto lighting = sceneRoot["Lighting"];
+				envSettings.Lighting.Direction = ReadYamlValue(lighting, "Direction", envSettings.Lighting.Direction);
+				envSettings.Lighting.LightColor =
+					ReadYamlValue(lighting, "LightColor", envSettings.Lighting.LightColor);
+				envSettings.Lighting.Ambient = ReadYamlValue(lighting, "Ambient", envSettings.Lighting.Ambient);
+			}
+			else
+			{
+				// Backward compat: old flat field names.
+				envSettings.Lighting.Direction =
+					ReadYamlValue(sceneRoot, "LightDirection", envSettings.Lighting.Direction);
+				envSettings.Lighting.LightColor =
+					ReadYamlValue(sceneRoot, "LightColor", envSettings.Lighting.LightColor);
+				envSettings.Lighting.Ambient =
+					ReadYamlValue(sceneRoot, "AmbientIntensity", envSettings.Lighting.Ambient);
+			}
+
+			if (auto skybox = sceneRoot["Skybox"])
+			{
+				if (skybox["TexturePath"] && skybox["TexturePath"].IsScalar())
+				{
+					envSettings.Skybox.TexturePath =
+						ReadYamlValue(skybox, "TexturePath", envSettings.Skybox.TexturePath);
+				}
+				envSettings.Skybox.Mode = ReadYamlValue(skybox, "Mode", envSettings.Skybox.Mode);
+				envSettings.Skybox.Exposure = ReadYamlValue(skybox, "Exposure", envSettings.Skybox.Exposure);
+				envSettings.Skybox.Brightness = ReadYamlValue(skybox, "Brightness", envSettings.Skybox.Brightness);
+				envSettings.Skybox.Contrast = ReadYamlValue(skybox, "Contrast", envSettings.Skybox.Contrast);
+			}
+
+			if (auto fog = sceneRoot["Fog"])
+			{
+				envSettings.Fog.Enabled = ReadYamlValue(fog, "Enabled", envSettings.Fog.Enabled);
+				envSettings.Fog.FogColor = ReadYamlValue(fog, "Color", envSettings.Fog.FogColor);
+				envSettings.Fog.Density = ReadYamlValue(fog, "Density", envSettings.Fog.Density);
+				envSettings.Fog.Start = ReadYamlValue(fog, "Start", envSettings.Fog.Start);
+				envSettings.Fog.End = ReadYamlValue(fog, "End", envSettings.Fog.End);
+			}
+		}
+
+		static void SerializeSceneSettings(YAML::Emitter& out, const SceneSettings& settings)
+		{
+			out << YAML::Key << "Scene" << YAML::Value << settings.Name;
+			out << YAML::Key << "SceneType" << YAML::Value << (int)settings.Type;
+			SerializeBackgroundSettings(out, settings);
+			SerializeCanvasSettings(out, settings);
+			SerializeEnvironmentSettings(out, settings);
+			SerializeGridSettings(out, settings.Grid);
+			SerializeDebugSettings(out, settings);
+		}
+
+		static bool DeserializeSceneSettings(const YAML::Node& sceneRoot, SceneSettings& settings,
+											 std::string& lastError)
+		{
+			if (!sceneRoot["Scene"] || !sceneRoot["Scene"].IsScalar())
+			{
+				lastError = "SceneSerializer: missing Scene root key";
+				return false;
+			}
+
+			settings.Name = ReadYamlValue(sceneRoot, "Scene", settings.Name);
+			settings.Type =
+				static_cast<SceneType>(ReadYamlValue(sceneRoot, "SceneType", static_cast<int>(settings.Type)));
+			DeserializeBackgroundSettings(sceneRoot, settings);
+			DeserializeCanvasSettings(sceneRoot, settings);
+			DeserializeGridSettings(sceneRoot, settings.Grid);
+			DeserializeDebugSettings(sceneRoot, settings);
+			DeserializeEnvironmentSettings(sceneRoot, settings);
+			return true;
+		}
+
+		static void DeserializeEntities(Scene* scene, const YAML::Node& entities)
+		{
+			std::vector<HierarchyTask> hierarchyTasks;
+			std::set<uint64_t> seenUUIDs;
+
+			for (auto entity : entities)
+			{
+				if (!entity["Entity"])
+				{
+					CH_CORE_WARN("SceneSerializer: Malformed entity entry missing 'Entity' key, skipping.");
+					continue;
+				}
+
+				uint64_t uuid = ReadYamlValue(entity, "Entity", uint64_t{0});
+				if (uuid == 0)
+				{
+					uuid = UUID();
+				}
+				else if (seenUUIDs.count(uuid))
+				{
+					CH_CORE_WARN("SceneSerializer: Duplicate UUID {} found, generating new UUID.", uuid);
+					uuid = UUID();
+				}
+				seenUUIDs.insert(uuid);
+
+				std::string name;
+				auto tagComponent = entity["Tag"];
+				if (tagComponent && tagComponent["Tag"] && tagComponent["Tag"].IsScalar())
+				{
+					name = ReadYamlValue(tagComponent, "Tag", std::string());
+				}
+
+				Entity deserializedEntity = scene->CreateEntityWithUUID(uuid, name);
+
+				ComponentSerializer::DeserializeAll(deserializedEntity, entity);
+
+				if (deserializedEntity.HasComponent<TransformComponent>())
+				{
+					auto& tc = deserializedEntity.GetComponent<TransformComponent>();
+					tc.RotationQuat = glm::quat(tc.Rotation);
+					tc.PrevRotationQuat = tc.RotationQuat;
+					tc.PrevTranslation = tc.Translation;
+					tc.PrevScale = tc.Scale;
+				}
+
+				// Editor-saved physics handles are stale at runtime. Reset so
+				// PhysicsBodySystem / BatchInitializeBodies will create fresh bodies.
+				if (deserializedEntity.HasComponent<RigidBodyComponent>())
+				{
+					deserializedEntity.GetComponent<RigidBodyComponent>().Handle = kInvalidPhysicsBody;
+				}
+
+				HierarchyTask task;
+				HierarchySerializer::DeserializeTask(deserializedEntity, entity, task);
+				if (task.entity)
+				{
+					hierarchyTasks.push_back(task);
+				}
+			}
+
+			for (auto& task : hierarchyTasks)
+			{
+				if (!task.entity.HasComponent<HierarchyComponent>())
+				{
+					task.entity.AddComponent<HierarchyComponent>();
+				}
+
+				auto& hc = task.entity.GetComponent<HierarchyComponent>();
+				if (task.parent != 0)
+				{
+					Chained::Entity parent = scene->GetEntityByUUID(task.parent);
+					if (parent)
+					{
+						hc.Parent = parent;
+					}
+				}
+
+				for (uint64_t childUUID : task.children)
+				{
+					Chained::Entity child = scene->GetEntityByUUID(childUUID);
+					if (child)
+					{
+						hc.Children.push_back(child);
+					}
+				}
+			}
+		}
+	} // namespace
+
+	static void SerializeEntity(YAML::Emitter& out, Entity entity)
+	{
+		out << YAML::BeginMap; // Entity
+
+		ComponentSerializer::SerializeID(out, entity);
+		ComponentSerializer::SerializeAll(out, entity);
+
+		out << YAML::EndMap; // Entity
+	}
+
+	std::string SceneSerializer::SerializeToString()
+	{
+		if (!m_Scene)
+		{
+			return "";
+		}
+
+		YAML::Emitter out;
+		out << YAML::BeginMap;
+
+		SerializeSceneSettings(out, m_Scene->GetSettings());
+
+		out << YAML::Key << "Entities" << YAML::Value << YAML::BeginSeq;
+
+		m_Scene->GetRegistry().view<IDComponent>().each([&, this](auto entityID, auto& id) {
+			Entity entity(entityID, &m_Scene->GetRegistry());
+			SerializeEntity(out, entity);
+		});
+
+		out << YAML::EndSeq;
+		out << YAML::EndMap;
+
+		return std::string(out.c_str());
+	}
+
+	bool SceneSerializer::Serialize(const std::string& filepath)
+	{
+		std::string yaml = SerializeToString();
+		std::ofstream fout(filepath);
+		if (fout.is_open())
+		{
+			fout << yaml;
+			if (!fout.good())
+			{
+				CH_CORE_ERROR("SceneSerializer: Failed to write scene file '{}'.", filepath);
+				return false;
+			}
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	SceneSerializer::SceneSerializer(Scene* scene)
+		: m_Scene(scene)
+	{
+	}
+
+	bool SceneSerializer::Deserialize(const std::string& filepath)
+	{
+		m_LastError.clear();
+
+		// ── 1. Try reading from pack archive ────────────────────────────────────
+		// ReadProjectAsset converts the absolute path to a project-relative pack key internally.
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am && am->IsPacked())
+		{
+			auto data = am->ReadProjectAsset(filepath);
+			if (!data.empty())
+			{
+				return DeserializeFromString({data.begin(), data.end()});
+			}
+		}
+
+		// ── 2. Fallback: direct disk read ────────────────────────────────────────
+		std::ifstream stream(filepath);
+		if (!stream.is_open())
+		{
+			m_LastError = "SceneSerializer: failed to open scene file '" + filepath + "'";
+			return false;
+		}
+
+		std::stringstream strStream;
+		strStream << stream.rdbuf();
+
+		return DeserializeFromString(strStream.str());
+	}
+
+	bool SceneSerializer::DeserializeFromString(const std::string& yaml)
+	{
+		m_LastError.clear();
+
+		YAML::Node sceneRootNode;
+		try
+		{
+			sceneRootNode = YAML::Load(yaml);
+		} catch (const std::exception& e)
+		{
+			m_LastError = std::string("SceneSerializer: invalid YAML: ") + e.what();
+			return false;
+		} catch (...)
+		{
+			m_LastError = "SceneSerializer: invalid YAML with an unknown exception";
+			return false;
+		}
+
+		if (!DeserializeSceneSettings(sceneRootNode, m_Scene->GetSettings(), m_LastError))
+		{
+			return false;
+		}
+
+		auto entities = sceneRootNode["Entities"];
+		if (entities && entities.IsSequence())
+		{
+			DeserializeEntities(m_Scene, entities);
+		}
+
+		return true;
+	}
+} // namespace Chained
diff --git a/engine/scene/scene_serializer.h b/engine/scene/scene_serializer.h
index c582dd496..08037422c 100644
--- a/engine/scene/scene_serializer.h
+++ b/engine/scene/scene_serializer.h
@@ -3,36 +3,36 @@
 
 #include "engine/scene/scene.h"
 
-namespace CHEngine
+namespace Chained
 {
 
-// Serializes and deserializes a single scene instance; the scene is not owned.
-class SceneSerializer
-{
-public:
-    // Creates a serializer bound to the provided scene instance.
-    SceneSerializer(Scene* scene);
-
-    // Serializes the bound scene to disk. Returns false on failure.
-    bool Serialize(const std::string& filepath);
-    // Deserializes the scene from disk. Returns false on failure.
-    bool Deserialize(const std::string& filepath);
-
-    // Returns the last serialization or deserialization error message.
-    [[nodiscard]] const std::string& GetLastError() const
-    {
-        return m_LastError;
-    }
-
-    // Serializes the bound scene to a YAML string.
-    std::string SerializeToString();
-    // Deserializes the scene from a YAML string. Returns false on failure.
-    bool DeserializeFromString(const std::string& yaml);
-
-private:
-    Scene* m_Scene;
-    std::string m_LastError;
-};
-} // namespace CHEngine
+	// Serializes and deserializes a single scene instance; the scene is not owned.
+	class SceneSerializer
+	{
+	public:
+		// Creates a serializer bound to the provided scene instance.
+		SceneSerializer(Scene* scene);
+
+		// Serializes the bound scene to disk. Returns false on failure.
+		bool Serialize(const std::string& filepath);
+		// Deserializes the scene from disk. Returns false on failure.
+		bool Deserialize(const std::string& filepath);
+
+		// Returns the last serialization or deserialization error message.
+		const std::string& GetLastError() const
+		{
+			return m_LastError;
+		}
+
+		// Serializes the bound scene to a YAML string.
+		std::string SerializeToString();
+		// Deserializes the scene from a YAML string. Returns false on failure.
+		bool DeserializeFromString(const std::string& yaml);
+
+	private:
+		Scene* m_Scene;
+		std::string m_LastError;
+	};
+} // namespace Chained
 
 #endif // CH_SCENE_SERIALIZER_H
diff --git a/engine/scene/scene_settings.h b/engine/scene/scene_settings.h
index 16351a7f6..d991dbb2b 100644
--- a/engine/scene/scene_settings.h
+++ b/engine/scene/scene_settings.h
@@ -1,55 +1,67 @@
 #ifndef CH_SCENE_SETTINGS_H
 #define CH_SCENE_SETTINGS_H
 
-#include "engine/graphics/assets/environment.h"
-#include "engine/scene/components/control_component.h"
+#include "engine/assets/types/environment_asset.h"
+#include "engine/common/color.h"
+#include "engine/ui/ui_style.h"
 #include <memory>
 #include <string>
 
-namespace CHEngine
+namespace Chained
 {
-struct DebugRenderFlags
-{
-    bool DrawColliders = false;
-    bool DrawHierarchy = false;
-    bool DrawCollisionModelBox = false;
-    bool DrawGrid = false;
-    bool DrawSelection = true;
-    bool DrawLights = true;
-    bool DrawSpawnZones = true;
-    int SetCollisionWireframeMode = 0;
-};
-
-enum class BackgroundMode
-{
-    Color = 0,
-    Texture = 1,
-    Environment3D = 2
-};
+	struct DebugRenderFlags
+	{
+		bool DrawColliders = false;
+		bool DrawHierarchy = false;
+		bool DrawGrid = false;
+		bool DrawSelection = true;
+		bool DrawLights = true;
+		bool DrawSpawnZones = true;
+		int SetCollisionWireframeMode = 0;
+	};
 
-struct GridSettings
-{
-    int   Slices  = 20;
-    float Spacing = 1.0f;
-};
+	enum class BackgroundMode
+	{
+		Color = 0,
+		Texture = 1,
+		Environment3D = 2
+	};
 
-struct SceneSettings
-{
-    std::string Name = "Untitled Scene";
-    std::string ScenePath;
-    std::shared_ptr<EnvironmentAsset> Environment;
+	struct GridSettings
+	{
+		int Slices = 20;
+		float Spacing = 1.0f;
+		float SecondarySpacing = 10.0f;
+		glm::vec4 Color = {1.0f, 1.0f, 1.0f, 0.4f};
+		float FadeStart = 0.0f;
+		float FadeEnd = 8000.0f;
+		float PlaneSize = 15000.0f;
+	};
+
+	enum class SceneType
+	{
+		Default = 0,
+		UI = 1
+	};
+
+	struct SceneSettings
+	{
+		std::string Name = "Untitled Scene";
+		std::string ScenePath;
+		std::shared_ptr<EnvironmentAsset> Environment;
 
-    BackgroundMode Mode = BackgroundMode::Environment3D;
-    Color BackgroundColor = {30, 30, 30, 255};
-    std::string BackgroundTexturePath;
+		SceneType Type = SceneType::Default;
+		BackgroundMode Mode = BackgroundMode::Environment3D;
+		Color BackgroundColor = {30, 30, 30, 255};
+		std::string BackgroundTexturePath;
 
-    CanvasSettings Canvas;
-    GridSettings   Grid;
+		CanvasSettings Canvas;
+		GridSettings Grid;
 
-    DebugRenderFlags DebugFlags;
-    float DiagnosticMode = 0.0f;
-};
+		DebugRenderFlags DebugFlags;
+		float DiagnosticMode = 0.0f;
+	};
 
-} // namespace CHEngine
+} // namespace Chained
 
 #endif // CH_SCENE_SETTINGS_H
diff --git a/engine/scene/scene_state.h b/engine/scene/scene_state.h
new file mode 100644
index 000000000..9248b9de7
--- /dev/null
+++ b/engine/scene/scene_state.h
@@ -0,0 +1,19 @@
+#ifndef CH_SCENE_STATE_H
+#define CH_SCENE_STATE_H
+
+#include <cstdint>
+
+namespace Chained
+{
+
+	enum class SceneState : uint8_t
+	{
+		None = 0,
+		Edit = 1,
+		Play = 2,
+		Simulate = 3
+	};
+
+} // namespace Chained
+
+#endif // CH_SCENE_STATE_H
diff --git a/engine/scene/scripting_serialization.h b/engine/scene/scripting_serialization.h
deleted file mode 100644
index 1f5aa48d8..000000000
--- a/engine/scene/scripting_serialization.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef CH_SCRIPTING_SERIALIZATION_H
-#define CH_SCRIPTING_SERIALIZATION_H
-
-#include "components/scripting_components.h"
-#include "engine/scene/yaml.h"
-#include <yaml-cpp/yaml.h>
-
-namespace YAML
-{
-template <> struct convert<CHEngine::ManagedScriptInstance>
-{
-    static Node encode(const CHEngine::ManagedScriptInstance& rhs)
-    {
-        Node node;
-        node["ClassName"] = rhs.ClassName;
-        if (!rhs.Fields.empty())
-        {
-            Node fields;
-            for (const auto& [name, field] : rhs.Fields)
-            {
-                Node f;
-                f["Name"] = field.Name;
-                f["Type"] = (int)field.Type;
-                std::visit([&](auto&& arg) { f["Value"] = YAML::Node(arg); }, field.Value);
-                fields.push_back(f);
-            }
-            node["Fields"] = fields;
-        }
-        return node;
-    }
-
-    static bool decode(const Node& node, CHEngine::ManagedScriptInstance& rhs)
-    {
-        if (node.IsScalar())
-        {
-            rhs.ClassName = node.as<std::string>();
-            return true;
-        }
-
-        if (!node.IsMap())
-        {
-            return false;
-        }
-
-        if (node["ClassName"])
-        {
-            rhs.ClassName = node["ClassName"].as<std::string>();
-        }
-
-        if (node["Fields"] && node["Fields"].IsSequence())
-        {
-            for (auto f : node["Fields"])
-            {
-                CHEngine::ScriptField field;
-                if (f["Name"])
-                {
-                    field.Name = f["Name"].as<std::string>();
-                }
-                if (f["Type"])
-                {
-                    field.Type = (CHEngine::ScriptFieldType)f["Type"].as<int>();
-                }
-
-                if (f["Value"])
-                {
-                    switch (field.Type)
-                    {
-                    case CHEngine::ScriptFieldType::Float:
-                        field.Value = f["Value"].as<float>();
-                        break;
-                    case CHEngine::ScriptFieldType::Int:
-                        field.Value = f["Value"].as<int>();
-                        break;
-                    case CHEngine::ScriptFieldType::Bool:
-                        field.Value = f["Value"].as<bool>();
-                        break;
-                    case CHEngine::ScriptFieldType::String:
-                        field.Value = f["Value"].as<std::string>();
-                        break;
-                    case CHEngine::ScriptFieldType::Vec2:
-                        field.Value = f["Value"].as<glm::vec2>();
-                        break;
-                    case CHEngine::ScriptFieldType::Vec3:
-                        field.Value = f["Value"].as<glm::vec3>();
-                        break;
-                    case CHEngine::ScriptFieldType::Vec4:
-                        field.Value = f["Value"].as<glm::vec4>();
-                        break;
-                    case CHEngine::ScriptFieldType::Color:
-                        field.Value = f["Value"].as<CHEngine::Color>();
-                        break;
-
-                    case CHEngine::ScriptFieldType::Entity:
-                        field.Value = f["Value"].as<uint64_t>();
-                        break;
-                    default:
-                        break;
-                    }
-                }
-                rhs.Fields[field.Name] = field;
-            }
-        }
-        return true;
-    }
-};
-
-inline Emitter& operator<<(Emitter& out, const CHEngine::ManagedScriptInstance& v)
-{
-    out << BeginMap;
-    out << Key << "ClassName" << Value << v.ClassName;
-    if (!v.Fields.empty())
-    {
-        out << Key << "Fields" << Value << BeginSeq;
-        for (const auto& [name, field] : v.Fields)
-        {
-            out << BeginMap;
-            out << Key << "Name" << Value << field.Name;
-            out << Key << "Type" << Value << (int)field.Type;
-            out << Key << "Value" << Value;
-            std::visit([&](auto&& arg) { out << YAML::Node(arg); }, field.Value);
-            out << EndMap;
-        }
-        out << EndSeq;
-    }
-    out << EndMap;
-    return out;
-}
-
-} // namespace YAML
-
-#endif // CH_SCRIPTING_SERIALIZATION_H
diff --git a/engine/scene/serialization.h b/engine/scene/serialization.h
new file mode 100644
index 000000000..e5b625039
--- /dev/null
+++ b/engine/scene/serialization.h
@@ -0,0 +1,398 @@
+#ifndef CH_SERIALIZATION_UTILS_H
+#define CH_SERIALIZATION_UTILS_H
+
+#include "engine/reflection/reflection.h"
+#include "engine/common/uuid.h"
+#include "engine/project/project.h"
+#include "engine/scene/yaml.h"
+#include <algorithm>
+#include <filesystem>
+
+namespace Chained::Serialization
+{
+	// --- YAML Serialization Helpers ---
+
+	template <typename T> inline void SerializeProperty(YAML::Emitter& out, const char* name, const T& value)
+	{
+		if constexpr (std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t> || std::is_same_v<T, unsigned char> ||
+					  std::is_same_v<T, char>)
+		{
+			out << YAML::Key << name << YAML::Value << static_cast<int>(value);
+		}
+		else
+		{
+			out << YAML::Key << name << YAML::Value << value;
+		}
+	}
+
+	inline void SerializePath(YAML::Emitter& out, const char* name, const std::string& path)
+	{
+		if (path.empty())
+		{
+			out << YAML::Key << name << YAML::Value << "";
+			return;
+		}
+
+		// fallback for now to fix build: return normalized path
+		std::string relativePath = std::filesystem::path(path).generic_string();
+		out << YAML::Key << name << YAML::Value << relativePath;
+	}
+
+	inline void SerializeHandle(YAML::Emitter& out, const char* name, uint64_t handle)
+	{
+		out << YAML::Key << name << YAML::Value << handle;
+	}
+
+	// --- YAML Deserialization Helpers ---
+
+	template <typename T> inline void DeserializeProperty(YAML::Node node, const char* name, T& value)
+	{
+		if (node.IsMap() && node[name])
+		{
+			if constexpr (std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t> || std::is_same_v<T, unsigned char> ||
+						  std::is_same_v<T, char>)
+			{
+				value = static_cast<T>(node[name].as<int>(static_cast<int>(value)));
+			}
+			else
+			{
+				value = node[name].as<T>(value);
+			}
+		}
+	}
+
+	inline void DeserializePath(YAML::Node node, const char* name, std::string& path)
+	{
+		if (node.IsMap() && node[name])
+		{
+			std::string pathValue = node[name].as<std::string>(path);
+			if (pathValue.empty())
+			{
+				path = "";
+				return;
+			}
+			path = pathValue;
+#if CH_PLATFORM_WINDOWS
+			std::replace(path.begin(), path.end(), '\\', '/');
+#endif
+		}
+	}
+
+	inline void DeserializeHandle(YAML::Node node, const char* name, uint64_t& handle)
+	{
+		if (node.IsMap() && node[name])
+		{
+			handle = node[name].as<uint64_t>(handle);
+		}
+	}
+
+	inline void DeserializePath(YAML::Node node, const char* name, std::filesystem::path& path)
+	{
+		std::string pathStr;
+		DeserializePath(node, name, pathStr);
+		if (!pathStr.empty())
+		{
+			path = pathStr;
+		}
+	}
+
+	// ========================================================================
+	// PropertyArchive - Declarative Serialization/Deserialization
+	// ========================================================================
+
+	class PropertyArchive : public IPropertyArchiveBase
+	{
+	public:
+		PropertyArchive(YAML::Emitter& emitter)
+			: m_Mode(ReflectionMode::Serialize),
+			  m_Out(&emitter)
+		{
+		}
+
+		PropertyArchive(YAML::Node node)
+			: m_Mode(ReflectionMode::Deserialize),
+			  m_Out(nullptr),
+			  m_Node(node)
+		{
+		}
+
+		virtual ReflectionMode GetReflectionMode() const override
+		{
+			return m_Mode;
+		}
+
+		virtual bool Property(const char* name, int& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, float& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, bool& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, std::string& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, glm::vec2& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, glm::vec3& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, glm::vec4& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, Color& value, const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+		virtual bool Property(const char* name, uint64_t& value, const PropertyMeta& meta = {}) override
+		{
+			return Handle(name, value, meta);
+		}
+		virtual bool Enum(const char* name, int& value, const char** names, int count,
+						  const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+
+		virtual bool StringEnum(const char* name, std::string& value, const std::vector<std::string>& options,
+								const PropertyMeta& meta = {}) override
+		{
+			return PropertyInternal(name, value);
+		}
+
+		virtual bool Handle(const char* name, uint64_t& handle, const PropertyMeta& meta = {}) override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				SerializeHandle(*m_Out, name, handle);
+			}
+			else
+			{
+				DeserializeHandle(m_Node, name, handle);
+			}
+			return false;
+		}
+		virtual bool File(const char* name, std::string& path, const char* extensions = nullptr,
+						  const PropertyMeta& meta = {}) override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				SerializePath(*m_Out, name, path);
+			}
+			else
+			{
+				DeserializePath(m_Node, name, path);
+			}
+			return false;
+		}
+
+		virtual void BeginSequence(const char* name, size_t& size) override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				if (name)
+				{
+					*m_Out << YAML::Key << name;
+				}
+				*m_Out << YAML::Value << YAML::BeginSeq;
+				m_SequenceStack.push_back({YAML::Node(), 0});
+			}
+			else
+			{
+				if (name && m_Node[name] && m_Node[name].IsSequence())
+				{
+					size = m_Node[name].size();
+					m_SequenceStack.push_back({m_Node[name], 0});
+				}
+				else
+				{
+					m_SequenceStack.push_back({YAML::Node(), 0});
+				}
+			}
+		}
+
+		virtual void EndSequence() override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				*m_Out << YAML::EndSeq;
+			}
+			m_SequenceStack.pop_back();
+		}
+
+		virtual bool Nested(const char* name, std::function<void(IPropertyArchiveBase&)> callback) override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				if (name)
+				{
+					*m_Out << YAML::Key << name << YAML::Value << YAML::BeginMap;
+				}
+				else
+				{
+					*m_Out << YAML::BeginMap;
+				}
+				PropertyArchive nestedArchive(*m_Out);
+				callback(static_cast<IPropertyArchiveBase&>(nestedArchive));
+				*m_Out << YAML::EndMap;
+			}
+			else
+			{
+				YAML::Node nodeToUse;
+				if (!m_SequenceStack.empty() && m_SequenceStack.back().Node && m_SequenceStack.back().Node.IsSequence())
+				{
+					auto& seq = m_SequenceStack.back();
+					if (seq.Index < seq.Node.size())
+					{
+						nodeToUse = seq.Node[seq.Index++];
+					}
+				}
+				else if (name && m_Node[name])
+				{
+					nodeToUse = m_Node[name];
+				}
+
+				if (nodeToUse && nodeToUse.IsMap())
+				{
+					PropertyArchive nestedArchive(nodeToUse);
+					callback(static_cast<IPropertyArchiveBase&>(nestedArchive));
+				}
+			}
+			return false;
+		}
+
+		virtual void BeginMap(const char* name, size_t& size) override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				if (name)
+				{
+					*m_Out << YAML::Key << name << YAML::Value << YAML::BeginMap;
+				}
+				m_MapStack.push_back({YAML::Node(), 0, false});
+			}
+			else
+			{
+				YAML::Node mapNode;
+				if (name && m_Node[name] && m_Node[name].IsMap())
+				{
+					mapNode = m_Node[name];
+					size = mapNode.size();
+				}
+				else
+				{
+					size = 0;
+				}
+				m_MapStack.push_back({mapNode, 0, true});
+			}
+		}
+
+		virtual void EndMap() override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				*m_Out << YAML::EndMap;
+			}
+			if (!m_MapStack.empty())
+			{
+				m_MapStack.pop_back();
+			}
+		}
+
+		virtual bool MapNextKey(std::string& key) override
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				*m_Out << YAML::Key << key;
+				return true;
+			}
+			else
+			{
+				if (m_MapStack.empty())
+				{
+					return false;
+				}
+				auto& state = m_MapStack.back();
+				if (!state.Node || !state.IsMap)
+				{
+					return false;
+				}
+
+				auto it = state.Node.begin();
+				for (size_t i = 0; i < state.Index && it != state.Node.end(); ++i, ++it)
+				{
+				}
+				if (it == state.Node.end())
+				{
+					return false;
+				}
+
+				key = it->first.as<std::string>();
+				state.Index++;
+				return true;
+			}
+		}
+
+	private:
+		template <typename T> bool PropertyInternal(const char* name, T& value)
+		{
+			if (m_Mode == ReflectionMode::Serialize)
+			{
+				if (name)
+				{
+					SerializeProperty(*m_Out, name, value);
+				}
+				else
+				{
+					*m_Out << value;
+				}
+			}
+			else
+			{
+				if (!m_SequenceStack.empty() && m_SequenceStack.back().Node && m_SequenceStack.back().Node.IsSequence())
+				{
+					auto& seq = m_SequenceStack.back();
+					if (seq.Index < seq.Node.size())
+					{
+						value = seq.Node[seq.Index++].as<T>(value);
+					}
+				}
+				else if (name && m_Node.IsMap())
+				{
+					DeserializeProperty(m_Node, name, value);
+				}
+			}
+			return false;
+		}
+
+		struct SequenceState
+		{
+			YAML::Node Node;
+			size_t Index;
+		};
+		std::vector<SequenceState> m_SequenceStack;
+
+		struct MapState
+		{
+			YAML::Node Node;
+			size_t Index;
+			bool IsMap;
+		};
+		std::vector<MapState> m_MapStack;
+
+		ReflectionMode m_Mode;
+		YAML::Emitter* m_Out = nullptr;
+		YAML::Node m_Node;
+	};
+} // namespace Chained::Serialization
+
+#endif // CH_SERIALIZATION_UTILS_H
diff --git a/engine/scene/serialization_utils.h b/engine/scene/serialization_utils.h
deleted file mode 100644
index 41d65c2f2..000000000
--- a/engine/scene/serialization_utils.h
+++ /dev/null
@@ -1,339 +0,0 @@
-#ifndef CH_SERIALIZATION_UTILS_H
-#define CH_SERIALIZATION_UTILS_H
-
-#include "engine/core/uuid.h"
-#include "engine/scene/yaml.h"
-#include "engine/core/reflection.h"
-#include "engine/scene/project.h"
-#include <filesystem>
-
-namespace CHEngine::SerializationUtils
-{
-// --- YAML Serialization Helpers ---
-
-template <typename T> inline void SerializeProperty(YAML::Emitter& out, const char* name, const T& value)
-{
-    if constexpr (std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t> || std::is_same_v<T, unsigned char> || std::is_same_v<T, char>)
-    {
-        out << YAML::Key << name << YAML::Value << static_cast<int>(value);
-    }
-    else
-    {
-        out << YAML::Key << name << YAML::Value << value;
-    }
-}
-
-inline void SerializePath(YAML::Emitter& out, const char* name, const std::string& path)
-{
-    if (path.empty())
-    {
-        out << YAML::Key << name << YAML::Value << "";
-        return;
-    }
-
-    std::string relativePath = Project::GetRelativePath(path);
-    out << YAML::Key << name << YAML::Value << relativePath;
-}
-
-inline void SerializeHandle(YAML::Emitter& out, const char* name, uint64_t handle)
-{
-    out << YAML::Key << name << YAML::Value << handle;
-}
-
-// --- YAML Deserialization Helpers ---
-
-template <typename T> inline void DeserializeProperty(YAML::Node node, const char* name, T& value)
-{
-    if (node[name])
-    {
-        if constexpr (std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t> || std::is_same_v<T, unsigned char> || std::is_same_v<T, char>)
-        {
-            value = static_cast<T>(node[name].as<int>(static_cast<int>(value)));
-        }
-        else
-        {
-            value = node[name].as<T>(value);
-        }
-    }
-}
-
-inline void DeserializePath(YAML::Node node, const char* name, std::string& path)
-{
-    if (node[name])
-    {
-        std::string pathValue = node[name].as<std::string>(path);
-        if (pathValue.empty())
-        {
-            path = "";
-            return;
-        }
-
-        // Keep it relative so that the UI displays it cleanly, and AssetManager will resolve it implicitly.
-        path = pathValue;
-
-        // Unify slashes for cross-platform portability.
-#if CH_PLATFORM_WINDOWS
-        std::replace(path.begin(), path.end(), '\\', '/');
-#endif
-    }
-}
-
-inline void DeserializeHandle(YAML::Node node, const char* name, uint64_t& handle)
-{
-    if (node[name])
-    {
-        handle = node[name].as<uint64_t>(handle);
-    }
-}
-
-inline void DeserializePath(YAML::Node node, const char* name, std::filesystem::path& path)
-{
-    std::string pathStr;
-    DeserializePath(node, name, pathStr);
-    if (!pathStr.empty())
-    {
-        path = pathStr;
-    }
-}
-
-// For optional components or complex types that might be missing
-template <typename T> inline bool HasProperty(YAML::Node node, const char* name)
-{
-    return node[name].IsDefined();
-}
-
-// ========================================================================
-// PropertyArchive - Declarative Serialization/Deserialization
-// ========================================================================
-// Allows defining component layout once for both save/load operations
-
-class PropertyArchive
-{
-public:
-    enum Mode
-    {
-        Serialize,
-        Deserialize
-    };
-
-    // Serialize constructor
-    PropertyArchive(YAML::Emitter& emitter)
-        : m_Mode(Serialize),
-          m_Out(&emitter),
-          m_Node()
-    {
-    }
-
-    // Deserialize constructor
-    PropertyArchive(YAML::Node node)
-        : m_Mode(Deserialize),
-          m_Out(nullptr),
-          m_Node(node)
-    {
-    }
-
-    // Check if property exists (for backwards compatibility/migrations)
-    bool HasProperty(const char* name)
-    {
-        if (m_Mode == Serialize)
-        {
-            return true; // Always "has" property in serialize mode (conceptually) or return false?
-                         // Actually for migration checks we usually check if generic properties exist in READ mode.
-        }
-        return m_Node[name].IsDefined();
-    }
-
-    // Generic property handler
-    template <typename T> bool operator()(const char* name, T& value)
-    {
-        if (m_Mode == Serialize)
-        {
-            SerializeProperty(*m_Out, name, value);
-        }
-        else
-        {
-            DeserializeProperty(m_Node, name, value);
-        }
-        return false; // No UI change tracking in serialization
-    }
-
-    // Generic field property
-    template <typename T> bool Property(const char* name, T& value)
-    {
-        return (*this)(name, value);
-    }
-
-    // Enum property (names and count ignored for now, but signature matches reflection)
-    template <typename T_Enum>
-    bool Property(const char* name, T_Enum& value, const char** names, int count)
-    {
-        return (*this)(name, value);
-    }
-
-    // --- Property methods with metadata (ignored in serialization) ---
-    template <typename T> bool Property(const char* name, T& value, const PropertyMeta& meta)
-    {
-        // Metadata is only used by UI, not by serialization
-        return (*this)(name, value);
-    }
-
-    template <typename T_Enum>
-    bool Property(const char* name, T_Enum& value, const char** names, int count, const PropertyMeta& meta)
-    {
-        return (*this)(name, value);
-    }
-
-    bool File(const char* name, std::string& path, const char* extensions, const PropertyMeta& meta)
-    {
-        // Metadata is only used by UI, not by serialization
-        return File(name, path, extensions);
-    }
-
-    // File/Path property (handles relative/absolute conversion)
-    bool File(const char* name, std::string& path, const char* extensions = nullptr)
-    {
-        if (m_Mode == Serialize)
-        {
-            SerializePath(*m_Out, name, path);
-        }
-        else
-        {
-            DeserializePath(m_Node, name, path);
-        }
-        return false;
-    }
-
-    bool Path(const char* name, std::filesystem::path& path)
-    {
-        if (m_Mode == Serialize)
-        {
-            SerializePath(*m_Out, name, path.string());
-        }
-        else
-        {
-            DeserializePath(m_Node, name, path);
-        }
-        return false;
-    }
-
-    bool Handle(const char* name, uint64_t& handle)
-    {
-        if (m_Mode == Serialize)
-        {
-            SerializeHandle(*m_Out, name, handle);
-        }
-        else
-        {
-            DeserializeHandle(m_Node, name, handle);
-        }
-        return false;
-    }
-
-    bool Handle(const char* name, UUID& handle)
-    {
-        uint64_t& id = (uint64_t&)handle;
-        if (m_Mode == Serialize)
-        {
-            SerializeHandle(*m_Out, name, id);
-        }
-        else
-        {
-            DeserializeHandle(m_Node, name, id);
-        }
-        return false;
-    }
-
-    // --- Reflection Compatibility ---
-
-    // Actions are ignored in serialization but we need a stub
-    bool Action(const char* label, std::function<void()> func)
-    {
-        return false;
-    }
-
-    void Header(const char* label) {}
-    void Separator() {}
-    bool BeginGroup(const char* label, bool defaultOpen = true) { return true; }
-    void EndGroup() {}
-
-    // YAML doesn't track change states like UI, so we return false for now
-    // (Actual change tracking is done when we SAVE the file anyway)
-    bool HasChanged() const { return false; }
-    void SetChanged(bool changed) {}
-
-    ReflectionMode GetReflectionMode() const
-    {
-        return m_Mode == Serialize ? ReflectionMode::Serialize : ReflectionMode::Deserialize;
-    }
-
-    // Nested structure (UIStyle, TextStyle, etc.)
-    template <typename T>
-    bool Nested(const char* name, T& value)
-    {
-        if (m_Mode == Serialize)
-        {
-            *m_Out << YAML::Key << name << YAML::Value << YAML::BeginMap;
-            PropertyArchive nestedArchive(*m_Out);
-            Properties<PropertyArchive> p(nestedArchive);
-            value.Reflect(p);
-            *m_Out << YAML::EndMap;
-        }
-        else
-        {
-            if (m_Node[name])
-            {
-                PropertyArchive nestedArchive(m_Node[name]);
-                Properties<PropertyArchive> p(nestedArchive);
-                value.Reflect(p);
-            }
-        }
-        return false;
-    }
-
-    // Array/Sequence property
-    template <typename T> bool Sequence(const char* name, std::vector<T>& vec)
-    {
-        if (m_Mode == Serialize)
-        {
-            *m_Out << YAML::Key << name << YAML::Value << YAML::BeginSeq;
-            for (const auto& item : vec)
-            {
-                *m_Out << item;
-            }
-            *m_Out << YAML::EndSeq;
-        }
-        else
-        {
-            if (m_Node[name] && m_Node[name].IsSequence())
-            {
-                vec.clear();
-                for (auto item : m_Node[name])
-                {
-                    vec.push_back(item.template as<T>(T{}));
-                }
-            }
-        }
-        return false;
-    }
-
-    Mode GetMode() const
-    {
-        return m_Mode;
-    }
-    YAML::Emitter* GetEmitter()
-    {
-        return m_Out;
-    }
-    YAML::Node GetNode()
-    {
-        return m_Node;
-    }
-
-private:
-    Mode m_Mode;
-    YAML::Emitter* m_Out;
-    YAML::Node m_Node;
-};
-} // namespace CHEngine::SerializationUtils
-
-#endif // CH_SERIALIZATION_UTILS_H
diff --git a/engine/scene/systems/animation_system.cpp b/engine/scene/systems/animation_system.cpp
new file mode 100644
index 000000000..a7edbcf66
--- /dev/null
+++ b/engine/scene/systems/animation_system.cpp
@@ -0,0 +1,498 @@
+#include "animation_system.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/components/animation/animation_component.h"
+#include "engine/assets/types/animation_graph_asset.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/scene/scene.h"
+
+static int s_AnimLogFrame = 0;
+
+namespace Chained::AnimationSystem
+{
+
+	static void EvaluateGraph(AnimationComponent& anim, bool isRuntimePlay)
+	{
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		if (anim.GraphPath.empty())
+		{
+			return;
+		}
+
+		if (anim.GraphAssetHandle == 0)
+		{
+			auto asset = assets->LoadAsset(anim.GraphPath, AssetType::AnimationGraph);
+			if (asset)
+			{
+				anim.GraphAssetHandle = asset->GetID();
+				if (s_AnimLogFrame < 10)
+				{
+					CH_CORE_INFO("[AnimGraph] Loaded graph asset: {} (handle={})", anim.GraphPath,
+								 (uint64_t)anim.GraphAssetHandle);
+				}
+			}
+			else
+			{
+				if (s_AnimLogFrame < 10)
+				{
+					CH_CORE_ERROR("[AnimGraph] FAILED to load graph asset: {}", anim.GraphPath);
+				}
+			}
+		}
+
+		auto graphAsset = assets->Get<AnimationGraphAsset>(anim.GraphAssetHandle);
+		if (!graphAsset)
+		{
+			if (s_AnimLogFrame < 10)
+			{
+				CH_CORE_ERROR("[AnimGraph] graphAsset is NULL (handle={}), isRuntime={}",
+							  (uint64_t)anim.GraphAssetHandle, isRuntimePlay);
+			}
+			return;
+		}
+
+		if (anim.CurrentNodeID == -1 || !graphAsset->FindNode(anim.CurrentNodeID))
+		{
+			anim.CurrentNodeID = graphAsset->EntryNodeID;
+			if (anim.CurrentNodeID == -1 && !graphAsset->Nodes.empty())
+			{
+				anim.CurrentNodeID = graphAsset->Nodes[0].ID;
+			}
+			CH_CORE_INFO("[AnimGraph] Set entry NodeID={} (nodes={}, transitions={})", anim.CurrentNodeID,
+						 graphAsset->Nodes.size(), graphAsset->Transitions.size());
+		}
+
+		// Seed missing Variables from the graph's DefaultVariables.
+		// Scripts can then override values via SetFloat/SetBool.
+		// This ensures every variable the graph references (e.g. isGrounded)
+		// exists in the map with a sane default - no hardcoding needed in C++.
+		for (const auto& [name, defaultVal] : graphAsset->DefaultVariables)
+		{
+			if (anim.Variables.find(name) == anim.Variables.end())
+			{
+				anim.Variables[name] = defaultVal;
+			}
+		}
+
+		AnimNode* currentNode = graphAsset->FindNode(anim.CurrentNodeID);
+		if (!currentNode)
+		{
+			return;
+		}
+
+		// Ensure animation and node properties match current state when not blending
+		if (!anim.Blending)
+		{
+			anim.CurrentAnimationIndex = currentNode->AnimationIndex;
+			anim.IsLooping = currentNode->IsLooping;
+			anim.StartFrame = currentNode->StartFrame;
+			anim.EndFrame = currentNode->EndFrame;
+			anim.Speed = (currentNode->Speed > 0.0f) ? currentNode->Speed : 1.0f;
+		}
+
+		// Collect valid transitions from current node
+		struct ValidTransition
+		{
+			const AnimTransition* transition;
+			AnimNode* targetNode;
+		};
+		std::vector<ValidTransition> validTransitions;
+
+		for (auto& link : graphAsset->Transitions)
+		{
+			if (link.SourceNodeID == anim.CurrentNodeID)
+			{
+				if (link.HasExitTime)
+				{
+					float exitTimeRef = 0.0f;
+					switch (link.ExitTimeMode)
+					{
+					case AnimTransition::ExitTimeMode::SourceAnimation:
+						exitTimeRef = anim.NormalizedTime;
+						break;
+					case AnimTransition::ExitTimeMode::TargetAnimation:
+						// For target animation, we'd need target's normalized time
+						// For now, fall back to source
+						exitTimeRef = anim.NormalizedTime;
+						break;
+					case AnimTransition::ExitTimeMode::AbsoluteTime:
+						// ExitTime in seconds from state entry
+						exitTimeRef = (anim.Duration > 0.0001f) ? (anim.CurrentTime / anim.Duration) : 0.0f;
+						break;
+					}
+					if (!anim.IsFinished && exitTimeRef < link.ExitTime)
+					{
+						continue;
+					}
+				}
+
+				bool conditionsMet = true;
+				for (auto& cond : link.Conditions)
+				{
+					if (!cond.Evaluate(anim.Variables))
+					{
+						conditionsMet = false;
+						break;
+					}
+				}
+
+				if (conditionsMet)
+				{
+					AnimNode* targetNode = graphAsset->FindNode(link.TargetNodeID);
+					if (targetNode)
+					{
+						validTransitions.push_back({&link, targetNode});
+					}
+				}
+			}
+		}
+
+		if (s_AnimLogFrame < 10)
+		{
+			std::string varStr;
+			for (auto& [k, v] : anim.Variables)
+			{
+				varStr += k + "=" + std::to_string(v) + " ";
+			}
+			CH_CORE_INFO("[AnimGraph] runtime={} node={} blending={} vars=[{}] validTrans={}", isRuntimePlay,
+						 anim.CurrentNodeID, anim.Blending, varStr, validTransitions.size());
+		}
+
+		// Only evaluate transitions during simulation.
+		// In edit mode, variables are never set by scripts so all conditions
+		// evaluate against 0.0 defaults, causing the graph to thrash states every frame.
+		if (!isRuntimePlay)
+		{
+			return;
+		}
+
+		// Sort by priority (higher first)
+		std::sort(validTransitions.begin(), validTransitions.end(),
+				  [](const ValidTransition& a, const ValidTransition& b) {
+					  return a.transition->Priority > b.transition->Priority;
+				  });
+
+		// Take highest priority transition
+		if (!validTransitions.empty() && !anim.Blending)
+		{
+			const auto& best = validTransitions[0];
+			const AnimTransition* link = best.transition;
+			AnimNode* targetNode = best.targetNode;
+
+			// Store target info for blend - capture target node params
+			anim.TargetNodeID = link->TargetNodeID;
+			anim.TargetAnimationIndex = targetNode->AnimationIndex;
+			anim.TargetFrame = targetNode->StartFrame;
+			anim.TargetFrameTimeCounter = 0.0f; // Initialize target frame counter
+			anim.TargetStartFrame = targetNode->StartFrame;
+			anim.TargetEndFrame = targetNode->EndFrame;
+			anim.TargetSpeed = (targetNode->Speed > 0.0f) ? targetNode->Speed : 1.0f;
+			anim.TargetIsLooping = targetNode->IsLooping;
+			anim.BlendDuration = link->BlendDuration;
+			anim.BlendTimer = 0.0f;
+			anim.Blending = true;
+			anim.IsPlaying = true;
+			anim.IsFinished = false;
+
+			CH_CORE_INFO("[AnimGraph] TRANSITION: node {} -> {} (blend={}s)", anim.CurrentNodeID, anim.TargetNodeID,
+						 anim.BlendDuration);
+
+			// Target node params will be applied after blend completes
+			// Current anim params (StartFrame, EndFrame, Speed, IsLooping) remain unchanged during blend
+		}
+	}
+
+	static void ProcessPlayback(entt::registry& reg, AnimationComponent& anim, const ModelComponent& model, Timestep ts)
+	{
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		auto handle = assets->LoadAsset(model.ModelPath, ModelAsset::GetStaticType());
+		auto modelAsset = assets->Get<ModelAsset>(model.ModelPath);
+		if (!modelAsset || modelAsset->GetAnimationCount() == 0)
+		{
+			return;
+		}
+
+		int animCount = modelAsset->GetAnimationCount();
+		if (anim.CurrentAnimationIndex >= animCount)
+		{
+			anim.CurrentAnimationIndex = 0;
+			anim.CurrentFrame = 0;
+			anim.IsFinished = false;
+		}
+		if (anim.TargetAnimationIndex >= animCount)
+		{
+			anim.TargetAnimationIndex = -1;
+		}
+
+		const auto& rawAnims = modelAsset->GetAnimations();
+
+		// ===== CURRENT ANIMATION TIMING =====
+		float currentFPS = 30.0f;
+		int currentTotalFrames = 1;
+		if (anim.CurrentAnimationIndex >= 0 && anim.CurrentAnimationIndex < (int)rawAnims.size())
+		{
+			currentFPS = rawAnims[anim.CurrentAnimationIndex].frameRate;
+			currentTotalFrames = rawAnims[anim.CurrentAnimationIndex].frameCount;
+		}
+		if (currentFPS <= 0.0f)
+		{
+			currentFPS = 30.0f;
+		}
+		if (currentTotalFrames <= 0)
+		{
+			currentTotalFrames = 1;
+		}
+
+		int currentEffectiveStart = std::clamp(anim.StartFrame, 0, currentTotalFrames - 1);
+		int currentEffectiveEnd = (anim.EndFrame < 0)
+									  ? (currentTotalFrames - 1)
+									  : std::clamp(anim.EndFrame, currentEffectiveStart, currentTotalFrames - 1);
+		int currentEffectiveLength = currentEffectiveEnd - currentEffectiveStart + 1;
+
+		if (anim.CurrentFrame < currentEffectiveStart || anim.CurrentFrame > currentEffectiveEnd)
+		{
+			anim.CurrentFrame = currentEffectiveStart;
+		}
+
+		float currentFrameTime = 1.0f / currentFPS;
+		anim.Duration = (float)currentEffectiveLength / currentFPS;
+
+		// ===== TARGET ANIMATION TIMING (for blend) =====
+		float targetFPS = currentFPS;
+		int targetTotalFrames = currentTotalFrames;
+		int targetEffectiveStart = currentEffectiveStart;
+		int targetEffectiveEnd = currentEffectiveEnd;
+		int targetEffectiveLength = currentEffectiveLength;
+
+		if (anim.Blending && anim.TargetAnimationIndex >= 0 && anim.TargetAnimationIndex < (int)rawAnims.size())
+		{
+			targetFPS = rawAnims[anim.TargetAnimationIndex].frameRate;
+			targetTotalFrames = rawAnims[anim.TargetAnimationIndex].frameCount;
+			if (targetFPS <= 0.0f)
+			{
+				targetFPS = 30.0f;
+			}
+			if (targetTotalFrames <= 0)
+			{
+				targetTotalFrames = 1;
+			}
+
+			// Use TARGET node's frame range (captured at transition trigger)
+			targetEffectiveStart = std::clamp(anim.TargetStartFrame, 0, targetTotalFrames - 1);
+			targetEffectiveEnd = (anim.TargetEndFrame < 0)
+									 ? (targetTotalFrames - 1)
+									 : std::clamp(anim.TargetEndFrame, targetEffectiveStart, targetTotalFrames - 1);
+			targetEffectiveLength = targetEffectiveEnd - targetEffectiveStart + 1;
+
+			// Initialize TargetFrame if not set
+			if (anim.TargetFrame < targetEffectiveStart || anim.TargetFrame > targetEffectiveEnd)
+			{
+				anim.TargetFrame = targetEffectiveStart;
+			}
+		}
+
+		bool isRuntimePlay = false;
+		if (auto* scenePtr = reg.ctx().find<Scene*>())
+		{
+			if (*scenePtr && (*scenePtr)->IsSimulationRunning())
+			{
+				isRuntimePlay = true;
+			}
+		}
+
+		if (anim.IsPlaying)
+		{
+			float dt = ts.GetSeconds();
+			float baseSpeed = anim.Speed > 0.0f ? anim.Speed : 0.0f;
+			if (baseSpeed <= 0.0f)
+			{
+				baseSpeed = 1.0f;
+			}
+			// NOTE: anim.Variables["speed"] is used ONLY for graph transition conditions.
+			// Do NOT multiply baseSpeed by it - that's what Node.Speed is for.
+
+			// ===== BLEND HANDLING =====
+			if (anim.Blending)
+			{
+				anim.BlendTimer += dt;
+				float blendAlpha =
+					(anim.BlendDuration > 0.0f) ? glm::clamp(anim.BlendTimer / anim.BlendDuration, 0.0f, 1.0f) : 1.0f;
+
+				// Interpolate parameters during blend (Speed, StartFrame, EndFrame)
+				// Note: IsLooping switches at blend end (handled below)
+				float interpSpeed = glm::mix(anim.Speed, anim.TargetSpeed, blendAlpha);
+				interpSpeed = interpSpeed > 0.0f ? interpSpeed : 1.0f;
+				// NOTE: interpSpeed is purely from Node.Speed interpolation, not from variables.
+				// Keep current animation within its own effective range during blend
+				int interpEffectiveStart = currentEffectiveStart;
+				int interpEffectiveEnd = currentEffectiveEnd;
+				float interpFrameTime = 1.0f / currentFPS;
+
+				// Advance current animation with interpolated speed
+				anim.FrameTimeCounter += dt * interpSpeed;
+				while (anim.FrameTimeCounter >= interpFrameTime)
+				{
+					anim.FrameTimeCounter -= interpFrameTime;
+					anim.CurrentFrame++;
+
+					if (anim.CurrentFrame > interpEffectiveEnd)
+					{
+						if (anim.IsLooping)
+						{
+							anim.CurrentFrame = interpEffectiveStart;
+							anim.IsFinished = false;
+						}
+						else
+						{
+							anim.CurrentFrame = interpEffectiveEnd;
+							anim.IsPlaying = false;
+							anim.IsFinished = true;
+						}
+					}
+				}
+
+				anim.CurrentTime =
+					(float)(anim.CurrentFrame - interpEffectiveStart) * interpFrameTime + anim.FrameTimeCounter;
+				anim.NormalizedTime =
+					(anim.Duration > 0.0001f) ? std::clamp(anim.CurrentTime / anim.Duration, 0.0f, 1.0f) : 0.0f;
+
+				// Advance target animation in ITS OWN FPS
+				float targetFrameTime = 1.0f / targetFPS;
+				anim.TargetFrameTimeCounter += dt * interpSpeed; // Use interpolated speed for consistency
+				while (anim.TargetFrameTimeCounter >= targetFrameTime)
+				{
+					anim.TargetFrameTimeCounter -= targetFrameTime;
+					anim.TargetFrame++;
+
+					if (anim.TargetFrame > targetEffectiveEnd)
+					{
+						if (anim.TargetIsLooping)
+						{
+							anim.TargetFrame = targetEffectiveStart;
+						}
+						else
+						{
+							anim.TargetFrame = targetEffectiveEnd;
+						}
+					}
+				}
+
+				// Check if blend is complete
+				if (anim.BlendTimer >= anim.BlendDuration)
+				{
+					// ===== BLEND COMPLETE - Switch to target animation =====
+					// Convert target time to new current animation time
+					float targetCurrentTime = (float)(anim.TargetFrame - targetEffectiveStart) * targetFrameTime +
+											  anim.TargetFrameTimeCounter;
+
+					// New current animation params (from target node)
+					float newCurrentFPS = targetFPS;
+					int newCurrentTotalFrames = targetTotalFrames;
+					int newEffectiveStart = targetEffectiveStart;
+					int newEffectiveEnd = targetEffectiveEnd;
+					int newEffectiveLength = newEffectiveEnd - newEffectiveStart + 1;
+					float newFrameTime = 1.0f / newCurrentFPS;
+
+					anim.CurrentAnimationIndex = anim.TargetAnimationIndex;
+					anim.CurrentFrame = newEffectiveStart + (int)(targetCurrentTime / newFrameTime);
+					anim.CurrentFrame = std::clamp(anim.CurrentFrame, newEffectiveStart, newEffectiveEnd);
+					anim.FrameTimeCounter = fmodf(targetCurrentTime, newFrameTime);
+
+					// Apply target node parameters
+					anim.StartFrame = anim.TargetStartFrame;
+					anim.EndFrame = anim.TargetEndFrame;
+					anim.Speed = anim.TargetSpeed;
+					anim.IsLooping = anim.TargetIsLooping;
+
+					// Update graph state
+					anim.CurrentNodeID = anim.TargetNodeID;
+					anim.TargetNodeID = -1;
+
+					// Clear blend state
+					anim.Blending = false;
+					anim.TargetAnimationIndex = -1;
+					anim.TargetFrame = 0;
+					anim.TargetFrameTimeCounter = 0.0f;
+					anim.IsFinished = false;
+				}
+			}
+			else
+			{
+				// Non-blending: advance with current params
+				anim.FrameTimeCounter += dt * baseSpeed;
+
+				while (anim.FrameTimeCounter >= currentFrameTime)
+				{
+					anim.FrameTimeCounter -= currentFrameTime;
+					anim.CurrentFrame++;
+
+					if (anim.CurrentFrame > currentEffectiveEnd)
+					{
+						if (anim.IsLooping)
+						{
+							anim.CurrentFrame = currentEffectiveStart;
+							anim.IsFinished = false;
+						}
+						else
+						{
+							anim.CurrentFrame = currentEffectiveEnd;
+							anim.IsPlaying = false;
+							anim.IsFinished = true;
+						}
+					}
+				}
+
+				anim.CurrentTime =
+					(float)(anim.CurrentFrame - currentEffectiveStart) * currentFrameTime + anim.FrameTimeCounter;
+				anim.NormalizedTime =
+					(anim.Duration > 0.0001f) ? std::clamp(anim.CurrentTime / anim.Duration, 0.0f, 1.0f) : 0.0f;
+			}
+		}
+	}
+
+	void Update(entt::registry& reg, Timestep ts)
+	{
+		CH_PROFILE_FUNCTION();
+
+		bool isRuntimePlay = true;
+		if (auto* scenePtr = reg.ctx().find<Scene*>())
+		{
+			if (*scenePtr)
+			{
+				isRuntimePlay = (*scenePtr)->IsSimulationRunning();
+			}
+		}
+
+		auto view = reg.view<AnimationComponent, ModelComponent>();
+		for (auto entity : view)
+		{
+			auto& anim = view.get<AnimationComponent>(entity);
+			auto& model = view.get<ModelComponent>(entity);
+
+			if (anim.IsGraphDriven())
+			{
+				// Only evaluate graph transitions during simulation.
+				// Variables are only set by scripts, which don't run in edit mode.
+				EvaluateGraph(anim, isRuntimePlay);
+			}
+
+			ProcessPlayback(reg, anim, model, ts);
+		}
+
+		s_AnimLogFrame++;
+	}
+
+} // namespace Chained::AnimationSystem
diff --git a/engine/scene/systems/animation_system.h b/engine/scene/systems/animation_system.h
new file mode 100644
index 000000000..ce63892bd
--- /dev/null
+++ b/engine/scene/systems/animation_system.h
@@ -0,0 +1,15 @@
+#ifndef CH_ANIMATION_SYSTEM_H
+#define CH_ANIMATION_SYSTEM_H
+
+#include "engine/common/timestep.h"
+#include <entt/entt.hpp>
+
+namespace Chained
+{
+	namespace AnimationSystem
+	{
+		void Update(entt::registry& reg, Timestep ts);
+	}
+} // namespace Chained
+
+#endif // CH_ANIMATION_SYSTEM_H
diff --git a/engine/scene/systems/asset_resolution_system.cpp b/engine/scene/systems/asset_resolution_system.cpp
new file mode 100644
index 000000000..f5ab7a565
--- /dev/null
+++ b/engine/scene/systems/asset_resolution_system.cpp
@@ -0,0 +1,210 @@
+#include "asset_resolution_system.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/material_asset.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/assets/types/shader_asset.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/scene/components/render/shader_component.h"
+#include "engine/scene/components/render/sprite_component.h"
+
+#include <filesystem>
+
+namespace Chained::AssetResolutionSystem
+{
+
+	static void ResolveSprite(entt::registry& reg, entt::entity e)
+	{
+		auto& sprite = reg.get<SpriteComponent>(e);
+
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		if (sprite.TextureHandle != AssetHandle(0))
+		{
+			auto currentAsset = assets->Get<TextureAsset>(sprite.TextureHandle);
+			if (currentAsset && currentAsset->IsReady())
+			{
+				return;
+			}
+		}
+
+		if (sprite.TextureUUID != 0)
+		{
+			auto asset = assets->GetByUUID<TextureAsset>(sprite.TextureUUID);
+			if (asset)
+			{
+				if (asset->IsReady())
+				{
+					sprite.TextureHandle = asset->GetID();
+					if (sprite.TexturePath.empty())
+					{
+						sprite.TexturePath = asset->GetPath();
+					}
+				}
+				return;
+			}
+		}
+
+		if (!sprite.TexturePath.empty())
+		{
+			auto asset = assets->Get<TextureAsset>(sprite.TexturePath);
+			if (asset)
+			{
+				sprite.TextureUUID = asset->GetID();
+				if (asset->IsReady())
+				{
+					sprite.TextureHandle = asset->GetID();
+				}
+			}
+		}
+	}
+
+	static void ResolveShader(entt::registry& reg, entt::entity e)
+	{
+		auto& shader = reg.get<ShaderComponent>(e);
+
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		if (shader.ShaderHandle != AssetHandle(0))
+		{
+			auto currentAsset = assets->Get<ShaderAsset>(shader.ShaderHandle);
+			if (currentAsset && currentAsset->IsReady())
+			{
+				return;
+			}
+		}
+
+		if (shader.ShaderUUID != 0)
+		{
+			auto asset = assets->GetByUUID<ShaderAsset>(shader.ShaderUUID);
+			if (asset)
+			{
+				if (asset->IsReady())
+				{
+					shader.ShaderHandle = asset->GetID();
+					if (shader.ShaderPath.empty())
+					{
+						shader.ShaderPath = asset->GetPath();
+					}
+				}
+				return;
+			}
+		}
+
+		if (!shader.ShaderPath.empty())
+		{
+			auto asset = assets->Get<ShaderAsset>(shader.ShaderPath);
+			if (asset)
+			{
+				shader.ShaderUUID = asset->GetID();
+				if (asset->IsReady())
+				{
+					shader.ShaderHandle = asset->GetID();
+				}
+			}
+		}
+	}
+
+	static void ResolveModel(entt::registry& reg, entt::entity e)
+	{
+		auto& model = reg.get<ModelComponent>(e);
+
+		auto* assets = ServiceLocator::TryGet<AssetManager>();
+		if (!assets)
+		{
+			return;
+		}
+
+		if (model.ModelHandle != AssetHandle(0))
+		{
+			auto currentAsset = assets->Get<ModelAsset>(model.ModelHandle);
+			if (currentAsset && currentAsset->IsReady())
+			{
+				return;
+			}
+		}
+
+		if (model.ModelUUID != 0)
+		{
+			auto asset = assets->GetByUUID<ModelAsset>(model.ModelUUID);
+			if (asset)
+			{
+				if (asset->IsReady())
+				{
+					model.ModelHandle = asset->GetID();
+					if (model.ModelPath.empty())
+					{
+						model.ModelPath = asset->GetPath();
+					}
+				}
+				return;
+			}
+		}
+
+		// Inline ResolveModelPath logic (was previously in ComponentUtils::ResolveModelPath)
+		if (model.ModelPath.empty())
+		{
+			model.ModelHandle = AssetHandle(0);
+			return;
+		}
+
+		auto asset = assets->Get<ModelAsset>(model.ModelPath);
+		if (asset && asset->GetState() == AssetState::Ready)
+		{
+			model.ModelHandle = asset->GetID();
+		}
+		else
+		{
+			model.ModelHandle = AssetHandle(0);
+		}
+	}
+
+	void RegisterObservers(entt::registry& reg)
+	{
+		reg.on_construct<SpriteComponent>().connect<&ResolveSprite>();
+		reg.on_update<SpriteComponent>().connect<&ResolveSprite>();
+
+		reg.on_construct<ShaderComponent>().connect<&ResolveShader>();
+		reg.on_update<ShaderComponent>().connect<&ResolveShader>();
+
+		reg.on_construct<ModelComponent>().connect<&ResolveModel>();
+		reg.on_update<ModelComponent>().connect<&ResolveModel>();
+	}
+
+	void Update(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		reg.view<SpriteComponent>().each([&](auto entity, auto& sprite) {
+			if (sprite.TextureHandle == AssetHandle(0) && (sprite.TextureUUID != 0 || !sprite.TexturePath.empty()))
+			{
+				ResolveSprite(reg, entity);
+			}
+		});
+
+		reg.view<ShaderComponent>().each([&](auto entity, auto& shader) {
+			if (shader.ShaderHandle == AssetHandle(0) && (shader.ShaderUUID != 0 || !shader.ShaderPath.empty()))
+			{
+				ResolveShader(reg, entity);
+			}
+		});
+
+		reg.view<ModelComponent>().each([&](auto entity, auto& model) {
+			if (model.ModelHandle == AssetHandle(0) && (model.ModelUUID != 0 || !model.ModelPath.empty()))
+			{
+				ResolveModel(reg, entity);
+			}
+		});
+	}
+
+} // namespace Chained::AssetResolutionSystem
diff --git a/engine/scene/systems/asset_resolution_system.h b/engine/scene/systems/asset_resolution_system.h
new file mode 100644
index 000000000..d294a21ef
--- /dev/null
+++ b/engine/scene/systems/asset_resolution_system.h
@@ -0,0 +1,15 @@
+#ifndef CH_ASSET_RESOLUTION_SYSTEM_H
+#define CH_ASSET_RESOLUTION_SYSTEM_H
+
+#include <entt/entt.hpp>
+
+namespace Chained
+{
+	namespace AssetResolutionSystem
+	{
+		void RegisterObservers(entt::registry& reg);
+		void Update(entt::registry& reg);
+	} // namespace AssetResolutionSystem
+} // namespace Chained
+
+#endif // CH_ASSET_RESOLUTION_SYSTEM_H
diff --git a/engine/scene/systems/audio_system.cpp b/engine/scene/systems/audio_system.cpp
new file mode 100644
index 000000000..dd091d1bb
--- /dev/null
+++ b/engine/scene/systems/audio_system.cpp
@@ -0,0 +1,141 @@
+#include "audio_system.h"
+#include "engine/audio/audio.h"
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/components/audio/audio_component.h"
+#include "engine/scene/components/render/camera_component.h"
+#include "engine/scene/components/core/transform_component.h"
+
+namespace Chained::AudioSystem
+{
+
+	void Update(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		// 1. Sync listener with primary camera
+		auto cameraView = reg.view<CameraComponent, TransformComponent>();
+		for (auto entity : cameraView)
+		{
+			auto& camera = cameraView.get<CameraComponent>(entity);
+			if (camera.Primary)
+			{
+				auto& transform = cameraView.get<TransformComponent>(entity);
+				glm::vec3 pos = glm::vec3(transform.WorldTransform[3]);
+				glm::mat3 rot = glm::mat3(transform.WorldTransform);
+				glm::vec3 forward = rot * glm::vec3(0, 0, -1);
+				glm::vec3 up = rot * glm::vec3(0, 1, 0);
+
+				if (auto* audioSvc = ServiceLocator::TryGet<Audio>())
+				{
+					audioSvc->SetListenerPosition(pos, forward, up);
+				}
+				break;
+			}
+		}
+
+		// 2. Manage audio components
+		auto audioView = reg.view<AudioComponent, TransformComponent>();
+		auto* audioSvc = ServiceLocator::TryGet<Audio>();
+		if (!audioSvc)
+		{
+			return;
+		}
+
+		for (auto entity : audioView)
+		{
+			auto& audio = audioView.get<AudioComponent>(entity);
+
+			// Load sound if path is set but handle is invalid OR path has changed
+			if (!audio.SoundPath.empty())
+			{
+				bool pathChanged = audio.SoundPath != audio.LoadedSoundPath;
+				if (pathChanged && audio.SoundHandle != AssetHandle(0))
+				{
+					// Stop the old sound and reset so we reload below
+					audioSvc->Stop(audio.SoundHandle);
+					audio.SoundHandle = AssetHandle(0);
+					audio.SoundUUID = 0;
+					audio.IsPlaying = false;
+				}
+
+				if (audio.SoundHandle == AssetHandle(0) || !audioSvc->IsSoundLoaded(audio.SoundHandle))
+				{
+					CH_CORE_INFO("AudioComponent: Loading sound: {}", audio.SoundPath);
+					audio.SoundHandle = audioSvc->LoadSound(audio.SoundPath);
+					// Sync UUID field and loaded path tracker
+					audio.SoundUUID = (uint64_t)audio.SoundHandle;
+					audio.LoadedSoundPath = audio.SoundPath;
+					// Auto-start playback if PlayOnStart was requested
+					if (audio.PlayOnStart && audio.SoundHandle != AssetHandle(0))
+					{
+						audio.IsPlaying = true;
+					}
+				}
+			}
+
+			if (audio.SoundHandle == AssetHandle(0))
+			{
+				continue;
+			}
+
+			// Sync IsPlaying back when a non-looping sound finishes naturally
+			const bool actuallyPlaying = audioSvc->IsPlaying(audio.SoundHandle);
+			if (audio.IsPlaying && !audio.Loop && !actuallyPlaying)
+			{
+				audio.IsPlaying = false;
+				continue;
+			}
+
+			// IsPlaying=true but sound isn't running — start it
+			if (audio.IsPlaying && !actuallyPlaying)
+			{
+				auto& transform = audioView.get<TransformComponent>(entity);
+				glm::vec3 worldPos = glm::vec3(transform.WorldTransform[3]);
+				audioSvc->Play(audio.SoundHandle, audio.Volume, audio.Pitch, audio.Loop, audio.Spatialized, worldPos);
+			}
+			// IsPlaying=false but sound is still running — stop it
+			else if (!audio.IsPlaying && actuallyPlaying)
+			{
+				audioSvc->Stop(audio.SoundHandle);
+			}
+			// IsPlaying=true and sound is running and spatialized — keep position in sync
+			else if (audio.IsPlaying && actuallyPlaying && audio.Spatialized)
+			{
+				auto& transform = audioView.get<TransformComponent>(entity);
+				glm::vec3 worldPos = glm::vec3(transform.WorldTransform[3]);
+				audioSvc->SetInstancePosition(audio.SoundHandle, worldPos);
+			}
+		}
+	}
+
+	void OnRuntimeStart(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		auto view = reg.view<AudioComponent>();
+		for (auto entity : view)
+		{
+			auto& audio = view.get<AudioComponent>(entity);
+			audio.IsPlaying = audio.PlayOnStart;
+		}
+	}
+
+	void OnRuntimeStop(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (auto* audioSvc = ServiceLocator::TryGet<Audio>())
+		{
+			audioSvc->StopAll();
+		}
+
+		auto view = reg.view<AudioComponent>();
+		for (auto entity : view)
+		{
+			auto& audio = view.get<AudioComponent>(entity);
+			audio.IsPlaying = false;
+		}
+	}
+
+} // namespace Chained::AudioSystem
diff --git a/engine/scene/systems/audio_system.h b/engine/scene/systems/audio_system.h
new file mode 100644
index 000000000..528381aeb
--- /dev/null
+++ b/engine/scene/systems/audio_system.h
@@ -0,0 +1,17 @@
+#ifndef CH_AUDIO_SYSTEM_H
+#define CH_AUDIO_SYSTEM_H
+
+#include "engine/common/timestep.h"
+#include <entt/entt.hpp>
+
+namespace Chained
+{
+	namespace AudioSystem
+	{
+		void Update(entt::registry& reg);
+		void OnRuntimeStart(entt::registry& reg);
+		void OnRuntimeStop(entt::registry& reg);
+	} // namespace AudioSystem
+} // namespace Chained
+
+#endif // CH_AUDIO_SYSTEM_H
diff --git a/engine/scene/systems/camera_auto_select_system.cpp b/engine/scene/systems/camera_auto_select_system.cpp
new file mode 100644
index 000000000..844b555ce
--- /dev/null
+++ b/engine/scene/systems/camera_auto_select_system.cpp
@@ -0,0 +1,106 @@
+#include "camera_auto_select_system.h"
+#include "engine/core/profiler.h"
+#include "engine/scene/components/render/camera_component.h"
+#include "engine/scene/components/core/tag_component.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/scene_settings.h"
+
+namespace Chained::CameraAutoSelectSystem
+{
+	// Returns true if the primary scene camera is orthographic (2D).
+	bool IsActiveCamera2D(entt::registry& reg)
+	{
+		auto view = reg.view<CameraComponent>();
+		for (auto entity : view)
+		{
+			auto& comp = view.get<CameraComponent>(entity);
+			if (comp.Primary)
+			{
+				return comp.Camera.GetProjectionType() == ProjectionType::Orthographic;
+			}
+		}
+		// No primary camera — fall back: check if scene wants 2D
+		auto* scenePtr = reg.ctx().find<Scene*>();
+		if (scenePtr && *scenePtr)
+		{
+			auto& settings = (*scenePtr)->GetSettings();
+			return (settings.Mode == BackgroundMode::Color || settings.Mode == BackgroundMode::Texture);
+		}
+		return false;
+	}
+
+	// Selects the best camera based on scene BackgroundMode and camera ProjectionType.
+	// No longer tag-dependent — iterates all CameraComponents.
+	void SelectCamera(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		auto* scenePtr = reg.ctx().find<Scene*>();
+		if (!scenePtr || !*scenePtr)
+		{
+			return;
+		}
+
+		Scene* scene = *scenePtr;
+		auto& settings = scene->GetSettings();
+
+		// 2D scene (Color/Texture background) → prefer orthographic camera
+		// 3D scene (Environment3D background) → prefer perspective camera
+		bool want2D = (settings.Mode == BackgroundMode::Color || settings.Mode == BackgroundMode::Texture);
+
+		auto view = reg.view<CameraComponent>();
+
+		// First pass: deselect all
+		for (auto entity : view)
+		{
+			view.get<CameraComponent>(entity).Primary = false;
+		}
+
+		// Second pass: find best candidate
+		Entity bestCandidate{};
+		for (auto entity : view)
+		{
+			Entity e(entity, &reg);
+			auto& comp = view.get<CameraComponent>(e);
+
+			bool isOrtho = (comp.Camera.GetProjectionType() == ProjectionType::Orthographic);
+			if (want2D && isOrtho)
+			{
+				bestCandidate = e;
+				break;
+			}
+			if (!want2D && !isOrtho)
+			{
+				bestCandidate = e;
+				break;
+			}
+		}
+
+		// Third pass fallback: if no perfect match, take the first camera
+		if (!bestCandidate)
+		{
+			for (auto entity : view)
+			{
+				bestCandidate = Entity(entity, &reg);
+				break;
+			}
+		}
+
+		if (bestCandidate)
+		{
+			bestCandidate.GetComponent<CameraComponent>().Primary = true;
+		}
+	}
+
+	void OnRuntimeStart(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+		SelectCamera(reg);
+	}
+
+	void OnSceneUpdate(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+		SelectCamera(reg);
+	}
+} // namespace Chained::CameraAutoSelectSystem
diff --git a/engine/scene/systems/camera_auto_select_system.h b/engine/scene/systems/camera_auto_select_system.h
new file mode 100644
index 000000000..6df896d2b
--- /dev/null
+++ b/engine/scene/systems/camera_auto_select_system.h
@@ -0,0 +1,17 @@
+#ifndef CH_CAMERA_AUTO_SELECT_SYSTEM_H
+#define CH_CAMERA_AUTO_SELECT_SYSTEM_H
+
+#include <entt/entt.hpp>
+
+namespace Chained
+{
+	namespace CameraAutoSelectSystem
+	{
+		void OnRuntimeStart(entt::registry& reg);
+		void OnSceneUpdate(entt::registry& reg);
+
+		bool IsActiveCamera2D(entt::registry& reg);
+	} // namespace CameraAutoSelectSystem
+} // namespace Chained
+
+#endif // CH_CAMERA_AUTO_SELECT_SYSTEM_H
diff --git a/engine/scene/systems/hierarchy_system.cpp b/engine/scene/systems/hierarchy_system.cpp
new file mode 100644
index 000000000..70f5c5015
--- /dev/null
+++ b/engine/scene/systems/hierarchy_system.cpp
@@ -0,0 +1,57 @@
+#include "hierarchy_system.h"
+#include "engine/core/profiler.h"
+#include "engine/scene/components.h"
+#include "engine/scene/systems/transform_system.h"
+
+namespace Chained::Hierarchy
+{
+
+	void UpdateWorldTransforms(entt::registry& reg, const std::vector<entt::entity>& roots)
+	{
+		CH_PROFILE_FUNCTION();
+
+		std::vector<UpdateTask> stack;
+		stack.reserve(roots.size());
+
+		// 1. Push root entities to stack
+		for (auto entity : roots)
+		{
+			if (reg.valid(entity) && reg.all_of<TransformComponent>(entity))
+			{
+				stack.push_back({entity, glm::mat4(1.0f), true});
+			}
+		}
+
+		// 2. Iterative DFS update with dirty flag propagation
+		while (!stack.empty())
+		{
+			UpdateTask task = stack.back();
+			stack.pop_back();
+
+			auto& tc = reg.get<TransformComponent>(task.Entity);
+
+			// A node needs update if it is explicitly dirty OR its parent's world transform changed
+			bool needsUpdate = task.ParentChanged || tc.TransformChanged;
+
+			if (needsUpdate)
+			{
+				tc.WorldTransform = task.ParentTransform * TransformSystem::ComputeLocalMatrix(tc);
+				tc.InverseWorldTransform = glm::inverse(tc.WorldTransform);
+				tc.TransformChanged = false;
+			}
+
+			if (reg.all_of<HierarchyComponent>(task.Entity))
+			{
+				auto& hc = reg.get<HierarchyComponent>(task.Entity);
+				for (auto child : hc.Children)
+				{
+					if (reg.valid(child) && reg.all_of<TransformComponent>(child))
+					{
+						stack.push_back({child, tc.WorldTransform, needsUpdate});
+					}
+				}
+			}
+		}
+	}
+
+} // namespace Chained::Hierarchy
diff --git a/engine/scene/systems/hierarchy_system.h b/engine/scene/systems/hierarchy_system.h
new file mode 100644
index 000000000..3034b8ab3
--- /dev/null
+++ b/engine/scene/systems/hierarchy_system.h
@@ -0,0 +1,29 @@
+#ifndef CH_HIERARCHY_SYSTEM_H
+#define CH_HIERARCHY_SYSTEM_H
+
+#include "entt/entt.hpp"
+#include <glm/glm.hpp>
+#include <vector>
+
+namespace Chained
+{
+
+	struct UpdateTask
+	{
+		entt::entity Entity;
+		glm::mat4 ParentTransform;
+		bool ParentChanged;
+	};
+
+	namespace Hierarchy
+	{
+		/**
+		 * @brief Updates the world-space transforms for all entities in the hierarchy.
+		 * Uses an iterative DFS approach with dirty-flag propagation.
+		 */
+		void UpdateWorldTransforms(entt::registry& reg, const std::vector<entt::entity>& roots);
+	} // namespace Hierarchy
+
+} // namespace Chained
+
+#endif // CH_HIERARCHY_SYSTEM_H
diff --git a/engine/scene/systems/network_system.cpp b/engine/scene/systems/network_system.cpp
new file mode 100644
index 000000000..802d5f4f1
--- /dev/null
+++ b/engine/scene/systems/network_system.cpp
@@ -0,0 +1,1331 @@
+#include "network_system.h"
+#include "engine/scene/components/gameplay/network_identity_component.h"
+#include "engine/scene/components/core/transform_component.h"
+#include "engine/scene/components/core/hierarchy_component.h"
+#include "engine/scene/systems/transform_system.h"
+#include "engine/scene/components/gameplay/player_component.h"
+#include "engine/scene/components/physics/physics_component.h"
+#include "engine/scene/components/render/camera_component.h"
+#include "engine/scene/components/gameplay/spawn_component.h"
+#include "engine/networking/network_service.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/prefab_serializer.h"
+#include "engine/scene/scene_events.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "engine/core/input.h"
+#include "engine/core/key_codes.h"
+
+#include <glm/gtc/quaternion.hpp>
+#include <cstring>
+
+namespace Chained
+{
+
+	NetworkSystem& NetworkSystem::GetInstance()
+	{
+		static NetworkSystem s_Instance;
+		return s_Instance;
+	}
+
+	// ---- Peer mapping ----
+
+	void NetworkSystem::SetPlayerPrefab(const std::string& path)
+	{
+		m_PlayerPrefab = path;
+	}
+
+	const std::string& NetworkSystem::GetPlayerPrefab()
+	{
+		return m_PlayerPrefab;
+	}
+
+	void NetworkSystem::RegisterPeerEntity(int peer, uint64_t networkID)
+	{
+		m_PeerToNetworkID[peer] = networkID;
+	}
+
+	void NetworkSystem::UnregisterPeer(int peer)
+	{
+		m_PeerToNetworkID.erase(peer);
+	}
+
+	// ---- Incoming message processing (client side) ----
+
+	void NetworkSystem::ProcessWorldStateMessage(WorldStateMessage* msg)
+	{
+		if (!msg)
+		{
+			return;
+		}
+
+		auto it = m_PendingStates.find(msg->NetworkID);
+		if (it != m_PendingStates.end() && msg->Tick < it->second.LastTick &&
+			(it->second.LastTick - msg->Tick) < 100000)
+		{
+			return; // Drop out-of-order / older state
+		}
+
+		PendingNetworkState state;
+		state.NetworkID = msg->NetworkID;
+		state.LastTick = msg->Tick;
+		state.TargetPosition = {msg->Position[0], msg->Position[1], msg->Position[2]};
+		state.TargetRotation = {msg->Rotation[0], msg->Rotation[1], msg->Rotation[2], msg->Rotation[3]};
+		state.TargetVelocity = {msg->Velocity[0], msg->Velocity[1], msg->Velocity[2]};
+		state.IsGrounded = (msg->IsGrounded != 0);
+		state.ActionFlags = msg->ActionFlags;
+
+		m_PendingStates[state.NetworkID] = state;
+	}
+
+	void NetworkSystem::ProcessSceneChangeMessage(SceneChangeMessage* msg)
+	{
+		if (!msg || msg->ScenePath[0] == '\0')
+		{
+			return;
+		}
+
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (net)
+		{
+			net->SetPendingSceneChange(std::string(msg->ScenePath));
+			CH_CORE_INFO("Network: Received scene change -> {}", msg->ScenePath);
+		}
+	}
+
+	static glm::vec3 FindSpawnPosition(entt::registry& reg)
+	{
+		for (auto [entity, spawn] : reg.view<SpawnComponent>().each())
+		{
+			if (spawn.IsActive)
+			{
+				if (auto* transform = reg.try_get<TransformComponent>(entity))
+				{
+					return transform->Translation + spawn.SpawnPoint;
+				}
+			}
+		}
+		for (auto [entity, player] : reg.view<PlayerComponent>().each())
+		{
+			if (auto* transform = reg.try_get<TransformComponent>(entity))
+			{
+				return transform->Translation;
+			}
+		}
+		return {0, 100, 0};
+	}
+
+	void NetworkSystem::ProcessEntitySpawnMessage(EntitySpawnMessage* msg, Scene* scene)
+	{
+		if (!msg || !scene)
+		{
+			return;
+		}
+
+		if (msg->NetworkID == 0 || msg->PrefabPath[0] == '\0')
+		{
+			return;
+		}
+
+		if (m_NetworkIDToEntity.find(msg->NetworkID) != m_NetworkIDToEntity.end())
+		{
+			return;
+		}
+
+		std::string path = msg->PrefabPath;
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			path = am->ResolvePath(path);
+		}
+
+		Entity avatar = PrefabSerializer::Deserialize(scene, path);
+		if (!avatar)
+		{
+			CH_CORE_ERROR("Network: Failed to spawn replicated prefab '{}' (netID={}).", msg->PrefabPath,
+						  msg->NetworkID);
+			return;
+		}
+
+		auto* net = ServiceLocator::TryGet<Network>();
+		uint64_t localNetID = m_LocalNetworkID;
+		if (localNetID == 0 && net)
+		{
+			localNetID = net->GetLocalNetworkID();
+			if (localNetID != 0)
+			{
+				m_LocalNetworkID = localNetID;
+			}
+		}
+
+		if (localNetID != 0 && msg->NetworkID == localNetID)
+		{
+			if (avatar.HasComponent<TransformComponent>())
+			{
+				auto& transform = avatar.GetComponent<TransformComponent>();
+				TransformSystem::SetTranslation(transform, FindSpawnPosition(scene->GetRegistry()));
+			}
+		}
+
+		auto& netID = avatar.AddOrReplaceComponent<NetworkIdentityComponent>();
+		netID.NetworkID = msg->NetworkID;
+		netID.PrefabPath = msg->PrefabPath;
+		if (localNetID != 0)
+		{
+			netID.IsOwner = (msg->NetworkID == localNetID);
+		}
+		else
+		{
+			netID.IsOwner = false;
+			CH_CORE_WARN("Network: EntitySpawn for netID={} arrived before PlayerAssign — IsOwner deferred.",
+						 msg->NetworkID);
+		}
+
+		// Mark remote entities as network-driven so physics doesn't fight interpolation.
+		if (!netID.IsOwner)
+		{
+			if (avatar.HasComponent<RigidBodyComponent>())
+			{
+				avatar.GetComponent<RigidBodyComponent>().IsNetworkDriven = true;
+			}
+		}
+
+		m_NetworkIDToEntity[msg->NetworkID] = avatar.GetUUID();
+		CH_CORE_INFO("Network: Spawned replicated entity (netID={}, owner={}).", msg->NetworkID, netID.IsOwner);
+	}
+
+	void NetworkSystem::ProcessEntityDestroyMessage(EntityDestroyMessage* msg, Scene* scene)
+	{
+		if (!msg || !scene)
+		{
+			return;
+		}
+
+		auto it = m_NetworkIDToEntity.find(msg->NetworkID);
+		if (it == m_NetworkIDToEntity.end())
+		{
+			return;
+		}
+
+		Entity entity = scene->GetEntityByUUID(it->second);
+		if (entity)
+		{
+			scene->DestroyEntity(entity);
+		}
+
+		m_NetworkIDToEntity.erase(it);
+		m_PendingStates.erase(msg->NetworkID);
+		CH_CORE_INFO("Network: Destroyed replicated entity (netID={}).", msg->NetworkID);
+	}
+
+	void NetworkSystem::ProcessPlayerAssignMessage(PlayerAssignMessage* msg)
+	{
+		if (!msg)
+		{
+			return;
+		}
+
+		m_LocalNetworkID = msg->NetworkID;
+
+		if (auto* net = ServiceLocator::TryGet<Network>())
+		{
+			net->SetLocalNetworkID(msg->NetworkID);
+		}
+
+		auto it = m_NetworkIDToEntity.find(msg->NetworkID);
+		if (it != m_NetworkIDToEntity.end())
+		{
+			if (auto* scene = m_ReplicationScene)
+			{
+				Entity entity = scene->GetEntityByUUID(it->second);
+				if (entity && entity.HasComponent<NetworkIdentityComponent>())
+				{
+					entity.GetComponent<NetworkIdentityComponent>().IsOwner = true;
+					if (entity.HasComponent<RigidBodyComponent>())
+					{
+						entity.GetComponent<RigidBodyComponent>().IsNetworkDriven = false;
+					}
+				}
+			}
+		}
+
+		CH_CORE_INFO("Network: Assigned local network ID {}.", msg->NetworkID);
+	}
+
+	// ---- Incoming message processing (host side) ----
+
+	void NetworkSystem::ProcessInputStateMessage(InputStateMessage* msg, int clientIndex)
+	{
+		if (!msg)
+		{
+			return;
+		}
+
+		auto it = m_PeerToNetworkID.find(clientIndex);
+		uint64_t networkID = (it != m_PeerToNetworkID.end()) ? it->second : 0;
+		if (networkID == 0)
+		{
+			if (auto* net = ServiceLocator::TryGet<Network>())
+			{
+				networkID = net->GetNetworkIDForConnection(clientIndex);
+				if (networkID != 0)
+				{
+					m_PeerToNetworkID[clientIndex] = networkID;
+				}
+			}
+		}
+
+		ProcessedInput input;
+		input.NetworkID = networkID;
+		input.MoveX = msg->MoveX;
+		input.MoveZ = msg->MoveZ;
+		input.ActionFlags = msg->ActionFlags;
+		input.MouseX = msg->MouseX;
+		input.MouseY = msg->MouseY;
+
+		m_PendingInputs.push_back(input);
+	}
+
+	void NetworkSystem::ProcessPlayerInfoMessage(PlayerInfoMessage* msg, int clientIndex)
+	{
+		if (!msg)
+		{
+			return;
+		}
+
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net)
+		{
+			return;
+		}
+
+		const uint64_t networkID = net->GetNetworkIDForConnection(clientIndex);
+		if (networkID == 0)
+		{
+			CH_CORE_WARN("Network: PlayerInfo from client {} arrived before PlayerAssign — deferring.", clientIndex);
+			m_PendingPlayerInfo[clientIndex] = {std::string(msg->Name), msg->SkinIndex};
+			return;
+		}
+
+		auto& playerList = net->GetPlayerListMutable();
+		for (auto& p : playerList)
+		{
+			if (p.NetworkID != networkID)
+			{
+				continue;
+			}
+
+			p.Name = msg->Name;
+			p.SkinIndex = msg->SkinIndex;
+			CH_CORE_INFO("Network: Updated player info: '{}' (netID={}, skin={}).", p.Name, p.NetworkID,
+						 (int)p.SkinIndex);
+			break;
+		}
+
+		net->BroadcastPlayerList();
+	}
+
+	void NetworkSystem::ProcessPlayerListMessage(PlayerListMessage* msg)
+	{
+		if (!msg)
+		{
+			return;
+		}
+
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net)
+		{
+			return;
+		}
+
+		auto& playerList = net->GetPlayerListMutable();
+		playerList.clear();
+
+		for (int i = 0; i < msg->Count && i < 64; ++i)
+		{
+			PlayerNetInfo info;
+			info.NetworkID = msg->Entries[i].NetworkID;
+			info.Name = msg->Entries[i].Name;
+			info.SkinIndex = msg->Entries[i].SkinIndex;
+			info.IsHost = msg->Entries[i].IsHost;
+			info.Ping = 0;
+
+			playerList.push_back(info);
+		}
+
+		CH_CORE_INFO("Network: Received player list ({} players).", msg->Count);
+	}
+
+	void NetworkSystem::ProcessChatMessageMessage(ChatMessageMessage* msg)
+	{
+		if (!msg)
+		{
+			return;
+		}
+
+		ChatMessagePacket pkt;
+		pkt.SenderNetworkID = msg->SenderNetworkID;
+		pkt.SenderName = msg->SenderName;
+		pkt.Message = msg->Message;
+
+		m_PendingChatMessages.push_back(pkt);
+		CH_CORE_INFO("Network: Chat from '{}': {}", pkt.SenderName, pkt.Message);
+	}
+
+	// ---- Host-side: apply inputs from remote clients ----
+
+	void NetworkSystem::ApplyHostInputs(entt::registry& reg, Timestep ts)
+	{
+		if (m_PendingInputs.empty())
+		{
+			return;
+		}
+
+		float dt = static_cast<float>(ts);
+
+		for (auto& input : m_PendingInputs)
+		{
+			if (input.NetworkID == 0)
+			{
+				continue;
+			}
+
+			entt::entity targetEntity = entt::null;
+			auto view = reg.view<NetworkIdentityComponent>();
+			for (auto entity : view)
+			{
+				auto& netID = view.get<NetworkIdentityComponent>(entity);
+				if (netID.NetworkID == input.NetworkID)
+				{
+					targetEntity = entity;
+					break;
+				}
+			}
+
+			if (targetEntity == entt::null || !reg.valid(targetEntity))
+			{
+				CH_CORE_WARN("Network: ApplyHostInputs — no entity for netID={}", input.NetworkID);
+				continue;
+			}
+
+			if (reg.all_of<PlayerComponent, RigidBodyComponent>(targetEntity))
+			{
+				auto& player = reg.get<PlayerComponent>(targetEntity);
+				auto& rb = reg.get<RigidBodyComponent>(targetEntity);
+
+				if (rb.Handle == kInvalidPhysicsBody)
+				{
+					continue;
+				}
+
+				float speed = player.MovementSpeed;
+				if (input.ActionFlags & InputAction_Sprint)
+				{
+					speed *= 2.0f;
+				}
+
+				float moveX = input.MoveX * speed;
+				float moveZ = input.MoveZ * speed;
+				rb.Velocity = glm::vec3(moveX, rb.Velocity.y, moveZ);
+
+				// Rotate remote avatar to face movement direction
+				if (auto* tc = reg.try_get<TransformComponent>(targetEntity))
+				{
+					if (std::abs(moveX) > 0.001f || std::abs(moveZ) > 0.001f)
+					{
+						float yaw = std::atan2(moveX, moveZ);
+						TransformSystem::SetRotation(*tc, glm::vec3(0.0f, yaw, 0.0f));
+					}
+				}
+
+				if ((input.ActionFlags & InputAction_Jump) && rb.IsGrounded)
+				{
+					rb.Velocity.y = player.JumpForce;
+					rb.VelocityForced = true;
+				}
+
+				m_LastActionFlags[input.NetworkID] = input.ActionFlags;
+			}
+			else
+			{
+				CH_CORE_WARN("Network: ApplyHostInputs — entity netID={} missing PlayerComponent/RigidBodyComponent",
+							 input.NetworkID);
+			}
+		}
+
+		m_PendingInputs.clear();
+	}
+
+	// ---- Client-side: collect local input and send to server ----
+
+	void NetworkSystem::CollectAndSendInput(Network* net, float dt)
+	{
+		if (!net->IsClient())
+		{
+			return;
+		}
+
+		InputStateMessage msg;
+		msg.Tick = m_ClientTick++;
+		msg.DeltaTime = dt;
+
+		float rawX = 0.0f;
+		float rawZ = 0.0f;
+		if (Core::Input::IsKeyDown(KeyCode::W))
+		{
+			rawZ += 1.0f;
+		}
+		if (Core::Input::IsKeyDown(KeyCode::S))
+		{
+			rawZ -= 1.0f;
+		}
+		if (Core::Input::IsKeyDown(KeyCode::A))
+		{
+			rawX -= 1.0f;
+		}
+		if (Core::Input::IsKeyDown(KeyCode::D))
+		{
+			rawX += 1.0f;
+		}
+
+		float moveX = rawX;
+		float moveZ = rawZ;
+		if (m_ReplicationScene)
+		{
+			auto camView = m_ReplicationScene->GetRegistry().view<CameraComponent, TransformComponent>();
+			for (auto entity : camView)
+			{
+				auto& cam = camView.get<CameraComponent>(entity);
+				if (!cam.Primary)
+				{
+					continue;
+				}
+				auto& tc = camView.get<TransformComponent>(entity);
+				glm::vec3 forward = tc.WorldTransform * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f);
+				forward.y = 0.0f;
+				float fwdLen = glm::length(forward);
+				if (fwdLen > 0.001f)
+				{
+					forward /= fwdLen;
+				}
+				else
+				{
+					forward = glm::vec3(0.0f, 0.0f, -1.0f);
+				}
+				glm::vec3 right = glm::vec3(-forward.z, 0.0f, forward.x);
+
+				moveX = rawX * right.x + rawZ * forward.x;
+				moveZ = rawX * right.z + rawZ * forward.z;
+				break;
+			}
+		}
+
+		float len = std::sqrt(moveX * moveX + moveZ * moveZ);
+		if (len > 0.001f)
+		{
+			moveX /= len;
+			moveZ /= len;
+		}
+
+		msg.MoveX = moveX;
+		msg.MoveZ = moveZ;
+
+		uint8_t flags = 0;
+		if (Core::Input::IsKeyPressed(KeyCode::Space))
+		{
+			flags |= InputAction_Jump;
+		}
+		if (Core::Input::IsKeyDown(KeyCode::LeftShift))
+		{
+			flags |= InputAction_Sprint;
+		}
+		msg.ActionFlags = flags;
+
+		glm::vec2 mouseDelta = Core::Input::GetMouseDelta();
+		msg.MouseX = mouseDelta.x;
+		msg.MouseY = mouseDelta.y;
+
+		ByteWriter w;
+		msg.Encode(w);
+		net->SendToServer(MessageType_InputState, w.Data().data(), w.Data().size(), true);
+	}
+
+	// ---- Client-side: interpolate towards server state ----
+
+	void NetworkSystem::InterpolateEntities(entt::registry& reg, float dt)
+	{
+		constexpr float InterpSpeed = 15.0f;
+		float t = glm::clamp(dt * InterpSpeed, 0.0f, 1.0f);
+
+		auto view = reg.view<NetworkIdentityComponent, TransformComponent>();
+		for (auto entity : view)
+		{
+			auto& netID = view.get<NetworkIdentityComponent>(entity);
+			auto& transform = view.get<TransformComponent>(entity);
+
+			auto it = m_PendingStates.find(netID.NetworkID);
+			if (it == m_PendingStates.end())
+			{
+				// No pending state: for non-owned entities, keep NetworkDriven so
+				// physics doesn't interfere; for owned, let physics run.
+				if (auto* rb = reg.try_get<RigidBodyComponent>(entity))
+				{
+					rb->IsNetworkDriven = !netID.IsOwner;
+				}
+				continue;
+			}
+
+			auto& target = it->second;
+			bool changed = false;
+
+			if (netID.IsOwner)
+			{
+				// Owned entity — physics runs locally, network only snap-corrects.
+				if (auto* rb = reg.try_get<RigidBodyComponent>(entity))
+				{
+					rb->IsNetworkDriven = false;
+				}
+
+				float dist = glm::length(TransformSystem::GetTranslation(transform) - target.TargetPosition);
+
+				if (dist > NetworkSystem::kMaxCorrectionDistance)
+				{
+					TransformSystem::SetTranslation(transform, target.TargetPosition);
+					TransformSystem::SetRotationQuat(transform, glm::normalize(target.TargetRotation));
+
+					if (auto* rb = reg.try_get<RigidBodyComponent>(entity))
+					{
+						rb->Velocity = target.TargetVelocity;
+					}
+					changed = true;
+				}
+			}
+			else
+			{
+				// Remote entity — fully driven by network interpolation.
+				if (auto* rb = reg.try_get<RigidBodyComponent>(entity))
+				{
+					rb->IsNetworkDriven = true;
+				}
+
+				TransformSystem::SetTranslation(
+					transform, glm::mix(TransformSystem::GetTranslation(transform), target.TargetPosition, t));
+
+				// Use the local RotationQuat for slerp (not WorldTransform which may be stale).
+				glm::quat currentQuat = transform.RotationQuat;
+				glm::quat targetQuat = glm::normalize(target.TargetRotation);
+				glm::quat blended = glm::slerp(currentQuat, targetQuat, t);
+				TransformSystem::SetRotationQuat(transform, blended);
+
+				if (auto* rb = reg.try_get<RigidBodyComponent>(entity))
+				{
+					rb->Velocity = target.TargetVelocity;
+					rb->IsGrounded = target.IsGrounded;
+				}
+				if (auto* netID = reg.try_get<NetworkIdentityComponent>(entity))
+				{
+					netID->RemoteActionFlags = target.ActionFlags;
+				}
+				changed = true;
+			}
+
+			if (changed)
+			{
+				glm::mat4 localMatrix = TransformSystem::ComputeLocalMatrix(transform);
+				if (reg.all_of<HierarchyComponent>(entity))
+				{
+					auto& hc = reg.get<HierarchyComponent>(entity);
+					if (hc.Parent != entt::null && reg.valid(hc.Parent) && reg.all_of<TransformComponent>(hc.Parent))
+					{
+						transform.WorldTransform = reg.get<TransformComponent>(hc.Parent).WorldTransform * localMatrix;
+					}
+					else
+					{
+						transform.WorldTransform = localMatrix;
+					}
+				}
+				else
+				{
+					transform.WorldTransform = localMatrix;
+				}
+				transform.InverseWorldTransform = glm::inverse(transform.WorldTransform);
+				transform.TransformChanged = false;
+			}
+		}
+	}
+
+	// ---- Host-side: broadcast world state ----
+
+	void NetworkSystem::BroadcastWorldState(entt::registry& reg)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !net->IsHost())
+		{
+			return;
+		}
+
+		struct EntityNetState
+		{
+			uint64_t NetworkID;
+			glm::vec3 Position;
+			glm::quat Rotation;
+			glm::vec3 Velocity;
+			bool IsGrounded;
+			uint8_t ActionFlags;
+		};
+
+		std::vector<EntityNetState> states;
+		auto view = reg.view<NetworkIdentityComponent, TransformComponent>();
+		for (auto entity : view)
+		{
+			auto& netID = view.get<NetworkIdentityComponent>(entity);
+			auto& transform = view.get<TransformComponent>(entity);
+
+			EntityNetState s;
+			s.NetworkID = netID.NetworkID;
+			s.Position = TransformSystem::GetTranslation(transform);
+			s.Rotation = glm::quat_cast(transform.WorldTransform);
+			if (auto* rb = reg.try_get<RigidBodyComponent>(entity))
+			{
+				s.Velocity = rb->Velocity;
+				s.IsGrounded = rb->IsGrounded;
+			}
+			else
+			{
+				s.Velocity = {0, 0, 0};
+				s.IsGrounded = false;
+			}
+			auto flagIt = m_LastActionFlags.find(netID.NetworkID);
+			s.ActionFlags = (flagIt != m_LastActionFlags.end()) ? flagIt->second : 0;
+			states.push_back(s);
+		}
+
+		if (!states.empty())
+		{
+			CH_CORE_INFO("Network: Broadcasting WorldState for {} entities (tick={}).", states.size(), m_HostTick);
+		}
+
+		for (auto& s : states)
+		{
+			net->BroadcastPacket(MessageType_WorldState, true, [this, &s](ByteWriter& bw) {
+				WorldStateMessage msg;
+				msg.Tick = m_HostTick++;
+				msg.NetworkID = s.NetworkID;
+				msg.Position[0] = s.Position.x;
+				msg.Position[1] = s.Position.y;
+				msg.Position[2] = s.Position.z;
+				msg.Rotation[0] = s.Rotation.w;
+				msg.Rotation[1] = s.Rotation.x;
+				msg.Rotation[2] = s.Rotation.y;
+				msg.Rotation[3] = s.Rotation.z;
+				msg.Velocity[0] = s.Velocity.x;
+				msg.Velocity[1] = s.Velocity.y;
+				msg.Velocity[2] = s.Velocity.z;
+				msg.IsGrounded = s.IsGrounded ? 1 : 0;
+				msg.ActionFlags = s.ActionFlags;
+				msg.Encode(bw);
+			});
+		}
+	}
+
+	// ---- Host-side: broadcast an entity spawn/destroy ----
+
+	void NetworkSystem::SendEntitySpawn(Network* net, uint64_t networkID, const std::string& prefabPath,
+										int clientIndex)
+	{
+		if (clientIndex == kInvalidPeerHandle)
+		{
+			net->BroadcastPacket(MessageType_EntitySpawn, true, [networkID, &prefabPath](ByteWriter& bw) {
+				EntitySpawnMessage msg;
+				msg.NetworkID = networkID;
+				std::strncpy(msg.PrefabPath, prefabPath.c_str(), sizeof(msg.PrefabPath) - 1);
+				msg.PrefabPath[sizeof(msg.PrefabPath) - 1] = '\0';
+				msg.Encode(bw);
+			});
+		}
+		else
+		{
+			EntitySpawnMessage msg;
+			msg.NetworkID = networkID;
+			std::strncpy(msg.PrefabPath, prefabPath.c_str(), sizeof(msg.PrefabPath) - 1);
+			msg.PrefabPath[sizeof(msg.PrefabPath) - 1] = '\0';
+			ByteWriter w;
+			msg.Encode(w);
+			net->SendPacket(clientIndex, MessageType_EntitySpawn, w.Data().data(), w.Data().size(), true);
+		}
+	}
+
+	void NetworkSystem::SendEntityDestroy(Network* net, uint64_t networkID)
+	{
+		net->BroadcastPacket(MessageType_EntityDestroy, true, [networkID](ByteWriter& bw) {
+			EntityDestroyMessage msg;
+			msg.NetworkID = networkID;
+			msg.Encode(bw);
+		});
+	}
+
+	void NetworkSystem::ResyncClientEntities(int clientIndex, Scene* scene)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !scene)
+		{
+			return;
+		}
+
+		uint64_t clientNetID = 0;
+		auto it = m_PeerToNetworkID.find(clientIndex);
+		if (it != m_PeerToNetworkID.end())
+		{
+			clientNetID = it->second;
+		}
+		else
+		{
+			clientNetID = net->GetNetworkIDForConnection(clientIndex);
+		}
+
+		int count = 0;
+		if (clientNetID != 0)
+		{
+			PlayerAssignMessage assignMsg;
+			assignMsg.NetworkID = clientNetID;
+			ByteWriter w;
+			assignMsg.Encode(w);
+			net->SendPacket(clientIndex, MessageType_PlayerAssign, w.Data().data(), w.Data().size(), true);
+		}
+
+		entt::registry& reg = scene->GetRegistry();
+		auto view = reg.view<NetworkIdentityComponent>();
+		for (auto entity : view)
+		{
+			auto& netID = view.get<NetworkIdentityComponent>(entity);
+			if (netID.NetworkID == 0)
+			{
+				continue;
+			}
+			std::string prefabPath = netID.PrefabPath.empty() ? m_PlayerPrefab : netID.PrefabPath;
+			SendEntitySpawn(net, netID.NetworkID, prefabPath, clientIndex);
+			count++;
+		}
+
+		CH_CORE_INFO("Network: Resynced {} entities for client {} (netID={}).", count, clientIndex, clientNetID);
+	}
+
+	void NetworkSystem::EnsureHostIdentity(Scene* scene)
+	{
+		if (!scene || scene->GetSettings().Type == SceneType::UI)
+		{
+			return;
+		}
+
+		entt::registry& reg = scene->GetRegistry();
+
+		auto owned = reg.view<NetworkIdentityComponent>();
+		for (auto entity : owned)
+		{
+			if (owned.get<NetworkIdentityComponent>(entity).NetworkID == HostAvatarNetworkID)
+			{
+				return;
+			}
+		}
+
+		auto players = reg.view<PlayerComponent>();
+		for (auto entity : players)
+		{
+			if (reg.all_of<NetworkIdentityComponent>(entity))
+			{
+				continue;
+			}
+
+			auto& netID = reg.emplace<NetworkIdentityComponent>(entity);
+			netID.NetworkID = HostAvatarNetworkID;
+			netID.IsOwner = true;
+			netID.PrefabPath = m_PlayerPrefab;
+
+			if (reg.all_of<TransformComponent>(entity))
+			{
+				auto& transform = reg.get<TransformComponent>(entity);
+				TransformSystem::SetTranslation(transform, FindSpawnPosition(reg));
+			}
+
+			CH_CORE_INFO("Network: Tagged host player with netID={}.", HostAvatarNetworkID);
+			return;
+		}
+
+		if (!m_PlayerPrefab.empty())
+		{
+			std::string path = m_PlayerPrefab;
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				path = am->ResolvePath(m_PlayerPrefab);
+			}
+
+			Entity hostAvatar = PrefabSerializer::Deserialize(scene, path);
+			if (hostAvatar)
+			{
+				if (hostAvatar.HasComponent<TransformComponent>())
+				{
+					auto& transform = hostAvatar.GetComponent<TransformComponent>();
+					TransformSystem::SetTranslation(transform, FindSpawnPosition(reg));
+				}
+
+				auto& netID = hostAvatar.AddOrReplaceComponent<NetworkIdentityComponent>();
+				netID.NetworkID = HostAvatarNetworkID;
+				netID.IsOwner = true;
+				netID.PrefabPath = m_PlayerPrefab;
+
+				bool hasRB = hostAvatar.HasComponent<RigidBodyComponent>();
+				bool hasCollider = hostAvatar.HasComponent<ColliderComponent>();
+				int rbType = hasRB ? (int)hostAvatar.GetComponent<RigidBodyComponent>().Type : -1;
+				CH_CORE_INFO(
+					"Network: Dynamically spawned host avatar (netID={}, entity={}, rb={}, collider={}, rbType={})",
+					HostAvatarNetworkID, (uint32_t)hostAvatar, hasRB, hasCollider, rbType);
+			}
+		}
+	}
+
+	// ---- Host-side: spawn/despawn an avatar per connected peer ----
+
+	void NetworkSystem::SyncPeerAvatars(Scene* scene, Network* net)
+	{
+		if (!scene || scene->GetSettings().Type == SceneType::UI)
+		{
+			return;
+		}
+
+		if (m_PlayerPrefab.empty())
+		{
+			if (!m_PrefabWarnedOnce && net->GetClientCount() > 0)
+			{
+				m_PrefabWarnedOnce = true;
+				CH_CORE_ERROR("Network: No player prefab configured — clients will connect without an avatar. "
+							  "Call NetworkSystem::SetPlayerPrefab().");
+			}
+			return;
+		}
+
+		for (int clientIndex = 0; clientIndex < net->GetMaxClients(); ++clientIndex)
+		{
+			if (!net->IsClientConnected(clientIndex))
+			{
+				continue;
+			}
+
+			if (m_PeerToAvatar.find(clientIndex) != m_PeerToAvatar.end())
+			{
+				continue;
+			}
+
+			uint64_t networkID = net->GetNetworkIDForConnection(clientIndex);
+			if (networkID == 0)
+			{
+				continue;
+			}
+			m_PeerToNetworkID[clientIndex] = networkID;
+
+			std::string path = m_PlayerPrefab;
+			if (auto* am = ServiceLocator::TryGet<AssetManager>())
+			{
+				path = am->ResolvePath(m_PlayerPrefab);
+			}
+
+			Entity avatar = PrefabSerializer::Deserialize(scene, path);
+			if (!avatar)
+			{
+				CH_CORE_ERROR("Network: Failed to spawn player prefab '{}' for client {}.", m_PlayerPrefab,
+							  clientIndex);
+				m_PeerToAvatar[clientIndex] = UUID(0);
+				continue;
+			}
+
+			if (avatar.HasComponent<TransformComponent>())
+			{
+				auto& transform = avatar.GetComponent<TransformComponent>();
+				glm::vec3 spawnPos = FindSpawnPosition(scene->GetRegistry());
+				spawnPos.x += static_cast<float>(networkID - 1) * 1.5f;
+				TransformSystem::SetTranslation(transform, spawnPos);
+			}
+
+			auto& netID = avatar.AddOrReplaceComponent<NetworkIdentityComponent>();
+			netID.NetworkID = networkID;
+			netID.IsOwner = false;
+			netID.PrefabPath = m_PlayerPrefab;
+
+			m_PeerToAvatar[clientIndex] = avatar.GetUUID();
+			CH_CORE_INFO("Network: Spawned avatar (netID={}) for client {}.", networkID, clientIndex);
+
+			for (const auto& [existingClient, uuid] : m_PeerToAvatar)
+			{
+				if (existingClient == clientIndex || uuid == UUID(0))
+				{
+					continue;
+				}
+				auto netIdIt = m_PeerToNetworkID.find(existingClient);
+				if (netIdIt != m_PeerToNetworkID.end())
+				{
+					SendEntitySpawn(net, netIdIt->second, m_PlayerPrefab, clientIndex);
+				}
+			}
+			SendEntitySpawn(net, HostAvatarNetworkID, m_PlayerPrefab, clientIndex);
+			SendEntitySpawn(net, networkID, m_PlayerPrefab, kInvalidPeerHandle);
+		}
+
+		for (auto it = m_PeerToAvatar.begin(); it != m_PeerToAvatar.end();)
+		{
+			int clientIndex = it->first;
+			if (net->IsClientConnected(clientIndex))
+			{
+				++it;
+				continue;
+			}
+
+			if (it->second != UUID(0))
+			{
+				Entity avatar = scene->GetEntityByUUID(it->second);
+				if (avatar)
+				{
+					scene->DestroyEntity(avatar);
+				}
+			}
+
+			auto idIt = m_PeerToNetworkID.find(clientIndex);
+			if (idIt != m_PeerToNetworkID.end())
+			{
+				SendEntityDestroy(net, idIt->second);
+			}
+
+			UnregisterPeer(clientIndex);
+			CH_CORE_INFO("Network: Despawned avatar for client {}.", clientIndex);
+			it = m_PeerToAvatar.erase(it);
+		}
+	}
+
+	void NetworkSystem::InstallPacketCallback()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net)
+		{
+			return;
+		}
+		// Re-install whenever the role has changed (including Offline→Host on each new session)
+		if (m_CallbackRole == net->GetRole() && net->GetRole() != Role::Offline)
+		{
+			return;
+		}
+
+		m_CallbackRole = net->GetRole();
+		net->SetPacketCallback([this, net](int clientIndex, MessageType type, const uint8_t* data, size_t len) {
+			ByteReader r(data, len);
+
+			if (net->GetRole() == Role::Host)
+			{
+				switch (type)
+				{
+				case MessageType_InputState: {
+					InputStateMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessInputStateMessage(&msg, clientIndex);
+					}
+					break;
+				}
+				case MessageType_PlayerInfo: {
+					PlayerInfoMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessPlayerInfoMessage(&msg, clientIndex);
+					}
+					break;
+				}
+				case MessageType_ChatMessage: {
+					ChatMessageMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessChatMessageMessage(&msg);
+						ChatMessagePacket pkt;
+						pkt.SenderNetworkID = msg.SenderNetworkID;
+						pkt.SenderName = msg.SenderName;
+						pkt.Message = msg.Message;
+						net->StorePendingChatMessage(pkt);
+						if (net->IsHost())
+						{
+							net->BroadcastPacket(MessageType_ChatMessage, true,
+												 [&msg](ByteWriter& bw) { msg.Encode(bw); });
+						}
+					}
+					break;
+				}
+				case MessageType_SceneLoaded: {
+					CH_CORE_INFO("Network: Client {} loaded scene — resyncing entities.", clientIndex);
+					ResyncClientEntities(clientIndex, m_ReplicationScene);
+					break;
+				}
+				default:
+					break;
+				}
+			}
+			else if (net->GetRole() == Role::Client)
+			{
+				switch (type)
+				{
+				case MessageType_WorldState: {
+					WorldStateMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessWorldStateMessage(&msg);
+					}
+					break;
+				}
+				case MessageType_SceneChange: {
+					SceneChangeMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessSceneChangeMessage(&msg);
+					}
+					break;
+				}
+				case MessageType_PlayerList: {
+					PlayerListMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessPlayerListMessage(&msg);
+					}
+					break;
+				}
+				case MessageType_PlayerAssign: {
+					PlayerAssignMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessPlayerAssignMessage(&msg);
+					}
+					break;
+				}
+				case MessageType_EntitySpawn: {
+					EntitySpawnMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessEntitySpawnMessage(&msg, m_ReplicationScene);
+					}
+					break;
+				}
+				case MessageType_EntityDestroy: {
+					EntityDestroyMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessEntityDestroyMessage(&msg, m_ReplicationScene);
+					}
+					break;
+				}
+				case MessageType_ChatMessage: {
+					ChatMessageMessage msg;
+					if (msg.Decode(r))
+					{
+						ProcessChatMessageMessage(&msg);
+						ChatMessagePacket pkt;
+						pkt.SenderNetworkID = msg.SenderNetworkID;
+						pkt.SenderName = msg.SenderName;
+						pkt.Message = msg.Message;
+						net->StorePendingChatMessage(pkt);
+					}
+					break;
+				}
+				default:
+					break;
+				}
+			}
+		});
+	}
+
+	// ---- Early identity setup (runs BEFORE scripts) ----
+
+	void NetworkSystem::EnsureLocalIdentity(Scene* scene)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || net->GetRole() == Role::Offline || !scene)
+		{
+			return;
+		}
+
+		if (net->IsHost())
+		{
+			EnsureHostIdentity(scene);
+		}
+	}
+
+	// ---- Per-session reset ----
+
+	void NetworkSystem::Reset()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (net && net->IsClient() && net->GetLocalNetworkID() != 0)
+		{
+			m_LocalNetworkID = net->GetLocalNetworkID();
+		}
+		else
+		{
+			m_LocalNetworkID = 0;
+		}
+
+		m_ClientTick = 0;
+		m_CallbackRole = Role::Offline; // forces callback re-install on next session
+		m_PeerToNetworkID.clear();
+		m_PeerToAvatar.clear();
+		m_PendingStates.clear();
+		m_PendingInputs.clear();
+		m_PendingChatMessages.clear();
+		m_PendingPlayerInfo.clear();
+		m_NetworkIDToEntity.clear();
+		m_LastActionFlags.clear();
+		m_ReplicationScene = nullptr;
+		m_PrefabWarnedOnce = false;
+		m_SceneLoadedPending = false;
+
+		if (net)
+		{
+			net->ClearPendingSceneChange();
+		}
+
+		CH_CORE_INFO("NetworkSystem: session state reset (localNetID={}).", m_LocalNetworkID);
+	}
+
+	// ---- Main update ----
+
+	void NetworkSystem::CheckAndPropagateSceneChange(Scene* scene)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !scene)
+		{
+			return;
+		}
+		if (!net->HasPendingSceneChange())
+		{
+			return;
+		}
+
+		std::string path = net->GetPendingSceneChange();
+		CH_CORE_INFO("CheckAndPropagateSceneChange: propagating '{}' to Scene", path);
+		scene->SetPendingScenePath(path);
+		net->ClearPendingSceneChange();
+
+		SceneChangeRequestEvent e(path);
+		Application::Get().OnEvent(e);
+	}
+
+	void NetworkSystem::PollNetwork(Scene* scene, Timestep ts)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || net->GetRole() == Role::Offline || !scene)
+		{
+			return;
+		}
+
+		entt::registry& reg = scene->GetRegistry();
+
+		// Scene pointer changed → new Play Mode session, reset lookup tables
+		if (m_ReplicationScene != scene)
+		{
+			m_ReplicationScene = scene;
+			m_NetworkIDToEntity.clear();
+			m_PeerToAvatar.clear();
+			m_PendingStates.clear();
+			if (net->IsClient())
+			{
+				m_SceneLoadedPending = true;
+			}
+		}
+
+		InstallPacketCallback();
+
+		if (m_SceneLoadedPending && net->IsClient())
+		{
+			m_SceneLoadedPending = false;
+			SceneLoadedMessage msg;
+			ByteWriter w;
+			msg.Encode(w);
+			net->SendToServer(MessageType_SceneLoaded, w.Data().data(), w.Data().size(), true);
+			CH_CORE_INFO("Network: Sent SceneLoaded to host.");
+		}
+
+		EnsureLocalIdentity(scene); // BUG4 fix: must run before scripts
+
+		float dt = static_cast<float>(ts);
+
+		net->Update(dt);
+
+		// Check for pending scene change AFTER processing ENet packets.
+		// This avoids the C# polling timing issue where OnUpdate runs before
+		// net->Update processes incoming SceneChangeMessage packets.
+		if (net->IsClient())
+		{
+			CheckAndPropagateSceneChange(scene);
+		}
+
+		if (net->IsHost())
+		{
+			// Flush any deferred PlayerInfoMessages (race: PlayerInfo arrived before PlayerAssign).
+			for (auto it = m_PendingPlayerInfo.begin(); it != m_PendingPlayerInfo.end();)
+			{
+				int clientIndex = it->first;
+				uint64_t netId = net->GetNetworkIDForConnection(clientIndex);
+				if (netId != 0)
+				{
+					const auto& info = it->second;
+					PlayerInfoMessage deferredMsg;
+					std::strncpy(deferredMsg.Name, info.first.c_str(), sizeof(deferredMsg.Name) - 1);
+					deferredMsg.Name[sizeof(deferredMsg.Name) - 1] = '\0';
+					deferredMsg.SkinIndex = info.second;
+					ProcessPlayerInfoMessage(&deferredMsg, clientIndex);
+					it = m_PendingPlayerInfo.erase(it);
+				}
+				else
+				{
+					++it;
+				}
+			}
+
+			EnsureHostIdentity(scene);
+			SyncPeerAvatars(scene, net);
+		}
+	}
+
+	void NetworkSystem::FinalizeFrame(Scene* scene, Timestep ts)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || net->GetRole() == Role::Offline || !scene)
+		{
+			return;
+		}
+
+		entt::registry& reg = scene->GetRegistry();
+
+		if (net->IsHost())
+		{
+			BroadcastWorldState(reg);
+		}
+		else if (net->IsClient())
+		{
+			float dt = static_cast<float>(ts);
+			CollectAndSendInput(net, dt);
+		}
+	}
+
+	const std::vector<ProcessedInput>& NetworkSystem::GetPendingInputs()
+	{
+		return m_PendingInputs;
+	}
+
+	void NetworkSystem::ClearPendingInputs()
+	{
+		m_PendingInputs.clear();
+	}
+
+	const std::vector<ChatMessagePacket>& NetworkSystem::GetPendingChatMessages()
+	{
+		return m_PendingChatMessages;
+	}
+
+	void NetworkSystem::ClearPendingChatMessages()
+	{
+		m_PendingChatMessages.clear();
+	}
+
+} // namespace Chained
diff --git a/engine/scene/systems/network_system.h b/engine/scene/systems/network_system.h
new file mode 100644
index 000000000..ad5f7873f
--- /dev/null
+++ b/engine/scene/systems/network_system.h
@@ -0,0 +1,133 @@
+#ifndef CH_NETWORK_SYSTEM_H
+#define CH_NETWORK_SYSTEM_H
+
+#include "engine/common/timestep.h"
+#include "engine/common/uuid.h"
+#include "engine/networking/net_packet.h"
+#include "engine/networking/network_service.h"
+#include <entt/entt.hpp>
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <unordered_map>
+#include <vector>
+#include <string>
+#include <cstdint>
+
+namespace Chained
+{
+	class Scene;
+
+	// NetworkPeerHandle and Role are now defined in network_service.h
+
+	struct PendingNetworkState
+	{
+		uint64_t NetworkID = 0;
+		uint32_t LastTick = 0;
+		glm::vec3 TargetPosition = {0, 0, 0};
+		glm::quat TargetRotation = {1, 0, 0, 0};
+		glm::vec3 TargetVelocity = {0, 0, 0};
+		bool IsGrounded = false;
+		uint8_t ActionFlags = 0;
+	};
+
+	struct ProcessedInput
+	{
+		uint64_t NetworkID = 0;
+		float MoveX = 0.0f;
+		float MoveZ = 0.0f;
+		uint8_t ActionFlags = 0;
+		float MouseX = 0.0f;
+		float MouseY = 0.0f;
+	};
+
+	class NetworkSystem
+	{
+	public:
+		static NetworkSystem& GetInstance();
+
+		// Maximum distance (m) between local and server position before snap-correction
+		// kicks in for owned entities. Below this threshold, local physics runs freely.
+		static constexpr float kMaxCorrectionDistance = 2.0f;
+
+		// Ensure the local player entity has a NetworkIdentityComponent BEFORE scripts
+		// run. Must be called early in the frame so PlayerController etc. can find it.
+		void EnsureLocalIdentity(Scene* scene);
+
+		// Resets all per-session state. Must be called from OnRuntimeStop.
+		void Reset();
+
+		void PollNetwork(Scene* scene, Timestep ts);
+		void FinalizeFrame(Scene* scene, Timestep ts);
+		void ApplyHostInputs(entt::registry& reg, Timestep ts);
+		void InterpolateEntities(entt::registry& reg, float dt);
+		void CheckAndPropagateSceneChange(Scene* scene);
+
+		const std::vector<ProcessedInput>& GetPendingInputs();
+		void ClearPendingInputs();
+
+		void RegisterPeerEntity(int peer, uint64_t networkID);
+		void UnregisterPeer(int peer);
+
+		// Prefab instantiated for each connecting client. Relative to the assets
+		// directory. Empty by default — clients get no avatar until this is set.
+		void SetPlayerPrefab(const std::string& path);
+		const std::string& GetPlayerPrefab();
+
+		// Chat messages received from the network (for C# consumption).
+		const std::vector<ChatMessagePacket>& GetPendingChatMessages();
+		void ClearPendingChatMessages();
+
+	private:
+		NetworkSystem() = default;
+
+		// ---- Incoming message processing ----
+		void ProcessWorldStateMessage(WorldStateMessage* msg);
+		void ProcessSceneChangeMessage(SceneChangeMessage* msg);
+		void ProcessEntitySpawnMessage(EntitySpawnMessage* msg, Scene* scene);
+		void ProcessEntityDestroyMessage(EntityDestroyMessage* msg, Scene* scene);
+		void ProcessPlayerAssignMessage(PlayerAssignMessage* msg);
+
+		// ---- Incoming message processing (host side) ----
+		void ProcessInputStateMessage(InputStateMessage* msg, int clientIndex);
+		void ProcessPlayerInfoMessage(PlayerInfoMessage* msg, int clientIndex);
+		void ProcessPlayerListMessage(PlayerListMessage* msg);
+		void ProcessChatMessageMessage(Chained::ChatMessageMessage* msg);
+
+		// ---- Host-side helpers ----
+		void EnsureHostIdentity(Scene* scene);
+		void SyncPeerAvatars(Scene* scene, Network* net);
+		void BroadcastWorldState(entt::registry& reg);
+		void SendEntitySpawn(Network* net, uint64_t networkID, const std::string& prefabPath, int clientIndex);
+		void SendEntityDestroy(Network* net, uint64_t networkID);
+		void ResyncClientEntities(int clientIndex, Scene* scene);
+
+		// ---- Client-side helpers ----
+		void CollectAndSendInput(Network* net, float dt);
+
+		// ---- Packet callback installer ----
+		void InstallPacketCallback();
+
+		// ---- Member state (previously file-scope globals) ----
+		std::unordered_map<uint64_t, PendingNetworkState> m_PendingStates;
+		std::vector<ProcessedInput> m_PendingInputs;
+		uint32_t m_ClientTick = 0;
+		uint32_t m_HostTick = 0;
+		std::unordered_map<int, uint64_t> m_PeerToNetworkID;
+		Role m_CallbackRole = Role::Offline;
+		std::string m_PlayerPrefab = "prefab/player.chprefab";
+		std::unordered_map<int, UUID> m_PeerToAvatar;
+		std::vector<ChatMessagePacket> m_PendingChatMessages;
+		std::unordered_map<uint64_t, UUID> m_NetworkIDToEntity;
+		uint64_t m_LocalNetworkID = 0;
+		std::unordered_map<int, std::pair<std::string, uint8_t>> m_PendingPlayerInfo;
+		std::unordered_map<uint64_t, uint8_t> m_LastActionFlags;
+		Scene* m_ReplicationScene = nullptr;
+		bool m_PrefabWarnedOnce = false;
+		bool m_SceneLoadedPending = false;
+
+		static constexpr uint64_t HostAvatarNetworkID = 1;
+	};
+
+} // namespace Chained
+
+#endif // CH_NETWORK_SYSTEM_H
diff --git a/engine/scene/systems/physics_body_system.cpp b/engine/scene/systems/physics_body_system.cpp
new file mode 100644
index 000000000..92aef90d2
--- /dev/null
+++ b/engine/scene/systems/physics_body_system.cpp
@@ -0,0 +1,407 @@
+#include "physics_body_system.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/types/model_asset.h"
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+#include "engine/physics/iphysics_world.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/components/physics/physics_component.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/scene/components/core/transform_component.h"
+#include "engine/common/thread_pool.h"
+
+#include <future>
+
+namespace Chained::PhysicsBodySystem
+{
+
+	void ApplyAutoCalculate(entt::entity entity, entt::registry& registry, ColliderComponent& collider,
+							const glm::vec3& scale)
+	{
+		std::string modelPath = collider.ModelPath;
+		if (modelPath.empty())
+		{
+			if (auto* mc = registry.try_get<ModelComponent>(entity))
+			{
+				modelPath = mc->ModelPath;
+			}
+		}
+
+		if (modelPath.empty())
+		{
+			CH_CORE_WARN("PhysicsBodySystem::ApplyAutoCalculate: no model path found for entity={}", (uint32_t)entity);
+			return;
+		}
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			return;
+		}
+
+		auto handle = am->ResolveToHandle(modelPath);
+		if (handle == AssetHandle(0))
+		{
+			CH_CORE_WARN("PhysicsBodySystem::ApplyAutoCalculate: model '{}' not loaded.", modelPath);
+			return;
+		}
+
+		auto asset = am->Get<ModelAsset>(handle);
+		if (!asset || asset->GetState() != AssetState::Ready)
+		{
+			CH_CORE_WARN("PhysicsBodySystem::ApplyAutoCalculate: model '{}' not ready.", modelPath);
+			return;
+		}
+
+		const auto& bbox = asset->GetBoundingBox();
+		glm::vec3 bMin = bbox.Min * scale;
+		glm::vec3 bMax = bbox.Max * scale;
+
+		glm::vec3 size = bMax - bMin;
+		glm::vec3 center = (bMax + bMin) * 0.5f;
+
+		collider.Size = size;
+		collider.Radius = glm::compMax(size) * 0.5f;
+		collider.Height = size.y;
+
+		if (collider.Type != ColliderType::Mesh)
+		{
+			collider.Offset = center;
+		}
+
+		CH_CORE_INFO("PhysicsBodySystem::ApplyAutoCalculate: entity={} model='{}' → Size=({:.2f},{:.2f},{:.2f}) "
+					 "Offset=({:.2f},{:.2f},{:.2f}) Radius={:.2f} Height={:.2f}",
+					 (uint32_t)entity, modelPath, collider.Size.x, collider.Size.y, collider.Size.z, collider.Offset.x,
+					 collider.Offset.y, collider.Offset.z, collider.Radius, collider.Height);
+	}
+
+	bool BuildBodyDesc(entt::registry& reg, entt::entity e, PhysicsBodyDesc& outDesc)
+	{
+		if (!reg.all_of<TransformComponent, RigidBodyComponent>(e))
+		{
+			return false;
+		}
+
+		auto& transform = reg.get<TransformComponent>(e);
+		auto& rb = reg.get<RigidBodyComponent>(e);
+
+		auto* collider = reg.try_get<ColliderComponent>(e);
+		if (!collider || !collider->Enabled)
+		{
+			return false;
+		}
+
+		PhysicsBodyDesc desc;
+		desc.Position = transform.Translation;
+		desc.Rotation = transform.RotationQuat;
+		desc.IsKinematic = (rb.Type == RigidBodyComponent::BodyType::Kinematic);
+		desc.IsStatic = (rb.Type == RigidBodyComponent::BodyType::Static);
+		desc.Mass = rb.Mass;
+		desc.LinearDamping = rb.LinearDamping;
+		desc.AngularDamping = rb.AngularDamping;
+		desc.UseGravity = rb.UseGravity;
+		desc.IsFixedRotation = rb.IsFixedRotation;
+		desc.InitialVelocity = rb.Velocity;
+		desc.UserData = (uint64_t)e;
+
+		desc.Shape = collider->Type;
+		desc.Friction = collider->Friction;
+		desc.Restitution = collider->Restitution;
+		desc.Offset = collider->Offset;
+		desc.UseFastBuildQuality = collider->UseFastBuildQuality;
+
+		switch (collider->Type)
+		{
+		case ColliderType::Box:
+			desc.Dimensions = (collider->Size * transform.Scale) * 0.5f;
+			break;
+
+		case ColliderType::Sphere:
+			desc.Dimensions.x = collider->Radius * std::max({transform.Scale.x, transform.Scale.y, transform.Scale.z});
+			break;
+
+		case ColliderType::Capsule:
+			desc.Dimensions.x = collider->Radius * std::max(transform.Scale.x, transform.Scale.z);
+			desc.Dimensions.y = (collider->Height * transform.Scale.y) * 0.5f;
+			break;
+
+		case ColliderType::Mesh: {
+			std::string modelPath = collider->ModelPath;
+			if (modelPath.empty())
+			{
+				if (auto* modelComp = reg.try_get<ModelComponent>(e))
+				{
+					modelPath = modelComp->ModelPath;
+				}
+			}
+
+			if (modelPath.empty())
+			{
+				return false;
+			}
+
+			if (auto* physicsPtr = reg.ctx().find<Physics*>())
+			{
+				if (*physicsPtr && (*physicsPtr)->GetWorld())
+				{
+					auto* world = (*physicsPtr)->GetWorld();
+					if (world->HasCachedMeshShape(modelPath))
+					{
+						desc.CacheKey = modelPath;
+						desc.MeshScale = transform.Scale;
+						break;
+					}
+					if (world->IsShapeBaking(modelPath))
+					{
+						desc.CacheKey = modelPath;
+						desc.MeshScale = transform.Scale;
+						return false;
+					}
+				}
+			}
+
+			auto* assets = ServiceLocator::TryGet<AssetManager>();
+			if (!assets)
+			{
+				return false;
+			}
+
+			auto modelAsset = assets->Get<ModelAsset>(modelPath);
+			if (!modelAsset || !modelAsset->IsReady())
+			{
+				return false;
+			}
+
+			const auto& rawMeshes = modelAsset->GetMeshes();
+			const auto& instances = modelAsset->GetInstances();
+
+			desc.MeshScale = transform.Scale;
+			desc.CacheKey = modelPath;
+
+			for (const auto& inst : instances)
+			{
+				if (inst.meshIndex < 0 || inst.meshIndex >= (int)rawMeshes.size())
+				{
+					continue;
+				}
+
+				const MeshData& raw = rawMeshes[inst.meshIndex];
+				if (raw.indices.size() < 3)
+				{
+					continue;
+				}
+
+				const glm::mat4& meshToLocal = inst.localTransform;
+
+				for (size_t i = 0; i + 2 < raw.indices.size(); i += 3)
+				{
+					uint32_t i0 = raw.indices[i];
+					uint32_t i1 = raw.indices[i + 1];
+					uint32_t i2 = raw.indices[i + 2];
+
+					size_t v0Idx = (size_t)i0 * 3;
+					size_t v1Idx = (size_t)i1 * 3;
+					size_t v2Idx = (size_t)i2 * 3;
+
+					if (v0Idx + 2 >= raw.vertices.size() || v1Idx + 2 >= raw.vertices.size() ||
+						v2Idx + 2 >= raw.vertices.size())
+					{
+						continue;
+					}
+
+					glm::vec3 v0 = {raw.vertices[v0Idx], raw.vertices[v0Idx + 1], raw.vertices[v0Idx + 2]};
+					glm::vec3 v1 = {raw.vertices[v1Idx], raw.vertices[v1Idx + 1], raw.vertices[v1Idx + 2]};
+					glm::vec3 v2 = {raw.vertices[v2Idx], raw.vertices[v2Idx + 1], raw.vertices[v2Idx + 2]};
+
+					PhysicsTriangle tri;
+					tri.V0 = glm::vec3(meshToLocal * glm::vec4(v0, 1.0f));
+					tri.V1 = glm::vec3(meshToLocal * glm::vec4(v1, 1.0f));
+					tri.V2 = glm::vec3(meshToLocal * glm::vec4(v2, 1.0f));
+
+					desc.Triangles.push_back(tri);
+				}
+			}
+			break;
+		}
+		}
+
+		outDesc = std::move(desc);
+		return true;
+	}
+
+	void TryCreateBody(entt::registry& reg, entt::entity e)
+	{
+		if (!reg.ctx().contains<Physics*>())
+		{
+			CH_CORE_WARN("Physics: TryCreateBody entity={} — no Physics* in context yet.", (uint32_t)e);
+			return;
+		}
+
+		auto* physicsPtr = reg.ctx().find<Physics*>();
+		if (!physicsPtr || !(*physicsPtr) || !(*physicsPtr)->GetWorld())
+		{
+			CH_CORE_WARN("Physics: TryCreateBody entity={} — Physics* is null or world not initialized.", (uint32_t)e);
+			return;
+		}
+
+		auto* world = (*physicsPtr)->GetWorld();
+
+		auto& rb = reg.get<RigidBodyComponent>(e);
+
+		if (rb.Handle != kInvalidPhysicsBody)
+		{
+			return;
+		}
+
+		auto* collider = reg.try_get<ColliderComponent>(e);
+		if (!collider || !collider->Enabled)
+		{
+			CH_CORE_WARN("Physics: TryCreateBody entity={} — ColliderComponent missing or disabled (has={}).",
+						 (uint32_t)e, collider != nullptr);
+			return;
+		}
+
+		if (collider->AutoCalculate)
+		{
+			auto& transform = reg.get<TransformComponent>(e);
+			ApplyAutoCalculate(e, reg, *collider, transform.Scale);
+		}
+
+		PhysicsBodyDesc desc;
+		if (!BuildBodyDesc(reg, e, desc))
+		{
+			CH_CORE_WARN("Physics: TryCreateBody entity={} — BuildBodyDesc failed.", (uint32_t)e);
+			return;
+		}
+
+		if (desc.Shape == ColliderType::Mesh && !desc.CacheKey.empty() && !world->HasCachedMeshShape(desc.CacheKey))
+		{
+			world->QueuePrebuildShape(desc);
+			// Defer body creation until background mesh baking finishes
+			return;
+		}
+
+		rb.Handle = world->CreateBody(desc);
+		if (rb.Handle == kInvalidPhysicsBody)
+		{
+			CH_CORE_ERROR("Physics: TryCreateBody entity={} — CreateBody returned invalid handle.", (uint32_t)e);
+		}
+		else
+		{
+			CH_CORE_INFO("Physics: TryCreateBody entity={} — body created (handle={}, type={}, mass={})", (uint32_t)e,
+						 (uint64_t)rb.Handle, (int)rb.Type, rb.Mass);
+		}
+	}
+
+	void BatchInitializeBodies(entt::registry& reg, IPhysicsWorld* world)
+	{
+		std::vector<PhysicsBodyDesc> descs;
+		std::vector<entt::entity> entities;
+
+		auto view = reg.view<RigidBodyComponent, TransformComponent>();
+		for (auto entity : view)
+		{
+			auto& rb = view.get<RigidBodyComponent>(entity);
+			if (rb.Handle != kInvalidPhysicsBody)
+			{
+				continue;
+			}
+
+			auto* collider = reg.try_get<ColliderComponent>(entity);
+			if (!collider || !collider->Enabled)
+			{
+				CH_CORE_WARN("Physics: BatchInitializeBodies entity={} — ColliderComponent missing or disabled.",
+							 (uint32_t)entity);
+				continue;
+			}
+
+			CH_CORE_INFO("Physics: BatchInitializeBodies entity={} — Type={}, IsStatic={}, IsKinematic={}",
+						 (uint32_t)entity, (int)rb.Type, (rb.Type == RigidBodyComponent::BodyType::Static),
+						 (rb.Type == RigidBodyComponent::BodyType::Kinematic));
+
+			if (collider->AutoCalculate)
+			{
+				ApplyAutoCalculate(entity, reg, *collider, view.get<TransformComponent>(entity).Scale);
+			}
+
+			PhysicsBodyDesc desc;
+			if (!BuildBodyDesc(reg, entity, desc))
+			{
+				continue;
+			}
+
+			// If mesh shape is not yet baked, dispatch to background ThreadPool and defer body creation
+			if (desc.Shape == ColliderType::Mesh && !desc.CacheKey.empty() && !world->HasCachedMeshShape(desc.CacheKey))
+			{
+				world->QueuePrebuildShape(desc);
+				// Will be picked up on a subsequent frame once the shape is cached
+				continue;
+			}
+
+			entities.push_back(entity);
+			descs.push_back(std::move(desc));
+		}
+
+		if (descs.empty())
+		{
+			return;
+		}
+
+		// Sort: static (0) first, then kinematic (1), then dynamic (2)
+		std::vector<size_t> indices(descs.size());
+		for (size_t i = 0; i < indices.size(); ++i)
+		{
+			indices[i] = i;
+		}
+		std::sort(indices.begin(), indices.end(), [&descs](size_t a, size_t b) {
+			int orderA = descs[a].IsStatic ? 0 : (descs[a].IsKinematic ? 1 : 2);
+			int orderB = descs[b].IsStatic ? 0 : (descs[b].IsKinematic ? 1 : 2);
+			return orderA < orderB;
+		});
+
+		// Reorder descs and entities by sort order
+		std::vector<PhysicsBodyDesc> sortedDescs;
+		std::vector<entt::entity> sortedEntities;
+		sortedDescs.reserve(descs.size());
+		sortedEntities.reserve(entities.size());
+		for (size_t i : indices)
+		{
+			sortedDescs.push_back(std::move(descs[i]));
+			sortedEntities.push_back(entities[i]);
+		}
+
+		auto handles = world->CreateBodies(sortedDescs);
+
+		for (size_t i = 0; i < sortedEntities.size(); ++i)
+		{
+			reg.get<RigidBodyComponent>(sortedEntities[i]).Handle = handles[i];
+		}
+
+		CH_CORE_INFO(
+			"Physics: Batch-created {} bodies (static={}, dynamic={}, kinematic={}).", sortedEntities.size(),
+			std::count_if(sortedDescs.begin(), sortedDescs.end(), [](const PhysicsBodyDesc& d) { return d.IsStatic; }),
+			std::count_if(sortedDescs.begin(), sortedDescs.end(),
+						  [](const PhysicsBodyDesc& d) { return !d.IsStatic && !d.IsKinematic; }),
+			std::count_if(sortedDescs.begin(), sortedDescs.end(),
+						  [](const PhysicsBodyDesc& d) { return d.IsKinematic; }));
+	}
+
+	void Update(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (!reg.ctx().contains<Physics*>())
+		{
+			return;
+		}
+
+		auto* physics = *reg.ctx().find<Physics*>();
+		if (!physics || !physics->GetWorld())
+		{
+			return;
+		}
+
+		BatchInitializeBodies(reg, physics->GetWorld());
+	}
+
+} // namespace Chained::PhysicsBodySystem
diff --git a/engine/scene/systems/physics_body_system.h b/engine/scene/systems/physics_body_system.h
new file mode 100644
index 000000000..182178a28
--- /dev/null
+++ b/engine/scene/systems/physics_body_system.h
@@ -0,0 +1,23 @@
+#ifndef CH_PHYSICS_BODY_SYSTEM_H
+#define CH_PHYSICS_BODY_SYSTEM_H
+
+#include "engine/physics/iphysics_world.h"
+#include "engine/scene/components/physics/physics_component.h"
+#include <entt/entt.hpp>
+#include <glm/glm.hpp>
+
+namespace Chained
+{
+	class IPhysicsWorld;
+
+	namespace PhysicsBodySystem
+	{
+		void ApplyAutoCalculate(entt::entity entity, entt::registry& registry, ColliderComponent& collider,
+								const glm::vec3& scale);
+		bool BuildBodyDesc(entt::registry& reg, entt::entity e, PhysicsBodyDesc& outDesc);
+		void BatchInitializeBodies(entt::registry& reg, IPhysicsWorld* world);
+		void Update(entt::registry& reg);
+	} // namespace PhysicsBodySystem
+} // namespace Chained
+
+#endif // CH_PHYSICS_BODY_SYSTEM_H
diff --git a/engine/scene/systems/primitive_system.cpp b/engine/scene/systems/primitive_system.cpp
new file mode 100644
index 000000000..09dd44617
--- /dev/null
+++ b/engine/scene/systems/primitive_system.cpp
@@ -0,0 +1,344 @@
+#include "primitive_system.h"
+
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/loaders/model_loader.h"
+#include "engine/assets/model_data.h"
+#include "engine/core/log.h"
+#include "engine/core/service_locator.h"
+#include "engine/graphics/pipeline/geometry_generator.h"
+#include "engine/scene/components/core/id_component.h"
+#include "engine/scene/components/core/tag_component.h"
+#include "engine/scene/components/render/model_component.h"
+#include "engine/scene/components/render/primitive_component.h"
+#include "engine/assets/types/material_asset.h"
+
+#include <cereal/archives/binary.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/unordered_map.hpp>
+#include <filesystem>
+#include <fstream>
+#include <sstream>
+
+namespace Chained::PrimitiveSystem
+{
+
+	// ---------------------------------------------------------------------------
+	// Internal helpers
+	// ---------------------------------------------------------------------------
+
+	static std::string s_PrimitiveDir;
+
+	/// Maps PrimitiveType enum → the marker string used by GeometryGenerator.
+	static const char* TypeMarker(PrimitiveType t)
+	{
+		switch (t)
+		{
+		case PrimitiveType::Cube:
+			return ":cube:";
+		case PrimitiveType::Sphere:
+			return ":sphere:";
+		case PrimitiveType::Plane:
+			return ":plane:";
+		case PrimitiveType::Cylinder:
+			return ":cylinder:";
+		case PrimitiveType::Cone:
+			return ":cone:";
+		case PrimitiveType::Torus:
+			return ":torus:";
+		case PrimitiveType::Knot:
+			return ":knot:";
+		case PrimitiveType::Hemisphere:
+			return ":hemisphere:";
+		default:
+			return nullptr;
+		}
+	}
+
+	static std::string TypeName(PrimitiveType t)
+	{
+		switch (t)
+		{
+		case PrimitiveType::Cube:
+			return "Cube";
+		case PrimitiveType::Sphere:
+			return "Sphere";
+		case PrimitiveType::Plane:
+			return "Plane";
+		case PrimitiveType::Cylinder:
+			return "Cylinder";
+		case PrimitiveType::Cone:
+			return "Cone";
+		case PrimitiveType::Torus:
+			return "Torus";
+		case PrimitiveType::Knot:
+			return "Knot";
+		case PrimitiveType::Hemisphere:
+			return "Hemisphere";
+		default:
+			return "Primitive";
+		}
+	}
+
+	static std::string SanitizeName(const std::string& name)
+	{
+		std::string result;
+		for (char c : name)
+		{
+			if (std::isalnum(static_cast<unsigned char>(c)) || c == '_' || c == '-')
+			{
+				result += c;
+			}
+			else if (c == ' ' || c == '.' || c == ':')
+			{
+				result += '_';
+			}
+		}
+		return result.empty() ? "Primitive" : result;
+	}
+
+	/// Build human-readable project-relative key stored in ModelComponent.ModelPath.
+	/// Format: primitives/<Name>.chmesh (e.g. primitives/Cube.chmesh)
+	static std::string MakeRelativePath(entt::registry& reg, entt::entity e, PrimitiveType type)
+	{
+		std::string baseName;
+		if (auto* tag = reg.try_get<TagComponent>(e))
+		{
+			if (!tag->Tag.empty() && tag->Tag != "Entity")
+			{
+				baseName = SanitizeName(tag->Tag);
+			}
+		}
+		if (baseName.empty())
+		{
+			baseName = TypeName(type);
+		}
+
+		return "primitives/" + baseName + ".chmesh";
+	}
+
+	/// Serialize PendingModelData to disk using the same ChainedAssetHeader+cereal
+	/// format that ModelLoader already knows how to read.
+	static bool WriteChasset(const std::string& absPath, const PendingModelData& data)
+	{
+		try
+		{
+			std::filesystem::create_directories(std::filesystem::path(absPath).parent_path());
+
+			std::ostringstream dataStream(std::ios::binary);
+			{
+				cereal::BinaryOutputArchive dataArchive(dataStream);
+				dataArchive(data);
+			}
+			std::string serializedData = dataStream.str();
+
+			ChainedAssetHeader header;
+			header.sourceHash = 0; // procedural — no source file to hash
+			header.compressed = false;
+			header.compressedSize = 0;
+			header.uncompressedSize = serializedData.size();
+
+			std::ofstream os(absPath, std::ios::binary | std::ios::trunc);
+			if (!os.is_open())
+			{
+				CH_CORE_ERROR("PrimitiveSystem: cannot open '{}' for writing", absPath);
+				return false;
+			}
+			cereal::BinaryOutputArchive archive(os);
+			archive(header);
+			os.write(serializedData.data(), static_cast<std::streamsize>(serializedData.size()));
+			return os.good();
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("PrimitiveSystem: failed to write '{}': {}", absPath, e.what());
+			return false;
+		}
+	}
+
+	/// Generate the mesh and write it to disk. Returns the relative path on success,
+	/// or an empty string on failure.
+	static std::string BakeMesh(entt::registry& reg, entt::entity e)
+	{
+		auto* prim = reg.try_get<PrimitiveComponent>(e);
+		if (!prim || prim->Type == PrimitiveType::None)
+		{
+			return {};
+		}
+
+		const char* marker = TypeMarker(prim->Type);
+		if (!marker)
+		{
+			return {};
+		}
+
+		ProceduralParameters params;
+		params.Radius = prim->Radius;
+		params.InnerRadius = prim->InnerRadius;
+		params.Height = prim->Height;
+		params.Slices = prim->Slices;
+		params.Stacks = prim->Stacks;
+		params.Dimensions = prim->Dimensions;
+
+		PendingModelData data = GeometryGenerator::GeneratePrimitivePendingData(marker, params);
+		if (!data.isValid)
+		{
+			CH_CORE_WARN("PrimitiveSystem: GeometryGenerator returned invalid data for entity {}", (uint32_t)e);
+			return {};
+		}
+
+		std::string rel = MakeRelativePath(reg, e, prim->Type);
+
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		std::string abs = am ? am->ResolvePath(rel) : (s_PrimitiveDir.empty() ? rel : s_PrimitiveDir + "/" + rel);
+
+		if (!WriteChasset(abs, data))
+		{
+			return {};
+		}
+
+		if (am)
+		{
+			auto modelAsset = am->Get<ModelAsset>(rel);
+			if (modelAsset)
+			{
+				modelAsset->SetPendingData(std::move(data));
+				modelAsset->OnLoaded();
+
+				// Restore custom material from ModelComponent or .chmat on disk
+				if (auto* mc = reg.try_get<ModelComponent>(e))
+				{
+					for (size_t i = 0; i < mc->MaterialPaths.size(); ++i)
+					{
+						if (!mc->MaterialPaths[i].empty())
+						{
+							auto matAsset = am->Get<MaterialAsset>(mc->MaterialPaths[i]);
+							if (matAsset && matAsset->IsReady())
+							{
+								if (i >= modelAsset->GetMaterials().size())
+								{
+									modelAsset->GetMaterials().resize(i + 1);
+								}
+								modelAsset->GetMaterials()[i] = matAsset->GetMaterial();
+							}
+						}
+					}
+				}
+				else
+				{
+					std::filesystem::path modelPath(rel);
+					std::string modelName = modelPath.stem().string();
+					std::filesystem::path modelDir = modelPath.parent_path();
+					for (size_t i = 0; i < modelAsset->GetMaterials().size(); ++i)
+					{
+						std::string autoMatRel =
+							(modelDir / (modelName + "_material_" + std::to_string(i) + ".chmat")).generic_string();
+						if (am->FileExists(autoMatRel))
+						{
+							auto matAsset = am->Get<MaterialAsset>(autoMatRel);
+							if (matAsset && matAsset->IsReady())
+							{
+								modelAsset->GetMaterials()[i] = matAsset->GetMaterial();
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return rel;
+	}
+
+	/// Invalidate the asset in AssetManager so ModelLoader re-reads from disk.
+	static void InvalidateAsset(const std::string& relPath)
+	{
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			am->Invalidate(relPath);
+		}
+	}
+
+	// ---------------------------------------------------------------------------
+	// Observer callbacks
+	// ---------------------------------------------------------------------------
+
+	/// Called when PrimitiveComponent is constructed or updated (on_construct + on_update).
+	static void OnPrimitiveChanged(entt::registry& reg, entt::entity e)
+	{
+		auto* prim = reg.try_get<PrimitiveComponent>(e);
+		if (!prim)
+		{
+			return;
+		}
+
+		if (prim->Type == PrimitiveType::None)
+		{
+			// Remove ModelComponent if the primitive is set to None.
+			reg.remove<ModelComponent>(e);
+			prim->MeshPath.clear();
+			return;
+		}
+
+		std::string newRelPath = BakeMesh(reg, e);
+		if (newRelPath.empty())
+		{
+			return;
+		}
+
+		prim->MeshPath = newRelPath;
+
+		// Ensure ModelComponent exists and points at the generated file.
+		auto& mc = reg.get_or_emplace<ModelComponent>(e);
+		if (mc.ModelPath != newRelPath)
+		{
+			mc.ModelPath = newRelPath;
+			mc.ModelHandle = AssetHandle(0); // force re-resolve
+		}
+
+		// Auto-populate MaterialPaths if a saved .chmat file exists on disk
+		if (auto* am = ServiceLocator::TryGet<AssetManager>())
+		{
+			std::filesystem::path modelPath(newRelPath);
+			std::string modelName = modelPath.stem().string();
+			std::filesystem::path modelDir = modelPath.parent_path();
+			std::string autoMatRel = (modelDir / (modelName + "_material_0.chmat")).generic_string();
+			if ((mc.MaterialPaths.empty() || mc.MaterialPaths[0].empty()) && am->FileExists(autoMatRel))
+			{
+				if (mc.MaterialPaths.empty())
+				{
+					mc.MaterialPaths.resize(1);
+				}
+				mc.MaterialPaths[0] = autoMatRel;
+			}
+		}
+
+		reg.patch<ModelComponent>(e, [](ModelComponent&) {});
+	}
+
+	/// Called when PrimitiveComponent is destroyed.
+	static void OnPrimitiveDestroyed(entt::registry& reg, entt::entity e)
+	{
+		// Remove the generated ModelComponent — per the design decision:
+		// deleting PrimitiveComponent also removes the mesh from the scene.
+		reg.remove<ModelComponent>(e);
+	}
+
+	// ---------------------------------------------------------------------------
+	// Public API
+	// ---------------------------------------------------------------------------
+
+	void RegisterObservers(entt::registry& reg, const std::string& primitiveDir)
+	{
+		s_PrimitiveDir = primitiveDir;
+		reg.on_construct<PrimitiveComponent>().connect<&OnPrimitiveChanged>();
+		reg.on_update<PrimitiveComponent>().connect<&OnPrimitiveChanged>();
+		reg.on_destroy<PrimitiveComponent>().connect<&OnPrimitiveDestroyed>();
+	}
+
+	void UnregisterObservers(entt::registry& reg)
+	{
+		reg.on_construct<PrimitiveComponent>().disconnect<&OnPrimitiveChanged>();
+		reg.on_update<PrimitiveComponent>().disconnect<&OnPrimitiveChanged>();
+		reg.on_destroy<PrimitiveComponent>().disconnect<&OnPrimitiveDestroyed>();
+	}
+
+} // namespace Chained::PrimitiveSystem
diff --git a/engine/scene/systems/primitive_system.h b/engine/scene/systems/primitive_system.h
new file mode 100644
index 000000000..e197b03a6
--- /dev/null
+++ b/engine/scene/systems/primitive_system.h
@@ -0,0 +1,33 @@
+#ifndef CH_PRIMITIVE_SYSTEM_H
+#define CH_PRIMITIVE_SYSTEM_H
+
+#include <entt/entt.hpp>
+#include <string>
+
+namespace Chained
+{
+
+	/// @brief Manages the lifecycle of PrimitiveComponent entities.
+	///
+	/// Responsibilities:
+	///  - On construct/update of PrimitiveComponent: bake geometry to a .chasset file
+	///    under assets/primitives/ and keep ModelComponent.ModelPath in sync.
+	///  - On destroy of PrimitiveComponent: remove the paired ModelComponent so the
+	///    mesh disappears from the scene.
+	///
+	/// The generated file is always loaded through the standard ModelLoader pipeline;
+	/// materials are then edited via the Material Editor exactly like any other mesh.
+	namespace PrimitiveSystem
+	{
+		/// Register entt observers. Must be called once after the registry is created.
+		/// @param primitiveDir  Absolute path to the directory where .chasset files are written
+		///                      (typically <project>/assets/primitives/).
+		void RegisterObservers(entt::registry& reg, const std::string& primitiveDir);
+
+		/// Unregister all observers and free resources.
+		void UnregisterObservers(entt::registry& reg);
+
+	} // namespace PrimitiveSystem
+} // namespace Chained
+
+#endif // CH_PRIMITIVE_SYSTEM_H
diff --git a/engine/scene/systems/scene_transition_system.cpp b/engine/scene/systems/scene_transition_system.cpp
new file mode 100644
index 000000000..42ce9e033
--- /dev/null
+++ b/engine/scene/systems/scene_transition_system.cpp
@@ -0,0 +1,36 @@
+#include "scene_transition_system.h"
+#include "engine/core/profiler.h"
+#include "engine/scene/components/ui/control_component.h"
+#include "engine/scene/components/ui/scene_transition_component.h"
+
+namespace Chained::SceneTransitionSystem
+{
+
+	std::optional<std::string> Update(entt::registry& reg)
+	{
+		CH_PROFILE_FUNCTION();
+
+		auto transitionView = reg.view<SceneTransitionComponent>();
+		for (auto entity : transitionView)
+		{
+			auto& transition = transitionView.get<SceneTransitionComponent>(entity);
+			if (reg.all_of<UIControlComponent>(entity))
+			{
+				auto& widget = reg.get<UIControlComponent>(entity);
+				if (widget.PressedThisFrame)
+				{
+					transition.Triggered = true;
+				}
+			}
+
+			if (transition.Triggered && !transition.TargetScenePath.empty())
+			{
+				transition.Triggered = false;
+				return transition.TargetScenePath;
+			}
+		}
+
+		return std::nullopt;
+	}
+
+} // namespace Chained::SceneTransitionSystem
diff --git a/engine/scene/systems/scene_transition_system.h b/engine/scene/systems/scene_transition_system.h
new file mode 100644
index 000000000..493e5a4b2
--- /dev/null
+++ b/engine/scene/systems/scene_transition_system.h
@@ -0,0 +1,16 @@
+#ifndef CH_SCENE_TRANSITION_SYSTEM_H
+#define CH_SCENE_TRANSITION_SYSTEM_H
+
+#include <entt/entt.hpp>
+#include <optional>
+#include <string>
+
+namespace Chained
+{
+	namespace SceneTransitionSystem
+	{
+		std::optional<std::string> Update(entt::registry& reg);
+	} // namespace SceneTransitionSystem
+} // namespace Chained
+
+#endif // CH_SCENE_TRANSITION_SYSTEM_H
diff --git a/engine/scene/systems/system_manager.cpp b/engine/scene/systems/system_manager.cpp
new file mode 100644
index 000000000..d9ddc5ad6
--- /dev/null
+++ b/engine/scene/systems/system_manager.cpp
@@ -0,0 +1,59 @@
+#include "engine/scene/systems/system_manager.h"
+#include "engine/scene/scene.h"
+
+namespace Chained
+{
+
+	void SystemManager::RegisterSystem(Phase phase, SystemFn fn, bool editor, bool runtime, bool simulation)
+	{
+		m_Systems.push_back({phase, std::move(fn), editor, runtime, simulation});
+	}
+
+	void SystemManager::UpdateEditor(Scene& scene, Timestep ts)
+	{
+		ExecutePhase(scene, ts, Phase::PreUpdate, true, false, false);
+		ExecutePhase(scene, ts, Phase::Update, true, false, false);
+		ExecutePhase(scene, ts, Phase::PostUpdate, true, false, false);
+	}
+
+	void SystemManager::UpdateRuntime(Scene& scene, Timestep ts)
+	{
+		ExecutePhase(scene, ts, Phase::PreUpdate, false, true, false);
+		ExecutePhase(scene, ts, Phase::Update, false, true, false);
+		ExecutePhase(scene, ts, Phase::PostUpdate, false, true, false);
+	}
+
+	void SystemManager::UpdateSimulation(Scene& scene, Timestep ts)
+	{
+		ExecutePhase(scene, ts, Phase::PreUpdate, false, false, true);
+		ExecutePhase(scene, ts, Phase::Update, false, false, true);
+		ExecutePhase(scene, ts, Phase::PostUpdate, false, false, true);
+	}
+
+	void SystemManager::ExecutePhase(Scene& scene, Timestep ts, Phase phase, bool editor, bool runtime, bool simulation)
+	{
+		for (auto& entry : m_Systems)
+		{
+			if (entry.phase != phase)
+			{
+				continue;
+			}
+
+			if (editor && !entry.enabledInEditor)
+			{
+				continue;
+			}
+			if (runtime && !entry.enabledInRuntime)
+			{
+				continue;
+			}
+			if (simulation && !entry.enabledInSimulation)
+			{
+				continue;
+			}
+
+			entry.function(scene, ts);
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scene/systems/system_manager.h b/engine/scene/systems/system_manager.h
new file mode 100644
index 000000000..62eaa8e2b
--- /dev/null
+++ b/engine/scene/systems/system_manager.h
@@ -0,0 +1,50 @@
+#ifndef CH_SYSTEM_MANAGER_H
+#define CH_SYSTEM_MANAGER_H
+
+#include "engine/common/base.h"
+#include "engine/common/timestep.h"
+#include <functional>
+#include <vector>
+
+namespace Chained
+{
+
+	class Scene;
+
+	class CH_API SystemManager
+	{
+	public:
+		enum class Phase : uint8_t
+		{
+			PreUpdate = 0,
+			Update = 1,
+			PostUpdate = 2
+		};
+
+		using SystemFn = std::function<void(Scene&, Timestep)>;
+
+		struct SystemEntry
+		{
+			Phase phase;
+			SystemFn function;
+			bool enabledInEditor;
+			bool enabledInRuntime;
+			bool enabledInSimulation;
+		};
+
+	public:
+		void RegisterSystem(Phase phase, SystemFn fn, bool editor = true, bool runtime = true, bool simulation = true);
+
+		void UpdateEditor(Scene& scene, Timestep ts);
+		void UpdateRuntime(Scene& scene, Timestep ts);
+		void UpdateSimulation(Scene& scene, Timestep ts);
+
+	private:
+		void ExecutePhase(Scene& scene, Timestep ts, Phase phase, bool editor, bool runtime, bool simulation);
+
+		std::vector<SystemEntry> m_Systems;
+	};
+
+} // namespace Chained
+
+#endif // CH_SYSTEM_MANAGER_H
diff --git a/engine/scene/systems/transform_system.cpp b/engine/scene/systems/transform_system.cpp
new file mode 100644
index 000000000..42d191e79
--- /dev/null
+++ b/engine/scene/systems/transform_system.cpp
@@ -0,0 +1,67 @@
+#include "transform_system.h"
+
+namespace Chained::TransformSystem
+{
+	const glm::vec3& GetTranslation(const TransformComponent& tc)
+	{
+		return tc.Translation;
+	}
+
+	const glm::vec3& GetRotation(const TransformComponent& tc)
+	{
+		return tc.Rotation;
+	}
+
+	const glm::quat& GetRotationQuat(const TransformComponent& tc)
+	{
+		return tc.RotationQuat;
+	}
+
+	const glm::vec3& GetScale(const TransformComponent& tc)
+	{
+		return tc.Scale;
+	}
+
+	glm::mat4 ComputeLocalMatrix(const TransformComponent& tc)
+	{
+		return glm::translate(glm::mat4(1.0f), tc.Translation) * glm::toMat4(tc.RotationQuat) *
+			   glm::scale(glm::mat4(1.0f), tc.Scale);
+	}
+
+	glm::mat4 ComputeInterpolatedMatrix(const TransformComponent& tc, float alpha)
+	{
+		glm::vec3 interpolatedTranslation = glm::mix(tc.PrevTranslation, tc.Translation, alpha);
+		glm::quat interpolatedRotation = glm::slerp(tc.PrevRotationQuat, tc.RotationQuat, alpha);
+		glm::vec3 interpolatedScale = glm::mix(tc.PrevScale, tc.Scale, alpha);
+
+		return glm::translate(glm::mat4(1.0f), interpolatedTranslation) * glm::toMat4(interpolatedRotation) *
+			   glm::scale(glm::mat4(1.0f), interpolatedScale);
+	}
+
+	void SetTranslation(TransformComponent& tc, const glm::vec3& translation)
+	{
+		tc.Translation = translation;
+		tc.TransformChanged = true;
+	}
+
+	void SetRotation(TransformComponent& tc, const glm::vec3& eulerAngles)
+	{
+		tc.Rotation = eulerAngles;
+		tc.RotationQuat = glm::quat(eulerAngles);
+		tc.TransformChanged = true;
+	}
+
+	void SetScale(TransformComponent& tc, const glm::vec3& scale)
+	{
+		tc.Scale = scale;
+		tc.TransformChanged = true;
+	}
+
+	void SetRotationQuat(TransformComponent& tc, const glm::quat& rotationQuat)
+	{
+		tc.RotationQuat = rotationQuat;
+		tc.Rotation = glm::eulerAngles(rotationQuat);
+		tc.TransformChanged = true;
+	}
+
+} // namespace Chained::TransformSystem
diff --git a/engine/scene/systems/transform_system.h b/engine/scene/systems/transform_system.h
new file mode 100644
index 000000000..cd6889a64
--- /dev/null
+++ b/engine/scene/systems/transform_system.h
@@ -0,0 +1,27 @@
+#ifndef CH_TRANSFORM_SYSTEM_H
+#define CH_TRANSFORM_SYSTEM_H
+
+#include "engine/scene/components/core/transform_component.h"
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+namespace Chained
+{
+	namespace TransformSystem
+	{
+		glm::mat4 ComputeLocalMatrix(const TransformComponent& tc);
+		glm::mat4 ComputeInterpolatedMatrix(const TransformComponent& tc, float alpha);
+
+		const glm::vec3& GetTranslation(const TransformComponent& tc);
+		const glm::vec3& GetRotation(const TransformComponent& tc);
+		const glm::quat& GetRotationQuat(const TransformComponent& tc);
+		const glm::vec3& GetScale(const TransformComponent& tc);
+
+		void SetTranslation(TransformComponent& tc, const glm::vec3& translation);
+		void SetRotation(TransformComponent& tc, const glm::vec3& eulerAngles);
+		void SetScale(TransformComponent& tc, const glm::vec3& scale);
+		void SetRotationQuat(TransformComponent& tc, const glm::quat& rotationQuat);
+	} // namespace TransformSystem
+} // namespace Chained
+
+#endif // CH_TRANSFORM_SYSTEM_H
diff --git a/engine/scene/yaml.h b/engine/scene/yaml.h
index dd353d059..83cbc14fe 100644
--- a/engine/scene/yaml.h
+++ b/engine/scene/yaml.h
@@ -1,631 +1,463 @@
 #ifndef CH_YAML_UTILS_H
 #define CH_YAML_UTILS_H
 
-#include <cassert>
-
+#include "engine/common/color.h"
 #include "engine/scene/components.h"
+#include "yaml-cpp/yaml.h"
+#include <filesystem>
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/quaternion.hpp>
 #include <string>
 #include <variant>
 
-#include "engine/core/ch_math.h"
-#include "engine/scene/project.h"
-#include "yaml-cpp/yaml.h"
-
 namespace YAML
 {
 
-template <> struct convert<glm::vec2>
-{
-    static Node encode(const glm::vec2& rhs)
-    {
-        Node node;
-        node.push_back(rhs.x);
-        node.push_back(rhs.y);
-        return node;
-    }
-
-    static bool decode(const Node& node, glm::vec2& rhs)
-    {
-        if (node.IsSequence() && node.size() == 2)
-        {
-            rhs.x = node[0].as<float>();
-            rhs.y = node[1].as<float>();
-            return true;
-        }
-        else if (node.IsMap())
-        {
-            rhs.x = (node["x"] ? node["x"] : node["X"]) ? (node["x"] ? node["x"] : node["X"]).as<float>() : 0.0f;
-            rhs.y = (node["y"] ? node["y"] : node["Y"]) ? (node["y"] ? node["y"] : node["Y"]).as<float>() : 0.0f;
-            return true;
-        }
-        return false;
-    }
-};
-
-template <> struct convert<glm::vec3>
-{
-    static Node encode(const glm::vec3& rhs)
-    {
-        Node node;
-        node.push_back(rhs.x);
-        node.push_back(rhs.y);
-        node.push_back(rhs.z);
-        return node;
-    }
-
-    static bool decode(const Node& node, glm::vec3& rhs)
-    {
-        if (node.IsSequence() && node.size() == 3)
-        {
-            rhs.x = node[0].as<float>();
-            rhs.y = node[1].as<float>();
-            rhs.z = node[2].as<float>();
-            return true;
-        }
-        else if (node.IsMap())
-        {
-            rhs.x = (node["x"] ? node["x"] : node["X"]) ? (node["x"] ? node["x"] : node["X"]).as<float>() : 0.0f;
-            rhs.y = (node["y"] ? node["y"] : node["Y"]) ? (node["y"] ? node["y"] : node["Y"]).as<float>() : 0.0f;
-            rhs.z = (node["z"] ? node["z"] : node["Z"]) ? (node["z"] ? node["z"] : node["Z"]).as<float>() : 0.0f;
-            return true;
-        }
-        return false;
-    }
-};
-
-template <> struct convert<glm::vec4>
-{
-    static Node encode(const glm::vec4& rhs)
-    {
-        Node node;
-        node.push_back(rhs.x);
-        node.push_back(rhs.y);
-        node.push_back(rhs.z);
-        node.push_back(rhs.w);
-        return node;
-    }
-
-    static bool decode(const Node& node, glm::vec4& rhs)
-    {
-        if (node.IsSequence() && node.size() == 4)
-        {
-            rhs.x = node[0].as<float>();
-            rhs.y = node[1].as<float>();
-            rhs.z = node[2].as<float>();
-            rhs.w = node[3].as<float>();
-            return true;
-        }
-        return false;
-    }
-};
-
-template <> struct convert<glm::quat>
-{
-    static Node encode(const glm::quat& rhs)
-    {
-        Node node;
-        node.push_back(rhs.w);
-        node.push_back(rhs.x);
-        node.push_back(rhs.y);
-        node.push_back(rhs.z);
-        return node;
-    }
-
-    static bool decode(const Node& node, glm::quat& rhs)
-    {
-        if (node.IsSequence() && node.size() == 4)
-        {
-            rhs.w = node[0].as<float>();
-            rhs.x = node[1].as<float>();
-            rhs.y = node[2].as<float>();
-            rhs.z = node[3].as<float>();
-            return true;
-        }
-        return false;
-    }
-};
-
-template <> struct convert<CHEngine::Color>
-{
-    static Node encode(const CHEngine::Color& rhs)
-    {
-        Node node;
-        node.push_back(static_cast<uint32_t>(rhs.r));
-        node.push_back(static_cast<uint32_t>(rhs.g));
-        node.push_back(static_cast<uint32_t>(rhs.b));
-        node.push_back(static_cast<uint32_t>(rhs.a));
-        return node;
-    }
-
-    static bool decode(const Node& node, CHEngine::Color& rhs)
-    {
-        if (node.IsSequence() && node.size() == 4)
-        {
-            rhs.r = static_cast<unsigned char>(node[0].as<int>());
-            rhs.g = static_cast<unsigned char>(node[1].as<int>());
-            rhs.b = static_cast<unsigned char>(node[2].as<int>());
-            rhs.a = static_cast<unsigned char>(node[3].as<int>());
-            return true;
-        }
-        else if (node.IsMap())
-        {
-            auto rNode = node["r"] ? node["r"] : node["R"];
-            auto gNode = node["g"] ? node["g"] : node["G"];
-            auto bNode = node["b"] ? node["b"] : node["B"];
-            auto aNode = node["a"] ? node["a"] : node["A"];
-
-            rhs.r = rNode ? static_cast<unsigned char>(rNode.as<int>()) : 255;
-            rhs.g = gNode ? static_cast<unsigned char>(gNode.as<int>()) : 255;
-            rhs.b = bNode ? static_cast<unsigned char>(bNode.as<int>()) : 255;
-            rhs.a = aNode ? static_cast<unsigned char>(aNode.as<int>()) : 255;
-            return true;
-        }
-        return false;
-    }
-};
-
-template <> struct convert<CHEngine::UIStyle>
-{
-    static Node encode(const CHEngine::UIStyle& rhs)
-    {
-        Node node;
-        node.push_back(rhs.BackgroundColor);
-        node.push_back(rhs.HoverColor);
-        node.push_back(rhs.PressedColor);
-        return node;
-    }
-
-    static bool decode(const Node& node, CHEngine::UIStyle& rhs)
-    {
-        if (node.IsSequence() && node.size() >= 3)
-        {
-            rhs.BackgroundColor = node[0].as<CHEngine::Color>();
-            rhs.HoverColor = node[1].as<CHEngine::Color>();
-            rhs.PressedColor = node[2].as<CHEngine::Color>();
-            return true;
-        }
-        return false;
-    }
-};
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::Color& color)
-{
-    out << YAML::Flow;
-    out << YAML::BeginSeq << static_cast<uint32_t>(color.r) << static_cast<uint32_t>(color.g)
-        << static_cast<uint32_t>(color.b) << static_cast<uint32_t>(color.a) << YAML::EndSeq;
-    return out;
-}
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::UIStyle& style)
-{
-    out << YAML::Flow;
-    out << YAML::BeginSeq << style.BackgroundColor << style.HoverColor << style.PressedColor << YAML::EndSeq;
-    return out;
-}
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const glm::vec2& v)
-{
-    out << YAML::Flow;
-    out << YAML::BeginSeq << v.x << v.y << YAML::EndSeq;
-    return out;
-}
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const glm::vec3& v)
-{
-    out << YAML::Flow;
-    out << YAML::BeginSeq << v.x << v.y << v.z << YAML::EndSeq;
-    return out;
-}
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const glm::vec4& v)
-{
-    out << YAML::Flow;
-    out << YAML::BeginSeq << v.x << v.y << v.z << v.w << YAML::EndSeq;
-    return out;
-}
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const glm::quat& q)
-{
-    out << YAML::Flow;
-    out << YAML::BeginSeq << q.w << q.x << q.y << q.z << YAML::EndSeq;
-    return out;
-}
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const std::filesystem::path& p)
-{
-    out << p.string();
-    return out;
-}
-inline YAML::Emitter& operator<<(YAML::Emitter& out, char* s)
-{
-    out << (const char*)s;
-    return out;
-}
-
-// operator<< for glm::quat uses glm::vec4 overload
-
-template <typename... Ts> inline Emitter& operator<<(Emitter& out, const std::variant<Ts...>& v)
-{
-    std::visit([&](auto&& arg) { out << arg; }, v);
-    return out;
-}
-
-// ---- TextStyle ----
-template <> struct convert<CHEngine::TextStyle>
-{
-    static Node encode(const CHEngine::TextStyle& rhs)
-    {
-        Node node;
-        node["FontName"] = rhs.FontName;
-        node["FontSize"] = rhs.FontSize;
-        node["TextColor"] = rhs.TextColor;
-        node["Shadow"] = rhs.Shadow;
-        node["ShadowOffset"] = rhs.ShadowOffset;
-        node["ShadowColor"] = rhs.ShadowColor;
-        node["LetterSpacing"] = rhs.LetterSpacing;
-        node["LineHeight"] = rhs.LineHeight;
-        node["HorizontalAlignment"] = static_cast<int>(rhs.HorizontalAlignment);
-        node["VerticalAlignment"] = static_cast<int>(rhs.VerticalAlignment);
-        return node;
-    }
-    static bool decode(const Node& node, CHEngine::TextStyle& rhs)
-    {
-        if (!node.IsMap())
-        {
-            return false;
-        }
-        if (node["FontName"])
-        {
-            rhs.FontName = node["FontName"].as<std::string>();
-        }
-        if (node["FontSize"])
-        {
-            rhs.FontSize = node["FontSize"].as<float>();
-        }
-        if (node["TextColor"])
-        {
-            rhs.TextColor = node["TextColor"].as<CHEngine::Color>();
-        }
-        if (node["Shadow"])
-        {
-            rhs.Shadow = node["Shadow"].as<bool>();
-        }
-        if (node["ShadowOffset"])
-        {
-            rhs.ShadowOffset = node["ShadowOffset"].as<float>();
-        }
-        if (node["ShadowColor"])
-        {
-            rhs.ShadowColor = node["ShadowColor"].as<CHEngine::Color>();
-        }
-        if (node["LetterSpacing"])
-        {
-            rhs.LetterSpacing = node["LetterSpacing"].as<float>();
-        }
-        if (node["LineHeight"])
-        {
-            rhs.LineHeight = node["LineHeight"].as<float>();
-        }
-        if (node["HorizontalAlignment"])
-        {
-            rhs.HorizontalAlignment = static_cast<CHEngine::TextAlignment>(node["HorizontalAlignment"].as<int>());
-        }
-        if (node["VerticalAlignment"])
-        {
-            rhs.VerticalAlignment = static_cast<CHEngine::TextAlignment>(node["VerticalAlignment"].as<int>());
-        }
-        return true;
-    }
-};
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::TextStyle& s)
-{
-    out << YAML::BeginMap << YAML::Key << "FontName" << YAML::Value << s.FontName << YAML::Key << "FontSize"
-        << YAML::Value << s.FontSize << YAML::Key << "TextColor" << YAML::Value << s.TextColor << YAML::Key << "Shadow"
-        << YAML::Value << s.Shadow << YAML::Key << "ShadowOffset" << YAML::Value << s.ShadowOffset << YAML::Key
-        << "ShadowColor" << YAML::Value << s.ShadowColor << YAML::Key << "LetterSpacing" << YAML::Value
-        << s.LetterSpacing << YAML::Key << "LineHeight" << YAML::Value << s.LineHeight << YAML::Key
-        << "HorizontalAlignment" << YAML::Value << static_cast<int>(s.HorizontalAlignment) << YAML::Key
-        << "VerticalAlignment" << YAML::Value << static_cast<int>(s.VerticalAlignment) << YAML::EndMap;
-    return out;
-}
-
-// ---- RectTransform ----
-template <> struct convert<CHEngine::RectTransform>
-{
-    static Node encode(const CHEngine::RectTransform& rhs)
-    {
-        Node node;
-        node["AnchorMin"] = rhs.AnchorMin;
-        node["AnchorMax"] = rhs.AnchorMax;
-        node["OffsetMin"] = rhs.OffsetMin;
-        node["OffsetMax"] = rhs.OffsetMax;
-        node["Pivot"] = rhs.Pivot;
-        node["Rotation"] = rhs.Rotation;
-        node["Scale"] = rhs.Scale;
-        return node;
-    }
-    static bool decode(const Node& node, CHEngine::RectTransform& rhs)
-    {
-        if (!node.IsMap())
-        {
-            return false;
-        }
-        if (node["AnchorMin"])
-        {
-            rhs.AnchorMin = node["AnchorMin"].as<glm::vec2>();
-        }
-        if (node["AnchorMax"])
-        {
-            rhs.AnchorMax = node["AnchorMax"].as<glm::vec2>();
-        }
-        if (node["OffsetMin"])
-        {
-            rhs.OffsetMin = node["OffsetMin"].as<glm::vec2>();
-        }
-        if (node["OffsetMax"])
-        {
-            rhs.OffsetMax = node["OffsetMax"].as<glm::vec2>();
-        }
-        if (node["Pivot"])
-        {
-            rhs.Pivot = node["Pivot"].as<glm::vec2>();
-        }
-        if (node["Rotation"])
-        {
-            rhs.Rotation = node["Rotation"].as<float>();
-        }
-        if (node["Scale"])
-        {
-            rhs.Scale = node["Scale"].as<glm::vec2>();
-        }
-        return true;
-    }
-};
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::RectTransform& t)
-{
-    out << YAML::BeginMap << YAML::Key << "AnchorMin" << YAML::Value << t.AnchorMin << YAML::Key << "AnchorMax"
-        << YAML::Value << t.AnchorMax << YAML::Key << "OffsetMin" << YAML::Value << t.OffsetMin << YAML::Key
-        << "OffsetMax" << YAML::Value << t.OffsetMax << YAML::Key << "Pivot" << YAML::Value << t.Pivot << YAML::Key
-        << "Rotation" << YAML::Value << t.Rotation << YAML::Key << "Scale" << YAML::Value << t.Scale << YAML::EndMap;
-    return out;
-}
-
-// ---- MaterialInstance ----
-template <> struct convert<CHEngine::MaterialInstance>
-{
-    static Node encode(const CHEngine::MaterialInstance& rhs)
-    {
-        Node node;
-        node["AlbedoColor"] = rhs.AlbedoColor;
-        node["AlbedoPath"] = CHEngine::Project::GetRelativePath(rhs.AlbedoPath);
-        node["OverrideAlbedo"] = rhs.OverrideAlbedo;
-        node["NormalMapPath"] = CHEngine::Project::GetRelativePath(rhs.NormalMapPath);
-        node["OverrideNormal"] = rhs.OverrideNormal;
-        node["MetallicRoughnessPath"] = CHEngine::Project::GetRelativePath(rhs.MetallicRoughnessPath);
-        node["OverrideMetallicRoughness"] = rhs.OverrideMetallicRoughness;
-        node["OcclusionMapPath"] = CHEngine::Project::GetRelativePath(rhs.OcclusionMapPath);
-        node["OverrideOcclusion"] = rhs.OverrideOcclusion;
-        node["EmissivePath"] = CHEngine::Project::GetRelativePath(rhs.EmissivePath);
-        node["EmissiveColor"] = rhs.EmissiveColor;
-        node["EmissiveIntensity"] = rhs.EmissiveIntensity;
-        node["OverrideEmissive"] = rhs.OverrideEmissive;
-        node["ShaderPath"] = CHEngine::Project::GetRelativePath(rhs.ShaderPath);
-        node["OverrideShader"] = rhs.OverrideShader;
-        node["Metalness"] = rhs.Metalness;
-        node["Roughness"] = rhs.Roughness;
-        node["DoubleSided"] = rhs.DoubleSided;
-        node["Transparent"] = rhs.Transparent;
-        node["Alpha"] = rhs.Alpha;
-        return node;
-    }
-    static bool decode(const Node& node, CHEngine::MaterialInstance& rhs)
-    {
-        if (!node.IsMap())
-        {
-            return false;
-        }
-        if (node["AlbedoColor"])
-        {
-            rhs.AlbedoColor = node["AlbedoColor"].as<CHEngine::Color>();
-        }
-        if (node["AlbedoPath"])
-        {
-            rhs.AlbedoPath = node["AlbedoPath"].as<std::string>();
-        }
-        if (node["OverrideAlbedo"])
-        {
-            rhs.OverrideAlbedo = node["OverrideAlbedo"].as<bool>();
-        }
-        if (node["NormalMapPath"])
-        {
-            rhs.NormalMapPath = node["NormalMapPath"].as<std::string>();
-        }
-        if (node["OverrideNormal"])
-        {
-            rhs.OverrideNormal = node["OverrideNormal"].as<bool>();
-        }
-        if (node["MetallicRoughnessPath"])
-        {
-            rhs.MetallicRoughnessPath = node["MetallicRoughnessPath"].as<std::string>();
-        }
-        if (node["OverrideMetallicRoughness"])
-        {
-            rhs.OverrideMetallicRoughness = node["OverrideMetallicRoughness"].as<bool>();
-        }
-        if (node["OcclusionMapPath"])
-        {
-            rhs.OcclusionMapPath = node["OcclusionMapPath"].as<std::string>();
-        }
-        if (node["OverrideOcclusion"])
-        {
-            rhs.OverrideOcclusion = node["OverrideOcclusion"].as<bool>();
-        }
-        if (node["EmissivePath"])
-        {
-            rhs.EmissivePath = node["EmissivePath"].as<std::string>();
-        }
-        if (node["EmissiveColor"])
-        {
-            rhs.EmissiveColor = node["EmissiveColor"].as<CHEngine::Color>();
-        }
-        if (node["EmissiveIntensity"])
-        {
-            rhs.EmissiveIntensity = node["EmissiveIntensity"].as<float>();
-        }
-        if (node["OverrideEmissive"])
-        {
-            rhs.OverrideEmissive = node["OverrideEmissive"].as<bool>();
-        }
-        if (node["ShaderPath"])
-        {
-            rhs.ShaderPath = node["ShaderPath"].as<std::string>();
-        }
-        if (node["OverrideShader"])
-        {
-            rhs.OverrideShader = node["OverrideShader"].as<bool>();
-        }
-        if (node["Metalness"])
-        {
-            rhs.Metalness = node["Metalness"].as<float>();
-        }
-        if (node["Roughness"])
-        {
-            rhs.Roughness = node["Roughness"].as<float>();
-        }
-        if (node["DoubleSided"])
-        {
-            rhs.DoubleSided = node["DoubleSided"].as<bool>();
-        }
-        if (node["Transparent"])
-        {
-            rhs.Transparent = node["Transparent"].as<bool>();
-        }
-        if (node["Alpha"])
-        {
-            rhs.Alpha = node["Alpha"].as<float>();
-        }
-        return true;
-    }
-};
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::MaterialInstance& m)
-{
-    out << YAML::BeginMap << YAML::Key << "AlbedoColor" << YAML::Value << m.AlbedoColor << YAML::Key << "AlbedoPath"
-        << YAML::Value << CHEngine::Project::GetRelativePath(m.AlbedoPath) << YAML::Key << "OverrideAlbedo"
-        << YAML::Value << m.OverrideAlbedo << YAML::Key << "NormalMapPath" << YAML::Value
-        << CHEngine::Project::GetRelativePath(m.NormalMapPath) << YAML::Key << "OverrideNormal" << YAML::Value
-        << m.OverrideNormal << YAML::Key << "MetallicRoughnessPath" << YAML::Value
-        << CHEngine::Project::GetRelativePath(m.MetallicRoughnessPath) << YAML::Key << "OverrideMetallicRoughness"
-        << YAML::Value << m.OverrideMetallicRoughness << YAML::Key << "OcclusionMapPath" << YAML::Value
-        << CHEngine::Project::GetRelativePath(m.OcclusionMapPath) << YAML::Key << "OverrideOcclusion" << YAML::Value
-        << m.OverrideOcclusion << YAML::Key << "EmissivePath" << YAML::Value
-        << CHEngine::Project::GetRelativePath(m.EmissivePath) << YAML::Key << "EmissiveColor" << YAML::Value
-        << m.EmissiveColor << YAML::Key << "EmissiveIntensity" << YAML::Value << m.EmissiveIntensity << YAML::Key
-        << "OverrideEmissive" << YAML::Value << m.OverrideEmissive << YAML::Key << "ShaderPath" << YAML::Value
-        << CHEngine::Project::GetRelativePath(m.ShaderPath) << YAML::Key << "OverrideShader" << YAML::Value
-        << m.OverrideShader << YAML::Key << "Metalness" << YAML::Value << m.Metalness << YAML::Key << "Roughness"
-        << YAML::Value << m.Roughness << YAML::Key << "DoubleSided" << YAML::Value << m.DoubleSided << YAML::Key
-        << "Transparent" << YAML::Value << m.Transparent << YAML::Key << "Alpha" << YAML::Value << m.Alpha
-        << YAML::EndMap;
-    return out;
-}
-
-// ---- MaterialSlot ----
-template <> struct convert<CHEngine::MaterialSlot>
-{
-    static Node encode(const CHEngine::MaterialSlot& rhs)
-    {
-        Node node;
-        node["Name"] = rhs.Name;
-        node["Index"] = rhs.Index;
-        node["Target"] = static_cast<int>(rhs.Target);
-        node["Material"] = rhs.Material;
-        return node;
-    }
-    static bool decode(const Node& node, CHEngine::MaterialSlot& rhs)
-    {
-        if (!node.IsMap())
-        {
-            return false;
-        }
-        if (node["Name"])
-        {
-            rhs.Name = node["Name"].as<std::string>();
-        }
-        if (node["Index"])
-        {
-            rhs.Index = node["Index"].as<int>();
-        }
-        if (node["Target"])
-        {
-            rhs.Target = static_cast<CHEngine::MaterialSlotTarget>(node["Target"].as<int>());
-        }
-        if (node["Material"])
-        {
-            rhs.Material = node["Material"].as<CHEngine::MaterialInstance>();
-        }
-        return true;
-    }
-};
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::MaterialSlot& s)
-{
-    out << YAML::BeginMap << YAML::Key << "Name" << YAML::Value << s.Name << YAML::Key << "Index" << YAML::Value
-        << s.Index << YAML::Key << "Target" << YAML::Value << static_cast<int>(s.Target) << YAML::Key << "Material"
-        << YAML::Value << s.Material << YAML::EndMap;
-    return out;
-}
-
-// ---- ShaderUniform ----
-template <> struct convert<CHEngine::ShaderUniform>
-{
-    static Node encode(const CHEngine::ShaderUniform& rhs)
-    {
-        Node node;
-        node["Name"] = rhs.Name;
-        node["Type"] = rhs.Type;
-        node["Value"] = glm::vec4(rhs.Value[0], rhs.Value[1], rhs.Value[2], rhs.Value[3]);
-        return node;
-    }
-    static bool decode(const Node& node, CHEngine::ShaderUniform& rhs)
-    {
-        if (!node.IsMap())
-        {
-            return false;
-        }
-        if (node["Name"])
-        {
-            rhs.Name = node["Name"].as<std::string>();
-        }
-        if (node["Type"])
-        {
-            rhs.Type = node["Type"].as<int>();
-        }
-        if (node["Value"])
-        {
-            glm::vec4 v = node["Value"].as<glm::vec4>();
-            rhs.Value[0] = v.x;
-            rhs.Value[1] = v.y;
-            rhs.Value[2] = v.z;
-            rhs.Value[3] = v.w;
-        }
-        return true;
-    }
-};
-
-inline YAML::Emitter& operator<<(YAML::Emitter& out, const CHEngine::ShaderUniform& u)
-{
-    out << YAML::BeginMap << YAML::Key << "Name" << YAML::Value << u.Name << YAML::Key << "Type" << YAML::Value
-        << u.Type << YAML::Key << "Value" << YAML::Value << glm::vec4(u.Value[0], u.Value[1], u.Value[2], u.Value[3])
-        << YAML::EndMap;
-    return out;
-}
-
+	template <typename T> inline void DecodeField(const Node& node, const std::string& key, T& target)
+	{
+		if (node[key])
+		{
+			target = node[key].as<T>();
+		}
+	}
+
+	template <typename T, typename EnumT>
+	inline void DecodeEnum(const Node& node, const std::string& key, EnumT& target)
+	{
+		if (node[key])
+		{
+			target = static_cast<EnumT>(node[key].as<T>());
+		}
+	}
+
+	// --- GLM GLM::VEC2 ---
+	template <> struct convert<glm::vec2>
+	{
+		static Node encode(const glm::vec2& rhs)
+		{
+			Node node;
+			node.push_back(rhs.x);
+			node.push_back(rhs.y);
+			return node;
+		}
+
+		static bool decode(const Node& node, glm::vec2& rhs)
+		{
+			if (node.IsSequence() && node.size() == 2)
+			{
+				rhs.x = node[0].as<float>();
+				rhs.y = node[1].as<float>();
+				return true;
+			}
+			if (node.IsMap())
+			{
+				rhs.x = node["x"] ? node["x"].as<float>() : (node["X"] ? node["X"].as<float>() : 0.0f);
+				rhs.y = node["y"] ? node["y"].as<float>() : (node["Y"] ? node["Y"].as<float>() : 0.0f);
+				return true;
+			}
+			return false;
+		}
+	};
+
+	// --- GLM GLM::VEC3 ---
+	template <> struct convert<glm::vec3>
+	{
+		static Node encode(const glm::vec3& rhs)
+		{
+			Node node;
+			node.push_back(rhs.x);
+			node.push_back(rhs.y);
+			node.push_back(rhs.z);
+			return node;
+		}
+
+		static bool decode(const Node& node, glm::vec3& rhs)
+		{
+			if (node.IsSequence() && node.size() == 3)
+			{
+				rhs.x = node[0].as<float>();
+				rhs.y = node[1].as<float>();
+				rhs.z = node[2].as<float>();
+				return true;
+			}
+			if (node.IsMap())
+			{
+				rhs.x = node["x"] ? node["x"].as<float>() : (node["X"] ? node["X"].as<float>() : 0.0f);
+				rhs.y = node["y"] ? node["y"].as<float>() : (node["Y"] ? node["Y"].as<float>() : 0.0f);
+				rhs.z = node["z"] ? node["z"].as<float>() : (node["Z"] ? node["Z"].as<float>() : 0.0f);
+				return true;
+			}
+			return false;
+		}
+	};
+
+	// --- GLM GLM::VEC4 ---
+	template <> struct convert<glm::vec4>
+	{
+		static Node encode(const glm::vec4& rhs)
+		{
+			Node node;
+			node.push_back(rhs.x);
+			node.push_back(rhs.y);
+			node.push_back(rhs.z);
+			node.push_back(rhs.w);
+			return node;
+		}
+		static bool decode(const Node& node, glm::vec4& rhs)
+		{
+			if (!node.IsSequence() || node.size() != 4)
+			{
+				return false;
+			}
+			rhs.x = node[0].as<float>();
+			rhs.y = node[1].as<float>();
+			rhs.z = node[2].as<float>();
+			rhs.w = node[3].as<float>();
+			return true;
+		}
+	};
+
+	// --- GLM GLM::QUAT ---
+	template <> struct convert<glm::quat>
+	{
+		static Node encode(const glm::quat& rhs)
+		{
+			Node node;
+			node.push_back(rhs.w);
+			node.push_back(rhs.x);
+			node.push_back(rhs.y);
+			node.push_back(rhs.z);
+			return node;
+		}
+		static bool decode(const Node& node, glm::quat& rhs)
+		{
+			if (!node.IsSequence() || node.size() != 4)
+			{
+				return false;
+			}
+			rhs.w = node[0].as<float>();
+			rhs.x = node[1].as<float>();
+			rhs.y = node[2].as<float>();
+			rhs.z = node[3].as<float>();
+			return true;
+		}
+	};
+
+	// --- Chained::COLOR ---
+	template <> struct convert<Chained::Color>
+	{
+		static Node encode(const Chained::Color& rhs)
+		{
+			Node node;
+			node.push_back(static_cast<uint32_t>(rhs.r));
+			node.push_back(static_cast<uint32_t>(rhs.g));
+			node.push_back(static_cast<uint32_t>(rhs.b));
+			node.push_back(static_cast<uint32_t>(rhs.a));
+			return node;
+		}
+		static bool decode(const Node& node, Chained::Color& rhs)
+		{
+			if (node.IsSequence() && node.size() == 4)
+			{
+				rhs.r = static_cast<unsigned char>(node[0].as<int>());
+				rhs.g = static_cast<unsigned char>(node[1].as<int>());
+				rhs.b = static_cast<unsigned char>(node[2].as<int>());
+				rhs.a = static_cast<unsigned char>(node[3].as<int>());
+				return true;
+			}
+			if (node.IsMap())
+			{
+				auto getChannel = [&](const char* k1, const char* k2) {
+					auto n = node[k1] ? node[k1] : node[k2];
+					return n ? static_cast<unsigned char>(n.as<int>()) : 255;
+				};
+				rhs.r = getChannel("r", "R");
+				rhs.g = getChannel("g", "G");
+				rhs.b = getChannel("b", "B");
+				rhs.a = getChannel("a", "A");
+				return true;
+			}
+			return false;
+		}
+	};
+
+	// --- Chained::UISTYLE ---
+	template <> struct convert<Chained::UIStyle>
+	{
+		static Node encode(const Chained::UIStyle& rhs)
+		{
+			Node node;
+			node.push_back(rhs.BackgroundColor);
+			node.push_back(rhs.HoverColor);
+			node.push_back(rhs.PressedColor);
+			return node;
+		}
+		static bool decode(const Node& node, Chained::UIStyle& rhs)
+		{
+			if (!node.IsSequence() || node.size() < 3)
+			{
+				return false;
+			}
+			rhs.BackgroundColor = node[0].as<Chained::Color>();
+			rhs.HoverColor = node[1].as<Chained::Color>();
+			rhs.PressedColor = node[2].as<Chained::Color>();
+			return true;
+		}
+	};
+
+	// --- TEXTSTYLE ---
+	template <> struct convert<Chained::TextStyle>
+	{
+		static Node encode(const Chained::TextStyle& rhs)
+		{
+			Node node;
+			node["FontName"] = rhs.FontName;
+			node["FontSize"] = rhs.FontSize;
+			node["TextColor"] = rhs.TextColor;
+			node["Shadow"] = rhs.Shadow;
+			node["ShadowOffset"] = rhs.ShadowOffset;
+			node["ShadowColor"] = rhs.ShadowColor;
+			node["LetterSpacing"] = rhs.LetterSpacing;
+			node["LineHeight"] = rhs.LineHeight;
+			node["Horizontal"] = static_cast<int>(rhs.Horizontal);
+			node["Vertical"] = static_cast<int>(rhs.Vertical);
+			return node;
+		}
+		static bool decode(const Node& node, Chained::TextStyle& rhs)
+		{
+			if (!node.IsMap())
+			{
+				return false;
+			}
+
+			DecodeField(node, "FontName", rhs.FontName);
+			DecodeField(node, "FontSize", rhs.FontSize);
+			DecodeField(node, "TextColor", rhs.TextColor);
+			DecodeField(node, "Shadow", rhs.Shadow);
+			DecodeField(node, "ShadowOffset", rhs.ShadowOffset);
+			DecodeField(node, "ShadowColor", rhs.ShadowColor);
+			DecodeField(node, "LetterSpacing", rhs.LetterSpacing);
+			DecodeField(node, "LineHeight", rhs.LineHeight);
+
+			DecodeEnum<int>(node, "Horizontal", rhs.Horizontal);
+			DecodeEnum<int>(node, "HorizontalAlignment", rhs.Horizontal);
+			DecodeEnum<int>(node, "Vertical", rhs.Vertical);
+			DecodeEnum<int>(node, "VerticalAlignment", rhs.Vertical);
+
+			return true;
+		}
+	};
+
+	// --- RECTRANSFORM ---
+	template <> struct convert<Chained::RectTransform>
+	{
+		static Node encode(const Chained::RectTransform& rhs)
+		{
+			Node node;
+			node["AnchorMin"] = rhs.AnchorMin;
+			node["AnchorMax"] = rhs.AnchorMax;
+			node["OffsetMin"] = rhs.OffsetMin;
+			node["OffsetMax"] = rhs.OffsetMax;
+			node["Pivot"] = rhs.Pivot;
+			node["Rotation"] = rhs.Rotation;
+			node["Scale"] = rhs.Scale;
+			return node;
+		}
+		static bool decode(const Node& node, Chained::RectTransform& rhs)
+		{
+			if (!node.IsMap())
+			{
+				return false;
+			}
+
+			DecodeField(node, "AnchorMin", rhs.AnchorMin);
+			DecodeField(node, "AnchorMax", rhs.AnchorMax);
+			DecodeField(node, "OffsetMin", rhs.OffsetMin);
+			DecodeField(node, "OffsetMax", rhs.OffsetMax);
+			DecodeField(node, "Pivot", rhs.Pivot);
+			DecodeField(node, "Rotation", rhs.Rotation);
+			DecodeField(node, "Scale", rhs.Scale);
+
+			return true;
+		}
+	};
+
+	// --- ASSETHANDLE ---
+	template <> struct convert<Chained::AssetHandle>
+	{
+		static Node encode(const Chained::AssetHandle& rhs)
+		{
+			return Node(static_cast<uint64_t>(rhs));
+		}
+		static bool decode(const Node& node, Chained::AssetHandle& rhs)
+		{
+			rhs = node.as<uint64_t>();
+			return true;
+		}
+	};
+
+	// --- SHADERUNIFORM helper ---
+	inline int GetShaderUniformTypeId(const Chained::ShaderUniform& u)
+	{
+		int typeInt = -1;
+		std::visit(
+			[&](auto&& arg) {
+				using T = std::decay_t<decltype(arg)>;
+				if constexpr (std::is_same_v<T, float>)
+				{
+					typeInt = 0;
+				}
+				else if constexpr (std::is_same_v<T, glm::vec2>)
+				{
+					typeInt = 1;
+				}
+				else if constexpr (std::is_same_v<T, glm::vec3>)
+				{
+					typeInt = 2;
+				}
+				else if constexpr (std::is_same_v<T, glm::vec4>)
+				{
+					typeInt = 3;
+				}
+				else if constexpr (std::is_same_v<T, Chained::Color>)
+				{
+					typeInt = 4;
+				}
+			},
+			u.Value);
+		return typeInt;
+	}
+
+	// --- SHADERUNIFORM ---
+	template <> struct convert<Chained::ShaderUniform>
+	{
+		static Node encode(const Chained::ShaderUniform& rhs)
+		{
+			Node node;
+			node["Name"] = rhs.Name;
+			node["Type"] = GetShaderUniformTypeId(rhs);
+			node["Value"] = rhs.Value;
+			return node;
+		}
+
+		static bool decode(const Node& node, Chained::ShaderUniform& rhs)
+		{
+			if (!node.IsMap() || !node["Value"] || !node["Type"])
+			{
+				return false;
+			}
+
+			DecodeField(node, "Name", rhs.Name);
+
+			int typeInt = node["Type"].as<int>();
+			switch (typeInt)
+			{
+			case 0:
+				rhs.Value = node["Value"].as<float>();
+				break;
+			case 1:
+				rhs.Value = node["Value"].as<glm::vec2>();
+				break;
+			case 2:
+				rhs.Value = node["Value"].as<glm::vec3>();
+				break;
+			case 3:
+				rhs.Value = node["Value"].as<glm::vec4>();
+				break;
+			case 4:
+				rhs.Value = node["Value"].as<Chained::Color>();
+				break;
+			default:
+				return false;
+			}
+
+			return true;
+		}
+	};
+
+	// --- STD::VARIANT ---
+	template <typename... Ts> struct convert<std::variant<Ts...>>
+	{
+		static Node encode(const std::variant<Ts...>& rhs)
+		{
+			return std::visit([](auto&& arg) { return Node(arg); }, rhs);
+		}
+		static bool decode(const Node& node, std::variant<Ts...>& rhs)
+		{
+			return false;
+		}
+	};
+
+	// ==========================================
+
+	// ==========================================
+
+	inline Emitter& operator<<(Emitter& out, const Chained::Color& c)
+	{
+		return out << Flow << BeginSeq << static_cast<uint32_t>(c.r) << static_cast<uint32_t>(c.g)
+				   << static_cast<uint32_t>(c.b) << static_cast<uint32_t>(c.a) << EndSeq;
+	}
+
+	inline Emitter& operator<<(Emitter& out, const Chained::UIStyle& s)
+	{
+		return out << Flow << BeginSeq << s.BackgroundColor << s.HoverColor << s.PressedColor << EndSeq;
+	}
+
+	inline Emitter& operator<<(Emitter& out, const glm::vec2& v)
+	{
+		return out << Flow << BeginSeq << v.x << v.y << EndSeq;
+	}
+	inline Emitter& operator<<(Emitter& out, const glm::vec3& v)
+	{
+		return out << Flow << BeginSeq << v.x << v.y << v.z << EndSeq;
+	}
+	inline Emitter& operator<<(Emitter& out, const glm::vec4& v)
+	{
+		return out << Flow << BeginSeq << v.x << v.y << v.z << v.w << EndSeq;
+	}
+	inline Emitter& operator<<(Emitter& out, const glm::quat& q)
+	{
+		return out << Flow << BeginSeq << q.w << q.x << q.y << q.z << EndSeq;
+	}
+	inline Emitter& operator<<(Emitter& out, const std::filesystem::path& p)
+	{
+		return out << p.string();
+	}
+
+	template <typename... Ts> inline Emitter& operator<<(Emitter& out, const std::variant<Ts...>& v)
+	{
+		std::visit([&](auto&& arg) { out << arg; }, v);
+		return out;
+	}
+
+	inline Emitter& operator<<(Emitter& out, const Chained::TextStyle& s)
+	{
+		return out << BeginMap << Key << "FontName" << Value << s.FontName << Key << "FontSize" << Value << s.FontSize
+				   << Key << "TextColor" << Value << s.TextColor << Key << "Shadow" << Value << s.Shadow << Key
+				   << "ShadowOffset" << Value << s.ShadowOffset << Key << "ShadowColor" << Value << s.ShadowColor << Key
+				   << "LetterSpacing" << Value << s.LetterSpacing << Key << "LineHeight" << Value << s.LineHeight << Key
+				   << "Horizontal" << Value << static_cast<int>(s.Horizontal) << Key << "Vertical" << Value
+				   << static_cast<int>(s.Vertical) << EndMap;
+	}
+
+	inline Emitter& operator<<(Emitter& out, const Chained::RectTransform& t)
+	{
+		return out << BeginMap << Key << "AnchorMin" << Value << t.AnchorMin << Key << "AnchorMax" << Value
+				   << t.AnchorMax << Key << "OffsetMin" << Value << t.OffsetMin << Key << "OffsetMax" << Value
+				   << t.OffsetMax << Key << "Pivot" << Value << t.Pivot << Key << "Rotation" << Value << t.Rotation
+				   << Key << "Scale" << Value << t.Scale << EndMap;
+	}
+
+	inline Emitter& operator<<(Emitter& out, const Chained::AssetHandle& handle)
+	{
+		return out << static_cast<uint64_t>(handle);
+	}
+
+	inline Emitter& operator<<(Emitter& out, const Chained::ShaderUniform& u)
+	{
+		return out << BeginMap << Key << "Name" << Value << u.Name << Key << "Type" << Value
+				   << GetShaderUniformTypeId(u) << Key << "Value" << Value << u.Value << EndMap;
+	}
 } // namespace YAML
 
-#endif // CH_YAML_UTILS_H
+#endif // CH_YAML_UTILS_H
\ No newline at end of file
diff --git a/engine/scripting/CMakeLists.txt b/engine/scripting/CMakeLists.txt
new file mode 100644
index 000000000..afd8974d1
--- /dev/null
+++ b/engine/scripting/CMakeLists.txt
@@ -0,0 +1,138 @@
+add_library(engine_scripting STATIC
+    scriptengine.h
+    scriptengine.cpp
+    scriptengine_services.h
+    scriptengine_services.cpp
+    scene_scripting_manager.h
+    scene_scripting_manager.cpp
+    script_glue.h
+    script_glue.cpp
+    script_glue_internal.h
+    script_glue_internal.cpp
+    script_glue_system.h
+    script_glue_system.cpp
+    script_glue_input.h
+    script_glue_input.cpp
+    script_glue_scene.h
+    script_glue_scene.cpp
+    script_glue_entity.h
+    script_glue_entity.cpp
+    script_glue_transform.cpp
+    script_glue_physics.cpp
+    script_glue_animation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/generated/script_glue_generated.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/generated/script_glue_generated.cpp
+    script_glue_camera.h
+    script_glue_camera.cpp
+    script_glue_ui.h
+    script_glue_ui.cpp
+    script_glue_audio.h
+    script_glue_audio.cpp
+    script_glue_network.h
+    script_glue_network.cpp
+)
+
+target_include_directories(engine_scripting PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_scripting PUBLIC
+    engine_core
+    engine_audio
+    engine_physics
+    engine_imgui
+    engine_graphics
+    engine_network
+    Coral.Native
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_scripting PRIVATE engine_pch)
+endif()
+
+target_include_directories(engine_scripting PRIVATE
+    ${CMAKE_SOURCE_DIR}/thirdparty/coral/Coral.Native/Include
+    ${CMAKE_SOURCE_DIR}/thirdparty/coral/NetCore
+)
+
+
+if(MINGW)
+    # See cmake/external/coral.cmake: MinGW -O0 codegen can misalign the stack
+    # on the call path into CoreCLR, causing Debug-only access violations on
+    # CI. -Og overrides the global Debug -O0 for this bridge module only.
+    target_compile_options(engine_scripting PRIVATE $<$<CONFIG:Debug>:-Og>)
+endif()
+
+
+# ── Generate ManagedDependencies.props for C# build ───────────────────────────
+# This tells MSBuild where to find Coral.Managed.dll. The path changes per
+# build preset (windows-clang, windows-gcc, etc.), so we generate it from a
+# template at configure time using the correct CMAKE_BINARY_DIR.
+set(CORAL_MANAGED_DIR "${CMAKE_BINARY_DIR}/vendor/coral")
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/managed/ManagedDependencies.props.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/managed/ManagedDependencies.props"
+    @ONLY
+)
+
+set(MANAGED_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/managed")
+set(MANAGED_PROJECT_PATH "${MANAGED_PROJECT_DIR}/Chained.Managed.csproj")
+
+set(MANAGED_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin/$<CONFIG>")
+set(CORAL_MANAGED_DIR "${CMAKE_BINARY_DIR}/vendor/coral")
+
+set(BUILD_MANAGED_SCRIPT "${CMAKE_SOURCE_DIR}/tools/build_managed.py")
+
+file(GLOB_RECURSE MANAGED_SOURCES "${MANAGED_PROJECT_DIR}/src/*.cs")
+
+set(MANAGED_DLL_OUTPUT "${MANAGED_OUTPUT_DIR}/Chained.Managed.dll")
+
+add_custom_command(
+    OUTPUT  "${MANAGED_DLL_OUTPUT}"
+    COMMAND Python3::Interpreter "${BUILD_MANAGED_SCRIPT}"
+            --project "${MANAGED_PROJECT_PATH}"
+            --output "${MANAGED_OUTPUT_DIR}"
+            --coral-dir "${CORAL_MANAGED_DIR}"
+            --configuration $<CONFIG>
+            --copy-coral   
+            --write-props  
+            --parallel     
+    WORKING_DIRECTORY "${MANAGED_PROJECT_DIR}"
+    DEPENDS ${MANAGED_SOURCES} "${MANAGED_PROJECT_PATH}"
+    COMMENT "Building Chained.Managed C# Library"
+    VERBATIM
+)
+
+# 3. Створення таргету та зв'язування залежностей
+add_custom_target(Chained_Managed ALL DEPENDS "${MANAGED_DLL_OUTPUT}")
+
+if(TARGET Coral.Native)
+    add_dependencies(Chained_Managed Coral.Native)
+endif()
+
+add_dependencies(engine_scripting Chained_Managed)
+
+# ── Auto-generate C++ glue from C# component wrappers ────────────────────────
+set(GLUE_GENERATOR_SCRIPT "${CMAKE_SOURCE_DIR}/tools/generate_glue.py")
+set(GLUE_OUTPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/generated")
+set(GLUE_OUTPUTS
+    "${GLUE_OUTPUT_DIR}/script_glue_generated.h"
+    "${GLUE_OUTPUT_DIR}/script_glue_generated.cpp"
+    "${GLUE_OUTPUT_DIR}/script_glue_generated_reg.inl"
+)
+
+add_custom_command(
+    OUTPUT  ${GLUE_OUTPUTS}
+    COMMAND Python3::Interpreter "${GLUE_GENERATOR_SCRIPT}"
+            --cs-dir "${MANAGED_PROJECT_DIR}/src/Components"
+            --output-dir "${GLUE_OUTPUT_DIR}"
+            --classes PlayerComponent SpawnComponent NetworkIdentityComponent
+    DEPENDS ${GLUE_GENERATOR_SCRIPT}
+            ${MANAGED_SOURCES}
+    COMMENT "Generating C++ glue from C# [NativeProperty]/[NativeCall] attributes"
+    VERBATIM
+)
+
+add_custom_target(GlueGenerated DEPENDS ${GLUE_OUTPUTS})
+add_dependencies(engine_scripting GlueGenerated)
\ No newline at end of file
diff --git a/engine/scripting/generated/script_glue_generated.cpp b/engine/scripting/generated/script_glue_generated.cpp
new file mode 100644
index 000000000..bfc3334e9
--- /dev/null
+++ b/engine/scripting/generated/script_glue_generated.cpp
@@ -0,0 +1,164 @@
+// <auto-generated/>
+// Generated by tools/generate_glue.py — do not edit by hand.
+
+#include "script_glue_generated.h"
+
+namespace Chained
+{
+
+	// ── NetworkIdentityComponent ──────────────────────────────────────────────
+	CH_SCRIPT_FUNC uint64_t NetworkIdentityComponent_GetNetworkID(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::NetworkIdentityComponent>()
+				   ? entity.GetComponent<Chained::NetworkIdentityComponent>().NetworkID
+				   : 0;
+	}
+
+	CH_SCRIPT_FUNC uint8_t NetworkIdentityComponent_GetIsOwner(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::NetworkIdentityComponent>()
+				   ? entity.GetComponent<Chained::NetworkIdentityComponent>().IsOwner
+				   : false;
+	}
+
+	CH_SCRIPT_FUNC uint8_t NetworkIdentityComponent_GetRemoteActionFlags(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::NetworkIdentityComponent>()
+				   ? entity.GetComponent<Chained::NetworkIdentityComponent>().RemoteActionFlags
+				   : 0;
+	}
+
+	// ── PlayerComponent ──────────────────────────────────────────────
+	CH_SCRIPT_FUNC float PlayerComponent_GetMovementSpeed(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::PlayerComponent>()
+				   ? entity.GetComponent<Chained::PlayerComponent>().MovementSpeed
+				   : 0;
+	}
+
+	CH_SCRIPT_FUNC void PlayerComponent_SetMovementSpeed(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::PlayerComponent>())
+		{
+			entity.GetComponent<Chained::PlayerComponent>().MovementSpeed = value;
+		}
+	}
+
+	CH_SCRIPT_FUNC float PlayerComponent_GetJumpForce(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::PlayerComponent>()
+				   ? entity.GetComponent<Chained::PlayerComponent>().JumpForce
+				   : 0;
+	}
+
+	CH_SCRIPT_FUNC void PlayerComponent_SetJumpForce(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::PlayerComponent>())
+		{
+			entity.GetComponent<Chained::PlayerComponent>().JumpForce = value;
+		}
+	}
+
+	CH_SCRIPT_FUNC float PlayerComponent_GetLookSensitivity(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::PlayerComponent>()
+				   ? entity.GetComponent<Chained::PlayerComponent>().LookSensitivity
+				   : 0;
+	}
+
+	CH_SCRIPT_FUNC void PlayerComponent_SetLookSensitivity(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::PlayerComponent>())
+		{
+			entity.GetComponent<Chained::PlayerComponent>().LookSensitivity = value;
+		}
+	}
+
+	// ── SpawnComponent ──────────────────────────────────────────────
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_GetIsActive(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::SpawnComponent>()
+				   ? entity.GetComponent<Chained::SpawnComponent>().IsActive
+				   : false;
+	}
+
+	CH_SCRIPT_FUNC void SpawnComponent_SetIsActive(uint64_t entityID, uint8_t value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>())
+		{
+			entity.GetComponent<Chained::SpawnComponent>().IsActive = value;
+		}
+	}
+
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_IsCheckpoint(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::SpawnComponent>()
+				   ? entity.GetComponent<Chained::SpawnComponent>().IsCheckpoint
+				   : false;
+	}
+
+	CH_SCRIPT_FUNC void SpawnComponent_SetIsCheckpoint(uint64_t entityID, uint8_t value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>())
+		{
+			entity.GetComponent<Chained::SpawnComponent>().IsCheckpoint = value;
+		}
+	}
+
+	CH_SCRIPT_FUNC void SpawnComponent_GetSpawnPoint(uint64_t entityID, glm::vec3* outVal)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>() && outVal)
+		{
+			*outVal = entity.GetComponent<Chained::SpawnComponent>().SpawnPoint;
+		}
+		else if (outVal)
+		{
+			*outVal = {};
+		}
+	}
+
+	CH_SCRIPT_FUNC void SpawnComponent_SetSpawnPoint(uint64_t entityID, glm::vec3* inVal)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>() && inVal)
+		{
+			entity.GetComponent<Chained::SpawnComponent>().SpawnPoint = *inVal;
+		}
+	}
+
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_GetRenderSpawnZoneInScene(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::SpawnComponent>()
+				   ? entity.GetComponent<Chained::SpawnComponent>().RenderSpawnZoneInScene
+				   : false;
+	}
+
+	CH_SCRIPT_FUNC void SpawnComponent_GetZoneSize(uint64_t entityID, glm::vec3* outVal)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>() && outVal)
+		{
+			*outVal = entity.GetComponent<Chained::SpawnComponent>().ZoneSize;
+		}
+		else if (outVal)
+		{
+			*outVal = {};
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/generated/script_glue_generated.h b/engine/scripting/generated/script_glue_generated.h
new file mode 100644
index 000000000..ffd9706e5
--- /dev/null
+++ b/engine/scripting/generated/script_glue_generated.h
@@ -0,0 +1,37 @@
+// <auto-generated/>
+// Generated by tools/generate_glue.py — do not edit by hand.
+#ifndef SCRIPT_GLUE_GENERATED_H
+#define SCRIPT_GLUE_GENERATED_H
+
+#include "script_glue_internal.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// ── NetworkIdentityComponent ──────────────────────────────────────────────
+	CH_SCRIPT_FUNC uint64_t NetworkIdentityComponent_GetNetworkID(uint64_t entityID);
+	CH_SCRIPT_FUNC uint8_t NetworkIdentityComponent_GetIsOwner(uint64_t entityID);
+	CH_SCRIPT_FUNC uint8_t NetworkIdentityComponent_GetRemoteActionFlags(uint64_t entityID);
+
+	// ── PlayerComponent ──────────────────────────────────────────────
+	CH_SCRIPT_FUNC float PlayerComponent_GetMovementSpeed(uint64_t entityID);
+	CH_SCRIPT_FUNC void PlayerComponent_SetMovementSpeed(uint64_t entityID, float value);
+	CH_SCRIPT_FUNC float PlayerComponent_GetJumpForce(uint64_t entityID);
+	CH_SCRIPT_FUNC void PlayerComponent_SetJumpForce(uint64_t entityID, float value);
+	CH_SCRIPT_FUNC float PlayerComponent_GetLookSensitivity(uint64_t entityID);
+	CH_SCRIPT_FUNC void PlayerComponent_SetLookSensitivity(uint64_t entityID, float value);
+
+	// ── SpawnComponent ──────────────────────────────────────────────
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_GetIsActive(uint64_t entityID);
+	CH_SCRIPT_FUNC void SpawnComponent_SetIsActive(uint64_t entityID, uint8_t value);
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_IsCheckpoint(uint64_t entityID);
+	CH_SCRIPT_FUNC void SpawnComponent_SetIsCheckpoint(uint64_t entityID, uint8_t value);
+	CH_SCRIPT_FUNC void SpawnComponent_GetSpawnPoint(uint64_t entityID, glm::vec3* outVal);
+	CH_SCRIPT_FUNC void SpawnComponent_SetSpawnPoint(uint64_t entityID, glm::vec3* inVal);
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_GetRenderSpawnZoneInScene(uint64_t entityID);
+	CH_SCRIPT_FUNC void SpawnComponent_GetZoneSize(uint64_t entityID, glm::vec3* outVal);
+
+} // namespace Chained
+#endif // SCRIPT_GLUE_GENERATED_H
diff --git a/engine/scripting/generated/script_glue_generated_reg.inl b/engine/scripting/generated/script_glue_generated_reg.inl
new file mode 100644
index 000000000..d8a6e1f27
--- /dev/null
+++ b/engine/scripting/generated/script_glue_generated_reg.inl
@@ -0,0 +1,43 @@
+// <auto-generated/>
+// Generated by tools/generate_glue.py — do not edit by hand.
+
+	// ── NetworkIdentityComponent ──────────────────────────────────────────────
+	assembly.AddInternalCall("Chained.NetworkIdentityComponent", "NetworkIdentityComponent_GetNetworkID_Ptr",
+								 (void*)&NetworkIdentityComponent_GetNetworkID);
+	assembly.AddInternalCall("Chained.NetworkIdentityComponent", "NetworkIdentityComponent_GetIsOwner_Ptr",
+								 (void*)&NetworkIdentityComponent_GetIsOwner);
+	assembly.AddInternalCall("Chained.NetworkIdentityComponent", "NetworkIdentityComponent_GetRemoteActionFlags_Ptr",
+								 (void*)&NetworkIdentityComponent_GetRemoteActionFlags);
+
+	// ── PlayerComponent ──────────────────────────────────────────────
+	assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_GetMovementSpeed_Ptr",
+								 (void*)&PlayerComponent_GetMovementSpeed);
+	assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_SetMovementSpeed_Ptr",
+								 (void*)&PlayerComponent_SetMovementSpeed);
+	assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_GetJumpForce_Ptr",
+								 (void*)&PlayerComponent_GetJumpForce);
+	assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_SetJumpForce_Ptr",
+								 (void*)&PlayerComponent_SetJumpForce);
+	assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_GetLookSensitivity_Ptr",
+								 (void*)&PlayerComponent_GetLookSensitivity);
+	assembly.AddInternalCall("Chained.PlayerComponent", "PlayerComponent_SetLookSensitivity_Ptr",
+								 (void*)&PlayerComponent_SetLookSensitivity);
+
+	// ── SpawnComponent ──────────────────────────────────────────────
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_GetIsActive_Ptr",
+								 (void*)&SpawnComponent_GetIsActive);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_SetIsActive_Ptr",
+								 (void*)&SpawnComponent_SetIsActive);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_IsCheckpoint_Ptr",
+								 (void*)&SpawnComponent_IsCheckpoint);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_SetIsCheckpoint_Ptr",
+								 (void*)&SpawnComponent_SetIsCheckpoint);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_GetSpawnPoint_Ptr",
+								 (void*)&SpawnComponent_GetSpawnPoint);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_SetSpawnPoint_Ptr",
+								 (void*)&SpawnComponent_SetSpawnPoint);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_GetRenderSpawnZoneInScene_Ptr",
+								 (void*)&SpawnComponent_GetRenderSpawnZoneInScene);
+	assembly.AddInternalCall("Chained.SpawnComponent", "SpawnComponent_GetZoneSize_Ptr",
+								 (void*)&SpawnComponent_GetZoneSize);
+
diff --git a/engine/scripting/managed/Chained.Managed.Generator/Chained.Managed.Generator.csproj b/engine/scripting/managed/Chained.Managed.Generator/Chained.Managed.Generator.csproj
new file mode 100644
index 000000000..c0ba5e93b
--- /dev/null
+++ b/engine/scripting/managed/Chained.Managed.Generator/Chained.Managed.Generator.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IsRoslynComponent>true</IsRoslynComponent>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
+  </ItemGroup>
+
+</Project>
diff --git a/engine/scripting/managed/Chained.Managed.Generator/NativeCallGenerator.cs b/engine/scripting/managed/Chained.Managed.Generator/NativeCallGenerator.cs
new file mode 100644
index 000000000..119916309
--- /dev/null
+++ b/engine/scripting/managed/Chained.Managed.Generator/NativeCallGenerator.cs
@@ -0,0 +1,456 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Chained.Managed.Generator
+{
+    // ---------------------------------------------------------------------------
+    // Syntax receiver: collects every class/struct declaration that carries at
+    // least one [NativeCall] or [NativeProperty] attribute.
+    // ---------------------------------------------------------------------------
+    internal sealed class NativeCallSyntaxReceiver : ISyntaxReceiver
+    {
+        public List<TypeDeclarationSyntax> Candidates { get; } = new();
+
+        public void OnVisitSyntaxNode(SyntaxNode node)
+        {
+            if (node is TypeDeclarationSyntax tds && tds.AttributeLists.Count > 0)
+                Candidates.Add(tds);
+        }
+    }
+
+    // ---------------------------------------------------------------------------
+    // Type mapping helper.
+    // ---------------------------------------------------------------------------
+    internal static class TypeMap
+    {
+        private static readonly Dictionary<string, string> s_Map = new()
+        {
+            { "void",    "void"    },
+            { "bool",    "byte"    },
+            { "byte",    "byte"    },
+            { "sbyte",   "sbyte"   },
+            { "short",   "short"   },
+            { "ushort",  "ushort"  },
+            { "int",     "int"     },
+            { "uint",    "uint"    },
+            { "long",    "long"    },
+            { "ulong",   "ulong"   },
+            { "float",   "float"   },
+            { "double",  "double"  },
+            { "char*",   "char*"   },
+            { "Vector2", "Chained.Vector2" },
+            { "Vector3", "Chained.Vector3" },
+            { "Vector4", "Chained.Vector4" },
+            { "Vector2*","Chained.Vector2*" },
+            { "Vector3*","Chained.Vector3*" },
+            { "Vector4*","Chained.Vector4*" },
+        };
+
+        public static string Resolve(string raw)
+            => s_Map.TryGetValue(raw.Trim(), out var mapped) ? mapped : raw.Trim();
+    }
+
+    // ---------------------------------------------------------------------------
+    // Describes one [NativeCall] attribute.
+    // ---------------------------------------------------------------------------
+    internal sealed class NativeCallInfo
+    {
+        public string ClassName   { get; set; } = "";
+        public string MethodName  { get; set; } = "";
+        public string ReturnType  { get; set; } = "void";
+        public List<string> Params { get; set; } = new();
+
+        public string DelegatePtrType()
+        {
+            var sb = new StringBuilder("delegate* unmanaged<");
+            foreach (var p in Params)
+            {
+                sb.Append(p);
+                sb.Append(", ");
+            }
+            sb.Append(ReturnType);
+            sb.Append('>');
+            return sb.ToString();
+        }
+
+        public string FieldName => MethodName + "_Ptr";
+    }
+
+    // ---------------------------------------------------------------------------
+    // Describes one [NativeProperty] attribute.
+    // ---------------------------------------------------------------------------
+    internal sealed class NativePropertyInfo
+    {
+        public string PropertyName  { get; set; } = "";
+        public string PropertyType  { get; set; } = "float";
+        public string? GetterMethod { get; set; }
+        public string? SetterMethod { get; set; }
+
+        public bool IsStructType => PropertyType is "Vector2" or "Vector3" or "Vector4" or "Chained.Vector2" or "Chained.Vector3" or "Chained.Vector4";
+        public bool IsBoolType => PropertyType is "bool";
+
+        public NativeCallInfo? MakeGetterCallInfo(string className)
+        {
+            if (string.IsNullOrEmpty(GetterMethod)) return null;
+
+            if (IsStructType)
+            {
+                // Out-pointer pattern: void Get(ulong entityID, Vector3* outVal)
+                var structPtr = TypeMap.Resolve(PropertyType + "*");
+                return new NativeCallInfo
+                {
+                    ClassName = className,
+                    MethodName = GetterMethod!,
+                    ReturnType = "void",
+                    Params = new List<string> { "ulong", structPtr }
+                };
+            }
+            else
+            {
+                // Direct return pattern: float/int/byte Get(ulong entityID)
+                var returnType = TypeMap.Resolve(PropertyType);
+                return new NativeCallInfo
+                {
+                    ClassName = className,
+                    MethodName = GetterMethod!,
+                    ReturnType = returnType,
+                    Params = new List<string> { "ulong" }
+                };
+            }
+        }
+
+        public NativeCallInfo? MakeSetterCallInfo(string className)
+        {
+            if (string.IsNullOrEmpty(SetterMethod)) return null;
+
+            if (IsStructType)
+            {
+                // In-pointer pattern: void Set(ulong entityID, Vector3* val)
+                var structPtr = TypeMap.Resolve(PropertyType + "*");
+                return new NativeCallInfo
+                {
+                    ClassName = className,
+                    MethodName = SetterMethod!,
+                    ReturnType = "void",
+                    Params = new List<string> { "ulong", structPtr }
+                };
+            }
+            else
+            {
+                // Value pattern: void Set(ulong entityID, float/byte val)
+                var paramType = TypeMap.Resolve(PropertyType);
+                return new NativeCallInfo
+                {
+                    ClassName = className,
+                    MethodName = SetterMethod!,
+                    ReturnType = "void",
+                    Params = new List<string> { "ulong", paramType }
+                };
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------------------
+    // Main Generator. Handles both [NativeCall] and [NativeProperty].
+    // ---------------------------------------------------------------------------
+    [Generator]
+    public sealed class NativeCallGenerator : ISourceGenerator
+    {
+        private const string NativeCallFullName     = "Chained.NativeCallAttribute";
+        private const string NativePropertyFullName = "Chained.NativePropertyAttribute";
+
+        public void Initialize(GeneratorInitializationContext context)
+        {
+            context.RegisterForSyntaxNotifications(() => new NativeCallSyntaxReceiver());
+        }
+
+        public void Execute(GeneratorExecutionContext context)
+        {
+            if (context.SyntaxReceiver is not NativeCallSyntaxReceiver receiver)
+                return;
+
+            var callAttrSymbol     = context.Compilation.GetTypeByMetadataName(NativeCallFullName);
+            var propertyAttrSymbol = context.Compilation.GetTypeByMetadataName(NativePropertyFullName);
+
+            var callsByType      = new Dictionary<INamedTypeSymbol, List<NativeCallInfo>>(SymbolEqualityComparer.Default);
+            var propertiesByType = new Dictionary<INamedTypeSymbol, List<NativePropertyInfo>>(SymbolEqualityComparer.Default);
+
+            foreach (var candidate in receiver.Candidates)
+            {
+                bool hasTargetAttribute = candidate.AttributeLists
+                    .SelectMany(al => al.Attributes)
+                    .Any(a => ExtractName(a.Name) is "NativeCall" or "NativeCallAttribute" or "NativeProperty" or "NativePropertyAttribute");
+
+                if (!hasTargetAttribute)
+                    continue;
+
+                var model = context.Compilation.GetSemanticModel(candidate.SyntaxTree);
+                if (model.GetDeclaredSymbol(candidate) is not INamedTypeSymbol typeSymbol)
+                    continue;
+
+                bool isPartial = candidate.Modifiers.Any(SyntaxKind.PartialKeyword);
+                if (!isPartial)
+                    continue;
+
+                if (!callsByType.TryGetValue(typeSymbol, out var callList))
+                {
+                    callList = new List<NativeCallInfo>();
+                    callsByType[typeSymbol] = callList;
+                }
+
+                if (!propertiesByType.TryGetValue(typeSymbol, out var propertyList))
+                {
+                    propertyList = new List<NativePropertyInfo>();
+                    propertiesByType[typeSymbol] = propertyList;
+                }
+
+                foreach (var attrList in candidate.AttributeLists)
+                {
+                    foreach (var attrSyntax in attrList.Attributes)
+                    {
+                        var attrInfo = model.GetSymbolInfo(attrSyntax);
+                        IMethodSymbol? ctor = attrInfo.Symbol as IMethodSymbol
+                            ?? attrInfo.CandidateSymbols.OfType<IMethodSymbol>().FirstOrDefault();
+
+                        if (ctor == null)
+                            continue;
+
+                        bool isNativeCall = callAttrSymbol != null
+                            ? SymbolEqualityComparer.Default.Equals(ctor.ContainingType, callAttrSymbol)
+                            : ctor.ContainingType.ToDisplayString() == NativeCallFullName;
+
+                        bool isNativeProperty = propertyAttrSymbol != null
+                            ? SymbolEqualityComparer.Default.Equals(ctor.ContainingType, propertyAttrSymbol)
+                            : ctor.ContainingType.ToDisplayString() == NativePropertyFullName;
+
+                        if (isNativeCall)
+                        {
+                            var info = ParseNativeCall(attrSyntax, model);
+                            if (info != null)
+                                callList.Add(info);
+                        }
+                        else if (isNativeProperty)
+                        {
+                            var info = ParseNativeProperty(attrSyntax, model);
+                            if (info != null)
+                            {
+                                propertyList.Add(info);
+
+                                // Synthesize the NativeCallInfos for getter & setter
+                                string fullClassName = typeSymbol.ToDisplayString();
+                                var getterCall = info.MakeGetterCallInfo(fullClassName);
+                                if (getterCall != null) callList.Add(getterCall);
+
+                                var setterCall = info.MakeSetterCallInfo(fullClassName);
+                                if (setterCall != null) callList.Add(setterCall);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Emit for each type that has either calls or properties
+            var allTypes = callsByType.Keys.Union(propertiesByType.Keys, SymbolEqualityComparer.Default).Cast<INamedTypeSymbol>();
+
+            foreach (var typeSymbol in allTypes)
+            {
+                var calls = callsByType.TryGetValue(typeSymbol, out var cList) ? cList : new List<NativeCallInfo>();
+                var props = propertiesByType.TryGetValue(typeSymbol, out var pList) ? pList : new List<NativePropertyInfo>();
+
+                if (calls.Count == 0 && props.Count == 0)
+                    continue;
+
+                // Deduplicate calls by FieldName
+                var seenCalls = new HashSet<string>();
+                var uniqueCalls = new List<NativeCallInfo>();
+                foreach (var c in calls)
+                {
+                    if (seenCalls.Add(c.FieldName))
+                        uniqueCalls.Add(c);
+                }
+
+                // Deduplicate properties by PropertyName
+                var seenProps = new HashSet<string>();
+                var uniqueProps = new List<NativePropertyInfo>();
+                foreach (var p in props)
+                {
+                    if (seenProps.Add(p.PropertyName))
+                        uniqueProps.Add(p);
+                }
+
+                var source   = BuildSource(typeSymbol, uniqueCalls, uniqueProps);
+                var hintName = $"{typeSymbol.Name}.NativeCalls.g.cs";
+                context.AddSource(hintName, SourceText.From(source, Encoding.UTF8));
+            }
+        }
+
+        private static NativeCallInfo? ParseNativeCall(AttributeSyntax attrSyntax, SemanticModel model)
+        {
+            var args = attrSyntax.ArgumentList?.Arguments;
+            if (args == null || args.Value.Count < 2)
+                return null;
+
+            string? className  = EvalString(args.Value[0].Expression, model);
+            string? methodName = EvalString(args.Value[1].Expression, model);
+            if (className == null || methodName == null)
+                return null;
+
+            var sigArgs = args.Value.Skip(2).ToList();
+            string returnType = sigArgs.Count > 0
+                ? TypeMap.Resolve(EvalString(sigArgs[0].Expression, model) ?? "void")
+                : "void";
+
+            var paramTypes = sigArgs
+                .Skip(1)
+                .Select(a => TypeMap.Resolve(EvalString(a.Expression, model) ?? "void"))
+                .ToList();
+
+            return new NativeCallInfo
+            {
+                ClassName  = className,
+                MethodName = methodName,
+                ReturnType = returnType,
+                Params     = paramTypes,
+            };
+        }
+
+        private static NativePropertyInfo? ParseNativeProperty(AttributeSyntax attrSyntax, SemanticModel model)
+        {
+            var args = attrSyntax.ArgumentList?.Arguments;
+            if (args == null || args.Value.Count < 2)
+                return null;
+
+            string? propName = EvalString(args.Value[0].Expression, model);
+            string? propType = EvalString(args.Value[1].Expression, model);
+            if (propName == null || propType == null)
+                return null;
+
+            string? getter = args.Value.Count > 2 ? EvalString(args.Value[2].Expression, model) : null;
+            string? setter = args.Value.Count > 3 ? EvalString(args.Value[3].Expression, model) : null;
+
+            return new NativePropertyInfo
+            {
+                PropertyName = propName,
+                PropertyType = propType,
+                GetterMethod = getter,
+                SetterMethod = setter,
+            };
+        }
+
+        private static string? EvalString(ExpressionSyntax expr, SemanticModel model)
+        {
+            var constant = model.GetConstantValue(expr);
+            if (constant.HasValue && constant.Value is string s)
+                return s;
+
+            if (expr is LiteralExpressionSyntax lit && lit.IsKind(SyntaxKind.StringLiteralExpression))
+                return lit.Token.ValueText;
+
+            return null;
+        }
+
+        private static string ExtractName(NameSyntax name) => name switch
+        {
+            IdentifierNameSyntax id    => id.Identifier.Text,
+            QualifiedNameSyntax  q     => q.Right.Identifier.Text,
+            AliasQualifiedNameSyntax a => a.Name.Identifier.Text,
+            _                          => name.ToString(),
+        };
+
+        private static string BuildSource(INamedTypeSymbol type, List<NativeCallInfo> calls, List<NativePropertyInfo> properties)
+        {
+            string ns        = type.ContainingNamespace.IsGlobalNamespace ? "" : type.ContainingNamespace.ToDisplayString();
+            string className = type.Name;
+            string keyword   = type.TypeKind == TypeKind.Struct ? "struct" : "class";
+
+            var sb = new StringBuilder();
+            sb.AppendLine("// <auto-generated/>");
+            sb.AppendLine("// Generated by Chained.Managed.Generator — do not edit by hand.");
+            sb.AppendLine("// Source: NativeCallGenerator.cs");
+            sb.AppendLine("#nullable enable");
+            sb.AppendLine("#pragma warning disable 0649, 0169  // field never assigned / never used");
+            sb.AppendLine();
+
+            bool hasNs = !string.IsNullOrEmpty(ns);
+            if (hasNs)
+            {
+                sb.AppendLine($"namespace {ns}");
+                sb.AppendLine("{");
+            }
+
+            string indent = hasNs ? "    " : "";
+
+            sb.AppendLine($"{indent}public partial {keyword} {className}");
+            sb.AppendLine($"{indent}{{");
+
+            // 1. Emit _Ptr fields
+            foreach (var call in calls)
+            {
+                sb.AppendLine($"{indent}    internal static unsafe {call.DelegatePtrType()} {call.FieldName};");
+            }
+
+            if (calls.Count > 0 && properties.Count > 0)
+                sb.AppendLine();
+
+            // 2. Emit C# properties (getters/setters)
+            foreach (var prop in properties)
+            {
+                string csharpPropType = prop.PropertyType;
+                string resolvedType   = TypeMap.Resolve(prop.PropertyType);
+
+                sb.AppendLine($"{indent}    public {csharpPropType} {prop.PropertyName}");
+                sb.AppendLine($"{indent}    {{");
+
+                // Getter
+                if (!string.IsNullOrEmpty(prop.GetterMethod))
+                {
+                    string getterPtr = prop.GetterMethod + "_Ptr";
+                    if (prop.IsStructType)
+                    {
+                        sb.AppendLine($"{indent}        get {{ unsafe {{ {resolvedType} val = default; if ({getterPtr} != null) {getterPtr}(Entity.ID, &val); return val; }} }}");
+                    }
+                    else if (prop.IsBoolType)
+                    {
+                        sb.AppendLine($"{indent}        get {{ unsafe {{ return {getterPtr} != null && {getterPtr}(Entity.ID) != 0; }} }}");
+                    }
+                    else
+                    {
+                        sb.AppendLine($"{indent}        get {{ unsafe {{ return {getterPtr} != null ? {getterPtr}(Entity.ID) : default; }} }}");
+                    }
+                }
+
+                // Setter
+                if (!string.IsNullOrEmpty(prop.SetterMethod))
+                {
+                    string setterPtr = prop.SetterMethod + "_Ptr";
+                    if (prop.IsStructType)
+                    {
+                        sb.AppendLine($"{indent}        set {{ unsafe {{ if ({setterPtr} != null) {setterPtr}(Entity.ID, &value); }} }}");
+                    }
+                    else if (prop.IsBoolType)
+                    {
+                        sb.AppendLine($"{indent}        set {{ unsafe {{ if ({setterPtr} != null) {setterPtr}(Entity.ID, (byte)(value ? 1 : 0)); }} }}");
+                    }
+                    else
+                    {
+                        sb.AppendLine($"{indent}        set {{ unsafe {{ if ({setterPtr} != null) {setterPtr}(Entity.ID, value); }} }}");
+                    }
+                }
+
+                sb.AppendLine($"{indent}    }}");
+            }
+
+            sb.AppendLine($"{indent}}}");
+
+            if (hasNs)
+                sb.AppendLine("}");
+
+            return sb.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/engine/scripting/managed/Chained.Managed.csproj b/engine/scripting/managed/Chained.Managed.csproj
new file mode 100644
index 000000000..9c63ee0c5
--- /dev/null
+++ b/engine/scripting/managed/Chained.Managed.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <AssemblyName>Chained.Managed</AssemblyName>
+    <RootNamespace>Chained</RootNamespace>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+    <!-- Output path is controlled by the CMake build system to avoid stale DLL issues -->
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    
+    <Authors>Oleg and Contributors</Authors>
+    <Description>C# Base Class Library for Chained Engine.</Description>
+    <RepositoryUrl>https://github.com/IOleg-crypto/ChainedEngine</RepositoryUrl>
+  </PropertyGroup>
+
+
+
+  <!-- Import dynamically generated properties from CMake -->
+  <Import Project="ManagedDependencies.props" Condition="Exists('ManagedDependencies.props')" />
+
+  <ItemGroup>
+    <Reference Include="Coral.Managed">
+      <HintPath>$(CoralManagedDir)/Coral.Managed.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <!-- The generator project lives as a subfolder; keep its sources out of this assembly. -->
+  <ItemGroup>
+    <Compile Remove="Chained.Managed.Generator/**/*.cs" />
+    <None Remove="Chained.Managed.Generator/**" />
+    <ProjectReference Include="Chained.Managed.Generator\Chained.Managed.Generator.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false" />
+  </ItemGroup>
+</Project>
diff --git a/engine/scripting/managed/ManagedDependencies.props b/engine/scripting/managed/ManagedDependencies.props
new file mode 100644
index 000000000..b2ba6f8a8
--- /dev/null
+++ b/engine/scripting/managed/ManagedDependencies.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <CoralManagedDir>D:/gitnext/Chained Decos/build/windows-clang/vendor/coral</CoralManagedDir>
+  </PropertyGroup>
+</Project>
diff --git a/engine/scripting/managed/ManagedDependencies.props.in b/engine/scripting/managed/ManagedDependencies.props.in
new file mode 100644
index 000000000..a30026ded
--- /dev/null
+++ b/engine/scripting/managed/ManagedDependencies.props.in
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <CoralManagedDir>@CORAL_MANAGED_DIR@</CoralManagedDir>
+  </PropertyGroup>
+</Project>
diff --git a/engine/scripting/managed/src/Components/AnimationComponent.cs b/engine/scripting/managed/src/Components/AnimationComponent.cs
new file mode 100644
index 000000000..0a92f7823
--- /dev/null
+++ b/engine/scripting/managed/src/Components/AnimationComponent.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Animation component wrapper. Native call bindings are generated from the
+    /// [NativeCall] attributes below (see NativeCallGenerator).</summary>
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetCurrentAnimationIndex", "int", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_SetCurrentAnimationIndex", "void", "ulong", "int")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetIsPlaying", "uint", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_SetIsPlaying", "void", "ulong", "uint")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetIsLooping", "byte", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_SetIsLooping", "void", "ulong", "byte")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetIsFinished", "byte", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetDuration", "float", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetNormalizedTime", "float", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetBlendDuration", "float", "ulong")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_SetBlendDuration", "void", "ulong", "float")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_CrossFade", "void", "ulong", "int", "float")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_SetFloat", "void", "ulong", "char*", "float")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_SetBool", "void", "ulong", "char*", "byte")]
+    [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetFloat", "float", "ulong", "char*")]
+    public partial class AnimationComponent : Component
+    {
+        public int CurrentAnimationIndex
+        {
+            get { unsafe { return AnimationComponent_GetCurrentAnimationIndex_Ptr != null ? AnimationComponent_GetCurrentAnimationIndex_Ptr(Entity.ID) : 0; } }
+            set { unsafe { if (AnimationComponent_SetCurrentAnimationIndex_Ptr != null) AnimationComponent_SetCurrentAnimationIndex_Ptr(Entity.ID, value); } }
+        }
+
+        public bool IsPlaying
+        {
+            get { unsafe { return AnimationComponent_GetIsPlaying_Ptr != null && AnimationComponent_GetIsPlaying_Ptr(Entity.ID) != 0; } }
+            set { unsafe { if (AnimationComponent_SetIsPlaying_Ptr != null) AnimationComponent_SetIsPlaying_Ptr(Entity.ID, value ? 1u : 0u); } }
+        }
+
+        public bool IsLooping
+        {
+            get { unsafe { return AnimationComponent_GetIsLooping_Ptr != null && AnimationComponent_GetIsLooping_Ptr(Entity.ID) != 0; } }
+            set { unsafe { if (AnimationComponent_SetIsLooping_Ptr != null) AnimationComponent_SetIsLooping_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+        }
+
+        public bool IsFinished
+        {
+            get { unsafe { return AnimationComponent_GetIsFinished_Ptr != null && AnimationComponent_GetIsFinished_Ptr(Entity.ID) != 0; } }
+        }
+
+        public float Duration
+        {
+            get { unsafe { return AnimationComponent_GetDuration_Ptr != null ? AnimationComponent_GetDuration_Ptr(Entity.ID) : 0.0f; } }
+        }
+
+        public float NormalizedTime
+        {
+            get { unsafe { return AnimationComponent_GetNormalizedTime_Ptr != null ? AnimationComponent_GetNormalizedTime_Ptr(Entity.ID) : 0.0f; } }
+        }
+
+        public float BlendDuration
+        {
+            get { unsafe { return AnimationComponent_GetBlendDuration_Ptr != null ? AnimationComponent_GetBlendDuration_Ptr(Entity.ID) : 0.25f; } }
+            set { unsafe { if (AnimationComponent_SetBlendDuration_Ptr != null) AnimationComponent_SetBlendDuration_Ptr(Entity.ID, value); } }
+        }
+
+        public void Play() => IsPlaying = true;
+        public void Pause() => IsPlaying = false;
+
+        public void CrossFade(int targetIndex, float duration = 0.25f)
+        {
+            unsafe
+            {
+                if (AnimationComponent_CrossFade_Ptr != null)
+                    AnimationComponent_CrossFade_Ptr(Entity.ID, targetIndex, duration);
+            }
+        }
+
+        public unsafe void SetFloat(string name, float value)
+        {
+            if (AnimationComponent_SetFloat_Ptr != null)
+                fixed (char* ptr = name)
+                    AnimationComponent_SetFloat_Ptr(Entity.ID, ptr, value);
+        }
+
+        public unsafe void SetBool(string name, bool value)
+        {
+            if (AnimationComponent_SetBool_Ptr != null)
+                fixed (char* ptr = name)
+                    AnimationComponent_SetBool_Ptr(Entity.ID, ptr, (byte)(value ? 1 : 0));
+        }
+
+        public unsafe float GetFloat(string name)
+        {
+            if (AnimationComponent_GetFloat_Ptr != null)
+                fixed (char* ptr = name)
+                    return AnimationComponent_GetFloat_Ptr(Entity.ID, ptr);
+            return 0.0f;
+        }
+    }
+
+    /// <summary>Deprecated: use AnimationComponent instead. Kept for backward compatibility.</summary>
+    public class AnimationGraphComponent : AnimationComponent
+    {
+    }
+}
diff --git a/engine/scripting/managed/src/Components/AudioComponent.cs b/engine/scripting/managed/src/Components/AudioComponent.cs
new file mode 100644
index 000000000..13fbb7626
--- /dev/null
+++ b/engine/scripting/managed/src/Components/AudioComponent.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Audio wrapper.</summary>
+    public class AudioComponent : Component
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<ulong, float, void> AudioComponent_SetVolume_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte, void> AudioComponent_SetLoop_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte> AudioComponent_IsPlaying_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, char*> AudioComponent_GetSoundPath_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, void> AudioComponent_Play_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, void> AudioComponent_Stop_Ptr;
+#pragma warning restore 0649
+
+        private static unsafe void SetVolume(ulong entityID, float volume) => AudioComponent_SetVolume_Ptr(entityID, volume);
+        private static unsafe void SetLoop(ulong entityID, bool loop) => AudioComponent_SetLoop_Ptr(entityID, (byte)(loop ? 1 : 0));
+        private static unsafe bool IsPlaying_Native(ulong entityID) => AudioComponent_IsPlaying_Ptr(entityID) != 0;
+        private static unsafe string GetSoundPath(ulong entityID) => Marshal.PtrToStringUni(new IntPtr(AudioComponent_GetSoundPath_Ptr(entityID))) ?? string.Empty;
+
+        public float Volume { set => SetVolume(Entity.ID, value); }
+        public bool  Loop   { set => SetLoop(Entity.ID, value); }
+        public bool  IsPlaying  => IsPlaying_Native(Entity.ID);
+        public string SoundPath => GetSoundPath(Entity.ID) ?? string.Empty;
+
+        public void Play()
+        {
+            unsafe { AudioComponent_Play_Ptr(Entity.ID); }
+        }
+
+        public void Stop()
+        {
+            unsafe { AudioComponent_Stop_Ptr(Entity.ID); }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Components/CameraComponent.cs b/engine/scripting/managed/src/Components/CameraComponent.cs
new file mode 100644
index 000000000..ce79705ee
--- /dev/null
+++ b/engine/scripting/managed/src/Components/CameraComponent.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Camera wrapper.</summary>
+    public class CameraComponent : Component
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<ulong, Vector3*, void> Camera_GetForward_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, Vector3*, void> Camera_GetRight_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, float*, float*, float*, void> Camera_GetOrbit_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, float, float, float, void> Camera_SetOrbit_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte> Camera_GetPrimary_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte, void> Camera_SetPrimary_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte> Camera_GetIsOrbit_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte, void> Camera_SetIsOrbit_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, char*> Camera_GetTargetTag_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, char*, void> Camera_SetTargetTag_Ptr;
+#pragma warning restore 0649
+
+        private static void GetForward(ulong entityID, out Vector3 outForward)
+        {
+            unsafe { fixed (Vector3* p = &outForward) Camera_GetForward_Ptr(entityID, p); }
+        }
+
+        private static void GetRight(ulong entityID, out Vector3 outRight)
+        {
+            unsafe { fixed (Vector3* p = &outRight) Camera_GetRight_Ptr(entityID, p); }
+        }
+
+        private static void GetOrbit(ulong entityID, out float yaw, out float pitch, out float distance)
+        {
+            unsafe { fixed (float* yawPtr = &yaw, pitchPtr = &pitch, distancePtr = &distance) Camera_GetOrbit_Ptr(entityID, yawPtr, pitchPtr, distancePtr); }
+        }
+
+        private static void SetOrbit(ulong entityID, float yaw, float pitch, float distance)
+        {
+            unsafe { Camera_SetOrbit_Ptr(entityID, yaw, pitch, distance); }
+        }
+
+        public Vector3 Forward
+        {
+            get { GetForward(Entity.ID, out Vector3 forward); return forward; }
+        }
+
+        public Vector3 Right
+        {
+            get { GetRight(Entity.ID, out Vector3 right); return right; }
+        }
+
+        public void GetOrbit(out float yaw, out float pitch, out float distance)
+            => GetOrbit(Entity.ID, out yaw, out pitch, out distance);
+
+        public void SetOrbit(float yaw, float pitch, float distance)
+            => SetOrbit(Entity.ID, yaw, pitch, distance);
+
+        public bool Primary
+        {
+            get { unsafe { return Camera_GetPrimary_Ptr(Entity.ID) != 0; } }
+            set { unsafe { Camera_SetPrimary_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+        }
+
+        public bool IsOrbitCamera
+        {
+            get { unsafe { return Camera_GetIsOrbit_Ptr(Entity.ID) != 0; } }
+            set { unsafe { Camera_SetIsOrbit_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+        }
+
+        public string TargetEntityTag
+        {
+            get { unsafe { return Marshal.PtrToStringUni(new IntPtr(Camera_GetTargetTag_Ptr(Entity.ID))) ?? string.Empty; } }
+            set { unsafe { if (Camera_SetTargetTag_Ptr != null) fixed (char* ptr = value) Camera_SetTargetTag_Ptr(Entity.ID, ptr); } }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Components/Component.cs b/engine/scripting/managed/src/Components/Component.cs
new file mode 100644
index 000000000..2a0288191
--- /dev/null
+++ b/engine/scripting/managed/src/Components/Component.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace Chained
+{
+
+// ─────────────────────────────────────────────────────────────────────────────
+//  Component — base class for all component wrappers
+// ─────────────────────────────────────────────────────────────────────────────
+/// <summary>Base class for managed component wrappers.</summary>
+public abstract class Component
+{
+    /// <summary>The entity this component belongs to.</summary>
+    public Entity Entity { get; internal set; } = null!;
+    
+    /// <summary>Short-cut to the entity's transform, or null if absent.</summary>
+    public TransformComponent? Transform => Entity.Transform;
+}
+
+}
diff --git a/engine/scripting/managed/src/Components/ModelComponent.cs b/engine/scripting/managed/src/Components/ModelComponent.cs
new file mode 100644
index 000000000..b431b8f91
--- /dev/null
+++ b/engine/scripting/managed/src/Components/ModelComponent.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Model/Mesh wrapper.</summary>
+    public class ModelComponent : Component
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<ulong, char*> Model_GetModelPath_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, char*, void> Model_SetModelPath_Ptr;
+#pragma warning restore 0649
+
+        public string ModelPath
+        {
+            get { unsafe { string? result = Marshal.PtrToStringUni(new IntPtr(Model_GetModelPath_Ptr(Entity.ID))); return result ?? string.Empty; } }
+            set { unsafe { if (Model_SetModelPath_Ptr != null) fixed (char* ptr = value) Model_SetModelPath_Ptr(Entity.ID, ptr); } }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Components/NetworkIdentityComponent.cs b/engine/scripting/managed/src/Components/NetworkIdentityComponent.cs
new file mode 100644
index 000000000..2bc4ac506
--- /dev/null
+++ b/engine/scripting/managed/src/Components/NetworkIdentityComponent.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Chained
+{
+    /// <summary>Network identity component — identifies a networked entity.</summary>
+    [NativeProperty("NetworkID", "ulong", "NetworkIdentityComponent_GetNetworkID")]
+    [NativeProperty("IsOwner", "bool", "NetworkIdentityComponent_GetIsOwner")]
+    [NativeProperty("RemoteActionFlags", "byte", "NetworkIdentityComponent_GetRemoteActionFlags")]
+    public partial class NetworkIdentityComponent : Component
+    {
+    }
+}
diff --git a/engine/scripting/managed/src/Components/PlayerComponent.cs b/engine/scripting/managed/src/Components/PlayerComponent.cs
new file mode 100644
index 000000000..31f8f89a8
--- /dev/null
+++ b/engine/scripting/managed/src/Components/PlayerComponent.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Chained
+{
+    /// <summary>Player component wrapper.</summary>
+    [NativeProperty("MovementSpeed", "float", "PlayerComponent_GetMovementSpeed", "PlayerComponent_SetMovementSpeed")]
+    [NativeProperty("JumpForce", "float", "PlayerComponent_GetJumpForce", "PlayerComponent_SetJumpForce")]
+    [NativeProperty("LookSensitivity", "float", "PlayerComponent_GetLookSensitivity", "PlayerComponent_SetLookSensitivity")]
+    public partial class PlayerComponent : Component
+    {
+    }
+}
diff --git a/engine/scripting/managed/src/Components/PrimitiveComponent.cs b/engine/scripting/managed/src/Components/PrimitiveComponent.cs
new file mode 100644
index 000000000..9943b0ae7
--- /dev/null
+++ b/engine/scripting/managed/src/Components/PrimitiveComponent.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Primitive geometry component. Shape parameters are exposed here;
+    /// material properties are edited via the Material Editor (ModelComponent + .chmat).</summary>
+    public class PrimitiveComponent : Component
+    {
+        // No scripting-accessible material properties — use ModelComponent for that.
+        // Geometry parameters (Type, Radius, etc.) are not yet exposed to scripting;
+        // add NativeProperty bindings here when needed.
+    }
+}
diff --git a/engine/scripting/managed/src/Components/RigidBodyComponent.cs b/engine/scripting/managed/src/Components/RigidBodyComponent.cs
new file mode 100644
index 000000000..85a3a68a3
--- /dev/null
+++ b/engine/scripting/managed/src/Components/RigidBodyComponent.cs
@@ -0,0 +1,23 @@
+using System;
+using Coral.Managed.Interop;
+
+namespace Chained
+{
+    /// <summary>Rigid-body wrapper.</summary>
+    [NativeProperty("Velocity", "Vector3", "RigidBody_GetVelocity", "RigidBody_SetVelocity")]
+    [NativeProperty("IsGrounded", "bool", "RigidBody_IsGrounded")]
+    [NativeProperty("IsKinematic", "bool", "RigidBody_IsKinematic", "RigidBody_SetKinematic")]
+    [NativeCall("Chained.RigidBodyComponent", "RigidBody_ForceSetVelocity", "void", "ulong", "Vector3*")]
+    public partial class RigidBodyComponent : Component
+    {
+        /// <summary>
+        /// Sets velocity unconditionally, bypassing the Y-velocity override
+        /// that the normal Velocity setter applies for Dynamic bodies.
+        /// Use this to truly zero velocity (e.g. after a respawn teleport).
+        /// </summary>
+        public void ForceSetVelocity(Vector3 velocity)
+        {
+            unsafe { if (RigidBody_ForceSetVelocity_Ptr != null) RigidBody_ForceSetVelocity_Ptr(Entity.ID, &velocity); }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Components/ShaderComponent.cs b/engine/scripting/managed/src/Components/ShaderComponent.cs
new file mode 100644
index 000000000..bdca52c7b
--- /dev/null
+++ b/engine/scripting/managed/src/Components/ShaderComponent.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Shader control wrapper.</summary>
+    public class ShaderComponent : Component
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<ulong, char*, float, void> Shader_SetFloat_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, char*, Vector3*, void> Shader_SetVec3_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte> Shader_GetEnabled_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte, void> Shader_SetEnabled_Ptr;
+#pragma warning restore 0649
+
+        public bool Enabled
+        {
+            get { unsafe { return Shader_GetEnabled_Ptr(Entity.ID) != 0; } }
+            set { unsafe { Shader_SetEnabled_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+        }
+
+        public unsafe void SetFloat(string name, float value)
+        {
+            if (Shader_SetFloat_Ptr == null) return;
+            fixed (char* ptr = name) Shader_SetFloat_Ptr(Entity.ID, ptr, value);
+        }
+
+        public unsafe void SetVector3(string vname, Vector3 value)
+        {
+            if (Shader_SetVec3_Ptr == null) return;
+            Vector3 v = value;
+            fixed (char* ptr = vname) Shader_SetVec3_Ptr(Entity.ID, ptr, &v);
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Components/SpawnComponent.cs b/engine/scripting/managed/src/Components/SpawnComponent.cs
new file mode 100644
index 000000000..b8b2944b6
--- /dev/null
+++ b/engine/scripting/managed/src/Components/SpawnComponent.cs
@@ -0,0 +1,15 @@
+using System;
+using Coral.Managed.Interop;
+
+namespace Chained
+{
+    /// <summary>Spawn point component.</summary>
+    [NativeProperty("IsActive", "bool", "SpawnComponent_GetIsActive", "SpawnComponent_SetIsActive")]
+    [NativeProperty("IsCheckpoint", "bool", "SpawnComponent_IsCheckpoint", "SpawnComponent_SetIsCheckpoint")]
+    [NativeProperty("SpawnPoint", "Vector3", "SpawnComponent_GetSpawnPoint", "SpawnComponent_SetSpawnPoint")]
+    [NativeProperty("RenderSpawnZoneInScene", "bool", "SpawnComponent_GetRenderSpawnZoneInScene")]
+    [NativeProperty("ZoneSize", "Vector3", "SpawnComponent_GetZoneSize")]
+    public partial class SpawnComponent : Component
+    {
+    }
+}
diff --git a/engine/scripting/managed/src/Components/SpriteComponent.cs b/engine/scripting/managed/src/Components/SpriteComponent.cs
new file mode 100644
index 000000000..cd48bb6a3
--- /dev/null
+++ b/engine/scripting/managed/src/Components/SpriteComponent.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>2D Sprite wrapper.</summary>
+    public class SpriteComponent : Component
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<ulong, char*> SpriteComponent_GetTexturePath_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, char*, void> SpriteComponent_SetTexturePath_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, Vector4*, void> SpriteComponent_GetTint_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, Vector4, void> SpriteComponent_SetTint_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte> SpriteComponent_GetFlipX_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte, void> SpriteComponent_SetFlipX_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte> SpriteComponent_GetFlipY_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, byte, void> SpriteComponent_SetFlipY_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, int> SpriteComponent_GetZOrder_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, int, void> SpriteComponent_SetZOrder_Ptr;
+#pragma warning restore 0649
+
+        public string TexturePath
+        {
+            get { unsafe { return Marshal.PtrToStringUni(new IntPtr(SpriteComponent_GetTexturePath_Ptr(Entity.ID))) ?? string.Empty; } }
+            set { unsafe { if (SpriteComponent_SetTexturePath_Ptr != null) fixed (char* ptr = value) SpriteComponent_SetTexturePath_Ptr(Entity.ID, ptr); } }
+        }
+
+        public Vector4 Tint
+        {
+            get { unsafe { Vector4 v; SpriteComponent_GetTint_Ptr(Entity.ID, &v); return v; } }
+            set { unsafe { SpriteComponent_SetTint_Ptr(Entity.ID, value); } }
+        }
+
+        public bool FlipX
+        {
+            get { unsafe { return SpriteComponent_GetFlipX_Ptr(Entity.ID) != 0; } }
+            set { unsafe { SpriteComponent_SetFlipX_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+        }
+
+        public bool FlipY
+        {
+            get { unsafe { return SpriteComponent_GetFlipY_Ptr(Entity.ID) != 0; } }
+            set { unsafe { SpriteComponent_SetFlipY_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+        }
+
+        public int ZOrder
+        {
+            get { unsafe { return SpriteComponent_GetZOrder_Ptr(Entity.ID); } }
+            set { unsafe { SpriteComponent_SetZOrder_Ptr(Entity.ID, value); } }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Components/TagComponent.cs b/engine/scripting/managed/src/Components/TagComponent.cs
new file mode 100644
index 000000000..125c0ea65
--- /dev/null
+++ b/engine/scripting/managed/src/Components/TagComponent.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>Tag wrapper.</summary>
+    public class TagComponent : Component
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<ulong, char*> TagComponent_GetTag_Ptr;
+#pragma warning restore 0649
+
+        private static unsafe string GetTag_Native(ulong entityID) => Marshal.PtrToStringUni(new IntPtr(TagComponent_GetTag_Ptr(entityID))) ?? string.Empty;
+        public string Tag => GetTag_Native(Entity.ID);
+    }
+}
diff --git a/engine/scripting/managed/src/Components/TransformComponent.cs b/engine/scripting/managed/src/Components/TransformComponent.cs
new file mode 100644
index 000000000..303520b11
--- /dev/null
+++ b/engine/scripting/managed/src/Components/TransformComponent.cs
@@ -0,0 +1,13 @@
+using System;
+using Coral.Managed.Interop;
+
+namespace Chained
+{
+    /// <summary>Transform wrapper.</summary>
+    [NativeProperty("Translation", "Vector3", "Transform_GetTranslation", "Transform_SetTranslation")]
+    [NativeProperty("Rotation", "Vector3", "Transform_GetRotation", "Transform_SetRotation")]
+    [NativeProperty("Scale", "Vector3", "Transform_GetScale", "Transform_SetScale")]
+    public partial class TransformComponent : Component
+    {
+    }
+}
diff --git a/engine/scripting/managed/src/Components/UIControls.cs b/engine/scripting/managed/src/Components/UIControls.cs
new file mode 100644
index 000000000..0ccfb6730
--- /dev/null
+++ b/engine/scripting/managed/src/Components/UIControls.cs
@@ -0,0 +1,206 @@
+using System;
+using System.Runtime.InteropServices;
+using Coral.Managed.Interop;
+
+namespace Chained
+{
+
+// ── UI Controls ───────────────────────────────────────────────────────────────
+
+/// <summary>Base UI widget wrapper.</summary>
+public class WidgetControl : Component
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, byte> WidgetControl_GetActive_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, byte, void> WidgetControl_SetActive_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*> WidgetControl_GetTextColor_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, int, int, int, int, void> WidgetControl_SetTextColorRGBA_Ptr;
+#pragma warning restore 0649
+
+    public bool IsActive
+    {
+        get { unsafe { return WidgetControl_GetActive_Ptr(Entity.ID) != 0; } }
+        set { unsafe { WidgetControl_SetActive_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+    }
+
+    public void SetTextColor(int r, int g, int b, int a = 255)
+    {
+        unsafe { WidgetControl_SetTextColorRGBA_Ptr(Entity.ID, r, g, b, a); }
+    }
+
+    public string TextColorRGBA
+    {
+        get { unsafe { return Marshal.PtrToStringUni(new IntPtr(WidgetControl_GetTextColor_Ptr(Entity.ID))) ?? string.Empty; } }
+    }
+}
+
+/// <summary>Button control wrapper.</summary>
+public class ButtonControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, byte> ButtonControl_IsClicked_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, byte> ButtonControl_IsDown_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*> ButtonControl_GetLabel_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> ButtonControl_SetLabel_Ptr;
+#pragma warning restore 0649
+
+    public bool IsClicked { get { unsafe { return ButtonControl_IsClicked_Ptr(Entity.ID) != 0; } } }
+    public bool IsDown    { get { unsafe { return ButtonControl_IsDown_Ptr(Entity.ID) != 0; } } }
+
+    public string Label
+    {
+        get { unsafe { return Marshal.PtrToStringUni(new IntPtr(ButtonControl_GetLabel_Ptr(Entity.ID))) ?? string.Empty; } }
+        set { unsafe { fixed (char* ptr = value) ButtonControl_SetLabel_Ptr(Entity.ID, ptr); } }
+    }
+}
+
+/// <summary>Label control wrapper.</summary>
+public class LabelControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, char*> LabelControl_GetText_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> LabelControl_SetText_Ptr;
+#pragma warning restore 0649
+
+    public string Text
+    {
+        get { unsafe { return Marshal.PtrToStringUni(new IntPtr(LabelControl_GetText_Ptr(Entity.ID))) ?? string.Empty; } }
+        set { unsafe { fixed (char* ptr = value) LabelControl_SetText_Ptr(Entity.ID, ptr); } }
+    }
+}
+
+/// <summary>Checkbox wrapper.</summary>
+public class CheckboxControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, byte> CheckboxControl_GetChecked_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, byte, void> CheckboxControl_SetChecked_Ptr;
+#pragma warning restore 0649
+
+    public bool IsChecked
+    {
+        get { unsafe { return CheckboxControl_GetChecked_Ptr(Entity.ID) != 0; } }
+            set { unsafe { CheckboxControl_SetChecked_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+    }
+}
+
+/// <summary>Slider control wrapper.</summary>
+public class SliderControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, char*> SliderControl_GetLabel_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> SliderControl_SetLabel_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float> SliderControl_GetValue_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float, void> SliderControl_SetValue_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float> SliderControl_GetMin_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float, void> SliderControl_SetMin_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float> SliderControl_GetMax_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float, void> SliderControl_SetMax_Ptr;
+#pragma warning restore 0649
+
+    public string Label
+    {
+        get { unsafe { return Marshal.PtrToStringUni(new IntPtr(SliderControl_GetLabel_Ptr(Entity.ID))) ?? string.Empty; } }
+        set { unsafe { fixed (char* ptr = value) SliderControl_SetLabel_Ptr(Entity.ID, ptr); } }
+    }
+    public float Value
+    {
+        get { unsafe { return SliderControl_GetValue_Ptr(Entity.ID); } }
+        set { unsafe { SliderControl_SetValue_Ptr(Entity.ID, value); } }
+    }
+    public float Min
+    {
+        get { unsafe { return SliderControl_GetMin_Ptr(Entity.ID); } }
+        set { unsafe { SliderControl_SetMin_Ptr(Entity.ID, value); } }
+    }
+    public float Max
+    {
+        get { unsafe { return SliderControl_GetMax_Ptr(Entity.ID); } }
+        set { unsafe { SliderControl_SetMax_Ptr(Entity.ID, value); } }
+    }
+}
+
+/// <summary>Progress bar wrapper.</summary>
+public class ProgressBarControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, float> ProgressBarControl_GetProgress_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, float, void> ProgressBarControl_SetProgress_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*> ProgressBarControl_GetOverlayText_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> ProgressBarControl_SetOverlayText_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, byte> ProgressBarControl_GetShowPercentage_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, byte, void> ProgressBarControl_SetShowPercentage_Ptr;
+#pragma warning restore 0649
+
+    public float Progress
+    {
+        get { unsafe { return ProgressBarControl_GetProgress_Ptr(Entity.ID); } }
+        set { unsafe { ProgressBarControl_SetProgress_Ptr(Entity.ID, value); } }
+    }
+    public string OverlayText
+    {
+        get { unsafe { return Marshal.PtrToStringUni(new IntPtr(ProgressBarControl_GetOverlayText_Ptr(Entity.ID))) ?? string.Empty; } }
+        set { unsafe { fixed (char* ptr = value) ProgressBarControl_SetOverlayText_Ptr(Entity.ID, ptr); } }
+    }
+    public bool ShowPercentage
+    {
+        get { unsafe { return ProgressBarControl_GetShowPercentage_Ptr(Entity.ID) != 0; } }
+            set { unsafe { ProgressBarControl_SetShowPercentage_Ptr(Entity.ID, (byte)(value ? 1 : 0)); } }
+    }
+}
+
+/// <summary>Combo box wrapper.</summary>
+public class ComboBoxControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, int> ComboBoxControl_GetSelectedIndex_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, int, void> ComboBoxControl_SetSelectedIndex_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> ComboBoxControl_AddItem_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, void> ComboBoxControl_ClearItems_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, int> ComboBoxControl_GetItemCount_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, int, char*> ComboBoxControl_GetItem_Ptr;
+#pragma warning restore 0649
+
+    private static unsafe int GetSelectedIndex(ulong entityID) => ComboBoxControl_GetSelectedIndex_Ptr(entityID);
+    private static unsafe void SetSelectedIndex(ulong entityID, int index) => ComboBoxControl_SetSelectedIndex_Ptr(entityID, index);
+    private static unsafe void AddItem(ulong entityID, string item)
+    { if (ComboBoxControl_AddItem_Ptr != null) fixed (char* ptr = item) ComboBoxControl_AddItem_Ptr(entityID, ptr); }
+    private static unsafe void ClearItems(ulong entityID) => ComboBoxControl_ClearItems_Ptr(entityID);
+    private static unsafe int GetItemCount(ulong entityID) => ComboBoxControl_GetItemCount_Ptr(entityID);
+    private static unsafe string GetItem(ulong entityID, int index) => Marshal.PtrToStringUni(new IntPtr(ComboBoxControl_GetItem_Ptr(entityID, index))) ?? string.Empty;
+
+    public int    SelectedIndex     { get => GetSelectedIndex(Entity.ID); set => SetSelectedIndex(Entity.ID, value); }
+    public int    ItemCount         => GetItemCount(Entity.ID);
+    public string? GetItem(int index) => GetItem(Entity.ID, index);
+    public void   AddItem(string item) => AddItem(Entity.ID, item);
+    public void   ClearItems()         => ClearItems(Entity.ID);
+}
+
+/// <summary>Input text field wrapper.</summary>
+public class InputTextControl : WidgetControl
+{
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, char*> InputTextControl_GetText_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> InputTextControl_SetText_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, byte> InputTextControl_HasChanged_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, void> InputTextControl_ClearChanged_Ptr;
+#pragma warning restore 0649
+
+    public string Text
+    {
+        get { unsafe { return Marshal.PtrToStringUni(new IntPtr(InputTextControl_GetText_Ptr(Entity.ID))) ?? string.Empty; } }
+        set { unsafe { fixed (char* ptr = value) InputTextControl_SetText_Ptr(Entity.ID, ptr); } }
+    }
+
+    public bool HasChanged
+    {
+        get { unsafe { return InputTextControl_HasChanged_Ptr(Entity.ID) != 0; } }
+    }
+
+    public void ClearChanged()
+    {
+        unsafe { InputTextControl_ClearChanged_Ptr(Entity.ID); }
+    }
+}
+
+}
diff --git a/engine/scripting/managed/src/Entity.cs b/engine/scripting/managed/src/Entity.cs
new file mode 100644
index 000000000..c5ddc314a
--- /dev/null
+++ b/engine/scripting/managed/src/Entity.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Coral.Managed.Interop;
+
+namespace Chained
+{
+
+
+// ─────────────────────────────────────────────────────────────────────────────
+//  Entity — wraps a native entity ID and provides component access
+// ─────────────────────────────────────────────────────────────────────────────
+/// <summary>Entity wrapper with a small component cache.</summary>
+public class Entity
+{
+    /// <summary>Native entity handle.</summary>
+    public ulong ID { get; private set; }
+
+    // Cache: avoids allocating a new stub on every GetComponent<T>() call
+    private readonly Dictionary<System.Type, Component> _cache = new();
+
+#pragma warning disable 0649
+    internal static unsafe delegate* unmanaged<ulong, char*, byte> Entity_HasComponent_Ptr;
+    internal static unsafe delegate* unmanaged<char*, ulong*, int, int> Entity_FindAllWithComponent_Ptr;
+    internal static unsafe delegate* unmanaged<ulong, char*, void> Entity_AddComponent_Ptr;
+#pragma warning restore 0649
+
+    public const ulong NullID = 0xFFFFFFFF;
+
+    /// <summary>Wraps a native entity ID.</summary>
+    public Entity(ulong id) { ID = id; }
+
+    /// <summary>True when the entity handle is valid.</summary>
+    public bool IsValid => ID != NullID && ID != ulong.MaxValue && ID != (ulong)uint.MaxValue;
+
+    /// <summary>Quick access to the TransformComponent, or null if absent.</summary>
+    public TransformComponent? Transform => GetComponent<TransformComponent>();
+
+    // ── Component access ──────────────────────────────────────────────────
+
+    private static unsafe bool HasComponent_Native(ulong entityID, string componentName)
+    {
+        if (Entity_HasComponent_Ptr == null) return false;
+        fixed (char* ptr = componentName)
+            return Entity_HasComponent_Ptr(entityID, ptr) != 0;
+    }
+
+    /// <summary>True when the component exists.</summary>
+    public bool HasComponent<T>() where T : Component, new()
+        => IsValid && HasComponent_Native(ID, typeof(T).Name);
+
+    /// <summary>Returns the component wrapper, or null.</summary>
+    public T? GetComponent<T>() where T : Component, new()
+    {
+        if (!IsValid) return null;
+
+        System.Type componentType = typeof(T);
+        if (_cache.TryGetValue(componentType, out Component? cachedComponent))
+            return (T)cachedComponent;
+
+        if (!HasComponent<T>())
+            return null;
+
+        T component = new T() { Entity = this };
+        _cache[componentType] = component;
+        return component;
+    }
+
+    /// <summary>Adds a component and returns its wrapper.</summary>
+    public T AddComponent<T>() where T : Component, new()
+    {
+        if (!IsValid) throw new System.Exception("Cannot add component to invalid entity.");
+        string name = typeof(T).Name;
+        unsafe
+        {
+            if (Entity_AddComponent_Ptr == null) return new T() { Entity = this };
+            fixed (char* ptr = name) Entity_AddComponent_Ptr(ID, ptr);
+        }
+        T component = new T() { Entity = this };
+        _cache[typeof(T)] = component;
+        return component;
+    }
+
+    /// <summary>Returns all entity IDs with the component.</summary>
+    public static unsafe ulong[] FindAllWithComponent<T>() where T : Component, new()
+    {
+        if (Entity_FindAllWithComponent_Ptr == null) return Array.Empty<ulong>();
+        string name = typeof(T).Name;
+        {
+            fixed (char* ptr = name)
+            {
+                ulong* buf = stackalloc ulong[512];
+                int count = Entity_FindAllWithComponent_Ptr(ptr, buf, 512);
+                ulong[] result = new ulong[count];
+                for (int i = 0; i < count; i++) result[i] = buf[i];
+                return result;
+            }
+        }
+    }
+
+    /// <summary>Clears the component cache.</summary>
+    public void InvalidateComponentCache() => _cache.Clear();
+
+    public override string ToString() => $"Entity({ID})";
+}
+
+}
+
diff --git a/engine/scripting/managed/src/Input.cs b/engine/scripting/managed/src/Input.cs
new file mode 100644
index 000000000..7d4dbad80
--- /dev/null
+++ b/engine/scripting/managed/src/Input.cs
@@ -0,0 +1,62 @@
+using System;
+
+namespace Chained
+{
+    public static unsafe class Input
+    {
+        internal static delegate* unmanaged<int, int> Input_IsKeyDown_Ptr;
+        internal static delegate* unmanaged<int, int> Input_IsKeyPressed_Ptr;
+        internal static delegate* unmanaged<int, int> Input_IsKeyReleased_Ptr;
+        internal static delegate* unmanaged<int, int> Input_IsMouseButtonDown_Ptr;
+        internal static delegate* unmanaged<int, int> Input_IsMouseButtonPressed_Ptr;
+        internal static delegate* unmanaged<float> Input_GetMouseWheelMove_Ptr;
+        internal static delegate* unmanaged<float*, float*, void> Input_GetMouseDelta_Ptr;
+
+        public static bool IsKeyDown(Key keyCode)
+        {
+            if (Input_IsKeyDown_Ptr == null) return false;
+            return Input_IsKeyDown_Ptr((int)keyCode) != 0;
+        }
+
+        public static bool IsKeyPressed(Key keyCode)
+        {
+            if (Input_IsKeyPressed_Ptr == null) return false;
+            return Input_IsKeyPressed_Ptr((int)keyCode) != 0;
+        }
+
+        public static bool IsKeyReleased(Key keyCode)
+        {
+            if (Input_IsKeyReleased_Ptr == null) return false;
+            return Input_IsKeyReleased_Ptr((int)keyCode) != 0;
+        }
+
+        public static bool IsMouseButtonDown(MouseButton button)
+        {
+            if (Input_IsMouseButtonDown_Ptr == null) return false;
+            return Input_IsMouseButtonDown_Ptr((int)button) != 0;
+        }
+
+        public static bool IsMouseButtonPressed(MouseButton button)
+        {
+            if (Input_IsMouseButtonPressed_Ptr == null) return false;
+            return Input_IsMouseButtonPressed_Ptr((int)button) != 0;
+        }
+
+        public static float GetMouseWheelMove()
+        {
+            if (Input_GetMouseWheelMove_Ptr == null) return 0.0f;
+            return Input_GetMouseWheelMove_Ptr();
+        }
+
+        public static Vector3 MouseDelta
+        {
+            get
+            {
+                if (Input_GetMouseDelta_Ptr == null) return Vector3.Zero;
+                float x = 0.0f, y = 0.0f;
+                Input_GetMouseDelta_Ptr(&x, &y);
+                return new Vector3(x, y, 0.0f);
+            }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Interop.cs b/engine/scripting/managed/src/Interop.cs
new file mode 100644
index 000000000..7b99d7c50
--- /dev/null
+++ b/engine/scripting/managed/src/Interop.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>
+    /// Minimal interop: Coral fills the delegate* fields below via AddInternalCall
+    /// (each maps to a C++ ScriptGlue_Register*Callback). C# then registers the
+    /// managed lifecycle callbacks directly — no struct, no round-trip.
+    /// </summary>
+    public static unsafe class Interop
+    {
+        // Coral fills these via AddInternalCall (points to C++ ScriptGlue_Register*Callback).
+        // Must be internal (non-public) — Coral uses BindingFlags.NonPublic to find delegate* fields.
+        internal static delegate* unmanaged<delegate* unmanaged<float, void>, void> ScriptGlue_RegisterUpdateCallback_Ptr;
+        internal static delegate* unmanaged<delegate* unmanaged<int, void>, void> ScriptGlue_RegisterEventCallback_Ptr;
+        internal static delegate* unmanaged<delegate* unmanaged<void>, void> ScriptGlue_RegisterRenderUICallback_Ptr;
+        internal static delegate* unmanaged<delegate* unmanaged<ulong, ulong, void>, void> ScriptGlue_RegisterCollisionCallback_Ptr;
+        internal static delegate* unmanaged<delegate* unmanaged<void>, void> ScriptGlue_RegisterClearAllCallback_Ptr;
+        internal static delegate* unmanaged<delegate* unmanaged<ulong, char*, byte>, void> ScriptGlue_RegisterInstantiateCallback_Ptr;
+        internal static delegate* unmanaged<delegate* unmanaged<ulong, char*, void>, void> ScriptGlue_RegisterDestroyCallback_Ptr;
+
+        /// <summary>
+        /// Called once from C++ after assemblies are loaded.
+        /// NOT [UnmanagedCallersOnly] — invoked via managed InvokeStaticMethod.
+        /// Registers each managed lifecycle callback with C++ directly.
+        /// </summary>
+        public static void RegisterCallbacks()
+        {
+            if (ScriptGlue_RegisterUpdateCallback_Ptr == null)
+            {
+                Console.WriteLine("[C# Interop] ERROR: ScriptGlue_Register*Callback fields are null - Coral did not fill them.");
+                return;
+            }
+
+            ScriptGlue_RegisterUpdateCallback_Ptr(&ScriptEngine.OnUpdate);
+            ScriptGlue_RegisterEventCallback_Ptr(&ScriptEngine.OnEvent);
+            ScriptGlue_RegisterRenderUICallback_Ptr(&ScriptEngine.OnRenderUI);
+            ScriptGlue_RegisterCollisionCallback_Ptr(&ScriptEngine.OnCollisionEnter);
+            ScriptGlue_RegisterClearAllCallback_Ptr(&ScriptEngine.ClearAll);
+            ScriptGlue_RegisterInstantiateCallback_Ptr(&ScriptEngine.InstantiateScript);
+            ScriptGlue_RegisterDestroyCallback_Ptr(&ScriptEngine.DestroyScript);
+
+            Console.WriteLine("[C# Interop] Managed callbacks registered successfully.");
+            VerifyInternalCalls();
+        }
+
+        /// <summary>
+        /// Catches ABI/signature drift: any delegate* field suffixed with _Ptr that Coral
+        /// failed to bind (name mismatch, signature mismatch) stays null. A null here means
+        /// a C++ AddInternalCall has no matching C# field (or vice versa) — a silent crash
+        /// waiting to happen. We surface it loudly at load time instead.
+        /// </summary>
+        private static void VerifyInternalCalls()
+        {
+            var unbound = new System.Collections.Generic.List<string>();
+            var asm = typeof(Interop).Assembly;
+            foreach (var type in asm.GetTypes())
+            {
+                foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static))
+                {
+                    if (field.Name.EndsWith("_Ptr") && field.FieldType.IsFunctionPointer && field.GetValue(null) == null)
+                        unbound.Add($"{type.Name}.{field.Name}");
+                }
+            }
+
+            if (unbound.Count > 0)
+                Console.WriteLine($"[C# Interop] ERROR: {unbound.Count} internal call(s) NOT bound by Coral: {string.Join(", ", unbound)}");
+            else
+                Console.WriteLine("[C# Interop] All internal calls bound successfully.");
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/Log.cs b/engine/scripting/managed/src/Log.cs
new file mode 100644
index 000000000..ac190f640
--- /dev/null
+++ b/engine/scripting/managed/src/Log.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+
+namespace Chained
+{
+    public static class Log
+    {
+        private static List<string> s_History = new List<string>();
+        public static IReadOnlyList<string> History => s_History;
+
+        internal static unsafe delegate* unmanaged<char*, void> Log_Info_Ptr;
+        internal static unsafe delegate* unmanaged<char*, void> Log_Warn_Ptr;
+        internal static unsafe delegate* unmanaged<char*, void> Log_Error_Ptr;
+
+        public static unsafe void Info(string message) 
+        {
+            if (message == null) return;
+            AddToHistory("[INFO] " + message);
+
+            if (Log_Info_Ptr != null)
+            {
+                
+                
+                fixed (char* ptr = message)
+                {
+                    Log_Info_Ptr(ptr);
+                }
+            }
+            else
+            {
+                Console.WriteLine("[INFO] " + message);
+            }
+        }
+
+        public static unsafe void Warn(string message) 
+        {
+            if (message == null) return;
+            AddToHistory("[WARN] " + message);
+
+            if (Log_Warn_Ptr != null)
+            {
+                fixed (char* ptr = message) Log_Warn_Ptr(ptr);
+            }
+            else Console.WriteLine("[WARN] " + message);
+        }
+
+        public static unsafe void Error(string message) 
+        {
+            if (message == null) return;
+            AddToHistory("[ERROR] " + message);
+
+            if (Log_Error_Ptr != null)
+            {
+                fixed (char* ptr = message) Log_Error_Ptr(ptr);
+            }
+            else Console.WriteLine("[ERROR] " + message);
+        }
+
+        private static void AddToHistory(string formatted)
+        {
+            if (s_History == null) s_History = new List<string>();
+            s_History.Add(formatted);
+            if (s_History.Count > 15) s_History.RemoveAt(0);
+        }
+
+        public static void ClearHistory() => s_History?.Clear();
+    }
+}
\ No newline at end of file
diff --git a/engine/scripting/managed/src/Math.cs b/engine/scripting/managed/src/Math.cs
new file mode 100644
index 000000000..974275a76
--- /dev/null
+++ b/engine/scripting/managed/src/Math.cs
@@ -0,0 +1,146 @@
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+
+// ── Math ─────────────────────────────────────────────────────────────────────
+
+/// <summary>3D vector shared with native code.</summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct Vector3
+{
+    public float X, Y, Z;
+
+    /// <summary>Creates a vector from X, Y, and Z.</summary>
+    public Vector3(float x, float y, float z) { X = x; Y = y; Z = z; }
+
+    public static readonly Vector3 Zero  = new Vector3(0, 0, 0);
+    public static readonly Vector3 One   = new Vector3(1, 1, 1);
+    public static readonly Vector3 Up    = new Vector3(0, 1, 0);
+
+    public static Vector3 operator +(Vector3 left, Vector3 right) => new Vector3(left.X + right.X, left.Y + right.Y, left.Z + right.Z);
+    public static Vector3 operator -(Vector3 left, Vector3 right) => new Vector3(left.X - right.X, left.Y - right.Y, left.Z - right.Z);
+    public static Vector3 operator -(Vector3 vector)              => new Vector3(-vector.X, -vector.Y, -vector.Z);
+    public static Vector3 operator *(Vector3 vector, float scalar) => new Vector3(vector.X * scalar, vector.Y * scalar, vector.Z * scalar);
+    public static Vector3 operator *(float scalar, Vector3 vector) => new Vector3(scalar * vector.X, scalar * vector.Y, scalar * vector.Z);
+    public static Vector3 operator /(Vector3 vector, float scalar) => new Vector3(vector.X / scalar, vector.Y / scalar, vector.Z / scalar);
+
+    public float LengthSquared() => X * X + Y * Y + Z * Z;
+    public float Length()        => (float)System.Math.Sqrt(LengthSquared());
+
+    /// <summary>Returns a normalized copy, or zero for tiny inputs.</summary>
+    public static Vector3 Normalize(Vector3 vector)
+    {
+        float length = vector.Length();
+        return length > 0.00001f ? vector / length : Zero;
+    }
+
+    /// <summary>Dot product.</summary>
+    public static float Dot(Vector3 left, Vector3 right) => left.X * right.X + left.Y * right.Y + left.Z * right.Z;
+
+    /// <summary>Cross product.</summary>
+    public static Vector3 Cross(Vector3 left, Vector3 right) => new Vector3(
+        left.Y * right.Z - left.Z * right.Y,
+        left.Z * right.X - left.X * right.Z,
+        left.X * right.Y - left.Y * right.X);
+
+    /// <summary>Linear interpolation.</summary>
+    public static float Lerp(float start, float end, float factor) => start + (end - start) * factor;
+
+    public override string ToString() => $"({X:F2}, {Y:F2}, {Z:F2})";
+}
+
+/// <summary>4D vector shared with native code (useful for colors).</summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct Vector4
+{
+    public float X, Y, Z, W;
+
+    public Vector4(float x, float y, float z, float w) { X = x; Y = y; Z = z; W = w; }
+    public Vector4(float value) { X = Y = Z = W = value; }
+
+    public static readonly Vector4 White = new Vector4(1, 1, 1, 1);
+    public static readonly Vector4 Black = new Vector4(0, 0, 0, 1);
+}
+
+/// <summary>Scalar math helpers.</summary>
+public static class Mathf
+{
+    public const float PI      = (float)System.Math.PI;
+    public const float Deg2Rad = PI / 180.0f;
+    public const float Rad2Deg = 180.0f / PI;
+
+    public static float Clamp(float value, float min, float max)
+        => value < min ? min : (value > max ? max : value);
+    public static float Abs(float value) => value < 0 ? -value : value;
+    public static float Sin(float angle) => (float)System.Math.Sin(angle);
+    public static float Cos(float angle) => (float)System.Math.Cos(angle);
+    public static float Atan2(float y, float x) => (float)System.Math.Atan2(y, x);
+    public static float Sqrt(float value) => (float)System.Math.Sqrt(value);
+    public static float Lerp(float start, float end, float factor) => start + (end - start) * factor;
+}
+
+// ── Key / MouseButton enums ───────────────────────────────────────────────────
+
+/// <summary>Keyboard keys exposed to managed scripts.</summary>
+public enum Key : int
+{
+    Null = 0,
+    A = 1,  B = 2,  C = 3,
+    D = 4,  E = 5,  F = 6,
+    G = 7,  H = 8,  I = 9,
+    J = 10, K = 11, L = 12,
+    M = 13, N = 14, O = 15,
+    P = 16, Q = 17, R = 18,
+    S = 19, T = 20, U = 21,
+    V = 22, W = 23, X = 24,
+    Y = 25, Z = 26,
+
+    Space     = 27,
+    Escape    = 28,
+    Enter     = 29,
+    Tab       = 30,
+    Backspace = 31,
+    Insert    = 32,
+    Delete    = 33,
+    Right     = 34,
+    Left      = 35,
+    Down      = 36,
+    Up        = 37,
+    PageUp    = 38,
+    PageDown  = 39,
+    Home      = 40,
+    End       = 41,
+    CapsLock  = 42,
+    ScrollLock = 43,
+    NumLock   = 44,
+    PrintScreen = 45,
+    Pause     = 46,
+
+    F1  = 47, F2  = 48, F3  = 49,
+    F4  = 50, F5  = 51, F6  = 52,
+    F7  = 53, F8  = 54, F9  = 55,
+    F10 = 56, F11 = 57, F12 = 58,
+
+    LeftShift   = 59,
+    LeftControl = 60,
+    LeftAlt     = 61,
+    RightShift  = 62,
+    RightControl = 63,
+    RightAlt    = 64,
+
+    D0 = 65, D1 = 66, D2 = 67,
+    D3 = 68, D4 = 69, D5 = 70,
+    D6 = 71, D7 = 72, D8 = 73,
+    D9 = 74,
+}
+
+/// <summary>Mouse buttons exposed to managed scripts.</summary>
+public enum MouseButton : int
+{
+    Left   = 0,
+    Right  = 1,
+    Middle = 2
+}
+
+} // namespace Chained
diff --git a/engine/scripting/managed/src/NativeCallAttribute.cs b/engine/scripting/managed/src/NativeCallAttribute.cs
new file mode 100644
index 000000000..9faea155e
--- /dev/null
+++ b/engine/scripting/managed/src/NativeCallAttribute.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace Chained
+{
+    /// <summary>
+    /// Declares a C++ internal call bound through Coral. The NativeCall source generator
+    /// turns each attribute into an `internal static unsafe delegate* unmanaged<...> <Method>_Ptr`
+    /// field (so the field is no longer hand-written) and registers it in the native-call
+    /// manifest consumed by the load-time ABI self-check (Interop.VerifyInternalCalls).
+    ///
+    /// Signature is given as strings: [returnType, param1, param2, ...].
+    /// e.g. [NativeCall("Chained.AnimationComponent", "AnimationComponent_GetIsLooping", "byte", "ulong")].
+    /// Pointer types are written literally ("Vector3*", "char*").
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Field, AllowMultiple = true)]
+    public sealed class NativeCallAttribute : Attribute
+    {
+        public string ClassName { get; }
+        public string MethodName { get; }
+        public string[] Signature { get; }
+
+        public NativeCallAttribute(string className, string methodName, params string[] signature)
+        {
+            ClassName = className;
+            MethodName = methodName;
+            Signature = signature;
+        }
+    }
+
+    /// <summary>
+    /// Generates both the C++ internal call function pointer (_Ptr field) AND the
+    /// C# property getter/setter implementation on a component.
+    ///
+    /// Usage:
+    ///   [NativeProperty("MovementSpeed", "float", "PlayerComponent_GetMovementSpeed", "PlayerComponent_SetMovementSpeed")]
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class NativePropertyAttribute : Attribute
+    {
+        public string PropertyName { get; }
+        public string PropertyType { get; }
+        public string? GetterMethod { get; }
+        public string? SetterMethod { get; }
+
+        public NativePropertyAttribute(string propertyName, string propertyType, string? getterMethod = null, string? setterMethod = null)
+        {
+            PropertyName = propertyName;
+            PropertyType = propertyType;
+            GetterMethod = getterMethod;
+            SetterMethod = setterMethod;
+        }
+    }
+}
+
diff --git a/engine/scripting/managed/src/Network.cs b/engine/scripting/managed/src/Network.cs
new file mode 100644
index 000000000..b19a8fe51
--- /dev/null
+++ b/engine/scripting/managed/src/Network.cs
@@ -0,0 +1,244 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>
+    /// Static API for multiplayer networking.
+    /// Provides HostGame, ConnectTo, Disconnect, player list, chat, scene change, and status queries.
+    /// </summary>
+    public static class Network
+    {
+#pragma warning disable 0649
+
+        internal static unsafe delegate* unmanaged<ushort, int, void> Network_HostGame_Ptr;
+        internal static unsafe delegate* unmanaged<char*, ushort, void> Network_ConnectTo_Ptr;
+        internal static unsafe delegate* unmanaged<void> Network_Disconnect_Ptr;
+        internal static unsafe delegate* unmanaged<byte> Network_IsHost_Ptr;
+        internal static unsafe delegate* unmanaged<byte> Network_IsClient_Ptr;
+        internal static unsafe delegate* unmanaged<byte> Network_IsConnected_Ptr;
+        internal static unsafe delegate* unmanaged<byte> Network_IsFullyConnected_Ptr;
+        internal static unsafe delegate* unmanaged<int> Network_GetClientCount_Ptr;
+        internal static unsafe delegate* unmanaged<int> Network_GetMaxClients_Ptr;
+        internal static unsafe delegate* unmanaged<int> Network_GetRole_Ptr;
+        internal static unsafe delegate* unmanaged<char*, int, void> Network_GetListenAddress_Ptr;
+        internal static unsafe delegate* unmanaged<char*, int, void> Network_GetPublicAddress_Ptr;
+        internal static unsafe delegate* unmanaged<char*, int, void> Network_GetPublicIPv6Address_Ptr;
+        internal static unsafe delegate* unmanaged<char*, void> Network_BroadcastSceneChange_Ptr;
+        internal static unsafe delegate* unmanaged<byte> Network_HasPendingSceneChange_Ptr;
+        internal static unsafe delegate* unmanaged<char*, int, void> Network_GetPendingSceneChange_Ptr;
+        internal static unsafe delegate* unmanaged<void> Network_ClearPendingSceneChange_Ptr;
+
+        // Player list
+        internal static unsafe delegate* unmanaged<char*, byte, void> Network_SetLocalPlayerInfo_Ptr;
+        internal static unsafe delegate* unmanaged<char*, byte, void> Network_SendPlayerInfo_Ptr;
+        internal static unsafe delegate* unmanaged<int> Network_GetPlayerCount_Ptr;
+        internal static unsafe delegate* unmanaged<char*, int, void> Network_GetPlayerListJSON_Ptr;
+        internal static unsafe delegate* unmanaged<ulong> Network_GetLocalNetworkID_Ptr;
+
+        // Chat
+        internal static unsafe delegate* unmanaged<char*, void> Network_SendChatMessage_Ptr;
+        internal static unsafe delegate* unmanaged<byte> Network_HasPendingChat_Ptr;
+        internal static unsafe delegate* unmanaged<char*, int, void> Network_GetPendingChatJSON_Ptr;
+        internal static unsafe delegate* unmanaged<void> Network_ClearPendingChat_Ptr;
+
+        // Prefab
+        internal static unsafe delegate* unmanaged<char*, void> Network_SetPlayerPrefab_Ptr;
+
+        // UPnP
+        internal static unsafe delegate* unmanaged<byte> Network_IsUpnpAvailable_Ptr;
+
+        // Firewall
+        internal static unsafe delegate* unmanaged<byte> Network_IsFirewallRuleActive_Ptr;
+
+#pragma warning restore 0649
+
+        /// <summary>Starts a listen server on the given port.</summary>
+        public static unsafe void HostGame(ushort port = 7777, int maxClients = 4)
+        {
+            if (Network_HostGame_Ptr == null) return;
+            Network_HostGame_Ptr(port, maxClients);
+        }
+
+        /// <summary>Connects to a remote server.</summary>
+        public static unsafe void ConnectTo(string ip, ushort port = 7777)
+        {
+            if (Network_ConnectTo_Ptr == null || string.IsNullOrEmpty(ip)) return;
+            fixed (char* ptr = ip) Network_ConnectTo_Ptr(ptr, port);
+        }
+
+        /// <summary>Disconnects from the current session.</summary>
+        public static unsafe void Disconnect()
+        {
+            if (Network_Disconnect_Ptr == null) return;
+            Network_Disconnect_Ptr();
+        }
+
+        /// <summary>True when this instance is the host (listen server).</summary>
+        public static unsafe bool IsHost => Network_IsHost_Ptr != null && Network_IsHost_Ptr() != 0;
+
+        /// <summary>True when this instance is a connected client.</summary>
+        public static unsafe bool IsClient => Network_IsClient_Ptr != null && Network_IsClient_Ptr() != 0;
+
+        /// <summary>True when connected (host or client).</summary>
+        public static unsafe bool IsConnected => Network_IsConnected_Ptr != null && Network_IsConnected_Ptr() != 0;
+
+        /// <summary>True only after ENet handshake completes (client-side). Use this instead of IsConnected for connection state checks.</summary>
+        public static unsafe bool IsFullyConnected => Network_IsFullyConnected_Ptr != null && Network_IsFullyConnected_Ptr() != 0;
+
+        /// <summary>Number of connected clients (host-side only).</summary>
+        public static unsafe int ClientCount => Network_GetClientCount_Ptr != null ? Network_GetClientCount_Ptr() : 0;
+
+        /// <summary>Maximum number of clients allowed on this server (set via HostGame).</summary>
+        public static unsafe int MaxClients => Network_GetMaxClients_Ptr != null ? Network_GetMaxClients_Ptr() : 0;
+
+        /// <summary>Network role: 0=Offline, 1=Host, 2=Client.</summary>
+        public static unsafe int GetRole() => Network_GetRole_Ptr != null ? Network_GetRole_Ptr() : 0;
+
+		/// <summary>
+        /// Address of the local listen socket (host-side). This is a LAN address, not the
+        /// router's public IP — hosting over the internet requires a forwarded UDP port.
+        /// </summary>
+        public static unsafe string GetListenAddress()
+        {
+            if (Network_GetListenAddress_Ptr == null) return string.Empty;
+            sbyte* buf = stackalloc sbyte[64];
+            Network_GetListenAddress_Ptr((char*)buf, 64);
+            return new string(buf);
+        }
+
+        /// <summary>
+        /// Public IP:PORT string for internet hosting (e.g. "203.0.113.5:7777").
+        /// Returns "Fetching..." for a second or two after HostGame() while the
+        /// engine resolves the public address from api.ipify.org.
+        /// </summary>
+        public static unsafe string GetPublicAddress()
+        {
+            if (Network_GetPublicAddress_Ptr == null) return string.Empty;
+            sbyte* buf = stackalloc sbyte[64];
+            Network_GetPublicAddress_Ptr((char*)buf, 64);
+            return new string(buf);
+        }
+
+        /// <summary>
+        /// Public IPv6 address string for internet hosting (e.g. "[2001:db8::1]:7777").
+        /// Returns "Not available" if the host has no public IPv6.
+        /// IPv6 bypasses CGNAT — prefer this over IPv4 when available.
+        /// </summary>
+        public static unsafe string GetPublicIPv6Address()
+        {
+            if (Network_GetPublicIPv6Address_Ptr == null) return string.Empty;
+            sbyte* buf = stackalloc sbyte[128];
+            Network_GetPublicIPv6Address_Ptr((char*)buf, 128);
+            return new string(buf);
+        }
+
+        public static unsafe void BroadcastSceneChange(string scenePath)
+        {
+            if (Network_BroadcastSceneChange_Ptr == null || string.IsNullOrEmpty(scenePath)) return;
+            fixed (char* ptr = scenePath) Network_BroadcastSceneChange_Ptr(ptr);
+        }
+
+        /// <summary>True when a scene change packet was received from the host (client-side).</summary>
+        public static unsafe bool HasPendingSceneChange => Network_HasPendingSceneChange_Ptr != null && Network_HasPendingSceneChange_Ptr() != 0;
+
+        /// <summary>Returns the pending scene path received from the host, or empty string.</summary>
+        public static unsafe string GetPendingSceneChange()
+        {
+            if (Network_GetPendingSceneChange_Ptr == null) return string.Empty;
+            sbyte* buf = stackalloc sbyte[256];
+            Network_GetPendingSceneChange_Ptr((char*)buf, 256);
+            return new string(buf);
+        }
+
+        /// <summary>Clears the pending scene change flag.</summary>
+        public static unsafe void ClearPendingSceneChange()
+        {
+            if (Network_ClearPendingSceneChange_Ptr == null) return;
+            Network_ClearPendingSceneChange_Ptr();
+        }
+
+        // ── Player List ─────────────────────────────────────────────────
+
+        /// <summary>Sets the local player's name and skin index (call before hosting/connecting).</summary>
+        public static unsafe void SetLocalPlayerInfo(string name, byte skinIndex = 0)
+        {
+            if (Network_SetLocalPlayerInfo_Ptr == null || string.IsNullOrEmpty(name)) return;
+            fixed (char* ptr = name) Network_SetLocalPlayerInfo_Ptr(ptr, skinIndex);
+        }
+
+        /// <summary>Sends player info to the host (client-side, called automatically on connect).</summary>
+        public static unsafe void SendPlayerInfo(string name, byte skinIndex = 0)
+        {
+            if (Network_SendPlayerInfo_Ptr == null || string.IsNullOrEmpty(name)) return;
+            fixed (char* ptr = name) Network_SendPlayerInfo_Ptr(ptr, skinIndex);
+        }
+
+        /// <summary>Number of players in the lobby (including host).</summary>
+        public static unsafe int PlayerCount => Network_GetPlayerCount_Ptr != null ? Network_GetPlayerCount_Ptr() : 0;
+
+        /// <summary>Returns the player list as a JSON string.</summary>
+        public static unsafe string GetPlayerListJSON()
+        {
+            if (Network_GetPlayerListJSON_Ptr == null) return "[]";
+            sbyte* buf = stackalloc sbyte[4096];
+            Network_GetPlayerListJSON_Ptr((char*)buf, 4096);
+            int len = 0;
+            while (buf[len] != 0 && len < 4095) len++;
+            return System.Text.Encoding.UTF8.GetString((byte*)buf, len);
+        }
+
+        /// <summary>Returns the local player's network ID (assigned by host).</summary>
+        public static unsafe ulong GetLocalNetworkID()
+        {
+            return Network_GetLocalNetworkID_Ptr != null ? Network_GetLocalNetworkID_Ptr() : 0;
+        }
+
+        // ── Chat ────────────────────────────────────────────────────────
+
+        /// <summary>Sends a chat message to all players.</summary>
+        public static unsafe void SendChatMessage(string message)
+        {
+            if (Network_SendChatMessage_Ptr == null || string.IsNullOrEmpty(message)) return;
+            fixed (char* ptr = message) Network_SendChatMessage_Ptr(ptr);
+        }
+
+        /// <summary>True when there are pending chat messages to display.</summary>
+        public static unsafe bool HasPendingChat => Network_HasPendingChat_Ptr != null && Network_HasPendingChat_Ptr() != 0;
+
+        /// <summary>Returns pending chat messages as JSON.</summary>
+        public static unsafe string GetPendingChatJSON()
+        {
+            if (Network_GetPendingChatJSON_Ptr == null) return "[]";
+            sbyte* buf = stackalloc sbyte[8192];
+            Network_GetPendingChatJSON_Ptr((char*)buf, 8192);
+            int len = 0;
+            while (buf[len] != 0 && len < 8191) len++;
+            return System.Text.Encoding.UTF8.GetString((byte*)buf, len);
+        }
+
+        /// <summary>Clears pending chat messages after reading.</summary>
+        public static unsafe void ClearPendingChat()
+        {
+            if (Network_ClearPendingChat_Ptr == null) return;
+            Network_ClearPendingChat_Ptr();
+        }
+
+        // ── Prefab ──────────────────────────────────────────────────────
+
+        /// <summary>Sets the player prefab path for network avatar spawning.</summary>
+        public static unsafe void SetPlayerPrefab(string path)
+        {
+            if (Network_SetPlayerPrefab_Ptr == null || string.IsNullOrEmpty(path)) return;
+            fixed (char* ptr = path) Network_SetPlayerPrefab_Ptr(ptr);
+        }
+
+        // ── UPnP ─────────────────────────────────────────────────────────
+
+        /// <summary>True when UPnP port forwarding is available on the local network.</summary>
+        public static unsafe bool IsUpnpAvailable => Network_IsUpnpAvailable_Ptr != null && Network_IsUpnpAvailable_Ptr() != 0;
+
+        /// <summary>True when a Windows Firewall / iptables rule was added for the game port.</summary>
+        public static unsafe bool IsFirewallRuleActive => Network_IsFirewallRuleActive_Ptr != null && Network_IsFirewallRuleActive_Ptr() != 0;
+    }
+}
diff --git a/engine/scripting/managed/src/SceneAndApplication.cs b/engine/scripting/managed/src/SceneAndApplication.cs
new file mode 100644
index 000000000..a21d8f94d
--- /dev/null
+++ b/engine/scripting/managed/src/SceneAndApplication.cs
@@ -0,0 +1,225 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    // ─────────────────────────────────────────────────────────────────────────────
+    //  Scene — static API for scene / entity queries
+    // ─────────────────────────────────────────────────────────────────────────────
+    /// <summary>Scene helpers.</summary>
+    public static class Scene
+    {
+#pragma warning disable 0649
+        
+        internal static unsafe delegate* unmanaged<char*, ulong> Scene_FindEntityByTag_Ptr;
+        internal static unsafe delegate* unmanaged<char*, void> Scene_LoadScene_Ptr;
+        internal static unsafe delegate* unmanaged<ulong> Scene_GetPrimaryCameraEntity_Ptr;
+        internal static unsafe delegate* unmanaged<ulong, ulong> Scene_CopyEntity_Ptr;
+#pragma warning restore 0649
+
+        /// <summary>Finds an entity by tag. Returns null if not found or pointer is uninitialized.</summary>
+        
+        public static unsafe Entity? FindEntityByTag(string tag)
+{
+    if (Scene_FindEntityByTag_Ptr == null)
+    {
+        Console.WriteLine("[ScriptEngine] Error: Scene_FindEntityByTag_Ptr is NULL!");
+        return null;
+    }
+
+    if (string.IsNullOrEmpty(tag)) return null;
+
+    fixed (char* ptr = tag)
+    {
+        ulong entityId = Scene_FindEntityByTag_Ptr(ptr);
+        return (entityId != Entity.NullID && entityId != ulong.MaxValue && entityId != (ulong)uint.MaxValue)
+            ? new Entity(entityId)
+            : null;
+    }
+}
+
+        /// <summary>Loads a scene.</summary>
+        public static unsafe void LoadScene(string path)
+        {
+            if (Scene_LoadScene_Ptr == null) return;
+            fixed (char* ptr = path) Scene_LoadScene_Ptr(ptr);
+        }
+
+        private static unsafe ulong GetPrimaryCameraEntity_Native()
+        {
+            if (Scene_GetPrimaryCameraEntity_Ptr == null) return 0;
+            return Scene_GetPrimaryCameraEntity_Ptr();
+        }
+
+        /// <summary>Returns the main camera entity.</summary>
+        public static Entity? GetMainCamera()
+        {
+            ulong entityId = GetPrimaryCameraEntity_Native();
+            if (entityId != 0) return new Entity(entityId);
+
+            // Fallback: first camera in the scene.
+            var entityIds = Entity.FindAllWithComponent<CameraComponent>();
+            if (entityIds.Length > 0) return new Entity(entityIds[0]);
+
+            return null;
+        }
+
+        /// <summary>Creates a deep copy of an entity.</summary>
+        public static Entity? CopyEntity(Entity entity)
+        {
+            if (entity == null || !entity.IsValid) return null;
+
+            ulong newId = 0;
+            unsafe
+            {
+                if (Scene_CopyEntity_Ptr == null) return null;
+                newId = Scene_CopyEntity_Ptr(entity.ID);
+            }
+            return newId != 0 ? new Entity(newId) : null;
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────────
+    //  Audio — static API for audio playback
+    // ─────────────────────────────────────────────────────────────────────────────
+    /// <summary>Audio helpers.</summary>
+    public static class Audio
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<char*, float, float, byte, void> Audio_Play_Ptr;
+        internal static unsafe delegate* unmanaged<char*, void> Audio_Stop_Ptr;
+        internal static unsafe delegate* unmanaged<void> Audio_StopAll_Ptr;
+#pragma warning restore 0649
+
+        /// <summary>Plays an audio clip.</summary>
+        public static unsafe void Play(string path, float volume = 1.0f, float pitch = 1.0f, bool loop = false)
+        {
+            if (Audio_Play_Ptr == null) return;
+            fixed (char* ptr = path) Audio_Play_Ptr(ptr, volume, pitch, (byte)(loop ? 1 : 0));
+        }
+
+        /// <summary>Stops playback for one clip.</summary>
+        public static unsafe void Stop(string path)
+        {
+            if (Audio_Stop_Ptr == null) return;
+            fixed (char* ptr = path) Audio_Stop_Ptr(ptr);
+        }
+
+        /// <summary>Stops all audio.</summary>
+        public static unsafe void StopAll()
+        {
+            if (Audio_StopAll_Ptr == null) return;
+            Audio_StopAll_Ptr();
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────────
+    //  Application — static API for application control
+    // ─────────────────────────────────────────────────────────────────────────────
+    /// <summary>Application helpers.</summary>
+    public static class Application
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<void> Application_Close_Ptr;
+        internal static unsafe delegate* unmanaged<int> Application_GetFPS_Ptr;
+        internal static unsafe delegate* unmanaged<float> Application_GetFrameTime_Ptr;
+#pragma warning restore 0649
+
+        /// <summary>Requests shutdown.</summary>
+        public static unsafe void Close()
+        {
+            if (Application_Close_Ptr == null) return;
+            Application_Close_Ptr();
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────────
+    //  Time — static API for timing information
+    // ─────────────────────────────────────────────────────────────────────────────
+    /// <summary>Frame timing.</summary>
+    public static class Time
+    {
+        /// <summary>Current frame rate.</summary>
+        public static unsafe int FPS => Application.Application_GetFPS_Ptr != null ? Application.Application_GetFPS_Ptr() : 0;
+        
+        /// <summary>Current frame time.</summary>
+        public static unsafe float DeltaTime => Application.Application_GetFrameTime_Ptr != null ? Application.Application_GetFrameTime_Ptr() : 0.0f;
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────────
+    //  AppWindow — static API for window control
+    // ─────────────────────────────────────────────────────────────────────────────
+    /// <summary>Window helpers.</summary>
+    public static class AppWindow
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<int, int, void> Window_SetSize_Ptr;
+        internal static unsafe delegate* unmanaged<byte, void> Window_SetFullscreen_Ptr;
+        internal static unsafe delegate* unmanaged<byte, void> Window_SetVSync_Ptr;
+        internal static unsafe delegate* unmanaged<byte, void> Window_SetAntialiasing_Ptr;
+        internal static unsafe delegate* unmanaged<int, void> Window_SetAntiAliasingSamples_Ptr;
+        internal static unsafe delegate* unmanaged<char*> Window_GetSupportedResolution_Ptr;
+#pragma warning restore 0649
+
+        /// <summary>Sets the window size.</summary>
+        public static unsafe void SetSize(int width, int height)
+        {
+            if (Window_SetSize_Ptr == null) return;
+            Window_SetSize_Ptr(width, height);
+        }
+
+        /// <summary>Toggles fullscreen mode.</summary>
+        public static unsafe void SetFullscreen(bool enabled)
+        {
+            if (Window_SetFullscreen_Ptr == null) return;
+            Window_SetFullscreen_Ptr((byte)(enabled ? 1 : 0));
+        }
+
+        /// <summary>Toggles vertical sync.</summary>
+        public static unsafe void SetVSync(bool enabled)
+        {
+            if (Window_SetVSync_Ptr == null) return;
+            Window_SetVSync_Ptr((byte)(enabled ? 1 : 0));
+        }
+
+        /// <summary>Toggles multisampling.</summary>
+        public static unsafe void SetAntialiasing(bool enabled)
+        {
+            if (Window_SetAntialiasing_Ptr == null) return;
+            Window_SetAntialiasing_Ptr((byte)(enabled ? 1 : 0));
+        }
+
+        /// <summary>Sets the MSAA sample count (0, 2, 4, or 8). Recreates the HDR framebuffer with the new sample count.</summary>
+        public static unsafe void SetAntiAliasingSamples(int samples)
+        {
+            if (Window_SetAntiAliasingSamples_Ptr == null) return;
+            Window_SetAntiAliasingSamples_Ptr(samples);
+        }
+
+        /// <summary>Returns all supported resolutions as a semicolon-separated string (e.g. "1920x1080;1280x720").</summary>
+        public static unsafe string GetSupportedResolutions()
+        {
+            if (Window_GetSupportedResolution_Ptr == null) return "";
+            char* ptr = Window_GetSupportedResolution_Ptr();
+            return ptr != null ? new string(ptr) : "";
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────────
+    //  Physics — static API for physics settings
+    // ─────────────────────────────────────────────────────────────────────────────
+    /// <summary>Physics configuration helpers.</summary>
+    public static class Physics
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<float> Physics_GetGravity_Ptr;
+#pragma warning restore 0649
+
+        /// <summary>Returns the world gravity from the project configuration (units/s^2).</summary>
+        public static unsafe float GetGravity()
+        {
+            if (Physics_GetGravity_Ptr == null) return 20.0f;
+            return Physics_GetGravity_Ptr();
+        }
+    }
+}
\ No newline at end of file
diff --git a/engine/scripting/managed/src/Script.cs b/engine/scripting/managed/src/Script.cs
new file mode 100644
index 000000000..1af76ee98
--- /dev/null
+++ b/engine/scripting/managed/src/Script.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+
+// ─────────────────────────────────────────────────────────────────────────────
+//  Script — base class for all user-defined C# scripts
+// ─────────────────────────────────────────────────────────────────────────────
+/// <summary>Base class for managed scripts.</summary>
+public abstract class Script
+{
+    /// <summary>The entity this script is attached to.</summary>
+    public Entity Entity { get; private set; } = null!;
+
+    /// <summary>Returns a component from the entity.</summary>
+    public T? GetComponent<T>() where T : Component, new() => Entity.GetComponent<T>();
+    /// <summary>True when the entity has the component.</summary>
+    public bool HasComponent<T>() where T : Component, new() => Entity.HasComponent<T>();
+
+    /// <summary>Instantiates the native C++ entity handle.</summary>
+    internal void __Init(ulong entityID)
+    {
+        Entity = new Entity(entityID);
+        // Do not call Log.Info here, as the pointer struct may not be fully initialized or marshaled yet.
+    }
+
+    /// <summary>Called once after the script is instantiated and Entity is set.</summary>
+    public virtual void OnCreate() {}
+
+    /// <summary>Called once on the very first Update frame (after OnCreate).</summary>
+    public virtual void OnStart() {}
+
+    /// <summary>Called every frame while the scene is running.</summary>
+    public virtual void OnUpdate(float deltaTime) {}
+
+    /// <summary>Called for UI rendering (e.g. HUD, Debug tools).</summary>
+    public virtual void OnGUI() {}
+
+    /// <summary>Called when a physics collision starts.</summary>
+    public virtual void OnCollisionEnter(ulong otherEntityId) {}
+
+    /// <summary>Called for generic engine events (KeyPress, Mouse, etc).</summary>
+    public virtual void OnEvent(int eventType) {}
+
+    /// <summary>Called when the script or scene is destroyed / hot-reloaded.</summary>
+    public virtual void OnDestroy() {}
+}
+
+}
diff --git a/engine/scripting/managed/src/ScriptEngine.cs b/engine/scripting/managed/src/ScriptEngine.cs
new file mode 100644
index 000000000..6d2d3331e
--- /dev/null
+++ b/engine/scripting/managed/src/ScriptEngine.cs
@@ -0,0 +1,324 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace Chained
+{
+    /// <summary>
+    /// Central manager for all script instances.
+    /// This is called from C++ once per frame, handling the lifecycle of all ManagedScripts natively in C#.
+    /// </summary>
+    public static class ScriptEngine
+    {
+        // Tracks all active scripts per entity ID.
+        // It allows easy lookup of scripts attached to specific entities.
+        private static Dictionary<ulong, List<Script>> s_EntityScripts = new Dictionary<ulong, List<Script>>();
+        
+        // A flat list of scripts for fast iteration during OnUpdate / OnGUI.
+        private static List<Script> s_ActiveScripts = new List<Script>();
+        
+        // Scripts pending OnCreate() — deferred one frame to avoid re-entrant Coral calls
+        private static List<Script> s_ScriptsNeedingCreate = new List<Script>();
+        
+        // Scripts that need their OnStart called (one frame after OnCreate)
+        private static List<Script> s_ScriptsNeedingStart = new List<Script>();
+        
+        // Caches script types to avoid reflection overhead on every instantiation
+        private static Dictionary<string, Type> s_ScriptTypes = new Dictionary<string, Type>();
+
+        /// <summary>
+        /// Called from C++ when a script component is encountered.
+        /// IMPORTANT: Does NOT call OnCreate here to avoid re-entrant Coral calls.
+        /// OnCreate is deferred to the next OnUpdate tick.
+        /// </summary>
+        [UnmanagedCallersOnly]
+        public static unsafe byte InstantiateScript(ulong entityId, char* classNamePtr)
+        {
+            string className = (classNamePtr != null) ? new string(classNamePtr) : string.Empty;
+            if (!s_ScriptTypes.TryGetValue(className, out Type? type))
+            {
+                // Search only within the active AssemblyLoadContext to avoid resolving 
+                // stale types from old, unloaded contexts pending garbage collection.
+                var activeALC = System.Runtime.Loader.AssemblyLoadContext.GetLoadContext(typeof(ScriptEngine).Assembly);
+                if (activeALC != null)
+                {
+                    foreach (var assembly in activeALC.Assemblies)
+                    {
+                        type = assembly.GetType(className, false, true);
+                        if (type != null) break;
+                    }
+                }
+                
+                // Fallback for default context (e.g. system types)
+                if (type == null)
+                {
+                    foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+                    {
+                        type = assembly.GetType(className, false, true);
+                        if (type != null) break;
+                    }
+                }
+
+                if (type == null)
+                {
+                    Console.WriteLine($"[ScriptEngine] ERROR: Could not find script type: {className}");
+                    return 0;
+                }
+                s_ScriptTypes[className] = type;
+            }
+
+            try
+            {
+                Script? script = Activator.CreateInstance(type) as Script;
+                if (script == null)
+                {
+                    Console.WriteLine($"[ScriptEngine] ERROR: Failed to cast {className} to Script.");
+                    return 0;
+                }
+
+                // Initialize the base struct entity ID and C++ bindings
+                script.__Init(entityId);
+
+                // Check if an instance of this type is already registered for this entity
+                if (s_EntityScripts.TryGetValue(entityId, out var existingList))
+                {
+                    foreach (var existing in existingList)
+                    {
+                        if (existing.GetType() == type)
+                        {
+                            // Already instantiated for this entity
+                            return 1;
+                        }
+                    }
+                }
+
+                // Add to collections
+                if (!s_EntityScripts.TryGetValue(entityId, out var scriptList))
+                {
+                    scriptList = new List<Script>();
+                    s_EntityScripts[entityId] = scriptList;
+                }
+                scriptList.Add(script);
+                
+                // Defer OnCreate to next OnUpdate to avoid re-entrant Coral calls.
+                // Do NOT add to s_ActiveScripts yet — the script graduates there
+                // only after OnStart completes, so OnUpdate never runs prematurely.
+                s_ScriptsNeedingCreate.Add(script);
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"[ScriptEngine] ERROR: Exception instantiating {className}: {ex}");
+                return 0;
+            }
+        }
+
+        private static void InternalSetField(ulong entityId, string className, string fieldName, object value)
+        {
+            if (s_EntityScripts.TryGetValue(entityId, out var scriptList))
+            {
+                foreach (var script in scriptList)
+                {
+                    if (script.GetType().FullName == className || script.GetType().Name == className)
+                    {
+                        var field = script.GetType().GetField(fieldName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                        if (field != null)
+                        {
+                            try
+                            {
+                                field.SetValue(script, Convert.ChangeType(value, field.FieldType));
+                            }
+                            catch (Exception ex)
+                            {
+                                Console.WriteLine($"[ScriptEngine] WARN: Failed to set field {fieldName} on {className}: {ex.Message}");
+                            }
+                        }
+                        return;
+                    }
+                }
+            }
+        }
+
+        public static void SetFieldFloat(ulong entityId, string className, string fieldName, float value) => InternalSetField(entityId, className, fieldName, value);
+        public static void SetFieldInt(ulong entityId, string className, string fieldName, int value) => InternalSetField(entityId, className, fieldName, value);
+        public static void SetFieldBool(ulong entityId, string className, string fieldName, bool value) => InternalSetField(entityId, className, fieldName, value);
+        public static void SetFieldString(ulong entityId, string className, string fieldName, string value) => InternalSetField(entityId, className, fieldName, value);
+        // Using objects for math types as they might require custom marshaling depending on how Coral works.
+
+
+        [UnmanagedCallersOnly]
+        public static unsafe void DestroyScript(ulong entityId, char* classNamePtr)
+        {
+            string className = (classNamePtr != null) ? new string(classNamePtr) : string.Empty;
+            DestroyScriptInternal(entityId, className);
+        }
+
+        private static void DestroyScriptInternal(ulong entityId, string className)
+        {
+            if (s_EntityScripts.TryGetValue(entityId, out var scriptList))
+            {
+                for (int i = 0; i < scriptList.Count; i++)
+                {
+                    var script = scriptList[i];
+                    if (string.IsNullOrEmpty(className) || script.GetType().FullName == className || script.GetType().Name == className)
+                    {
+                        try
+                        {
+                            script.OnDestroy();
+                        }
+                        catch (Exception ex)
+                        {
+                            Console.WriteLine($"[ScriptEngine] ERROR: Exception destroying {className}: {ex.Message}");
+                        }
+                        
+                        s_ActiveScripts.Remove(script);
+                        s_ScriptsNeedingCreate.Remove(script);
+                        s_ScriptsNeedingStart.Remove(script);
+                        scriptList.RemoveAt(i);
+                        i--;
+                    }
+                }
+
+                if (scriptList.Count == 0)
+                {
+                    s_EntityScripts.Remove(entityId);
+                }
+            }
+        }
+
+        [UnmanagedCallersOnly]
+        public static void ClearAll()
+        {
+            foreach (var script in s_ActiveScripts)
+            {
+                try { script.OnDestroy(); } catch {}
+            }
+            foreach (var script in s_ScriptsNeedingCreate)
+            {
+                try { script.OnDestroy(); } catch {}
+            }
+            foreach (var script in s_ScriptsNeedingStart)
+            {
+                try { script.OnDestroy(); } catch {}
+            }
+            s_ActiveScripts.Clear();
+            s_EntityScripts.Clear();
+            s_ScriptsNeedingCreate.Clear();
+            s_ScriptsNeedingStart.Clear();
+            s_ScriptTypes.Clear();
+        }
+
+        [UnmanagedCallersOnly]
+        public static void OnUpdate(float deltaTime)
+        {
+            // 1. OnCreate for newly instantiated scripts
+            if (s_ScriptsNeedingCreate.Count > 0)
+            {
+                var batch = new List<Script>(s_ScriptsNeedingCreate);
+                s_ScriptsNeedingCreate.Clear();
+                foreach (var script in batch)
+                {
+                    try
+                    {
+                        script.OnCreate();
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"[ScriptEngine] ERROR: Exception in OnCreate for {script.GetType().Name}: {ex.Message}");
+                    }
+                }
+                // They need OnStart on the NEXT frame
+                s_ScriptsNeedingStart.AddRange(batch);
+            }
+
+            // 2. OnStart for scripts that got OnCreate last frame
+            if (s_ScriptsNeedingStart.Count > 0)
+            {
+                var batch = new List<Script>(s_ScriptsNeedingStart);
+                s_ScriptsNeedingStart.Clear();
+                foreach (var script in batch)
+                {
+                    try
+                    {
+                        script.OnStart();
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"[ScriptEngine] ERROR: Exception in OnStart for {script.GetType().Name}: {ex.Message}");
+                    }
+                    // Graduate to active only after OnStart — prevents OnUpdate from
+                    // running on the same frame as OnCreate (which caused button auto-fire).
+                    s_ActiveScripts.Add(script);
+                }
+            }
+
+            // 3. OnUpdate for all active scripts
+            for (int i = 0; i < s_ActiveScripts.Count; i++)
+            {
+                try
+                {
+                    s_ActiveScripts[i].OnUpdate(deltaTime);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"[ScriptEngine] ERROR: Exception in OnUpdate for {s_ActiveScripts[i].GetType().Name}: {ex.Message}");
+                }
+            }
+        }
+
+        [UnmanagedCallersOnly]
+        public static void OnEvent(int eventType)
+        {
+            for (int i = 0; i < s_ActiveScripts.Count; i++)
+            {
+                try
+                {
+                    s_ActiveScripts[i].OnEvent(eventType);
+                }
+                catch (Exception ex)
+                {
+                     Console.WriteLine($"[ScriptEngine] ERROR: Exception in OnEvent for {s_ActiveScripts[i].GetType().Name}: {ex.Message}");
+                }
+            }
+        }
+
+        [UnmanagedCallersOnly]
+        public static void OnRenderUI()
+        {
+            for (int i = 0; i < s_ActiveScripts.Count; i++)
+            {
+                try
+                {
+                    s_ActiveScripts[i].OnGUI();
+                }
+                catch (Exception ex)
+                {
+                     Console.WriteLine($"[ScriptEngine] ERROR: Exception in OnGUI for {s_ActiveScripts[i].GetType().Name}: {ex.Message}");
+                }
+            }
+        }
+
+        [UnmanagedCallersOnly]
+        public static void OnCollisionEnter(ulong entityA, ulong entityB)
+        {
+            // Dispatch to entity A
+            if (s_EntityScripts.TryGetValue(entityA, out var scriptsA))
+            {
+                foreach(var script in scriptsA)
+                {
+                    try { script.OnCollisionEnter(entityB); } catch {}
+                }
+            }
+
+            // Dispatch to entity B
+            if (s_EntityScripts.TryGetValue(entityB, out var scriptsB))
+            {
+                foreach(var script in scriptsB)
+                {
+                    try { script.OnCollisionEnter(entityA); } catch {}
+                }
+            }
+        }
+    }
+}
diff --git a/engine/scripting/managed/src/UI.cs b/engine/scripting/managed/src/UI.cs
new file mode 100644
index 000000000..8f4add3dd
--- /dev/null
+++ b/engine/scripting/managed/src/UI.cs
@@ -0,0 +1,106 @@
+using Coral.Managed.Interop;
+
+namespace Chained
+{
+    /// <summary>Immediate UI helpers for Script.OnGUI().</summary>
+    public static class UI
+    {
+#pragma warning disable 0649
+        internal static unsafe delegate* unmanaged<char*, void> UI_Text_Ptr;
+        internal static unsafe delegate* unmanaged<char*, float, float, float, float, void> UI_TextColored_Ptr;
+        internal static unsafe delegate* unmanaged<char*, byte> UI_Button_Ptr;
+        internal static unsafe delegate* unmanaged<char*, float, float, float, float, float, void> UI_BeginWindow_Ptr;
+        internal static unsafe delegate* unmanaged<void> UI_EndWindow_Ptr;
+        internal static unsafe delegate* unmanaged<char*, char*, int, byte> UI_InputText_Ptr;
+        internal static unsafe delegate* unmanaged<void> UI_SetKeyboardFocusHere_Ptr;
+        internal static unsafe delegate* unmanaged<float, void> UI_SetScrollHereY_Ptr;
+        internal static unsafe delegate* unmanaged<float*, float*, void> UI_GetDisplaySize_Ptr;
+#pragma warning restore 0649
+
+        /// <summary>Draws UI text.</summary>
+        public static unsafe void Text(string text)
+        {
+            if (text == null || UI_Text_Ptr == null) return;
+            fixed (char* ptr = text) UI_Text_Ptr(ptr);
+        }
+
+        /// <summary>Draws colored UI text.</summary>
+        public static unsafe void TextColored(string text, float r, float g, float b, float a = 1.0f)
+        {
+            if (text == null || UI_TextColored_Ptr == null) return;
+            fixed (char* ptr = text) UI_TextColored_Ptr(ptr, r, g, b, a);
+        }
+
+        /// <summary>Renders a button. Returns true when clicked.</summary>
+        public static unsafe bool Button(string label)
+        {
+            if (label == null || UI_Button_Ptr == null) return false;
+            fixed (char* ptr = label) return UI_Button_Ptr(ptr) != 0;
+        }
+
+        /// <summary>Begins a frameless window at the specified screen rectangle.</summary>
+        public static unsafe void BeginWindow(string title, float x = -1.0f, float y = -1.0f, float width = -1.0f, float height = -1.0f, float bgAlpha = 0.6f)
+        {
+            if (title == null || UI_BeginWindow_Ptr == null) return;
+            fixed (char* ptr = title) UI_BeginWindow_Ptr(ptr, x, y, width, height, bgAlpha);
+        }
+
+        /// <summary>Ends the current UI window.</summary>
+        public static unsafe void EndWindow()
+        {
+            if (UI_EndWindow_Ptr == null) return;
+            UI_EndWindow_Ptr();
+        }
+
+        /// <summary>
+        /// Renders a text input box. Returns true if the user pressed Enter.
+        /// </summary>
+        public static unsafe bool InputText(string label, ref string text, int maxCapacity = 256)
+        {
+            if (UI_InputText_Ptr == null) return false;
+            char[] buffer = new char[maxCapacity];
+            if (!string.IsNullOrEmpty(text))
+            {
+                int len = System.Math.Min(text.Length, maxCapacity - 1);
+                text.CopyTo(0, buffer, 0, len);
+            }
+
+            byte enterPressed = 0;
+            fixed (char* lPtr = label)
+            fixed (char* bPtr = buffer)
+            {
+                enterPressed = UI_InputText_Ptr(lPtr, bPtr, maxCapacity);
+            }
+
+            int end = 0;
+            while (end < buffer.Length && buffer[end] != '\0') end++;
+            text = new string(buffer, 0, end);
+            return enterPressed != 0;
+        }
+
+        /// <summary>Sets keyboard focus on the next widget.</summary>
+        public static unsafe void SetKeyboardFocusHere()
+        {
+            if (UI_SetKeyboardFocusHere_Ptr == null) return;
+            UI_SetKeyboardFocusHere_Ptr();
+        }
+
+        /// <summary>Scrolls vertically to the bottom/ratio.</summary>
+        public static unsafe void SetScrollHereY(float centerYRatio = 1.0f)
+        {
+            if (UI_SetScrollHereY_Ptr == null) return;
+            UI_SetScrollHereY_Ptr(centerYRatio);
+        }
+
+        /// <summary>Returns the game viewport display size in pixels.</summary>
+        public static unsafe System.Numerics.Vector2 GetDisplaySize()
+        {
+            float w = 1280.0f, h = 720.0f;
+            if (UI_GetDisplaySize_Ptr != null)
+            {
+                UI_GetDisplaySize_Ptr(&w, &h);
+            }
+            return new System.Numerics.Vector2(w, h);
+        }
+    }
+}
\ No newline at end of file
diff --git a/engine/scripting/scene_scripting_manager.cpp b/engine/scripting/scene_scripting_manager.cpp
new file mode 100644
index 000000000..be7ca7861
--- /dev/null
+++ b/engine/scripting/scene_scripting_manager.cpp
@@ -0,0 +1,337 @@
+
+#include "scene_scripting_manager.h"
+#include "engine/core/profiler.h"
+#include "engine/core/service_locator.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/scene.h"
+#include "engine/scripting/scriptengine.h"
+#include "engine/scripting/scriptengine_services.h"
+#include "engine/scripting/script_glue_internal.h"
+#include "engine/scripting/script_interop_pointers.h"
+#include <Coral/String.hpp>
+#include <Coral/Type.hpp>
+
+namespace Chained
+{
+	static std::vector<SceneScriptingManager*> s_Managers;
+	static std::mutex s_ManagersMutex;
+
+	void SceneScriptingManager::Register(SceneScriptingManager* manager)
+	{
+		std::lock_guard<std::mutex> lock(s_ManagersMutex);
+		s_Managers.push_back(manager);
+	}
+
+	void SceneScriptingManager::Unregister(SceneScriptingManager* manager)
+	{
+		std::lock_guard<std::mutex> lock(s_ManagersMutex);
+		auto it = std::find(s_Managers.begin(), s_Managers.end(), manager);
+		if (it != s_Managers.end())
+		{
+			s_Managers.erase(it);
+		}
+	}
+
+	void SceneScriptingManager::ResetAll()
+	{
+		// Snapshot under lock, then iterate without holding it.
+		// OnRuntimeStop() may call Unregister() which also takes s_ManagersMutex —
+		// iterating while holding the lock would cause a deadlock.
+		std::vector<SceneScriptingManager*> snapshot;
+		{
+			std::lock_guard<std::mutex> lock(s_ManagersMutex);
+			snapshot = s_Managers;
+		}
+		for (auto* manager : snapshot)
+		{
+			manager->OnRuntimeStop();
+		}
+	}
+
+	SceneScriptingManager::SceneScriptingManager(Scene* scene)
+		: m_Scene(scene)
+	{
+		SceneScriptingManager::Register(this);
+	}
+
+	SceneScriptingManager::ScriptEngineContext SceneScriptingManager::AcquireScriptEngine()
+	{
+		ScriptEngineContext ctx;
+		ctx.engine = ServiceLocator::TryGet<ScriptEngine>();
+		if (!ctx.engine || !ctx.engine->GetHost().IsInitialized())
+		{
+			return {};
+		}
+		auto* coreAssembly = ctx.engine->GetHost().GetCoreAssembly();
+		if (!coreAssembly)
+		{
+			return {};
+		}
+		ctx.scriptEngineType = coreAssembly->GetLocalType("Chained.ScriptEngine");
+		return ctx;
+	}
+
+	SceneScriptingManager::~SceneScriptingManager()
+	{
+		SceneScriptingManager::Unregister(this);
+
+		if (m_Scene && ServiceLocator::IsAvailable())
+		{
+			if (m_Scene->IsSimulationRunning())
+			{
+				auto ctx = AcquireScriptEngine();
+				if (ctx.engine && ctx.scriptEngineType)
+				{
+					if (g_ScriptClearAll)
+					{
+						g_ScriptClearAll();
+					}
+				}
+			}
+		}
+	}
+
+	void SceneScriptingManager::OnRuntimeStart()
+	{
+		CH_CORE_INFO("SceneScriptingManager::OnRuntimeStart - C# ScriptEngine based (Delegated)");
+		if (!m_Scene)
+		{
+			return;
+		}
+
+		auto& registry = m_Scene->GetRegistry();
+		auto view = registry.view<ManagedScriptComponent>();
+		for (auto entity : view)
+		{
+			auto& msc = registry.get<Chained::ManagedScriptComponent>(entity);
+			for (auto& script : msc.Scripts)
+			{
+				script.IsInstantiated = false;
+				script.NeedsStart = true;
+			}
+		}
+
+		entt::registry* registryPtr = m_Scene->GetRegistryPtr();
+
+		// Hook entity destruction so C# scripts are torn down (DestroyScript),
+		// preventing leaked script instances / stale entity handles.
+		auto& reg = m_Scene->GetRegistry();
+		reg.on_destroy<ManagedScriptComponent>().disconnect<&SceneScriptingManager::OnManagedScriptDestroyed>(this);
+		reg.on_destroy<ManagedScriptComponent>().connect<&SceneScriptingManager::OnManagedScriptDestroyed>(this);
+	}
+
+	void SceneScriptingManager::OnRuntimeStop()
+	{
+		if (m_Scene)
+		{
+			m_Scene->GetRegistry()
+				.on_destroy<ManagedScriptComponent>()
+				.disconnect<&SceneScriptingManager::OnManagedScriptDestroyed>(this);
+		}
+
+		auto ctx = AcquireScriptEngine();
+		if (ctx.engine && ctx.scriptEngineType && !m_ReloadInProgress)
+		{
+			if (g_ScriptClearAll)
+			{
+				g_ScriptClearAll();
+			}
+		}
+
+		auto& registry = m_Scene->GetRegistry();
+		auto view = registry.view<ManagedScriptComponent>();
+		for (auto entity : view)
+		{
+			auto& msc = registry.get<Chained::ManagedScriptComponent>(entity);
+			for (auto& script : msc.Scripts)
+			{
+				script.IsInstantiated = false;
+				script.NeedsStart = true;
+			}
+		}
+	}
+
+	void SceneScriptingManager::OnUpdate(Timestep deltaTime)
+	{
+		CH_PROFILE_FUNCTION();
+
+		if (!m_Scene || !m_Scene->IsSimulationRunning())
+		{
+			return;
+		}
+
+		auto ctx = AcquireScriptEngine();
+		if (!ctx.engine || !ctx.scriptEngineType)
+		{
+			return;
+		}
+
+		ctx.engine->SetContextScene(m_Scene);
+
+		auto& registry = m_Scene->GetRegistry();
+		auto view = registry.view<ManagedScriptComponent>();
+		for (auto entity : view)
+		{
+			auto& msc = registry.get<Chained::ManagedScriptComponent>(entity);
+			for (auto& script : msc.Scripts)
+			{
+				if (!script.HasInstance() && !script.ClassName.empty() && !script.InstantiateTried)
+				{
+					try
+					{
+						CH_CORE_INFO("C++ calling InstantiateScript for {}", script.ClassName);
+						std::u16string classNameStr = ch_utf8_to_u16(script.ClassName);
+						if (g_ScriptInstantiate)
+						{
+							uint8_t ok = g_ScriptInstantiate(static_cast<uint64_t>(entity), classNameStr.c_str());
+							script.IsInstantiated = ok != 0;
+							script.InstantiateTried = true;
+						}
+						else
+						{
+							script.InstantiateTried = true;
+						}
+						CH_CORE_INFO("C++ calling InstantiateScript SUCCESS");
+
+						for (const auto& [fieldName, field] : script.Fields)
+						{
+							CH_CORE_INFO("C++ setting field {}", fieldName);
+							Coral::String fNameStr = Coral::String::New(fieldName);
+							Coral::String cNameStr = Coral::String::New(script.ClassName);
+							if (field.Type == ScriptFieldType::Float)
+							{
+								if (auto* val = std::get_if<float>(&field.Value))
+								{
+									ctx.scriptEngineType.InvokeStaticMethod(
+										"SetFieldFloat", static_cast<uint64_t>(entity), cNameStr, fNameStr, *val);
+								}
+							}
+							else if (field.Type == ScriptFieldType::Int)
+							{
+								if (auto* val = std::get_if<int>(&field.Value))
+								{
+									ctx.scriptEngineType.InvokeStaticMethod(
+										"SetFieldInt", static_cast<uint64_t>(entity), cNameStr, fNameStr, *val);
+								}
+							}
+							else if (field.Type == ScriptFieldType::Bool)
+							{
+								if (auto* val = std::get_if<bool>(&field.Value))
+								{
+									ctx.scriptEngineType.InvokeStaticMethod(
+										"SetFieldBool", static_cast<uint64_t>(entity), cNameStr, fNameStr, *val);
+								}
+							}
+							else if (field.Type == ScriptFieldType::String)
+							{
+								if (auto* val = std::get_if<std::string>(&field.Value))
+								{
+									Coral::String vStr = Coral::String::New(*val);
+									ctx.scriptEngineType.InvokeStaticMethod(
+										"SetFieldString", static_cast<uint64_t>(entity), cNameStr, fNameStr, vStr);
+									Coral::String::Free(vStr);
+								}
+							}
+							Coral::String::Free(cNameStr);
+							Coral::String::Free(fNameStr);
+						}
+
+						// Mark instantiated on C++ side
+						script.IsInstantiated = true;
+						script.NeedsStart = false; // Start is called natively on the C# side
+					} catch (const std::exception& e)
+					{
+						CH_CORE_ERROR("ScriptEngine: Exception instantiating '{}': {}", script.ClassName, e.what());
+					}
+				}
+			}
+		}
+
+		try
+		{
+			if (g_ScriptOnUpdate)
+			{
+				g_ScriptOnUpdate((float)deltaTime);
+			}
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("ScriptEngine: Exception in OnUpdate Loop: {}", e.what());
+		}
+	}
+
+	void SceneScriptingManager::OnEvent(Event& e)
+	{
+		if (m_ReloadInProgress || !m_Scene || e.GetEventType() == EventType::None)
+		{
+			return;
+		}
+
+		auto ctx = AcquireScriptEngine();
+		if (!ctx.engine)
+		{
+			return;
+		}
+
+		ctx.engine->SetContextScene(m_Scene);
+
+		if (ctx.scriptEngineType)
+		{
+			if (g_ScriptOnEvent)
+			{
+				g_ScriptOnEvent((int)e.GetEventType());
+			}
+		}
+
+		ctx.engine->SetContextScene(nullptr);
+	}
+
+	void SceneScriptingManager::OnRenderUI()
+	{
+		if (m_ReloadInProgress)
+		{
+			return;
+		}
+
+		auto ctx = AcquireScriptEngine();
+		if (!ctx.engine)
+		{
+			return;
+		}
+
+		ctx.engine->SetContextScene(m_Scene);
+
+		if (ctx.scriptEngineType)
+		{
+			if (g_ScriptOnRenderUI)
+			{
+				g_ScriptOnRenderUI();
+			}
+		}
+
+		ctx.engine->SetContextScene(nullptr);
+	}
+
+	void SceneScriptingManager::OnManagedScriptDestroyed(entt::registry& registry, entt::entity entity)
+	{
+		if (!g_ScriptDestroy)
+		{
+			return;
+		}
+
+		// Entity is still valid inside the on_destroy callback; read its scripts.
+		if (!registry.all_of<ManagedScriptComponent>(entity))
+		{
+			return;
+		}
+		auto& msc = registry.get<ManagedScriptComponent>(entity);
+		for (auto& script : msc.Scripts)
+		{
+			if (script.HasInstance() && !script.ClassName.empty())
+			{
+				std::u16string classNameStr = ch_utf8_to_u16(script.ClassName);
+				g_ScriptDestroy(static_cast<uint64_t>(entity), classNameStr.c_str());
+			}
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/scene_scripting_manager.h b/engine/scripting/scene_scripting_manager.h
new file mode 100644
index 000000000..1ac135707
--- /dev/null
+++ b/engine/scripting/scene_scripting_manager.h
@@ -0,0 +1,57 @@
+#ifndef CH_SCENE_SCRIPTING_MANAGER_H
+#define CH_SCENE_SCRIPTING_MANAGER_H
+
+#include "engine/core/events/events.h"
+#include "engine/common/timestep.h"
+#include <Coral/Type.hpp>
+#include <atomic>
+
+namespace Chained
+{
+	class Scene;
+	class ScriptEngine;
+
+	class SceneScriptingManager
+	{
+	public:
+		SceneScriptingManager(Scene* scene);
+		~SceneScriptingManager();
+
+		void OnRuntimeStart();
+		void OnRuntimeStop();
+		void OnUpdate(Timestep deltaTime);
+		void OnEvent(Event& e);
+		void OnRenderUI();
+
+		bool IsReloadInProgress() const
+		{
+			return m_ReloadInProgress;
+		}
+		void SetReloadInProgress(bool inProgress)
+		{
+			m_ReloadInProgress = inProgress;
+		}
+
+		static void Register(SceneScriptingManager* manager);
+		static void Unregister(SceneScriptingManager* manager);
+		static void ResetAll();
+
+	private:
+		struct ScriptEngineContext
+		{
+			ScriptEngine* engine = nullptr;
+			Coral::Type scriptEngineType = {};
+		};
+		ScriptEngineContext AcquireScriptEngine();
+
+		// entt on_destroy<ManagedScriptComponent> handler — notifies C# to destroy scripts.
+		void OnManagedScriptDestroyed(entt::registry& registry, entt::entity entity);
+
+	private:
+		Scene* m_Scene = nullptr;
+		std::atomic<bool> m_ReloadInProgress{false};
+	};
+
+} // namespace Chained
+
+#endif // CH_SCENE_SCRIPTING_MANAGER_H
diff --git a/engine/scripting/script_glue.cpp b/engine/scripting/script_glue.cpp
new file mode 100644
index 000000000..5e3fba2f3
--- /dev/null
+++ b/engine/scripting/script_glue.cpp
@@ -0,0 +1,389 @@
+// script_glue.cpp
+// Registers every C++ function as a Coral internal call.
+// Coral automatically fills the matching delegate* fields on the C# side.
+// Adding a new function: 1) declare in script_glue_*.h, 2) implement in script_glue_*.cpp, 3) add one AddInternalCall
+// line here.
+//
+// ABI conventions (kept in sync with scripting/managed/src):
+//  - Strings are UTF-16 (Coral::UCChar == wchar_t on Windows). C# exposes them as `char*`
+//    (also 2 bytes), so no marshaling mismatch.
+//  - Booleans crossing the boundary use uint8_t (C++) / byte (C#), never `bool`, to avoid
+//    any reliance on marshaling semantics. Never return structs by value — use out-pointers.
+#include "script_glue.h"
+#include "script_interop_pointers.h"
+
+#include "script_glue_internal.h"
+#include "script_glue_system.h"
+#include "script_glue_scene.h"
+#include "script_glue_entity.h"
+#include "script_glue_camera.h"
+#include "script_glue_ui.h"
+#include "script_glue_audio.h"
+#include "script_glue_input.h"
+#include "script_glue_network.h"
+#include "generated/script_glue_generated.h"
+#include <Coral/Assembly.hpp>
+
+namespace Chained
+{
+
+	// ── C++ → C# callback pointers (filled by ScriptGlue_Register*Callback) ──
+	void (*g_ScriptOnUpdate)(float) = nullptr;
+	void (*g_ScriptOnEvent)(int) = nullptr;
+	void (*g_ScriptOnRenderUI)() = nullptr;
+	void (*g_ScriptOnCollisionEnter)(uint64_t, uint64_t) = nullptr;
+	void (*g_ScriptClearAll)() = nullptr;
+	uint8_t (*g_ScriptInstantiate)(uint64_t, const char16_t*) = nullptr;
+	void (*g_ScriptDestroy)(uint64_t, const char16_t*) = nullptr;
+
+	// C# registers each lifecycle callback directly — no struct, no round-trip.
+	static void ScriptGlue_RegisterUpdateCallback(void (*cb)(float))
+	{
+		g_ScriptOnUpdate = cb;
+	}
+	static void ScriptGlue_RegisterEventCallback(void (*cb)(int))
+	{
+		g_ScriptOnEvent = cb;
+	}
+	static void ScriptGlue_RegisterRenderUICallback(void (*cb)())
+	{
+		g_ScriptOnRenderUI = cb;
+	}
+	static void ScriptGlue_RegisterCollisionCallback(void (*cb)(uint64_t, uint64_t))
+	{
+		g_ScriptOnCollisionEnter = cb;
+	}
+	static void ScriptGlue_RegisterClearAllCallback(void (*cb)())
+	{
+		g_ScriptClearAll = cb;
+	}
+	static void ScriptGlue_RegisterInstantiateCallback(uint8_t (*cb)(uint64_t, const char16_t*))
+	{
+		g_ScriptInstantiate = cb;
+	}
+	static void ScriptGlue_RegisterDestroyCallback(void (*cb)(uint64_t, const char16_t*))
+	{
+		g_ScriptDestroy = cb;
+	}
+
+	void ScriptGlue::RegisterInternalCalls(Coral::ManagedAssembly& assembly)
+	{
+		// ── C# → C++ lifecycle callbacks (registered directly, one per callback) ──
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterUpdateCallback_Ptr",
+								 (void*)&ScriptGlue_RegisterUpdateCallback);
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterEventCallback_Ptr",
+								 (void*)&ScriptGlue_RegisterEventCallback);
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterRenderUICallback_Ptr",
+								 (void*)&ScriptGlue_RegisterRenderUICallback);
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterCollisionCallback_Ptr",
+								 (void*)&ScriptGlue_RegisterCollisionCallback);
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterClearAllCallback_Ptr",
+								 (void*)&ScriptGlue_RegisterClearAllCallback);
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterInstantiateCallback_Ptr",
+								 (void*)&ScriptGlue_RegisterInstantiateCallback);
+		assembly.AddInternalCall("Chained.Interop", "ScriptGlue_RegisterDestroyCallback_Ptr",
+								 (void*)&ScriptGlue_RegisterDestroyCallback);
+
+		// ── Entity ────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Entity", "Entity_HasComponent_Ptr", (void*)&Entity_HasComponent);
+		assembly.AddInternalCall("Chained.Entity", "Entity_FindAllWithComponent_Ptr",
+								 (void*)&Entity_FindAllWithComponent);
+		assembly.AddInternalCall("Chained.Entity", "Entity_AddComponent_Ptr", (void*)&Entity_AddComponent);
+
+		// ── Transform ─────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.TransformComponent", "Transform_GetTranslation_Ptr",
+								 (void*)&Transform_GetTranslation);
+		assembly.AddInternalCall("Chained.TransformComponent", "Transform_SetTranslation_Ptr",
+								 (void*)&Transform_SetTranslation);
+		assembly.AddInternalCall("Chained.TransformComponent", "Transform_GetRotation_Ptr",
+								 (void*)&Transform_GetRotation);
+		assembly.AddInternalCall("Chained.TransformComponent", "Transform_SetRotation_Ptr",
+								 (void*)&Transform_SetRotation);
+		assembly.AddInternalCall("Chained.TransformComponent", "Transform_GetScale_Ptr", (void*)&Transform_GetScale);
+		assembly.AddInternalCall("Chained.TransformComponent", "Transform_SetScale_Ptr", (void*)&Transform_SetScale);
+
+		// ── Model ─────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.ModelComponent", "Model_GetModelPath_Ptr", (void*)&Model_GetModelPath);
+		assembly.AddInternalCall("Chained.ModelComponent", "Model_SetModelPath_Ptr", (void*)&Model_SetModelPath);
+
+		// ── RigidBody ─────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.RigidBodyComponent", "RigidBody_GetVelocity_Ptr",
+								 (void*)&RigidBody_GetVelocity);
+		assembly.AddInternalCall("Chained.RigidBodyComponent", "RigidBody_SetVelocity_Ptr",
+								 (void*)&RigidBody_SetVelocity);
+		assembly.AddInternalCall("Chained.RigidBodyComponent", "RigidBody_ForceSetVelocity_Ptr",
+								 (void*)&RigidBody_ForceSetVelocity);
+		assembly.AddInternalCall("Chained.RigidBodyComponent", "RigidBody_IsGrounded_Ptr",
+								 (void*)&RigidBody_IsGrounded);
+		assembly.AddInternalCall("Chained.RigidBodyComponent", "RigidBody_IsKinematic_Ptr",
+								 (void*)&RigidBody_IsKinematic);
+		assembly.AddInternalCall("Chained.RigidBodyComponent", "RigidBody_SetKinematic_Ptr",
+								 (void*)&RigidBody_SetKinematic);
+
+		// ── Tag ───────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.TagComponent", "TagComponent_GetTag_Ptr", (void*)&TagComponent_GetTag);
+
+		// ── Camera ────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_GetForward_Ptr", (void*)&Camera_GetForward);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_GetRight_Ptr", (void*)&Camera_GetRight);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_GetOrbit_Ptr", (void*)&Camera_GetOrbit);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_SetOrbit_Ptr", (void*)&Camera_SetOrbit);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_GetPrimary_Ptr", (void*)&Camera_GetPrimary);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_SetPrimary_Ptr", (void*)&Camera_SetPrimary);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_GetIsOrbit_Ptr", (void*)&Camera_GetIsOrbit);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_SetIsOrbit_Ptr", (void*)&Camera_SetIsOrbit);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_GetTargetTag_Ptr", (void*)&Camera_GetTargetTag);
+		assembly.AddInternalCall("Chained.CameraComponent", "Camera_SetTargetTag_Ptr", (void*)&Camera_SetTargetTag);
+
+		// ── AudioComponent ────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.AudioComponent", "AudioComponent_SetVolume_Ptr",
+								 (void*)&AudioComponent_SetVolume);
+		assembly.AddInternalCall("Chained.AudioComponent", "AudioComponent_SetLoop_Ptr",
+								 (void*)&AudioComponent_SetLoop);
+		assembly.AddInternalCall("Chained.AudioComponent", "AudioComponent_IsPlaying_Ptr",
+								 (void*)&AudioComponent_IsPlaying);
+		assembly.AddInternalCall("Chained.AudioComponent", "AudioComponent_GetSoundPath_Ptr",
+								 (void*)&AudioComponent_GetSoundPath);
+		assembly.AddInternalCall("Chained.AudioComponent", "AudioComponent_Play_Ptr", (void*)&AudioComponent_Play);
+		assembly.AddInternalCall("Chained.AudioComponent", "AudioComponent_Stop_Ptr", (void*)&AudioComponent_Stop);
+
+		// ── SpriteComponent ───────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_GetTexturePath_Ptr",
+								 (void*)&SpriteComponent_GetTexturePath);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_SetTexturePath_Ptr",
+								 (void*)&SpriteComponent_SetTexturePath);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_GetTint_Ptr",
+								 (void*)&SpriteComponent_GetTint);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_SetTint_Ptr",
+								 (void*)&SpriteComponent_SetTint);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_GetFlipX_Ptr",
+								 (void*)&SpriteComponent_GetFlipX);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_SetFlipX_Ptr",
+								 (void*)&SpriteComponent_SetFlipX);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_GetFlipY_Ptr",
+								 (void*)&SpriteComponent_GetFlipY);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_SetFlipY_Ptr",
+								 (void*)&SpriteComponent_SetFlipY);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_GetZOrder_Ptr",
+								 (void*)&SpriteComponent_GetZOrder);
+		assembly.AddInternalCall("Chained.SpriteComponent", "SpriteComponent_SetZOrder_Ptr",
+								 (void*)&SpriteComponent_SetZOrder);
+
+		// ── UI Controls ───────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.ButtonControl", "ButtonControl_IsClicked_Ptr",
+								 (void*)&ButtonControl_IsClicked);
+		assembly.AddInternalCall("Chained.ButtonControl", "ButtonControl_IsDown_Ptr", (void*)&ButtonControl_IsDown);
+		assembly.AddInternalCall("Chained.ButtonControl", "ButtonControl_GetLabel_Ptr", (void*)&ButtonControl_GetLabel);
+		assembly.AddInternalCall("Chained.ButtonControl", "ButtonControl_SetLabel_Ptr", (void*)&ButtonControl_SetLabel);
+
+		assembly.AddInternalCall("Chained.CheckboxControl", "CheckboxControl_GetChecked_Ptr",
+								 (void*)&CheckboxControl_GetChecked);
+		assembly.AddInternalCall("Chained.CheckboxControl", "CheckboxControl_SetChecked_Ptr",
+								 (void*)&CheckboxControl_SetChecked);
+
+		assembly.AddInternalCall("Chained.LabelControl", "LabelControl_GetText_Ptr", (void*)&LabelControl_GetText);
+		assembly.AddInternalCall("Chained.LabelControl", "LabelControl_SetText_Ptr", (void*)&LabelControl_SetText);
+
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_GetLabel_Ptr", (void*)&SliderControl_GetLabel);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_SetLabel_Ptr", (void*)&SliderControl_SetLabel);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_GetValue_Ptr", (void*)&SliderControl_GetValue);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_SetValue_Ptr", (void*)&SliderControl_SetValue);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_GetMin_Ptr", (void*)&SliderControl_GetMin);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_SetMin_Ptr", (void*)&SliderControl_SetMin);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_GetMax_Ptr", (void*)&SliderControl_GetMax);
+		assembly.AddInternalCall("Chained.SliderControl", "SliderControl_SetMax_Ptr", (void*)&SliderControl_SetMax);
+
+		assembly.AddInternalCall("Chained.ProgressBarControl", "ProgressBarControl_GetProgress_Ptr",
+								 (void*)&ProgressBarControl_GetProgress);
+		assembly.AddInternalCall("Chained.ProgressBarControl", "ProgressBarControl_SetProgress_Ptr",
+								 (void*)&ProgressBarControl_SetProgress);
+		assembly.AddInternalCall("Chained.ProgressBarControl", "ProgressBarControl_GetOverlayText_Ptr",
+								 (void*)&ProgressBarControl_GetOverlayText);
+		assembly.AddInternalCall("Chained.ProgressBarControl", "ProgressBarControl_SetOverlayText_Ptr",
+								 (void*)&ProgressBarControl_SetOverlayText);
+		assembly.AddInternalCall("Chained.ProgressBarControl", "ProgressBarControl_GetShowPercentage_Ptr",
+								 (void*)&ProgressBarControl_GetShowPercentage);
+		assembly.AddInternalCall("Chained.ProgressBarControl", "ProgressBarControl_SetShowPercentage_Ptr",
+								 (void*)&ProgressBarControl_SetShowPercentage);
+
+		assembly.AddInternalCall("Chained.WidgetControl", "WidgetControl_GetActive_Ptr",
+								 (void*)&WidgetControl_GetActive);
+		assembly.AddInternalCall("Chained.WidgetControl", "WidgetControl_SetActive_Ptr",
+								 (void*)&WidgetControl_SetActive);
+		assembly.AddInternalCall("Chained.WidgetControl", "WidgetControl_GetTextColor_Ptr",
+								 (void*)&WidgetControl_GetTextColor);
+		assembly.AddInternalCall("Chained.WidgetControl", "WidgetControl_SetTextColorRGBA_Ptr",
+								 (void*)&WidgetControl_SetTextColorRGBA);
+
+		assembly.AddInternalCall("Chained.ComboBoxControl", "ComboBoxControl_GetSelectedIndex_Ptr",
+								 (void*)&ComboBoxControl_GetSelectedIndex);
+		assembly.AddInternalCall("Chained.ComboBoxControl", "ComboBoxControl_SetSelectedIndex_Ptr",
+								 (void*)&ComboBoxControl_SetSelectedIndex);
+		assembly.AddInternalCall("Chained.ComboBoxControl", "ComboBoxControl_AddItem_Ptr",
+								 (void*)&ComboBoxControl_AddItem);
+		assembly.AddInternalCall("Chained.ComboBoxControl", "ComboBoxControl_ClearItems_Ptr",
+								 (void*)&ComboBoxControl_ClearItems);
+		assembly.AddInternalCall("Chained.ComboBoxControl", "ComboBoxControl_GetItemCount_Ptr",
+								 (void*)&ComboBoxControl_GetItemCount);
+		assembly.AddInternalCall("Chained.ComboBoxControl", "ComboBoxControl_GetItem_Ptr",
+								 (void*)&ComboBoxControl_GetItem);
+
+		// ── InputTextControl ──────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.InputTextControl", "InputTextControl_GetText_Ptr",
+								 (void*)&InputTextControl_GetText);
+		assembly.AddInternalCall("Chained.InputTextControl", "InputTextControl_SetText_Ptr",
+								 (void*)&InputTextControl_SetText);
+		assembly.AddInternalCall("Chained.InputTextControl", "InputTextControl_HasChanged_Ptr",
+								 (void*)&InputTextControl_HasChanged);
+		assembly.AddInternalCall("Chained.InputTextControl", "InputTextControl_ClearChanged_Ptr",
+								 (void*)&InputTextControl_ClearChanged);
+
+		// ── AnimationComponent ──────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetCurrentAnimationIndex_Ptr",
+								 (void*)&AnimationComponent_GetCurrentAnimationIndex);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_SetCurrentAnimationIndex_Ptr",
+								 (void*)&AnimationComponent_SetCurrentAnimationIndex);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetIsPlaying_Ptr",
+								 (void*)&AnimationComponent_GetIsPlaying);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_SetIsPlaying_Ptr",
+								 (void*)&AnimationComponent_SetIsPlaying);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetIsLooping_Ptr",
+								 (void*)&AnimationComponent_GetIsLooping);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_SetIsLooping_Ptr",
+								 (void*)&AnimationComponent_SetIsLooping);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetIsFinished_Ptr",
+								 (void*)&AnimationComponent_GetIsFinished);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetDuration_Ptr",
+								 (void*)&AnimationComponent_GetDuration);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetNormalizedTime_Ptr",
+								 (void*)&AnimationComponent_GetNormalizedTime);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetBlendDuration_Ptr",
+								 (void*)&AnimationComponent_GetBlendDuration);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_SetBlendDuration_Ptr",
+								 (void*)&AnimationComponent_SetBlendDuration);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_CrossFade_Ptr",
+								 (void*)&AnimationComponent_CrossFade);
+
+		// ── AnimationComponent graph variables ──────────────────────────────
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_SetFloat_Ptr",
+								 (void*)&AnimationComponent_SetFloat);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_SetBool_Ptr",
+								 (void*)&AnimationComponent_SetBool);
+		assembly.AddInternalCall("Chained.AnimationComponent", "AnimationComponent_GetFloat_Ptr",
+								 (void*)&AnimationComponent_GetFloat);
+
+		// ── Shader ────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.ShaderComponent", "Shader_SetFloat_Ptr", (void*)&Shader_SetFloat);
+		assembly.AddInternalCall("Chained.ShaderComponent", "Shader_SetVec3_Ptr", (void*)&Shader_SetVec3);
+		assembly.AddInternalCall("Chained.ShaderComponent", "Shader_GetEnabled_Ptr", (void*)&Shader_GetEnabled);
+		assembly.AddInternalCall("Chained.ShaderComponent", "Shader_SetEnabled_Ptr", (void*)&Shader_SetEnabled);
+
+		// ── UI static ─────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.UI", "UI_Text_Ptr", (void*)&UI_Text);
+		assembly.AddInternalCall("Chained.UI", "UI_TextColored_Ptr", (void*)&UI_TextColored);
+		assembly.AddInternalCall("Chained.UI", "UI_Button_Ptr", (void*)&UI_Button);
+		assembly.AddInternalCall("Chained.UI", "UI_BeginWindow_Ptr", (void*)&UI_BeginWindow);
+		assembly.AddInternalCall("Chained.UI", "UI_EndWindow_Ptr", (void*)&UI_EndWindow);
+		assembly.AddInternalCall("Chained.UI", "UI_InputText_Ptr", (void*)&UI_InputText);
+		assembly.AddInternalCall("Chained.UI", "UI_SetKeyboardFocusHere_Ptr", (void*)&UI_SetKeyboardFocusHere);
+		assembly.AddInternalCall("Chained.UI", "UI_SetScrollHereY_Ptr", (void*)&UI_SetScrollHereY);
+		assembly.AddInternalCall("Chained.UI", "UI_GetDisplaySize_Ptr", (void*)&UI_GetDisplaySize);
+
+		// ── Input ─────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Input", "Input_IsKeyDown_Ptr", (void*)&Input_IsKeyDown);
+		assembly.AddInternalCall("Chained.Input", "Input_IsKeyPressed_Ptr", (void*)&Input_IsKeyPressed);
+		assembly.AddInternalCall("Chained.Input", "Input_IsKeyReleased_Ptr", (void*)&Input_IsKeyReleased);
+		assembly.AddInternalCall("Chained.Input", "Input_IsMouseButtonDown_Ptr", (void*)&Input_IsMouseButtonDown);
+		assembly.AddInternalCall("Chained.Input", "Input_IsMouseButtonPressed_Ptr", (void*)&Input_IsMouseButtonPressed);
+		assembly.AddInternalCall("Chained.Input", "Input_GetMouseWheelMove_Ptr", (void*)&Input_GetMouseWheelMove);
+		assembly.AddInternalCall("Chained.Input", "Input_GetMouseDelta_Ptr", (void*)&Input_GetMouseDelta);
+
+		// ── Log ───────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Log", "Log_Info_Ptr", (void*)&Log_Info);
+		assembly.AddInternalCall("Chained.Log", "Log_Warn_Ptr", (void*)&Log_Warn);
+		assembly.AddInternalCall("Chained.Log", "Log_Error_Ptr", (void*)&Log_Error);
+
+		// ── Scene ─────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Scene", "Scene_FindEntityByTag_Ptr", (void*)&Scene_FindEntityByTag);
+		assembly.AddInternalCall("Chained.Scene", "Scene_LoadScene_Ptr", (void*)&Scene_LoadScene);
+		assembly.AddInternalCall("Chained.Scene", "Scene_GetPrimaryCameraEntity_Ptr",
+								 (void*)&Scene_GetPrimaryCameraEntity);
+		assembly.AddInternalCall("Chained.Scene", "Scene_CopyEntity_Ptr", (void*)&Scene_CopyEntity);
+
+		// ── Audio static ──────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Audio", "Audio_Play_Ptr", (void*)&Audio_Play);
+		assembly.AddInternalCall("Chained.Audio", "Audio_Stop_Ptr", (void*)&Audio_Stop);
+		assembly.AddInternalCall("Chained.Audio", "Audio_StopAll_Ptr", (void*)&Audio_StopAll);
+
+		// ── Application ───────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Application", "Application_Close_Ptr", (void*)&Application_Close);
+		assembly.AddInternalCall("Chained.Application", "Application_GetFPS_Ptr", (void*)&Application_GetFPS);
+		assembly.AddInternalCall("Chained.Application", "Application_GetFrameTime_Ptr",
+								 (void*)&Application_GetFrameTime);
+
+		// ── Window ────────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.AppWindow", "Window_SetSize_Ptr", (void*)&Window_SetSize);
+		assembly.AddInternalCall("Chained.AppWindow", "Window_SetFullscreen_Ptr", (void*)&Window_SetFullscreen);
+		assembly.AddInternalCall("Chained.AppWindow", "Window_SetVSync_Ptr", (void*)&Window_SetVSync);
+		assembly.AddInternalCall("Chained.AppWindow", "Window_SetAntialiasing_Ptr", (void*)&Window_SetAntialiasing);
+		assembly.AddInternalCall("Chained.AppWindow", "Window_SetAntiAliasingSamples_Ptr",
+								 (void*)&Window_SetAntiAliasingSamples);
+		assembly.AddInternalCall("Chained.AppWindow", "Window_GetSupportedResolution_Ptr",
+								 (void*)&Window_GetSupportedResolution);
+
+		// ── Physics ─────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Physics", "Physics_GetGravity_Ptr", (void*)&Physics_GetGravity);
+
+		// ── Network ─────────────────────────────────────────────────────
+		assembly.AddInternalCall("Chained.Network", "Network_HostGame_Ptr", (void*)&Network_HostGame);
+		assembly.AddInternalCall("Chained.Network", "Network_ConnectTo_Ptr", (void*)&Network_ConnectTo);
+		assembly.AddInternalCall("Chained.Network", "Network_Disconnect_Ptr", (void*)&Network_Disconnect);
+		assembly.AddInternalCall("Chained.Network", "Network_IsHost_Ptr", (void*)&Network_IsHost);
+		assembly.AddInternalCall("Chained.Network", "Network_IsClient_Ptr", (void*)&Network_IsClient);
+		assembly.AddInternalCall("Chained.Network", "Network_IsConnected_Ptr", (void*)&Network_IsConnected);
+		assembly.AddInternalCall("Chained.Network", "Network_GetClientCount_Ptr", (void*)&Network_GetClientCount);
+		assembly.AddInternalCall("Chained.Network", "Network_GetMaxClients_Ptr", (void*)&Network_GetMaxClients);
+		assembly.AddInternalCall("Chained.Network", "Network_GetRole_Ptr", (void*)&Network_GetRole);
+		assembly.AddInternalCall("Chained.Network", "Network_GetListenAddress_Ptr", (void*)&Network_GetListenAddress);
+		assembly.AddInternalCall("Chained.Network", "Network_GetPublicAddress_Ptr", (void*)&Network_GetPublicAddress);
+		assembly.AddInternalCall("Chained.Network", "Network_BroadcastSceneChange_Ptr",
+								 (void*)&Network_BroadcastSceneChange);
+		assembly.AddInternalCall("Chained.Network", "Network_HasPendingSceneChange_Ptr",
+								 (void*)&Network_HasPendingSceneChange);
+		assembly.AddInternalCall("Chained.Network", "Network_GetPendingSceneChange_Ptr",
+								 (void*)&Network_GetPendingSceneChange);
+		assembly.AddInternalCall("Chained.Network", "Network_ClearPendingSceneChange_Ptr",
+								 (void*)&Network_ClearPendingSceneChange);
+
+		// New: Player list
+		assembly.AddInternalCall("Chained.Network", "Network_SetLocalPlayerInfo_Ptr",
+								 (void*)&Network_SetLocalPlayerInfo);
+		assembly.AddInternalCall("Chained.Network", "Network_SendPlayerInfo_Ptr", (void*)&Network_SendPlayerInfo);
+		assembly.AddInternalCall("Chained.Network", "Network_GetPlayerCount_Ptr", (void*)&Network_GetPlayerCount);
+		assembly.AddInternalCall("Chained.Network", "Network_GetPlayerListJSON_Ptr", (void*)&Network_GetPlayerListJSON);
+		assembly.AddInternalCall("Chained.Network", "Network_GetLocalNetworkID_Ptr", (void*)&Network_GetLocalNetworkID);
+
+		// New: Chat
+		assembly.AddInternalCall("Chained.Network", "Network_SendChatMessage_Ptr", (void*)&Network_SendChatMessage);
+		assembly.AddInternalCall("Chained.Network", "Network_HasPendingChat_Ptr", (void*)&Network_HasPendingChat);
+		assembly.AddInternalCall("Chained.Network", "Network_GetPendingChatJSON_Ptr",
+								 (void*)&Network_GetPendingChatJSON);
+		assembly.AddInternalCall("Chained.Network", "Network_ClearPendingChat_Ptr", (void*)&Network_ClearPendingChat);
+
+		// New: Prefab
+		assembly.AddInternalCall("Chained.Network", "Network_SetPlayerPrefab_Ptr", (void*)&Network_SetPlayerPrefab);
+
+		// UPnP + Firewall
+		assembly.AddInternalCall("Chained.Network", "Network_IsUpnpAvailable_Ptr", (void*)&Network_IsUpnpAvailable);
+		assembly.AddInternalCall("Chained.Network", "Network_IsFirewallRuleActive_Ptr",
+								 (void*)&Network_IsFirewallRuleActive);
+		assembly.AddInternalCall("Chained.Network", "Network_IsFullyConnected_Ptr", (void*)&Network_IsFullyConnected);
+
+		// ── Auto-generated: Player, Spawn, NetworkIdentity properties ──────
+#include "generated/script_glue_generated_reg.inl"
+
+		assembly.UploadInternalCalls();
+		CH_CORE_INFO("[ScriptGlue] Registered {} internal calls for '{}'.", 172, (std::string)assembly.GetName());
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue.h b/engine/scripting/script_glue.h
new file mode 100644
index 000000000..1948a0ac5
--- /dev/null
+++ b/engine/scripting/script_glue.h
@@ -0,0 +1,22 @@
+// script_glue.h
+// Registers C++ functions as Coral internal calls.
+// Each function gets its own AddInternalCall — Coral fills the C# delegate* fields.
+#ifndef CH_SCRIPT_GLUE_H
+#define CH_SCRIPT_GLUE_H
+
+namespace Coral
+{
+	class ManagedAssembly;
+}
+
+namespace Chained
+{
+	class ScriptGlue
+	{
+	public:
+		// Registers all C++ ↔ C# interop functions with Coral.
+		static void RegisterInternalCalls(Coral::ManagedAssembly& assembly);
+	};
+} // namespace Chained
+
+#endif // CH_SCRIPT_GLUE_H
diff --git a/engine/scripting/script_glue_animation.cpp b/engine/scripting/script_glue_animation.cpp
new file mode 100644
index 000000000..25f9bf77a
--- /dev/null
+++ b/engine/scripting/script_glue_animation.cpp
@@ -0,0 +1,149 @@
+#include "script_glue_entity.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// ── AnimationComponent ───────────────────────────────────────────────
+
+	int AnimationComponent_GetCurrentAnimationIndex(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>()
+				   ? entity.GetComponent<AnimationComponent>().CurrentAnimationIndex
+				   : -1;
+	}
+	void AnimationComponent_SetCurrentAnimationIndex(uint64_t entityID, int index)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			auto& anim = entity.GetComponent<AnimationComponent>();
+			if (anim.CurrentAnimationIndex != index)
+			{
+				anim.CurrentAnimationIndex = index;
+				anim.CurrentFrame = 0;
+				anim.FrameTimeCounter = 0.0f;
+				anim.IsFinished = false;
+			}
+		}
+	}
+	uint32_t AnimationComponent_GetIsPlaying(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>()
+				   ? (entity.GetComponent<AnimationComponent>().IsPlaying ? 1 : 0)
+				   : 0;
+	}
+	void AnimationComponent_SetIsPlaying(uint64_t entityID, uint32_t isPlaying)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			entity.GetComponent<AnimationComponent>().IsPlaying = isPlaying != 0;
+		}
+	}
+	uint8_t AnimationComponent_GetIsLooping(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>() ? entity.GetComponent<AnimationComponent>().IsLooping
+																   : false;
+	}
+	void AnimationComponent_SetIsLooping(uint64_t entityID, uint8_t isLooping)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			entity.GetComponent<AnimationComponent>().IsLooping = isLooping;
+		}
+	}
+	uint8_t AnimationComponent_GetIsFinished(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>()
+				   ? entity.GetComponent<AnimationComponent>().IsFinished
+				   : false;
+	}
+	float AnimationComponent_GetDuration(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>() ? entity.GetComponent<AnimationComponent>().Duration
+																   : 0.0f;
+	}
+	float AnimationComponent_GetNormalizedTime(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>()
+				   ? entity.GetComponent<AnimationComponent>().NormalizedTime
+				   : 0.0f;
+	}
+	float AnimationComponent_GetBlendDuration(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<AnimationComponent>()
+				   ? entity.GetComponent<AnimationComponent>().BlendDuration
+				   : 0.0f;
+	}
+	void AnimationComponent_SetBlendDuration(uint64_t entityID, float blendDuration)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			entity.GetComponent<AnimationComponent>().BlendDuration = blendDuration;
+		}
+	}
+	void AnimationComponent_CrossFade(uint64_t entityID, int targetIndex, float blendDuration)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			auto& anim = entity.GetComponent<AnimationComponent>();
+			if (anim.CurrentAnimationIndex == targetIndex && !anim.Blending)
+			{
+				return;
+			}
+			anim.TargetAnimationIndex = targetIndex;
+			anim.TargetFrame = 0;
+			anim.BlendDuration = blendDuration;
+			anim.BlendTimer = 0.0f;
+			anim.Blending = true;
+			anim.IsPlaying = true;
+			anim.IsFinished = false;
+		}
+	}
+
+	// ── AnimationComponent graph variables ────────────────────────────────
+
+	void AnimationComponent_SetFloat(uint64_t entityID, const Coral::UCChar* name, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			std::string strName = ch_u16_to_string(name);
+			entity.GetComponent<AnimationComponent>().SetFloat(strName, value);
+		}
+	}
+
+	void AnimationComponent_SetBool(uint64_t entityID, const Coral::UCChar* name, uint8_t value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			std::string strName = ch_u16_to_string(name);
+			entity.GetComponent<AnimationComponent>().SetBool(strName, value);
+		}
+	}
+
+	float AnimationComponent_GetFloat(uint64_t entityID, const Coral::UCChar* name)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AnimationComponent>())
+		{
+			std::string strName = ch_u16_to_string(name);
+			return entity.GetComponent<AnimationComponent>().GetFloat(strName);
+		}
+		return 0.0f;
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_audio.cpp b/engine/scripting/script_glue_audio.cpp
new file mode 100644
index 000000000..28492e828
--- /dev/null
+++ b/engine/scripting/script_glue_audio.cpp
@@ -0,0 +1,203 @@
+#include "script_glue_audio.h"
+#include "engine/scene/components.h"
+
+namespace Chained
+{
+
+	void Audio_Play(const Coral::UCChar* path, float volume, float pitch, uint8_t loop)
+	{
+		if (Project::GetActive() != nullptr && path)
+		{
+			const std::string soundPath = ch_u16_to_string(path);
+			auto* audioService = ServiceLocator::TryGet<Audio>();
+			if (!audioService)
+			{
+				return;
+			}
+
+			AssetHandle handle = audioService->LoadSound(soundPath);
+			if (handle != 0)
+			{
+				audioService->Play(handle, volume, pitch, loop, false, glm::vec3(0));
+
+				if (Scene* scene = GetActiveScene())
+				{
+					auto& registry = scene->GetRegistry();
+					auto view = registry.view<AudioComponent>();
+					for (auto entity : view)
+					{
+						auto& audio = view.get<AudioComponent>(entity);
+						if (audio.SoundPath == soundPath)
+						{
+							audio.SoundHandle = handle;
+							audio.IsPlaying = true;
+						}
+					}
+				}
+			}
+		}
+	}
+	void Audio_Stop(const Coral::UCChar* path)
+	{
+		if (Project::GetActive() != nullptr && path)
+		{
+			const std::string soundPath = ch_u16_to_string(path);
+			auto* audioService = ServiceLocator::TryGet<Audio>();
+			if (!audioService)
+			{
+				return;
+			}
+			audioService->Stop(soundPath);
+
+			if (Scene* scene = GetActiveScene())
+			{
+				auto& registry = scene->GetRegistry();
+				auto view = registry.view<AudioComponent>();
+				for (auto entity : view)
+				{
+					auto& audio = view.get<AudioComponent>(entity);
+					if (audio.SoundPath == soundPath)
+					{
+						audio.IsPlaying = false;
+					}
+				}
+			}
+		}
+	}
+	void Audio_StopAll()
+	{
+		if (Project::GetActive() != nullptr)
+		{
+			auto* audioService = ServiceLocator::TryGet<Audio>();
+			if (!audioService)
+			{
+				return;
+			}
+			audioService->StopAll();
+		}
+	}
+	void AudioComponent_SetVolume(uint64_t entityID, float volume)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AudioComponent>())
+		{
+			auto& audio = entity.GetComponent<AudioComponent>();
+			audio.Volume = volume;
+			if (audio.IsPlaying && audio.SoundHandle != 0)
+			{
+				auto* audioService = ServiceLocator::TryGet<Audio>();
+				if (audioService)
+				{
+					audioService->SetVolume(audio.SoundHandle, volume);
+				}
+			}
+		}
+	}
+	void AudioComponent_SetLoop(uint64_t entityID, uint8_t loop)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AudioComponent>())
+		{
+			entity.GetComponent<AudioComponent>().Loop = loop;
+		}
+	}
+	uint8_t AudioComponent_IsPlaying(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (!entity || !entity.HasComponent<AudioComponent>())
+		{
+			return false;
+		}
+
+		auto& audio = entity.GetComponent<AudioComponent>();
+		auto* audioService = ServiceLocator::TryGet<Audio>();
+		if (!audioService)
+		{
+			return false;
+		}
+		return audio.IsPlaying && audioService->IsPlaying(audio.SoundHandle);
+	}
+	const Coral::UCChar* AudioComponent_GetSoundPath(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		std::string path =
+			entity && entity.HasComponent<AudioComponent>() ? entity.GetComponent<AudioComponent>().SoundPath : "";
+		return GlueStringPool::ReturnString(path);
+	}
+	const Coral::UCChar* SpriteComponent_GetTexturePath(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		std::string path =
+			entity && entity.HasComponent<SpriteComponent>() ? entity.GetComponent<SpriteComponent>().TexturePath : "";
+		return GlueStringPool::ReturnString(path);
+	}
+	void SpriteComponent_SetTexturePath(uint64_t entityID, const Coral::UCChar* path)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<SpriteComponent>() && path)
+		{
+			auto& comp = entity.GetComponent<SpriteComponent>();
+			comp.TexturePath = ch_u16_to_string(path);
+			comp.TextureHandle = 0;
+		}
+	}
+	void SpriteComponent_GetTint(uint64_t entityID, glm::vec4* outTint)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<SpriteComponent>() && outTint)
+		{
+			auto& tint = entity.GetComponent<SpriteComponent>().Tint;
+			*outTint = {tint.r / 255.0f, tint.g / 255.0f, tint.b / 255.0f, tint.a / 255.0f};
+		}
+	}
+	void SpriteComponent_SetTint(uint64_t entityID, glm::vec4 tint)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<SpriteComponent>())
+		{
+			auto clamped = [](float v) -> uint8_t { return (uint8_t)(std::clamp(v, 0.0f, 1.0f) * 255); };
+			entity.GetComponent<SpriteComponent>().Tint = {clamped(tint.r), clamped(tint.g), clamped(tint.b),
+														   clamped(tint.a)};
+		}
+	}
+	uint8_t SpriteComponent_GetFlipX(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<SpriteComponent>() ? entity.GetComponent<SpriteComponent>().FlipX : false;
+	}
+	void SpriteComponent_SetFlipX(uint64_t entityID, uint8_t flip)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<SpriteComponent>())
+		{
+			entity.GetComponent<SpriteComponent>().FlipX = flip;
+		}
+	}
+	uint8_t SpriteComponent_GetFlipY(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<SpriteComponent>() ? entity.GetComponent<SpriteComponent>().FlipY : false;
+	}
+	void SpriteComponent_SetFlipY(uint64_t entityID, uint8_t flip)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<SpriteComponent>())
+		{
+			entity.GetComponent<SpriteComponent>().FlipY = flip;
+		}
+	}
+	int SpriteComponent_GetZOrder(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<SpriteComponent>() ? entity.GetComponent<SpriteComponent>().ZOrder : 0;
+	}
+	void SpriteComponent_SetZOrder(uint64_t entityID, int z)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<SpriteComponent>())
+		{
+			entity.GetComponent<SpriteComponent>().ZOrder = z;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_audio.h b/engine/scripting/script_glue_audio.h
new file mode 100644
index 000000000..02e855314
--- /dev/null
+++ b/engine/scripting/script_glue_audio.h
@@ -0,0 +1,49 @@
+#ifndef SCRIPT_GLUE_AUDIO_H
+#define SCRIPT_GLUE_AUDIO_H
+#include "script_glue_internal.h"
+#include "engine/scene/component_registry.h"
+#include "engine/audio/audio.h"
+#include "engine/core/service_locator.h"
+#include "engine/project/project.h"
+
+namespace Chained
+{
+
+	// ── Audio ─────────────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Audio_Play(const Coral::UCChar* path, float volume, float pitch, uint8_t loop);
+
+	CH_SCRIPT_FUNC void Audio_Stop(const Coral::UCChar* path);
+
+	CH_SCRIPT_FUNC void Audio_StopAll();
+
+	CH_SCRIPT_FUNC void AudioComponent_SetVolume(uint64_t entityID, float volume);
+
+	CH_SCRIPT_FUNC void AudioComponent_SetLoop(uint64_t entityID, uint8_t loop);
+
+	CH_SCRIPT_FUNC uint8_t AudioComponent_IsPlaying(uint64_t entityID);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* AudioComponent_GetSoundPath(uint64_t entityID);
+
+	// --- SpriteComponent ---
+	CH_SCRIPT_FUNC const Coral::UCChar* SpriteComponent_GetTexturePath(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void SpriteComponent_SetTexturePath(uint64_t entityID, const Coral::UCChar* path);
+
+	CH_SCRIPT_FUNC void SpriteComponent_GetTint(uint64_t entityID, glm::vec4* outTint);
+
+	CH_SCRIPT_FUNC void SpriteComponent_SetTint(uint64_t entityID, glm::vec4 tint);
+
+	CH_SCRIPT_FUNC uint8_t SpriteComponent_GetFlipX(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void SpriteComponent_SetFlipX(uint64_t entityID, uint8_t flip);
+
+	CH_SCRIPT_FUNC uint8_t SpriteComponent_GetFlipY(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void SpriteComponent_SetFlipY(uint64_t entityID, uint8_t flip);
+
+	CH_SCRIPT_FUNC int SpriteComponent_GetZOrder(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void SpriteComponent_SetZOrder(uint64_t entityID, int z);
+
+} // namespace Chained
+#endif
diff --git a/engine/scripting/script_glue_camera.cpp b/engine/scripting/script_glue_camera.cpp
new file mode 100644
index 000000000..6ace00bce
--- /dev/null
+++ b/engine/scripting/script_glue_camera.cpp
@@ -0,0 +1,212 @@
+#include "script_glue_camera.h"
+
+#include "engine/app/application.h"
+#include "engine/core/service_locator.h"
+#include "engine/physics/physics.h"
+#include "engine/physics/raycast_result.h"
+#include "engine/scene/components.h"
+
+namespace Chained
+{
+	void Camera_GetForward(uint64_t entityID, glm::vec3* outForward)
+	{
+		if (!outForward)
+		{
+			return;
+		}
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>())
+		{
+			auto& tc = entity.GetComponent<TransformComponent>();
+			glm::quat rotation = tc.RotationQuat;
+			*outForward = rotation * glm::vec3(0.0f, 0.0f, -1.0f);
+		}
+		else
+		{
+			CH_CORE_WARN("[Diag Camera_GetForward] entityID={} NOT FOUND or no TransformComponent!", entityID);
+			*outForward = {};
+		}
+	}
+	void Camera_GetRight(uint64_t entityID, glm::vec3* outRight)
+	{
+		if (!outRight)
+		{
+			return;
+		}
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>())
+		{
+			auto& tc = entity.GetComponent<TransformComponent>();
+			glm::quat rotation = tc.RotationQuat;
+			*outRight = rotation * glm::vec3(1.0f, 0.0f, 0.0f);
+		}
+		else
+		{
+			*outRight = {};
+		}
+	}
+	void Camera_SetOrbit(uint64_t entityID, float yaw, float pitch, float distance)
+	{
+		Entity entity = GetEntity(entityID);
+		Scene* scene = GetActiveScene();
+
+		if (entity && entity.HasComponent<CameraComponent>() && entity.HasComponent<TransformComponent>() && scene)
+		{
+			auto& camera = entity.GetComponent<CameraComponent>();
+
+			// 1. Clamp pitch
+			pitch = glm::clamp(pitch, 5.0f, 75.0f);
+
+			camera.OrbitYaw = yaw;
+			camera.OrbitPitch = pitch;
+			camera.OrbitDistance = distance;
+
+			auto& tc = entity.GetComponent<TransformComponent>();
+			Entity target;
+
+			// Find the player entity (networked: IsOwner, offline: by tag)
+			auto netView = scene->GetRegistry().view<NetworkIdentityComponent>();
+			for (auto e : netView)
+			{
+				const auto& netID = netView.get<NetworkIdentityComponent>(e);
+				if (netID.IsOwner)
+				{
+					target = Entity(e, scene->GetRegistryPtr());
+					break;
+				}
+			}
+
+			if (!target)
+			{
+				target = scene->FindEntityByTag(camera.TargetEntityTag);
+			}
+
+			glm::vec3 targetPos = camera.SmoothedPivot;
+			if (target && target.HasComponent<TransformComponent>())
+			{
+				const auto& targetTC = target.GetComponent<TransformComponent>();
+
+				// Use the local Translation (not WorldTransform[3]) so the camera
+				// tracks the player's CURRENT position rather than the position that
+				// was computed at the start of the frame. For root entities (no parent)
+				// these are identical; for parented entities we read from the parent's
+				// WorldTransform instead.
+				glm::vec3 rawPos;
+				const auto& hier = scene->GetRegistry().try_get<HierarchyComponent>(target);
+				if (hier && hier->Parent != entt::null && scene->GetRegistry().all_of<TransformComponent>(hier->Parent))
+				{
+					// Parented: reconstruct world position from parent world + local translation
+					const auto& parentTC = scene->GetRegistry().get<TransformComponent>(hier->Parent);
+					rawPos = glm::vec3(parentTC.WorldTransform * glm::vec4(targetTC.Translation, 1.0f));
+				}
+				else
+				{
+					rawPos = targetTC.Translation;
+				}
+
+				// Smoothly follow player position so the camera never lags by 1 frame.
+				// Use a very high lerp speed (30) so it's effectively instant for owned
+				// players (physics-driven), while still smoothing out any jitter for
+				// remote/interpolated entities.
+				constexpr float kPivotSmoothSpeed = 30.0f;
+				float dt = Application::Get().GetFrameTime();
+				float lerpT = glm::clamp(dt * kPivotSmoothSpeed, 0.0f, 1.0f);
+
+				if (!camera.PivotInitialized)
+				{
+					camera.SmoothedPivot = rawPos;
+					camera.PivotInitialized = true;
+				}
+				else
+				{
+					camera.SmoothedPivot = glm::mix(camera.SmoothedPivot, rawPos, lerpT);
+				}
+
+				targetPos = camera.SmoothedPivot;
+			}
+
+			// 2. Pivot at eye/chest height (+1.8m)
+			glm::vec3 pivot = targetPos + glm::vec3(0.0f, 1.8f, 0.0f);
+
+			// 3. Compute rotation quaternion
+			float yawRad = glm::radians(yaw);
+			float pitchRad = glm::radians(pitch);
+
+			glm::quat yawQuat = glm::angleAxis(yawRad, glm::vec3(0.0f, 1.0f, 0.0f));
+			glm::quat pitchQuat = glm::angleAxis(-pitchRad, glm::vec3(1.0f, 0.0f, 0.0f));
+			glm::quat rotation = yawQuat * pitchQuat;
+
+			glm::vec3 offset = rotation * glm::vec3(0.0f, 0.0f, distance);
+			glm::vec3 newPos = pivot + offset;
+
+			TransformSystem::SetTranslation(tc, newPos);
+			TransformSystem::SetRotationQuat(tc, rotation);
+		}
+	}
+	void Camera_GetOrbit(uint64_t entityID, float* yaw, float* pitch, float* distance)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<CameraComponent>())
+		{
+			auto& camera = entity.GetComponent<CameraComponent>();
+			if (yaw)
+			{
+				*yaw = camera.OrbitYaw;
+			}
+			if (pitch)
+			{
+				*pitch = camera.OrbitPitch;
+			}
+			if (distance)
+			{
+				*distance = camera.OrbitDistance;
+			}
+		}
+	}
+	uint8_t Camera_GetPrimary(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<CameraComponent>() ? entity.GetComponent<CameraComponent>().Primary
+																: false;
+	}
+	void Camera_SetPrimary(uint64_t entityID, uint8_t primary)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<CameraComponent>())
+		{
+			CH_CORE_TRACE("[ScriptGlue] Camera_SetPrimary: Entity={}, Primary={}", (uint32_t)entityID, primary);
+			entity.GetComponent<CameraComponent>().Primary = primary;
+		}
+	}
+	void Camera_SetIsOrbit(uint64_t entityID, uint8_t isOrbit)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<CameraComponent>())
+		{
+			entity.GetComponent<CameraComponent>().IsOrbitCamera = isOrbit;
+		}
+	}
+	const Coral::UCChar* Camera_GetTargetTag(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		std::string tag = entity && entity.HasComponent<CameraComponent>()
+							  ? entity.GetComponent<CameraComponent>().TargetEntityTag
+							  : "";
+		return GlueStringPool::ReturnString(tag);
+	}
+	void Camera_SetTargetTag(uint64_t entityID, const Coral::UCChar* tag)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<CameraComponent>() && tag)
+		{
+			entity.GetComponent<CameraComponent>().TargetEntityTag = ch_u16_to_string(tag);
+		}
+	}
+
+	uint8_t Camera_GetIsOrbit(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<CameraComponent>() ? entity.GetComponent<CameraComponent>().IsOrbitCamera
+																: false;
+	}
+} // namespace Chained
diff --git a/engine/scripting/script_glue_camera.h b/engine/scripting/script_glue_camera.h
new file mode 100644
index 000000000..b459e88fa
--- /dev/null
+++ b/engine/scripting/script_glue_camera.h
@@ -0,0 +1,31 @@
+#ifndef SCRIPT_GLUE_CAMERA_H
+#define SCRIPT_GLUE_CAMERA_H
+#include "script_glue_internal.h"
+#include "engine/scene/systems/transform_system.h"
+
+namespace Chained
+{
+
+	// ── Camera ────────────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Camera_GetForward(uint64_t entityID, glm::vec3* outForward);
+
+	CH_SCRIPT_FUNC void Camera_GetRight(uint64_t entityID, glm::vec3* outRight);
+
+	CH_SCRIPT_FUNC void Camera_GetOrbit(uint64_t entityID, float* yaw, float* pitch, float* distance);
+
+	CH_SCRIPT_FUNC void Camera_SetOrbit(uint64_t entityID, float yaw, float pitch, float distance);
+
+	CH_SCRIPT_FUNC uint8_t Camera_GetPrimary(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void Camera_SetPrimary(uint64_t entityID, uint8_t primary);
+
+	CH_SCRIPT_FUNC uint8_t Camera_GetIsOrbit(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void Camera_SetIsOrbit(uint64_t entityID, uint8_t isOrbit);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* Camera_GetTargetTag(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void Camera_SetTargetTag(uint64_t entityID, const Coral::UCChar* tag);
+
+} // namespace Chained
+#endif
\ No newline at end of file
diff --git a/engine/scripting/script_glue_entity.cpp b/engine/scripting/script_glue_entity.cpp
new file mode 100644
index 000000000..d3668953f
--- /dev/null
+++ b/engine/scripting/script_glue_entity.cpp
@@ -0,0 +1,121 @@
+#include "script_glue_entity.h"
+#include "engine/scene/component_registry.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// ── Entity Registry ──────────────────────────────────────────────────
+
+	void Entity_AddComponent(uint64_t entityID, const Coral::UCChar* componentName)
+	{
+		Entity entity = GetEntity(entityID);
+		if (!entity)
+		{
+			return;
+		}
+		std::string name = ch_u16_to_string(componentName);
+		for (const auto& [id, metadata] : ComponentRegistry::GetRegistry())
+		{
+			if (metadata.Name == name || metadata.SerializationKey == name)
+			{
+				if (metadata.Add)
+				{
+					metadata.Add(entity);
+				}
+				return;
+			}
+		}
+	}
+	int Entity_FindAllWithComponent(const Coral::UCChar* componentName, uint64_t* outBuf, int bufSize)
+	{
+		Scene* scene = GetActiveScene();
+		if (!scene)
+		{
+			return 0;
+		}
+		std::string name = ch_u16_to_string(componentName);
+		for (const auto& [id, metadata] : ComponentRegistry::GetRegistry())
+		{
+			if (metadata.Name == name || metadata.SerializationKey == name)
+			{
+				if (metadata.GetAll)
+				{
+					auto ids = metadata.GetAll(scene);
+					int count = (int)std::min(ids.size(), (size_t)bufSize);
+					if (outBuf)
+					{
+						for (int i = 0; i < count; ++i)
+						{
+							outBuf[i] = ids[i];
+						}
+					}
+					return count;
+				}
+				return 0;
+			}
+		}
+		return 0;
+	}
+	uint8_t Entity_HasComponent(uint64_t entityID, const Coral::UCChar* componentName)
+	{
+		Entity entity = GetEntity(entityID);
+		if (!entity)
+		{
+			return false;
+		}
+		std::string name = ch_u16_to_string(componentName);
+
+		if (name.find("Control") != std::string::npos || name.find("Group") != std::string::npos)
+		{
+			if (!entity.HasComponent<UIControlComponent>())
+			{
+				return false;
+			}
+			auto& widget = entity.GetComponent<UIControlComponent>();
+
+			static const std::pair<const char*, std::function<bool(const ControlData&)>> widgetChecks[] = {
+				{"ButtonControl", [](const ControlData& d) { return std::holds_alternative<ButtonData>(d); }},
+				{"PanelControl", [](const ControlData& d) { return std::holds_alternative<PanelData>(d); }},
+				{"LabelControl", [](const ControlData& d) { return std::holds_alternative<LabelData>(d); }},
+				{"ImageControl", [](const ControlData& d) { return std::holds_alternative<ImageData>(d); }},
+				{"CheckboxControl", [](const ControlData& d) { return std::holds_alternative<CheckboxData>(d); }},
+				{"ComboBoxControl", [](const ControlData& d) { return std::holds_alternative<ComboBoxData>(d); }},
+				{"SliderControl", [](const ControlData& d) { return std::holds_alternative<SliderData>(d); }},
+				{"ProgressBarControl", [](const ControlData& d) { return std::holds_alternative<ProgressBarData>(d); }},
+				{"InputTextControl", [](const ControlData& d) { return std::holds_alternative<InputTextData>(d); }},
+				{"ImageButtonControl", [](const ControlData& d) { return std::holds_alternative<ImageButtonData>(d); }},
+				{"SeparatorControl", [](const ControlData& d) { return std::holds_alternative<SeparatorData>(d); }},
+				{"RadioButtonControl", [](const ControlData& d) { return std::holds_alternative<RadioButtonData>(d); }},
+				{"ColorPickerControl", [](const ControlData& d) { return std::holds_alternative<ColorPickerData>(d); }},
+				{"DragFloatControl", [](const ControlData& d) { return std::holds_alternative<DragFloatData>(d); }},
+				{"DragIntControl", [](const ControlData& d) { return std::holds_alternative<DragIntData>(d); }},
+				{"VerticalLayoutGroup",
+				 [](const ControlData& d) { return std::holds_alternative<VerticalLayoutGroupData>(d); }},
+			};
+
+			for (const auto& [widgetName, check] : widgetChecks)
+			{
+				if (name == widgetName && check(widget.Data))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		for (const auto& [id, metadata] : ComponentRegistry::GetRegistry())
+		{
+			if (metadata.Name == name || metadata.SerializationKey == name)
+			{
+				if (metadata.Has)
+				{
+					return metadata.Has(entity);
+				}
+			}
+		}
+		return false;
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_entity.h b/engine/scripting/script_glue_entity.h
new file mode 100644
index 000000000..20e4dcf69
--- /dev/null
+++ b/engine/scripting/script_glue_entity.h
@@ -0,0 +1,113 @@
+#ifndef SCRIPT_GLUE_ENTITY_H
+#define SCRIPT_GLUE_ENTITY_H
+#include "engine/scene/components.h"
+#include "script_glue_internal.h"
+#include <algorithm>
+#include <string>
+
+namespace Chained
+{
+
+	// ── Entity / Transform ────────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Transform_GetTranslation(uint64_t entityID, glm::vec3* outTranslation);
+
+	CH_SCRIPT_FUNC void Transform_SetTranslation(uint64_t entityID, glm::vec3* inTranslation);
+
+	CH_SCRIPT_FUNC void Transform_GetRotation(uint64_t entityID, glm::vec3* outRotation);
+
+	CH_SCRIPT_FUNC void Transform_SetRotation(uint64_t entityID, glm::vec3* inRotation);
+
+	CH_SCRIPT_FUNC void Transform_GetScale(uint64_t entityID, glm::vec3* outScale);
+
+	CH_SCRIPT_FUNC void Transform_SetScale(uint64_t entityID, glm::vec3* inScale);
+
+	// ── Model Component ───────────────────────────────────────────────────
+	CH_SCRIPT_FUNC const Coral::UCChar* Model_GetModelPath(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void Model_SetModelPath(uint64_t entityID, const Coral::UCChar* inPath);
+
+	// ── Registry Management ───────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Entity_AddComponent(uint64_t entityID, const Coral::UCChar* componentName);
+
+	CH_SCRIPT_FUNC uint8_t Entity_HasComponent(uint64_t entityID, const Coral::UCChar* componentName);
+
+	CH_SCRIPT_FUNC int Entity_FindAllWithComponent(const Coral::UCChar* componentName, uint64_t* outBuf, int bufSize);
+
+	// ── Physics (RigidBody) ───────────────────────────────────────────────
+	CH_SCRIPT_FUNC void RigidBody_GetVelocity(uint64_t entityID, glm::vec3* outVelocity);
+
+	CH_SCRIPT_FUNC void RigidBody_SetVelocity(uint64_t entityID, glm::vec3* inVelocity);
+
+	CH_SCRIPT_FUNC void RigidBody_ForceSetVelocity(uint64_t entityID, glm::vec3* inVelocity);
+
+	CH_SCRIPT_FUNC uint8_t RigidBody_IsGrounded(uint64_t entityID);
+
+	CH_SCRIPT_FUNC uint32_t RigidBody_IsKinematic(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void RigidBody_SetKinematic(uint64_t entityID, uint8_t isKinematic);
+
+	// ── Audio Component ───────────────────────────────────────────────────
+	CH_SCRIPT_FUNC void AudioComponent_Play(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void AudioComponent_Stop(uint64_t entityID);
+
+	// ── Tag Component ─────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC const Coral::UCChar* TagComponent_GetTag(uint64_t entityID);
+
+	// ── Shader Component ──────────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Shader_SetFloat(uint64_t entityID, const Coral::UCChar* inName, float inValue);
+
+	CH_SCRIPT_FUNC void Shader_SetVec3(uint64_t entityID, const Coral::UCChar* inName, glm::vec3* inValue);
+
+	CH_SCRIPT_FUNC uint8_t Shader_GetEnabled(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void Shader_SetEnabled(uint64_t entityID, uint8_t enabled);
+
+	// ── PlayerComponent ───────────────────────────────────────────────────
+	CH_SCRIPT_FUNC float PlayerComponent_GetMovementSpeed(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void PlayerComponent_SetMovementSpeed(uint64_t entityID, float value);
+
+	CH_SCRIPT_FUNC float PlayerComponent_GetJumpForce(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void PlayerComponent_SetJumpForce(uint64_t entityID, float value);
+
+	CH_SCRIPT_FUNC float PlayerComponent_GetLookSensitivity(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void PlayerComponent_SetLookSensitivity(uint64_t entityID, float value);
+
+	// ── SpawnComponent ────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_GetIsActive(uint64_t entityID);
+	CH_SCRIPT_FUNC void SpawnComponent_SetIsActive(uint64_t entityID, uint8_t value);
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_IsCheckpoint(uint64_t entityID);
+	CH_SCRIPT_FUNC void SpawnComponent_SetIsCheckpoint(uint64_t entityID, uint8_t value);
+	CH_SCRIPT_FUNC void SpawnComponent_GetSpawnPoint(uint64_t entityID, glm::vec3* outPoint);
+	CH_SCRIPT_FUNC void SpawnComponent_SetSpawnPoint(uint64_t entityID, glm::vec3* inPoint);
+	CH_SCRIPT_FUNC uint8_t SpawnComponent_GetRenderSpawnZoneInScene(uint64_t entityID);
+	CH_SCRIPT_FUNC void SpawnComponent_GetZoneSize(uint64_t entityID, glm::vec3* outSize);
+
+	// ── AnimationComponent ──────────────────────────────────────────────────
+	CH_SCRIPT_FUNC int AnimationComponent_GetCurrentAnimationIndex(uint64_t entityID);
+	CH_SCRIPT_FUNC void AnimationComponent_SetCurrentAnimationIndex(uint64_t entityID, int index);
+	CH_SCRIPT_FUNC uint32_t AnimationComponent_GetIsPlaying(uint64_t entityID);
+	CH_SCRIPT_FUNC void AnimationComponent_SetIsPlaying(uint64_t entityID, uint32_t isPlaying);
+	CH_SCRIPT_FUNC uint8_t AnimationComponent_GetIsLooping(uint64_t entityID);
+	CH_SCRIPT_FUNC void AnimationComponent_SetIsLooping(uint64_t entityID, uint8_t isLooping);
+	CH_SCRIPT_FUNC uint8_t AnimationComponent_GetIsFinished(uint64_t entityID);
+	CH_SCRIPT_FUNC float AnimationComponent_GetDuration(uint64_t entityID);
+	CH_SCRIPT_FUNC float AnimationComponent_GetNormalizedTime(uint64_t entityID);
+	CH_SCRIPT_FUNC float AnimationComponent_GetBlendDuration(uint64_t entityID);
+	CH_SCRIPT_FUNC void AnimationComponent_SetBlendDuration(uint64_t entityID, float blendDuration);
+	CH_SCRIPT_FUNC void AnimationComponent_CrossFade(uint64_t entityID, int targetIndex, float blendDuration);
+
+	// ── AnimationComponent graph variables ──────────────────────────────
+	CH_SCRIPT_FUNC void AnimationComponent_SetFloat(uint64_t entityID, const Coral::UCChar* name, float value);
+	CH_SCRIPT_FUNC void AnimationComponent_SetBool(uint64_t entityID, const Coral::UCChar* name, uint8_t value);
+	CH_SCRIPT_FUNC float AnimationComponent_GetFloat(uint64_t entityID, const Coral::UCChar* name);
+
+	// ── NetworkIdentityComponent ─────────────────────────────────────────
+	CH_SCRIPT_FUNC uint64_t NetworkIdentityComponent_GetNetworkID(uint64_t entityID);
+	CH_SCRIPT_FUNC uint8_t NetworkIdentityComponent_GetIsOwner(uint64_t entityID);
+
+} // namespace Chained
+#endif
diff --git a/engine/scripting/script_glue_input.cpp b/engine/scripting/script_glue_input.cpp
new file mode 100644
index 000000000..05032e291
--- /dev/null
+++ b/engine/scripting/script_glue_input.cpp
@@ -0,0 +1,50 @@
+#include "script_glue_input.h"
+
+namespace Chained
+{
+	void Input_GetMouseDelta(float* outX, float* outY)
+	{
+		glm::vec2 delta = Core::Input::GetMouseDelta();
+		if (outX)
+		{
+			*outX = delta.x;
+		}
+		if (outY)
+		{
+			*outY = delta.y;
+		}
+	}
+	float Input_GetMouseWheelMove()
+	{
+		return Core::Input::GetMouseWheelMove();
+	}
+	int Input_IsMouseButtonPressed(int button)
+	{
+		return Core::Input::IsMouseButtonPressed(static_cast<MouseCode>(button)) ? 1 : 0;
+	}
+	int Input_IsMouseButtonDown(int button)
+	{
+		return Core::Input::IsMouseButtonDown(static_cast<MouseCode>(button)) ? 1 : 0;
+	}
+	int Input_IsKeyReleased(int keyCode)
+	{
+		return Core::Input::IsKeyReleased(static_cast<KeyCode>(keyCode)) ? 1 : 0;
+	}
+	int Input_IsKeyPressed(int keyCode)
+	{
+		if (ImGui::GetCurrentContext() && ImGui::GetIO().WantCaptureKeyboard)
+		{
+			return 0;
+		}
+		return Core::Input::IsKeyPressed(static_cast<KeyCode>(keyCode)) ? 1 : 0;
+	}
+	int Input_IsKeyDown(int keyCode)
+	{
+		if (ImGui::GetCurrentContext() && ImGui::GetIO().WantCaptureKeyboard)
+		{
+			return 0;
+		}
+		return Core::Input::IsKeyDown(static_cast<KeyCode>(keyCode)) ? 1 : 0;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/scripting/script_glue_input.h b/engine/scripting/script_glue_input.h
new file mode 100644
index 000000000..c13fd396c
--- /dev/null
+++ b/engine/scripting/script_glue_input.h
@@ -0,0 +1,26 @@
+#ifndef SCRIPT_GLUE_INPUT_H
+#define SCRIPT_GLUE_INPUT_H
+#include "engine/core/input.h"
+#include "script_glue_internal.h"
+
+#include <cstdint>
+
+namespace Chained
+{
+
+	CH_SCRIPT_FUNC int Input_IsKeyDown(int keyCode);
+
+	CH_SCRIPT_FUNC int Input_IsKeyPressed(int keyCode);
+
+	CH_SCRIPT_FUNC int Input_IsKeyReleased(int keyCode);
+
+	CH_SCRIPT_FUNC int Input_IsMouseButtonDown(int button);
+
+	CH_SCRIPT_FUNC int Input_IsMouseButtonPressed(int button);
+
+	CH_SCRIPT_FUNC void Input_GetMouseDelta(float* outX, float* outY);
+
+	CH_SCRIPT_FUNC float Input_GetMouseWheelMove();
+
+} // namespace Chained
+#endif
\ No newline at end of file
diff --git a/engine/scripting/script_glue_internal.cpp b/engine/scripting/script_glue_internal.cpp
new file mode 100644
index 000000000..818ec2638
--- /dev/null
+++ b/engine/scripting/script_glue_internal.cpp
@@ -0,0 +1,28 @@
+#include "script_glue_internal.h"
+#include "engine/core/service_locator.h"
+#include "scriptengine.h"
+
+Chained::Scene* Chained::GetActiveScene()
+{
+	auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>();
+	if (!scriptEngine)
+	{
+		return nullptr;
+	}
+	return scriptEngine->GetContextScene();
+}
+
+Chained::Entity Chained::GetEntity(uint64_t entityID)
+{
+	if (entityID == static_cast<uint64_t>(entt::null) || entityID == static_cast<uint32_t>(entt::null) ||
+		entityID == ~0ull)
+	{
+		return {};
+	}
+	Scene* scene = GetActiveScene();
+	if (!scene)
+	{
+		return {};
+	}
+	return Entity(static_cast<entt::entity>(static_cast<uint32_t>(entityID)), &scene->GetRegistry());
+}
diff --git a/engine/scripting/script_glue_internal.h b/engine/scripting/script_glue_internal.h
new file mode 100644
index 000000000..8ace194a9
--- /dev/null
+++ b/engine/scripting/script_glue_internal.h
@@ -0,0 +1,79 @@
+#ifndef CH_SCRIPT_GLUE_INTERNAL_H
+#define CH_SCRIPT_GLUE_INTERNAL_H
+
+#include "engine/scene/entity.h"
+#include "engine/scene/scene.h"
+#include "scriptengine.h"
+#include "scriptengine_services.h"
+#include <Coral/StringHelper.hpp>
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <imgui.h>
+
+#define CH_SCRIPT_FUNC extern "C"
+
+namespace Chained
+{
+
+	// Cross-platform string conversion wrappers using Coral::StringHelper.
+	// On Windows: UCChar = wchar_t (UTF-16), on Linux/macOS: UCChar = char (UTF-8).
+	inline std::string ToUtf8(const Coral::UCChar* str)
+	{
+		if (!str)
+		{
+			return {};
+		}
+		return Coral::StringHelper::ConvertWideToUtf8(str);
+	}
+
+	inline Coral::UCString ToWide(const std::string& str)
+	{
+		return Coral::StringHelper::ConvertUtf8ToWide(str);
+	}
+
+	// Backward-compat aliases so existing .cpp files compile without changes.
+	static inline std::string ch_u16_to_string(const Coral::UCChar* ptr)
+	{
+		return ToUtf8(ptr);
+	}
+	static inline std::u16string ch_utf8_to_u16(const std::string& str)
+	{
+		auto wide = ToWide(str);
+		return std::u16string(wide.begin(), wide.end());
+	}
+
+	// Unified string-return abstraction for glue functions.
+	// Replaces per-file thread_local buffers with a single rotating pool.
+	// Each thread gets 4 slots; ReturnString cycles through them so multiple
+	// return values can coexist within one interop call chain.
+	class GlueStringPool
+	{
+	public:
+		static constexpr int kSlots = 4;
+
+		// Store a string and return a stable C pointer valid until the next
+		// ReturnString call that wraps around to the same slot.
+		static const Coral::UCChar* ReturnString(const std::string& str)
+		{
+			thread_local Coral::UCString s_Buffers[kSlots];
+			thread_local int s_Index = 0;
+
+			s_Buffers[s_Index] = ToWide(str);
+			const Coral::UCChar* result = s_Buffers[s_Index].c_str();
+			s_Index = (s_Index + 1) % kSlots;
+			return result;
+		}
+
+		// Overload for wide strings (pass-through).
+		static const Coral::UCChar* ReturnString(const Coral::UCChar* str)
+		{
+			return str;
+		}
+	};
+
+	Scene* GetActiveScene();
+
+	Entity GetEntity(uint64_t entityID);
+} // namespace Chained
+
+#endif // CH_SCRIPT_GLUE_INTERNAL_H
\ No newline at end of file
diff --git a/engine/scripting/script_glue_network.cpp b/engine/scripting/script_glue_network.cpp
new file mode 100644
index 000000000..b5782e02e
--- /dev/null
+++ b/engine/scripting/script_glue_network.cpp
@@ -0,0 +1,387 @@
+#include "script_glue_network.h"
+#include "engine/networking/network_service.h"
+#include "engine/scene/systems/network_system.h"
+#include "engine/core/service_locator.h"
+
+namespace Chained
+{
+	namespace
+	{
+		/// Escape a string for embedding in a JSON string literal. Player nicknames and
+		/// chat messages are user-supplied — an unescaped quote or backslash would
+		/// corrupt the document the managed side parses.
+		std::string EscapeJson(const char* text)
+		{
+			std::string out;
+			if (!text)
+			{
+				return out;
+			}
+
+			for (const char* p = text; *p; ++p)
+			{
+				const unsigned char c = static_cast<unsigned char>(*p);
+				switch (c)
+				{
+				case '"':
+					out += "\\\"";
+					break;
+				case '\\':
+					out += "\\\\";
+					break;
+				case '\n':
+					out += "\\n";
+					break;
+				case '\r':
+					out += "\\r";
+					break;
+				case '\t':
+					out += "\\t";
+					break;
+				default:
+					if (c < 0x20)
+					{
+						char buf[7];
+						std::snprintf(buf, sizeof(buf), "\\u%04x", c);
+						out += buf;
+					}
+					else
+					{
+						out += static_cast<char>(c);
+					}
+					break;
+				}
+			}
+
+			return out;
+		}
+
+		std::string EscapeJson(const std::string& text)
+		{
+			return EscapeJson(text.c_str());
+		}
+	} // namespace
+
+	CH_SCRIPT_FUNC void Network_HostGame(uint16_t port, int maxClients)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net)
+		{
+			return;
+		}
+		CH_CORE_INFO("[Script] Network.HostGame(port={}, maxClients={})", port, maxClients);
+		net->HostGame(port, maxClients);
+	}
+
+	CH_SCRIPT_FUNC void Network_ConnectTo(const Coral::UCChar* ip, uint16_t port)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !ip)
+		{
+			return;
+		}
+		std::string ipStr = ch_u16_to_string(ip);
+		CH_CORE_INFO("[Script] Network.ConnectTo(ip='{}', port={})", ipStr, port);
+		net->ConnectTo(ipStr, port);
+	}
+
+	CH_SCRIPT_FUNC void Network_Disconnect()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net)
+		{
+			return;
+		}
+		CH_CORE_INFO("[Script] Network.Disconnect()");
+		net->Disconnect();
+	}
+
+	CH_SCRIPT_FUNC uint8_t Network_IsHost()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->IsHost();
+	}
+
+	CH_SCRIPT_FUNC uint8_t Network_IsClient()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->IsClient();
+	}
+
+	CH_SCRIPT_FUNC uint8_t Network_IsConnected()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->IsConnected();
+	}
+
+	CH_SCRIPT_FUNC uint8_t Network_IsFullyConnected()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->IsFullyConnected();
+	}
+
+	CH_SCRIPT_FUNC int Network_GetClientCount()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net ? static_cast<int>(net->GetClientCount()) : 0;
+	}
+
+	CH_SCRIPT_FUNC int Network_GetMaxClients()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net ? net->GetMaxClients() : 0;
+	}
+
+	CH_SCRIPT_FUNC int Network_GetRole()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net ? static_cast<int>(net->GetRole()) : 0;
+	}
+
+	CH_SCRIPT_FUNC void Network_GetListenAddress(char* outBuffer, int bufferSize)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !outBuffer || bufferSize <= 0)
+		{
+			if (outBuffer && bufferSize > 0)
+			{
+				outBuffer[0] = '\0';
+			}
+			return;
+		}
+		std::string ip = net->GetListenAddress();
+		std::strncpy(outBuffer, ip.c_str(), bufferSize - 1);
+		outBuffer[bufferSize - 1] = '\0';
+	}
+
+	CH_SCRIPT_FUNC void Network_GetPublicAddress(char* outBuffer, int bufferSize)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !outBuffer || bufferSize <= 0)
+		{
+			if (outBuffer && bufferSize > 0)
+			{
+				outBuffer[0] = '\0';
+			}
+			return;
+		}
+		std::string addr = net->GetPublicAddress();
+		std::strncpy(outBuffer, addr.c_str(), bufferSize - 1);
+		outBuffer[bufferSize - 1] = '\0';
+	}
+
+	CH_SCRIPT_FUNC void Network_GetPublicIPv6Address(char* outBuffer, int bufferSize)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !outBuffer || bufferSize <= 0)
+		{
+			if (outBuffer && bufferSize > 0)
+			{
+				outBuffer[0] = '\0';
+			}
+			return;
+		}
+		std::string addr = net->GetPublicIPv6Address();
+		std::strncpy(outBuffer, addr.c_str(), bufferSize - 1);
+		outBuffer[bufferSize - 1] = '\0';
+	}
+
+	CH_SCRIPT_FUNC void Network_BroadcastSceneChange(const Coral::UCChar* scenePath)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !scenePath)
+		{
+			return;
+		}
+		std::string path = ch_u16_to_string(scenePath);
+		CH_CORE_INFO("[Script] Network.BroadcastSceneChange(path='{}')", path);
+		net->BroadcastSceneChange(path.c_str());
+	}
+
+	CH_SCRIPT_FUNC uint8_t Network_HasPendingSceneChange()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->HasPendingSceneChange();
+	}
+
+	CH_SCRIPT_FUNC void Network_GetPendingSceneChange(char* outBuffer, int bufferSize)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !outBuffer || bufferSize <= 0)
+		{
+			if (outBuffer && bufferSize > 0)
+			{
+				outBuffer[0] = '\0';
+			}
+			return;
+		}
+		const std::string& path = net->GetPendingSceneChange();
+		std::strncpy(outBuffer, path.c_str(), bufferSize - 1);
+		outBuffer[bufferSize - 1] = '\0';
+	}
+
+	CH_SCRIPT_FUNC void Network_ClearPendingSceneChange()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (net)
+		{
+			net->ClearPendingSceneChange();
+		}
+	}
+
+	// ---- Player list ----
+
+	CH_SCRIPT_FUNC void Network_SetLocalPlayerInfo(const Coral::UCChar* name, uint8_t skinIndex)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !name)
+		{
+			return;
+		}
+		std::string nameStr = ch_u16_to_string(name);
+		net->SetLocalPlayerInfo(nameStr.c_str(), skinIndex);
+	}
+
+	CH_SCRIPT_FUNC void Network_SendPlayerInfo(const Coral::UCChar* name, uint8_t skinIndex)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !name)
+		{
+			return;
+		}
+		std::string nameStr = ch_u16_to_string(name);
+		net->SendPlayerInfoToHost(nameStr.c_str(), skinIndex);
+	}
+
+	CH_SCRIPT_FUNC int Network_GetPlayerCount()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net ? static_cast<int>(net->GetPlayerList().size()) : 0;
+	}
+
+	CH_SCRIPT_FUNC void Network_GetPlayerListJSON(char* outBuffer, int bufferSize)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !outBuffer || bufferSize <= 0)
+		{
+			if (outBuffer && bufferSize > 0)
+			{
+				outBuffer[0] = '\0';
+			}
+			return;
+		}
+
+		const auto& players = net->GetPlayerList();
+		// Build a simple JSON array: [{"id":1,"name":"Player","skin":0,"isHost":1}, ...]
+		std::string json = "[";
+		for (size_t i = 0; i < players.size(); ++i)
+		{
+			if (i > 0)
+			{
+				json += ",";
+			}
+			json += "{\"id\":" + std::to_string(players[i].NetworkID);
+			json += ",\"name\":\"" + EscapeJson(players[i].Name) + "\"";
+			json += ",\"skin\":" + std::to_string((int)players[i].SkinIndex);
+			json += ",\"isHost\":" + std::to_string((int)players[i].IsHost) + "}";
+		}
+		json += "]";
+
+		std::strncpy(outBuffer, json.c_str(), bufferSize - 1);
+		outBuffer[bufferSize - 1] = '\0';
+	}
+
+	CH_SCRIPT_FUNC uint64_t Network_GetLocalNetworkID()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net ? net->GetLocalNetworkID() : 0;
+	}
+
+	// ---- Chat ----
+
+	CH_SCRIPT_FUNC void Network_SendChatMessage(const Coral::UCChar* message)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !message)
+		{
+			return;
+		}
+		std::string msg = ch_u16_to_string(message);
+		net->SendChatMessage(msg.c_str());
+	}
+
+	CH_SCRIPT_FUNC uint8_t Network_HasPendingChat()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->HasPendingChatMessages();
+	}
+
+	CH_SCRIPT_FUNC void Network_GetPendingChatJSON(char* outBuffer, int bufferSize)
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (!net || !outBuffer || bufferSize <= 0)
+		{
+			if (outBuffer && bufferSize > 0)
+			{
+				outBuffer[0] = '\0';
+			}
+			return;
+		}
+
+		const auto& messages = net->GetPendingChatMessages();
+		// JSON array: [{"sender":"Name","message":"text"}, ...]
+		std::string json = "[";
+		for (size_t i = 0; i < messages.size(); ++i)
+		{
+			if (i > 0)
+			{
+				json += ",";
+			}
+			json += "{\"sender\":\"" + EscapeJson(messages[i].SenderName) + "\"";
+			json += ",\"message\":\"" + EscapeJson(messages[i].Message) + "\"}";
+		}
+		json += "]";
+
+		std::strncpy(outBuffer, json.c_str(), bufferSize - 1);
+		outBuffer[bufferSize - 1] = '\0';
+	}
+
+	CH_SCRIPT_FUNC void Network_ClearPendingChat()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		if (net)
+		{
+			net->ClearPendingChatMessages();
+		}
+	}
+
+	// ---- Prefab ----
+
+	CH_SCRIPT_FUNC void Network_SetPlayerPrefab(const Coral::UCChar* path)
+	{
+		if (!path)
+		{
+			return;
+		}
+		std::string pathStr = ch_u16_to_string(path);
+		NetworkSystem::GetInstance().SetPlayerPrefab(pathStr.c_str());
+		CH_CORE_INFO("[Script] Network.SetPlayerPrefab(path='{}')", pathStr);
+	}
+
+	// ---- UPnP ----
+
+	CH_SCRIPT_FUNC uint8_t Network_IsUpnpAvailable()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->IsUpnpAvailable();
+	}
+
+	// ---- Firewall ----
+
+	CH_SCRIPT_FUNC uint8_t Network_IsFirewallRuleActive()
+	{
+		auto* net = ServiceLocator::TryGet<Network>();
+		return net && net->IsFirewallRuleActive();
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_network.h b/engine/scripting/script_glue_network.h
new file mode 100644
index 000000000..280eb7188
--- /dev/null
+++ b/engine/scripting/script_glue_network.h
@@ -0,0 +1,69 @@
+#ifndef SCRIPT_GLUE_NETWORK_H
+#define SCRIPT_GLUE_NETWORK_H
+#include "script_glue_internal.h"
+
+namespace Chained
+{
+	class Network;
+}
+
+namespace Chained
+{
+
+	CH_SCRIPT_FUNC void Network_HostGame(uint16_t port, int maxClients);
+
+	CH_SCRIPT_FUNC void Network_ConnectTo(const Coral::UCChar* ip, uint16_t port);
+
+	CH_SCRIPT_FUNC void Network_Disconnect();
+
+	CH_SCRIPT_FUNC uint8_t Network_IsHost();
+
+	CH_SCRIPT_FUNC uint8_t Network_IsClient();
+
+	CH_SCRIPT_FUNC uint8_t Network_IsConnected();
+	CH_SCRIPT_FUNC uint8_t Network_IsFullyConnected();
+
+	CH_SCRIPT_FUNC int Network_GetClientCount();
+
+	CH_SCRIPT_FUNC int Network_GetMaxClients();
+
+	CH_SCRIPT_FUNC int Network_GetRole();
+
+	CH_SCRIPT_FUNC void Network_GetListenAddress(char* outBuffer, int bufferSize);
+
+	CH_SCRIPT_FUNC void Network_GetPublicAddress(char* outBuffer, int bufferSize);
+
+	CH_SCRIPT_FUNC void Network_GetPublicIPv6Address(char* outBuffer, int bufferSize);
+
+	CH_SCRIPT_FUNC void Network_BroadcastSceneChange(const Coral::UCChar* scenePath);
+
+	CH_SCRIPT_FUNC uint8_t Network_HasPendingSceneChange();
+
+	CH_SCRIPT_FUNC void Network_GetPendingSceneChange(char* outBuffer, int bufferSize);
+
+	CH_SCRIPT_FUNC void Network_ClearPendingSceneChange();
+
+	// Player list
+	CH_SCRIPT_FUNC void Network_SetLocalPlayerInfo(const Coral::UCChar* name, uint8_t skinIndex);
+	CH_SCRIPT_FUNC void Network_SendPlayerInfo(const Coral::UCChar* name, uint8_t skinIndex);
+	CH_SCRIPT_FUNC int Network_GetPlayerCount();
+	CH_SCRIPT_FUNC void Network_GetPlayerListJSON(char* outBuffer, int bufferSize);
+	CH_SCRIPT_FUNC uint64_t Network_GetLocalNetworkID();
+
+	// Chat
+	CH_SCRIPT_FUNC void Network_SendChatMessage(const Coral::UCChar* message);
+	CH_SCRIPT_FUNC uint8_t Network_HasPendingChat();
+	CH_SCRIPT_FUNC void Network_GetPendingChatJSON(char* outBuffer, int bufferSize);
+	CH_SCRIPT_FUNC void Network_ClearPendingChat();
+
+	// Prefab
+	CH_SCRIPT_FUNC void Network_SetPlayerPrefab(const Coral::UCChar* path);
+
+	// UPnP
+	CH_SCRIPT_FUNC uint8_t Network_IsUpnpAvailable();
+
+	// Firewall
+	CH_SCRIPT_FUNC uint8_t Network_IsFirewallRuleActive();
+
+} // namespace Chained
+#endif
diff --git a/engine/scripting/script_glue_physics.cpp b/engine/scripting/script_glue_physics.cpp
new file mode 100644
index 000000000..009b34167
--- /dev/null
+++ b/engine/scripting/script_glue_physics.cpp
@@ -0,0 +1,161 @@
+#include "script_glue_entity.h"
+#include "engine/audio/audio.h"
+#include "engine/core/service_locator.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// ── RigidBody ────────────────────────────────────────────────────────
+
+	void RigidBody_GetVelocity(uint64_t entityID, glm::vec3* outVelocity)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<RigidBodyComponent>() && outVelocity)
+		{
+			auto& rb = entity.GetComponent<RigidBodyComponent>();
+			if (rb.IsNetworkDriven)
+			{
+				*outVelocity = rb.Velocity;
+				return;
+			}
+			if (rb.Handle != kInvalidPhysicsBody)
+			{
+				auto* physics = ServiceLocator::TryGet<Physics>();
+				if (physics && physics->GetWorld())
+				{
+					*outVelocity = physics->GetWorld()->GetVelocity(rb.Handle);
+					return;
+				}
+			}
+			*outVelocity = rb.Velocity;
+		}
+		else if (outVelocity)
+		{
+			*outVelocity = {};
+		}
+	}
+	void RigidBody_SetVelocity(uint64_t entityID, glm::vec3* inVelocity)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<RigidBodyComponent>() && inVelocity)
+		{
+			auto& rb = entity.GetComponent<RigidBodyComponent>();
+			rb.Velocity = *inVelocity;
+			if (rb.Handle != kInvalidPhysicsBody)
+			{
+				auto* physics = ServiceLocator::TryGet<Physics>();
+				if (physics && physics->GetWorld())
+				{
+					glm::vec3 toSet = *inVelocity;
+					if (rb.Type == RigidBodyComponent::BodyType::Dynamic)
+					{
+						constexpr float kJumpImpulseThreshold = 0.5f;
+						if (toSet.y <= kJumpImpulseThreshold)
+						{
+							toSet.y = physics->GetWorld()->GetVelocity(rb.Handle).y;
+						}
+					}
+					physics->GetWorld()->SetVelocity(rb.Handle, toSet);
+				}
+			}
+		}
+	}
+	void RigidBody_ForceSetVelocity(uint64_t entityID, glm::vec3* inVelocity)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<RigidBodyComponent>() && inVelocity)
+		{
+			auto& rb = entity.GetComponent<RigidBodyComponent>();
+			rb.Velocity = *inVelocity;
+			rb.VelocityForced = true;
+			if (rb.Handle != kInvalidPhysicsBody)
+			{
+				auto* physics = ServiceLocator::TryGet<Physics>();
+				if (physics)
+				{
+					physics->ForceSetVelocity(rb.Handle, *inVelocity);
+				}
+			}
+		}
+	}
+	uint8_t RigidBody_IsGrounded(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (!entity || !entity.HasComponent<RigidBodyComponent>())
+		{
+			return false;
+		}
+
+		auto& rb = entity.GetComponent<RigidBodyComponent>();
+		return rb.IsGrounded;
+	}
+	uint32_t RigidBody_IsKinematic(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return (entity && entity.HasComponent<RigidBodyComponent>() &&
+				entity.GetComponent<RigidBodyComponent>().Type == RigidBodyComponent::BodyType::Kinematic)
+				   ? 1u
+				   : 0u;
+	}
+	void RigidBody_SetKinematic(uint64_t entityID, uint8_t isKinematic)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<RigidBodyComponent>())
+		{
+			entity.GetComponent<RigidBodyComponent>().Type =
+				isKinematic ? RigidBodyComponent::BodyType::Kinematic : RigidBodyComponent::BodyType::Dynamic;
+		}
+	}
+
+	// ── Audio (on entity) ────────────────────────────────────────────────
+
+	void AudioComponent_Play(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AudioComponent>())
+		{
+			auto& audio = entity.GetComponent<AudioComponent>();
+			if (audio.SoundHandle != 0)
+			{
+				auto* audioService = ServiceLocator::TryGet<Audio>();
+				if (!audioService)
+				{
+					return;
+				}
+
+				glm::vec3 worldPos = {0.0f, 0.0f, 0.0f};
+				if (entity.HasComponent<TransformComponent>())
+				{
+					worldPos = glm::vec3(entity.GetComponent<TransformComponent>().WorldTransform[3]);
+				}
+
+				audioService->SetInstancePosition(audio.SoundHandle, worldPos);
+				audioService->Play(audio.SoundHandle, audio.Volume, audio.Pitch, audio.Loop, audio.Spatialized,
+								   worldPos);
+				audio.IsPlaying = true;
+			}
+		}
+	}
+	void AudioComponent_Stop(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<AudioComponent>())
+		{
+			auto& audio = entity.GetComponent<AudioComponent>();
+			if (audio.SoundHandle != 0 && audio.IsPlaying)
+			{
+				auto* audioService = ServiceLocator::TryGet<Audio>();
+				if (!audioService)
+				{
+					return;
+				}
+				audioService->Stop(audio.SoundHandle);
+				audio.IsPlaying = false;
+			}
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_player.cpp b/engine/scripting/script_glue_player.cpp
new file mode 100644
index 000000000..5ab2fbc7f
--- /dev/null
+++ b/engine/scripting/script_glue_player.cpp
@@ -0,0 +1,128 @@
+#include "script_glue_entity.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// ── PlayerComponent ──────────────────────────────────────────────────
+
+	float PlayerComponent_GetMovementSpeed(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::PlayerComponent>()
+				   ? entity.GetComponent<Chained::PlayerComponent>().MovementSpeed
+				   : 0.0f;
+	}
+	void PlayerComponent_SetMovementSpeed(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::PlayerComponent>())
+		{
+			entity.GetComponent<Chained::PlayerComponent>().MovementSpeed = value;
+		}
+	}
+	float PlayerComponent_GetJumpForce(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::PlayerComponent>()
+				   ? entity.GetComponent<Chained::PlayerComponent>().JumpForce
+				   : 0.0f;
+	}
+	void PlayerComponent_SetJumpForce(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::PlayerComponent>())
+		{
+			entity.GetComponent<Chained::PlayerComponent>().JumpForce = value;
+		}
+	}
+	float PlayerComponent_GetLookSensitivity(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::PlayerComponent>()
+				   ? entity.GetComponent<Chained::PlayerComponent>().LookSensitivity
+				   : 0.0f;
+	}
+	void PlayerComponent_SetLookSensitivity(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::PlayerComponent>())
+		{
+			entity.GetComponent<Chained::PlayerComponent>().LookSensitivity = value;
+		}
+	}
+
+	// ── SpawnComponent ───────────────────────────────────────────────────
+
+	uint8_t SpawnComponent_GetIsActive(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::SpawnComponent>()
+				   ? entity.GetComponent<Chained::SpawnComponent>().IsActive
+				   : false;
+	}
+	void SpawnComponent_SetIsActive(uint64_t entityID, uint8_t value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>())
+		{
+			entity.GetComponent<Chained::SpawnComponent>().IsActive = value;
+		}
+	}
+	uint8_t SpawnComponent_IsCheckpoint(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::SpawnComponent>()
+				   ? entity.GetComponent<Chained::SpawnComponent>().IsCheckpoint
+				   : false;
+	}
+	void SpawnComponent_SetIsCheckpoint(uint64_t entityID, uint8_t value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>())
+		{
+			entity.GetComponent<Chained::SpawnComponent>().IsCheckpoint = value;
+		}
+	}
+	void SpawnComponent_GetSpawnPoint(uint64_t entityID, glm::vec3* outPoint)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>() && outPoint)
+		{
+			*outPoint = entity.GetComponent<Chained::SpawnComponent>().SpawnPoint;
+		}
+		else if (outPoint)
+		{
+			*outPoint = {};
+		}
+	}
+	void SpawnComponent_SetSpawnPoint(uint64_t entityID, glm::vec3* inPoint)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>() && inPoint)
+		{
+			entity.GetComponent<Chained::SpawnComponent>().SpawnPoint = *inPoint;
+		}
+	}
+	uint8_t SpawnComponent_GetRenderSpawnZoneInScene(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<Chained::SpawnComponent>()
+				   ? entity.GetComponent<Chained::SpawnComponent>().RenderSpawnZoneInScene
+				   : false;
+	}
+	void SpawnComponent_GetZoneSize(uint64_t entityID, glm::vec3* outSize)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<Chained::SpawnComponent>() && outSize)
+		{
+			*outSize = entity.GetComponent<Chained::SpawnComponent>().ZoneSize;
+		}
+		else if (outSize)
+		{
+			*outSize = {};
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_scene.cpp b/engine/scripting/script_glue_scene.cpp
new file mode 100644
index 000000000..5fc676db9
--- /dev/null
+++ b/engine/scripting/script_glue_scene.cpp
@@ -0,0 +1,64 @@
+#include "script_glue_scene.h"
+#include "engine/app/application.h"
+
+#include "engine/scene/scene_events.h"
+#include "engine/scene/components.h"
+
+namespace Chained
+{
+	CH_SCRIPT_FUNC uint64_t Scene_FindEntityByTag(const Coral::UCChar* tag)
+	{
+		auto* scene = GetActiveScene();
+		if (scene && tag)
+		{
+			auto entity = scene->FindEntityByTag(ch_u16_to_string(tag));
+			if (entity)
+			{
+				return static_cast<uint32_t>(static_cast<entt::entity>(entity));
+			}
+		}
+		return static_cast<uint64_t>(entt::null);
+	}
+
+	CH_SCRIPT_FUNC uint64_t Scene_CopyEntity(uint64_t entityID)
+	{
+		auto* scene = GetActiveScene();
+		if (scene)
+		{
+			auto entity = scene->CopyEntity(static_cast<entt::entity>(entityID));
+			return entity != entt::null ? static_cast<uint64_t>(entity) : 0;
+		}
+		return 0;
+	}
+
+	CH_SCRIPT_FUNC void Scene_LoadScene(const Coral::UCChar* path)
+	{
+		if (!path)
+		{
+			return;
+		}
+		SceneChangeRequestEvent e(ch_u16_to_string(path));
+		Application::Get().OnEvent(e);
+	}
+
+	CH_SCRIPT_FUNC uint64_t Scene_GetPrimaryCameraEntity()
+	{
+		auto* scene = GetActiveScene();
+		if (!scene)
+		{
+			return 0;
+		}
+
+		auto& reg = scene->GetRegistry();
+		auto view = reg.view<CameraComponent>();
+		for (auto entity : view)
+		{
+			if (view.get<CameraComponent>(entity).Primary)
+			{
+				return static_cast<uint64_t>(entity);
+			}
+		}
+		return 0;
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_scene.h b/engine/scripting/script_glue_scene.h
new file mode 100644
index 000000000..e5fa01b56
--- /dev/null
+++ b/engine/scripting/script_glue_scene.h
@@ -0,0 +1,18 @@
+#ifndef SCRIPT_GLUE_SCENE_H
+#define SCRIPT_GLUE_SCENE_H
+#include "script_glue_internal.h"
+#include "engine/core/log.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/app/application.h"
+#include "engine/scene/scene_events.h"
+
+namespace Chained
+{
+	CH_SCRIPT_FUNC uint64_t Scene_FindEntityByTag(const Coral::UCChar* tag);
+	CH_SCRIPT_FUNC uint64_t Scene_CopyEntity(uint64_t entityID);
+	CH_SCRIPT_FUNC void Scene_LoadScene(const Coral::UCChar* path);
+	CH_SCRIPT_FUNC uint64_t Scene_GetPrimaryCameraEntity();
+
+} // namespace Chained
+#endif
\ No newline at end of file
diff --git a/engine/scripting/script_glue_system.cpp b/engine/scripting/script_glue_system.cpp
new file mode 100644
index 000000000..b070a3cc9
--- /dev/null
+++ b/engine/scripting/script_glue_system.cpp
@@ -0,0 +1,113 @@
+#include "script_glue_system.h"
+#include "engine/project/project.h"
+#include <GLFW/glfw3.h>
+#include <set>
+
+namespace Chained
+{
+	void Log_Info(const Coral::UCChar* message)
+	{
+		CH_CORE_INFO("[C#] {}", ch_u16_to_string(message));
+	}
+	void Log_Warn(const Coral::UCChar* message)
+	{
+		CH_CORE_WARN("[C#] {}", ch_u16_to_string(message));
+	}
+	void Log_Error(const Coral::UCChar* message)
+	{
+		CH_CORE_ERROR("[C#] {}", ch_u16_to_string(message));
+	}
+	void Application_Close()
+	{
+		Application::Get().Close();
+	}
+	int Application_GetFPS()
+	{
+		float dt = Application::Get().GetFrameTime();
+		return dt > 0.0f ? (int)(1.0f / dt) : 0;
+	}
+	float Application_GetFrameTime()
+	{
+		return Application::Get().GetFrameTime();
+	}
+	void Window_SetSize(int w, int h)
+	{
+		Application::Get().GetWindow().SetSize(w, h);
+	}
+	void Window_SetFullscreen(uint8_t enabled)
+	{
+		Application::Get().GetWindow().SetFullscreen(enabled);
+	}
+	void Window_SetVSync(uint8_t enabled)
+	{
+		Application::Get().GetWindow().SetVSync(enabled);
+	}
+	void Window_SetAntialiasing(uint8_t enabled)
+	{
+		Application::Get().GetWindow().SetAntialiasing(enabled);
+	}
+	void Window_SetAntiAliasingSamples(int samples)
+	{
+		if (auto project = Project::GetActive())
+		{
+			project->GetConfig().Render.AntiAliasingSamples = samples;
+		}
+	}
+
+	const Coral::UCChar* Window_GetSupportedResolution()
+	{
+		// The returned pointer is handed to managed code, so it must outlive this
+		// call. Return a pointer into a persistent buffer, never .c_str() on a
+		// temporary UCString (that would dangle the moment this function returns).
+		static thread_local Coral::UCString s_ResolutionBuffer;
+
+		GLFWwindow* window = static_cast<GLFWwindow*>(Application::Get().GetWindow().GetNativeWindow());
+		if (!window)
+		{
+			s_ResolutionBuffer = ToWide("");
+			return s_ResolutionBuffer.c_str();
+		}
+
+		GLFWmonitor* monitor = glfwGetWindowMonitor(window);
+		if (!monitor)
+		{
+			monitor = glfwGetPrimaryMonitor();
+		}
+		if (!monitor)
+		{
+			s_ResolutionBuffer = ToWide("");
+			return s_ResolutionBuffer.c_str();
+		}
+
+		int count = 0;
+		const GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
+
+		std::set<std::pair<int, int>> seen;
+		std::ostringstream oss;
+		for (int i = 0; i < count; i++)
+		{
+			auto key = std::make_pair(modes[i].width, modes[i].height);
+			if (seen.insert(key).second)
+			{
+				if (!oss.str().empty())
+				{
+					oss << ";";
+				}
+				oss << modes[i].width << "x" << modes[i].height;
+			}
+		}
+
+		s_ResolutionBuffer = ToWide(oss.str());
+		return s_ResolutionBuffer.c_str();
+	}
+
+	float Physics_GetGravity()
+	{
+		if (auto project = Project::GetActive())
+		{
+			return project->GetConfig().Physics.Gravity;
+		}
+		return 20.0f;
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_system.h b/engine/scripting/script_glue_system.h
new file mode 100644
index 000000000..6aaa2629e
--- /dev/null
+++ b/engine/scripting/script_glue_system.h
@@ -0,0 +1,41 @@
+#ifndef SCRIPT_GLUE_SYSTEM_H
+#define SCRIPT_GLUE_SYSTEM_H
+#include "script_glue_internal.h"
+#include "engine/app/application.h"
+#include "engine/scene/scene.h"
+#include "engine/scripting/scriptengine.h"
+
+namespace Chained
+{
+
+	// ── Logging ──────────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Log_Info(const Coral::UCChar* message);
+
+	CH_SCRIPT_FUNC void Log_Warn(const Coral::UCChar* message);
+
+	CH_SCRIPT_FUNC void Log_Error(const Coral::UCChar* message);
+
+	// ── Application / Window ─────────────────────────────────────────────
+	CH_SCRIPT_FUNC void Application_Close();
+
+	CH_SCRIPT_FUNC int Application_GetFPS();
+
+	CH_SCRIPT_FUNC float Application_GetFrameTime();
+
+	CH_SCRIPT_FUNC void Window_SetSize(int w, int h);
+
+	CH_SCRIPT_FUNC void Window_SetFullscreen(uint8_t enabled);
+
+	CH_SCRIPT_FUNC void Window_SetVSync(uint8_t enabled);
+
+	CH_SCRIPT_FUNC void Window_SetAntialiasing(uint8_t enabled);
+
+	CH_SCRIPT_FUNC void Window_SetAntiAliasingSamples(int samples);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* Window_GetSupportedResolution();
+
+	// ── Physics ────────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC float Physics_GetGravity();
+
+} // namespace Chained
+#endif
diff --git a/engine/scripting/script_glue_transform.cpp b/engine/scripting/script_glue_transform.cpp
new file mode 100644
index 000000000..2dc4f3b43
--- /dev/null
+++ b/engine/scripting/script_glue_transform.cpp
@@ -0,0 +1,182 @@
+#include "script_glue_entity.h"
+#include "engine/core/service_locator.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/components.h"
+#include "engine/scene/systems/transform_system.h"
+#include "engine/scene/entity.h"
+
+namespace Chained
+{
+
+	// ── Transform ────────────────────────────────────────────────────────
+
+	void Transform_GetTranslation(uint64_t entityID, glm::vec3* outTranslation)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>() && outTranslation)
+		{
+			*outTranslation = entity.GetComponent<TransformComponent>().Translation;
+		}
+		else if (outTranslation)
+		{
+			*outTranslation = {};
+		}
+	}
+	void Transform_SetTranslation(uint64_t entityID, glm::vec3* inTranslation)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>() && inTranslation)
+		{
+			auto& tc = entity.GetComponent<TransformComponent>();
+			tc.Translation = *inTranslation;
+			tc.PrevTranslation = *inTranslation;
+			tc.TransformChanged = true;
+
+			if (entity.HasComponent<RigidBodyComponent>())
+			{
+				auto& rb = entity.GetComponent<RigidBodyComponent>();
+				if (rb.Handle != kInvalidPhysicsBody)
+				{
+					auto* physics = ServiceLocator::TryGet<Physics>();
+					if (physics && physics->GetWorld())
+					{
+						physics->GetWorld()->SetTransform(rb.Handle, *inTranslation, tc.RotationQuat);
+					}
+				}
+			}
+		}
+	}
+	void Transform_GetRotation(uint64_t entityID, glm::vec3* outRotation)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>() && outRotation)
+		{
+			*outRotation = entity.GetComponent<TransformComponent>().Rotation;
+		}
+		else if (outRotation)
+		{
+			*outRotation = {};
+		}
+	}
+	void Transform_SetRotation(uint64_t entityID, glm::vec3* inRotation)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>() && inRotation)
+		{
+			TransformSystem::SetRotation(entity.GetComponent<TransformComponent>(), *inRotation);
+		}
+	}
+	void Transform_GetScale(uint64_t entityID, glm::vec3* outScale)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>() && outScale)
+		{
+			*outScale = entity.GetComponent<TransformComponent>().Scale;
+		}
+		else if (outScale)
+		{
+			*outScale = {};
+		}
+	}
+	void Transform_SetScale(uint64_t entityID, glm::vec3* inScale)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<TransformComponent>() && inScale)
+		{
+			TransformSystem::SetScale(entity.GetComponent<TransformComponent>(), *inScale);
+		}
+	}
+
+	// ── Model ────────────────────────────────────────────────────────────
+
+	const Coral::UCChar* Model_GetModelPath(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		std::string path =
+			entity && entity.HasComponent<ModelComponent>() ? entity.GetComponent<ModelComponent>().ModelPath : "";
+		return GlueStringPool::ReturnString(path);
+	}
+	void Model_SetModelPath(uint64_t entityID, const Coral::UCChar* inPath)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<ModelComponent>())
+		{
+			entity.GetComponent<ModelComponent>().ModelPath = ch_u16_to_string(inPath);
+		}
+	}
+
+	// ── Tag ──────────────────────────────────────────────────────────────
+
+	const Coral::UCChar* TagComponent_GetTag(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		std::string tag = entity && entity.HasComponent<TagComponent>() ? entity.GetComponent<TagComponent>().Tag : "";
+		return GlueStringPool::ReturnString(tag);
+	}
+
+	// ── Shader ───────────────────────────────────────────────────────────
+
+	void Shader_SetFloat(uint64_t entityID, const Coral::UCChar* inName, float inValue)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<ShaderComponent>())
+		{
+			auto& shader = entity.GetComponent<ShaderComponent>();
+			std::string name = ch_u16_to_string(inName);
+
+			auto it = std::find_if(shader.Uniforms.begin(), shader.Uniforms.end(),
+								   [&](const auto& u) { return u.Name == name; });
+
+			if (it != shader.Uniforms.end())
+			{
+				it->Value = inValue;
+			}
+			else
+			{
+				ShaderUniform uniform;
+				uniform.Name = name;
+				uniform.Value = inValue;
+				shader.Uniforms.push_back(uniform);
+			}
+		}
+	}
+	void Shader_SetVec3(uint64_t entityID, const Coral::UCChar* inName, glm::vec3* inValue)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<ShaderComponent>() && inValue)
+		{
+			auto& shader = entity.GetComponent<ShaderComponent>();
+			std::string name = ch_u16_to_string(inName);
+
+			auto it = std::find_if(shader.Uniforms.begin(), shader.Uniforms.end(),
+								   [&](const auto& u) { return u.Name == name; });
+
+			if (it != shader.Uniforms.end())
+			{
+				it->Value = *inValue;
+			}
+			else
+			{
+				ShaderUniform uniform;
+				uniform.Name = name;
+				uniform.Value = *inValue;
+				shader.Uniforms.push_back(uniform);
+			}
+		}
+	}
+	uint8_t Shader_GetEnabled(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<ShaderComponent>() ? entity.GetComponent<ShaderComponent>().Enabled
+																: false;
+	}
+	void Shader_SetEnabled(uint64_t entityID, uint8_t enabled)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<ShaderComponent>())
+		{
+			entity.GetComponent<ShaderComponent>().Enabled = enabled;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_ui.cpp b/engine/scripting/script_glue_ui.cpp
new file mode 100644
index 000000000..43dece27f
--- /dev/null
+++ b/engine/scripting/script_glue_ui.cpp
@@ -0,0 +1,634 @@
+#include "script_glue_ui.h"
+
+namespace Chained
+{
+	uint8_t ButtonControl_IsClicked(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (widget.PressedThisFrame)
+			{
+				widget.PressedThisFrame = false; // consume on read
+				return true;
+			}
+		}
+		return false;
+	}
+
+	uint8_t ButtonControl_IsDown(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<UIControlComponent>() ? entity.GetComponent<UIControlComponent>().IsDown
+																   : false;
+	}
+
+	const Coral::UCChar* ButtonControl_GetLabel(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ButtonData>(widget.Data))
+			{
+				return GlueStringPool::ReturnString(std::get<ButtonData>(widget.Data).Label);
+			}
+		}
+		return nullptr;
+	}
+	void ButtonControl_SetLabel(uint64_t entityID, const Coral::UCChar* label)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>() && label)
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ButtonData>(widget.Data))
+			{
+				std::get<ButtonData>(widget.Data).Label = ch_u16_to_string(label);
+			}
+		}
+	}
+
+	void CheckboxControl_SetChecked(uint64_t entityID, uint8_t checked)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<CheckboxData>(widget.Data))
+			{
+				std::get<CheckboxData>(widget.Data).Checked = checked;
+			}
+		}
+	}
+
+	const Coral::UCChar* LabelControl_GetText(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<LabelData>(widget.Data))
+			{
+				return GlueStringPool::ReturnString(std::get<LabelData>(widget.Data).Text);
+			}
+		}
+		return nullptr;
+	}
+	void LabelControl_SetText(uint64_t entityID, const Coral::UCChar* text)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>() && text)
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<LabelData>(widget.Data))
+			{
+				std::get<LabelData>(widget.Data).Text = ch_u16_to_string(text);
+			}
+		}
+	}
+
+	const Coral::UCChar* SliderControl_GetLabel(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				return GlueStringPool::ReturnString(std::get<SliderData>(widget.Data).Label);
+			}
+		}
+		return nullptr;
+	}
+	void SliderControl_SetLabel(uint64_t entityID, const Coral::UCChar* label)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>() && label)
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				std::get<SliderData>(widget.Data).Label = ch_u16_to_string(label);
+			}
+		}
+	}
+	float SliderControl_GetValue(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				return std::get<SliderData>(widget.Data).Value;
+			}
+		}
+		return 0.0f;
+	}
+	void SliderControl_SetValue(uint64_t entityID, float value)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				std::get<SliderData>(widget.Data).Value = value;
+			}
+		}
+	}
+	float SliderControl_GetMin(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				return std::get<SliderData>(widget.Data).Min;
+			}
+		}
+		return 0.0f;
+	}
+	void SliderControl_SetMin(uint64_t entityID, float minVal)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				std::get<SliderData>(widget.Data).Min = minVal;
+			}
+		}
+	}
+	float SliderControl_GetMax(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				return std::get<SliderData>(widget.Data).Max;
+			}
+		}
+		return 0.0f;
+	}
+	void SliderControl_SetMax(uint64_t entityID, float maxVal)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<SliderData>(widget.Data))
+			{
+				std::get<SliderData>(widget.Data).Max = maxVal;
+			}
+		}
+	}
+
+	float ProgressBarControl_GetProgress(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ProgressBarData>(widget.Data))
+			{
+				return std::get<ProgressBarData>(widget.Data).Progress;
+			}
+		}
+		return 0.0f;
+	}
+	void ProgressBarControl_SetProgress(uint64_t entityID, float progress)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ProgressBarData>(widget.Data))
+			{
+				std::get<ProgressBarData>(widget.Data).Progress = progress;
+			}
+		}
+	}
+	const Coral::UCChar* ProgressBarControl_GetOverlayText(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ProgressBarData>(widget.Data))
+			{
+				return GlueStringPool::ReturnString(std::get<ProgressBarData>(widget.Data).OverlayText);
+			}
+		}
+		return nullptr;
+	}
+	void ProgressBarControl_SetOverlayText(uint64_t entityID, const Coral::UCChar* text)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>() && text)
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ProgressBarData>(widget.Data))
+			{
+				std::get<ProgressBarData>(widget.Data).OverlayText = ch_u16_to_string(text);
+			}
+		}
+	}
+	uint8_t ProgressBarControl_GetShowPercentage(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ProgressBarData>(widget.Data))
+			{
+				return std::get<ProgressBarData>(widget.Data).ShowPercentage;
+			}
+		}
+		return false;
+	}
+	void ProgressBarControl_SetShowPercentage(uint64_t entityID, uint8_t show)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ProgressBarData>(widget.Data))
+			{
+				std::get<ProgressBarData>(widget.Data).ShowPercentage = show;
+			}
+		}
+	}
+
+	uint8_t WidgetControl_GetActive(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		return entity && entity.HasComponent<ControlComponent>() ? entity.GetComponent<ControlComponent>().IsActive
+																 : false;
+	}
+	void WidgetControl_SetActive(uint64_t entityID, uint8_t active)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<ControlComponent>())
+		{
+			entity.GetComponent<ControlComponent>().IsActive = active;
+		}
+	}
+
+	const Coral::UCChar* WidgetControl_GetTextColor(uint64_t entityID)
+	{
+		// Returns "R G B A" as space-separated integers
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& c = entity.GetComponent<UIControlComponent>().TextStyle.TextColor;
+			std::string s =
+				std::to_string(c.r) + " " + std::to_string(c.g) + " " + std::to_string(c.b) + " " + std::to_string(c.a);
+			return GlueStringPool::ReturnString(s);
+		}
+		return nullptr;
+	}
+	void WidgetControl_SetTextColorRGBA(uint64_t entityID, int r, int g, int b, int a)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& col = entity.GetComponent<UIControlComponent>().TextStyle.TextColor;
+			col.r = (uint8_t)std::clamp(r, 0, 255);
+			col.g = (uint8_t)std::clamp(g, 0, 255);
+			col.b = (uint8_t)std::clamp(b, 0, 255);
+			col.a = (uint8_t)std::clamp(a, 0, 255);
+		}
+	}
+
+	uint8_t CheckboxControl_GetChecked(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<CheckboxData>(widget.Data))
+			{
+				return std::get<CheckboxData>(widget.Data).Checked;
+			}
+		}
+		return false;
+	}
+	int ComboBoxControl_GetSelectedIndex(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ComboBoxData>(widget.Data))
+			{
+				return std::get<ComboBoxData>(widget.Data).SelectedIndex;
+			}
+		}
+		return 0;
+	}
+	void ComboBoxControl_SetSelectedIndex(uint64_t entityID, int index)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ComboBoxData>(widget.Data))
+			{
+				std::get<ComboBoxData>(widget.Data).SelectedIndex = index;
+			}
+		}
+	}
+	void ComboBoxControl_AddItem(uint64_t entityID, const Coral::UCChar* item)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>() && item)
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ComboBoxData>(widget.Data))
+			{
+				std::get<ComboBoxData>(widget.Data).Items.push_back(ch_u16_to_string(item));
+			}
+		}
+	}
+	void ComboBoxControl_ClearItems(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ComboBoxData>(widget.Data))
+			{
+				auto& combo = std::get<ComboBoxData>(widget.Data);
+				combo.Items.clear();
+				combo.SelectedIndex = 0;
+			}
+		}
+	}
+	int ComboBoxControl_GetItemCount(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ComboBoxData>(widget.Data))
+			{
+				return (int)std::get<ComboBoxData>(widget.Data).Items.size();
+			}
+		}
+		return 0;
+	}
+	const Coral::UCChar* ComboBoxControl_GetItem(uint64_t entityID, int index)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<ComboBoxData>(widget.Data))
+			{
+				auto& combo = std::get<ComboBoxData>(widget.Data);
+				if (index >= 0 && index < (int)combo.Items.size())
+				{
+					return GlueStringPool::ReturnString(combo.Items[index]);
+				}
+			}
+		}
+		return nullptr;
+	}
+	const Coral::UCChar* InputTextControl_GetText(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<InputTextData>(widget.Data))
+			{
+				auto& input = std::get<InputTextData>(widget.Data);
+				// Sync text from InputBuffer if it has content
+				if (!input.InputBuffer.empty())
+				{
+					input.Text = input.InputBuffer.data();
+				}
+				return GlueStringPool::ReturnString(input.Text);
+			}
+		}
+		return nullptr;
+	}
+
+	void InputTextControl_SetText(uint64_t entityID, const Coral::UCChar* text)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>() && text)
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<InputTextData>(widget.Data))
+			{
+				auto& input = std::get<InputTextData>(widget.Data);
+				input.Text = ch_u16_to_string(text);
+				// Reset buffer so it picks up the new text on next render
+				input.InputBuffer.clear();
+			}
+		}
+	}
+
+	uint8_t InputTextControl_HasChanged(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			return entity.GetComponent<UIControlComponent>().ValueChanged;
+		}
+		return false;
+	}
+
+	void InputTextControl_ClearChanged(uint64_t entityID)
+	{
+		Entity entity = GetEntity(entityID);
+		if (entity && entity.HasComponent<UIControlComponent>())
+		{
+			entity.GetComponent<UIControlComponent>().ValueChanged = false;
+		}
+	}
+
+	static int s_LastOverlayFrame = -1;
+	static float s_OverlayCursorY = 10.0f;
+
+	void UI_Text(const Coral::UCChar* text)
+	{
+		if (ImGui::GetCurrentContext() == nullptr || !ImGui::GetCurrentContext()->WithinFrameScope || !text)
+		{
+			return;
+		}
+
+		std::string strText = ch_u16_to_string(text);
+
+		auto window = ImGui::GetCurrentContext()->CurrentWindow;
+		if (window && !window->SkipItems)
+		{
+			ImGui::Text("%s", strText.c_str());
+		}
+		else
+		{
+			int currentFrame = ImGui::GetFrameCount();
+			if (currentFrame != s_LastOverlayFrame)
+			{
+				s_LastOverlayFrame = currentFrame;
+				s_OverlayCursorY = 10.0f;
+			}
+
+			ImGui::GetForegroundDrawList()->AddText({10.0f, s_OverlayCursorY}, IM_COL32(255, 255, 255, 255),
+													strText.c_str());
+			s_OverlayCursorY += ImGui::GetFontSize() + 4.0f;
+		}
+	}
+
+	void UI_TextColored(const Coral::UCChar* text, float r, float g, float b, float a)
+	{
+		if (ImGui::GetCurrentContext() == nullptr || !ImGui::GetCurrentContext()->WithinFrameScope || !text)
+		{
+			return;
+		}
+
+		std::string strText = ch_u16_to_string(text);
+		auto window = ImGui::GetCurrentContext()->CurrentWindow;
+		if (window && !window->SkipItems)
+		{
+			ImGui::TextColored(ImVec4(r, g, b, a), "%s", strText.c_str());
+		}
+		else
+		{
+			int currentFrame = ImGui::GetFrameCount();
+			if (currentFrame != s_LastOverlayFrame)
+			{
+				s_LastOverlayFrame = currentFrame;
+				s_OverlayCursorY = 10.0f;
+			}
+
+			ImU32 col = ImGui::ColorConvertFloat4ToU32(ImVec4(r, g, b, a));
+			ImGui::GetForegroundDrawList()->AddText({10.0f, s_OverlayCursorY}, col, strText.c_str());
+			s_OverlayCursorY += ImGui::GetFontSize() + 4.0f;
+		}
+	}
+
+	uint8_t UI_Button(const Coral::UCChar* label)
+	{
+		if (ImGui::GetCurrentContext() == nullptr || !ImGui::GetCurrentContext()->WithinFrameScope || !label)
+		{
+			return false;
+		}
+
+		std::string strLabel = ch_u16_to_string(label);
+		return ImGui::Button(strLabel.c_str());
+	}
+
+	void UI_BeginWindow(const Coral::UCChar* title, float x, float y, float w, float h, float bgAlpha)
+	{
+		if (ImGui::GetCurrentContext() == nullptr || !title)
+		{
+			return;
+		}
+
+		std::string strTitle = ch_u16_to_string(title);
+
+		// Offset position by the main viewport origin so coords are relative to game window
+		ImGuiViewport* vp = ImGui::GetMainViewport();
+		float vpX = vp ? vp->Pos.x : 0.0f;
+		float vpY = vp ? vp->Pos.y : 0.0f;
+
+		if (x >= 0.0f && y >= 0.0f)
+		{
+			ImGui::SetNextWindowPos(ImVec2(vpX + x, vpY + y), ImGuiCond_Always);
+		}
+		if (w > 0.0f && h > 0.0f)
+		{
+			ImGui::SetNextWindowSize(ImVec2(w, h), ImGuiCond_Always);
+		}
+		ImGui::SetNextWindowBgAlpha(bgAlpha);
+
+		ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
+								 ImGuiWindowFlags_NoSavedSettings;
+		ImGui::Begin(strTitle.c_str(), nullptr, flags);
+	}
+
+	void UI_EndWindow()
+	{
+		if (ImGui::GetCurrentContext())
+		{
+			ImGui::End();
+		}
+	}
+
+	uint8_t UI_InputText(const Coral::UCChar* label, Coral::UCChar* buffer, int maxLen)
+	{
+		if (ImGui::GetCurrentContext() == nullptr || !label || !buffer || maxLen <= 0)
+		{
+			return false;
+		}
+
+		std::string strLabel = ch_u16_to_string(label);
+		std::string strBuf = ch_u16_to_string(buffer);
+
+		char localBuf[512] = {0};
+		std::strncpy(localBuf, strBuf.c_str(), sizeof(localBuf) - 1);
+
+		bool changed =
+			ImGui::InputText(strLabel.c_str(), localBuf, sizeof(localBuf), ImGuiInputTextFlags_EnterReturnsTrue);
+
+		auto wide = ToWide(localBuf);
+		int copyLen = std::min((int)wide.size(), maxLen - 1);
+		for (int i = 0; i < copyLen; ++i)
+		{
+			buffer[i] = wide[i];
+		}
+		buffer[copyLen] = 0;
+
+		return changed ? 1 : 0;
+	}
+
+	void UI_SetKeyboardFocusHere()
+	{
+		if (ImGui::GetCurrentContext())
+		{
+			ImGui::SetKeyboardFocusHere();
+		}
+	}
+
+	void UI_SetScrollHereY(float centerYRatio)
+	{
+		if (ImGui::GetCurrentContext())
+		{
+			ImGui::SetScrollHereY(centerYRatio);
+		}
+	}
+
+	void UI_GetDisplaySize(float* outW, float* outH)
+	{
+		if (!outW || !outH)
+		{
+			return;
+		}
+		ImGuiViewport* vp = ImGui::GetMainViewport();
+		if (vp)
+		{
+			*outW = vp->Size.x;
+			*outH = vp->Size.y;
+		}
+		else if (ImGui::GetCurrentContext())
+		{
+			*outW = ImGui::GetIO().DisplaySize.x;
+			*outH = ImGui::GetIO().DisplaySize.y;
+		}
+		else
+		{
+			*outW = 1280.0f;
+			*outH = 720.0f;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/scripting/script_glue_ui.h b/engine/scripting/script_glue_ui.h
new file mode 100644
index 000000000..6d3d964d8
--- /dev/null
+++ b/engine/scripting/script_glue_ui.h
@@ -0,0 +1,72 @@
+#ifndef SCRIPT_GLUE_UI_H
+#define SCRIPT_GLUE_UI_H
+#include "script_glue_internal.h"
+#include "engine/scene/components/ui/control_component.h"
+#include <variant>
+#include <imgui_internal.h>
+
+namespace Chained
+{
+
+	// ── UI Controls ───────────────────────────────────────────────────────
+	CH_SCRIPT_FUNC uint8_t ButtonControl_IsClicked(uint64_t entityID);
+	CH_SCRIPT_FUNC uint8_t ButtonControl_IsDown(uint64_t entityID);
+	CH_SCRIPT_FUNC const Coral::UCChar* ButtonControl_GetLabel(uint64_t entityID);
+	CH_SCRIPT_FUNC void ButtonControl_SetLabel(uint64_t entityID, const Coral::UCChar* label);
+
+	CH_SCRIPT_FUNC uint8_t CheckboxControl_GetChecked(uint64_t entityID);
+	CH_SCRIPT_FUNC void CheckboxControl_SetChecked(uint64_t entityID, uint8_t checked);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* LabelControl_GetText(uint64_t entityID);
+	CH_SCRIPT_FUNC void LabelControl_SetText(uint64_t entityID, const Coral::UCChar* text);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* SliderControl_GetLabel(uint64_t entityID);
+	CH_SCRIPT_FUNC void SliderControl_SetLabel(uint64_t entityID, const Coral::UCChar* label);
+	CH_SCRIPT_FUNC float SliderControl_GetValue(uint64_t entityID);
+	CH_SCRIPT_FUNC void SliderControl_SetValue(uint64_t entityID, float value);
+	CH_SCRIPT_FUNC float SliderControl_GetMin(uint64_t entityID);
+	CH_SCRIPT_FUNC void SliderControl_SetMin(uint64_t entityID, float minVal);
+	CH_SCRIPT_FUNC float SliderControl_GetMax(uint64_t entityID);
+	CH_SCRIPT_FUNC void SliderControl_SetMax(uint64_t entityID, float maxVal);
+
+	CH_SCRIPT_FUNC float ProgressBarControl_GetProgress(uint64_t entityID);
+	CH_SCRIPT_FUNC void ProgressBarControl_SetProgress(uint64_t entityID, float progress);
+	CH_SCRIPT_FUNC const Coral::UCChar* ProgressBarControl_GetOverlayText(uint64_t entityID);
+	CH_SCRIPT_FUNC void ProgressBarControl_SetOverlayText(uint64_t entityID, const Coral::UCChar* text);
+	CH_SCRIPT_FUNC uint8_t ProgressBarControl_GetShowPercentage(uint64_t entityID);
+	CH_SCRIPT_FUNC void ProgressBarControl_SetShowPercentage(uint64_t entityID, uint8_t show);
+
+	CH_SCRIPT_FUNC uint8_t WidgetControl_GetActive(uint64_t entityID);
+	CH_SCRIPT_FUNC void WidgetControl_SetActive(uint64_t entityID, uint8_t active);
+	CH_SCRIPT_FUNC const Coral::UCChar* WidgetControl_GetTextColor(uint64_t entityID);
+	CH_SCRIPT_FUNC void WidgetControl_SetTextColorRGBA(uint64_t entityID, int r, int g, int b, int a);
+
+	CH_SCRIPT_FUNC int ComboBoxControl_GetSelectedIndex(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void ComboBoxControl_SetSelectedIndex(uint64_t entityID, int index);
+
+	CH_SCRIPT_FUNC void ComboBoxControl_AddItem(uint64_t entityID, const Coral::UCChar* item);
+
+	CH_SCRIPT_FUNC void ComboBoxControl_ClearItems(uint64_t entityID);
+
+	CH_SCRIPT_FUNC int ComboBoxControl_GetItemCount(uint64_t entityID);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* ComboBoxControl_GetItem(uint64_t entityID, int index);
+
+	CH_SCRIPT_FUNC const Coral::UCChar* InputTextControl_GetText(uint64_t entityID);
+	CH_SCRIPT_FUNC void InputTextControl_SetText(uint64_t entityID, const Coral::UCChar* text);
+	CH_SCRIPT_FUNC uint8_t InputTextControl_HasChanged(uint64_t entityID);
+	CH_SCRIPT_FUNC void InputTextControl_ClearChanged(uint64_t entityID);
+
+	CH_SCRIPT_FUNC void UI_Text(const Coral::UCChar* text);
+	CH_SCRIPT_FUNC void UI_TextColored(const Coral::UCChar* text, float r, float g, float b, float a);
+	CH_SCRIPT_FUNC uint8_t UI_Button(const Coral::UCChar* label);
+	CH_SCRIPT_FUNC void UI_BeginWindow(const Coral::UCChar* title, float x, float y, float w, float h, float bgAlpha);
+	CH_SCRIPT_FUNC void UI_EndWindow();
+	CH_SCRIPT_FUNC uint8_t UI_InputText(const Coral::UCChar* label, Coral::UCChar* buffer, int maxLen);
+	CH_SCRIPT_FUNC void UI_SetKeyboardFocusHere();
+	CH_SCRIPT_FUNC void UI_SetScrollHereY(float centerYRatio);
+	CH_SCRIPT_FUNC void UI_GetDisplaySize(float* outW, float* outH);
+
+} // namespace Chained
+#endif
\ No newline at end of file
diff --git a/engine/scripting/script_interop_pointers.h b/engine/scripting/script_interop_pointers.h
new file mode 100644
index 000000000..6c1562854
--- /dev/null
+++ b/engine/scripting/script_interop_pointers.h
@@ -0,0 +1,23 @@
+// script_interop_pointers.h
+// C++ → C# callback pointers. Set once during assembly load via the
+// ScriptGlue_Register*Callback internal calls (see script_glue.cpp).
+// C# registers each callback directly — no struct, no round-trip.
+#ifndef CH_SCRIPT_INTEROP_POINTERS_H
+#define CH_SCRIPT_INTEROP_POINTERS_H
+
+#include <cstdint>
+
+namespace Chained
+{
+	// Each pointer is filled by its matching ScriptGlue_Register*Callback internal call.
+	extern void (*g_ScriptOnUpdate)(float);
+	extern void (*g_ScriptOnEvent)(int);
+	extern void (*g_ScriptOnRenderUI)();
+	extern void (*g_ScriptOnCollisionEnter)(uint64_t, uint64_t);
+	extern void (*g_ScriptClearAll)();
+	extern uint8_t (*g_ScriptInstantiate)(uint64_t, const char16_t*);
+	extern void (*g_ScriptDestroy)(uint64_t, const char16_t*);
+
+} // namespace Chained
+
+#endif // CH_SCRIPT_INTEROP_POINTERS_H
diff --git a/engine/scripting/scriptengine.cpp b/engine/scripting/scriptengine.cpp
new file mode 100644
index 000000000..bd695d901
--- /dev/null
+++ b/engine/scripting/scriptengine.cpp
@@ -0,0 +1,213 @@
+#include "scriptengine.h"
+#include "engine/app/application.h"
+
+#include "engine/common/engine_assert.h"
+#include "engine/scene/scene.h"
+#include <exception>
+
+namespace Chained
+{
+
+	ScriptEngine::ScriptEngine(bool enableScripting)
+		: m_EnableScripting(enableScripting)
+	{
+	}
+
+	ScriptEngine::~ScriptEngine()
+	{
+		if (m_Host.IsInitialized())
+		{
+			ScriptEngine::Shutdown();
+		}
+	}
+
+	void ScriptEngine::Initialize()
+	{
+		if (!m_EnableScripting)
+		{
+			CH_CORE_INFO("ScriptEngine: Scripting is disabled via config.");
+			return;
+		}
+
+		if (m_Host.IsInitialized())
+		{
+			return;
+		}
+
+		CH_CORE_INFO("ScriptEngine: Initializing CoreCLR Host...");
+
+		if (!m_Host.Init())
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to initialize ScriptHost.");
+			return;
+		}
+
+		CH_CORE_INFO("ScriptEngine: CoreCLR host and Glue system initialized successfully.");
+	}
+
+	void ScriptEngine::Shutdown()
+	{
+		if (!m_Host.IsInitialized())
+		{
+			return;
+		}
+
+		CH_CORE_INFO("ScriptEngine: Shutting down CoreCLR...");
+
+		m_Registry.Clear();
+		m_Host.Shutdown();
+
+		CH_CORE_INFO("ScriptEngine: ScriptEngine cleanup complete.");
+	}
+
+	bool ScriptEngine::LoadAppAssembly(const std::string& path)
+	{
+		if (path.empty() || !std::filesystem::exists(path))
+		{
+			return false;
+		}
+
+		CH_CORE_INFO("ScriptEngine: Loading app assembly '{}'...", path);
+
+		bool success = m_Host.LoadAppAssembly(path);
+		if (success)
+		{
+			// InternalCalls are already registered to CoreAssembly inside LoadAssembliesTransactional
+			m_Registry.Clear();
+			m_Registry.Discover(*m_Host.GetAppAssembly(), *m_Host.GetCoreAssembly());
+		}
+		return success;
+	}
+
+	bool ScriptEngine::ReloadAssembly(const std::string& assemblyPath)
+	{
+		if (assemblyPath.empty() || !std::filesystem::exists(assemblyPath))
+		{
+			return false;
+		}
+
+		CH_CORE_INFO("ScriptEngine: Reloading assembly '{}'...", assemblyPath);
+
+		bool success = m_Host.ReloadAppAssembly(assemblyPath);
+		if (success)
+		{
+			// InternalCalls are already registered to CoreAssembly inside LoadAssembliesTransactional
+			m_Registry.Clear();
+			m_Registry.Discover(*m_Host.GetAppAssembly(), *m_Host.GetCoreAssembly());
+		}
+		return success;
+	}
+
+	bool ScriptEngine::RequestAssemblyReload(const std::string& assemblyPath, const char* requestSource)
+	{
+		CH_CORE_INFO("ScriptEngine: Assembly reload requested by {}", requestSource);
+		return ReloadAssembly(assemblyPath);
+	}
+
+	Coral::Type* ScriptEngine::GetScriptClass(const std::string& name)
+	{
+		return m_Registry.GetScriptClass(name);
+	}
+
+	std::filesystem::path ScriptEngine::ResolveAssemblyPath(const ScriptingSettings& scripting,
+															const std::filesystem::path& projectDir)
+	{
+		if (scripting.ModuleName.empty())
+		{
+			return {};
+		}
+
+		std::string dllName = scripting.ModuleName;
+		if (!dllName.ends_with(".dll"))
+		{
+			dllName += ".dll";
+		}
+
+		// Try ModuleDirectory first (relative to project dir)
+		std::filesystem::path dllPath = scripting.ModuleDirectory / dllName;
+		if (dllPath.is_relative())
+		{
+			dllPath = projectDir / dllPath;
+		}
+
+		if (std::filesystem::exists(dllPath))
+		{
+			return dllPath;
+		}
+
+		// Try MinGW "lib" prefix
+		std::filesystem::path libPath = dllPath.parent_path() / ("lib" + dllName);
+		if (std::filesystem::exists(libPath))
+		{
+			return libPath;
+		}
+
+		// Try exe directory (build output)
+		std::filesystem::path exeDir = Application::GetExecutableDirectory();
+		std::filesystem::path exePath = exeDir / dllName;
+		if (std::filesystem::exists(exePath))
+		{
+			return exePath;
+		}
+
+		// Try exe directory with lib prefix
+		std::filesystem::path exeLibPath = exeDir / ("lib" + dllName);
+		if (std::filesystem::exists(exeLibPath))
+		{
+			return exeLibPath;
+		}
+
+		// Scan exeDir/scripts/*/ for CMake build output layout
+		std::filesystem::path scriptsRoot = exeDir / "scripts";
+		if (std::filesystem::is_directory(scriptsRoot))
+		{
+			std::error_code ec;
+			for (auto& entry : std::filesystem::directory_iterator(scriptsRoot, ec))
+			{
+				if (!entry.is_directory())
+				{
+					continue;
+				}
+				std::filesystem::path candidate = entry.path() / dllName;
+				if (std::filesystem::exists(candidate))
+				{
+					return candidate;
+				}
+				candidate = entry.path() / ("lib" + dllName);
+				if (std::filesystem::exists(candidate))
+				{
+					return candidate;
+				}
+			}
+		}
+
+		return {};
+	}
+
+	bool ScriptEngine::TryAutoLoad(const ProjectConfig& config)
+	{
+		if (!config.Scripting.AutoLoad || config.Scripting.ModuleName.empty())
+		{
+			return false;
+		}
+
+		auto dllPath = ResolveAssemblyPath(config.Scripting, config.ProjectDirectory);
+		if (dllPath.empty())
+		{
+			CH_CORE_WARN("ScriptEngine: Script assembly not found for '{}' (module: '{}', dir: '{}').", config.Name,
+						 config.Scripting.ModuleName, config.Scripting.ModuleDirectory.string());
+			return false;
+		}
+
+		SetEnabled(true);
+		Initialize();
+		if (!LoadAppAssembly(dllPath.string()))
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to auto-load script assembly '{}'.", dllPath.string());
+			return false;
+		}
+		CH_CORE_INFO("ScriptEngine: Auto-loaded script assembly '{}'.", dllPath.string());
+		return true;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/scripting/scriptengine.h b/engine/scripting/scriptengine.h
new file mode 100644
index 000000000..aae151b1f
--- /dev/null
+++ b/engine/scripting/scriptengine.h
@@ -0,0 +1,102 @@
+#ifndef CH_SCRIPT_ENGINE_H
+#define CH_SCRIPT_ENGINE_H
+
+#include "engine/core/service.h"
+#include "scriptengine_services.h"
+#include "engine/project/project.h"
+#include <Coral/Assembly.hpp>
+#include <atomic>
+#include <string>
+#include <unordered_map>
+
+namespace Chained
+{
+
+	class Scene;
+
+	class ScriptEngine : public Service
+	{
+	public:
+		ScriptEngine(bool enableScripting);
+		virtual ~ScriptEngine() override;
+
+		void Initialize() override;
+		void Shutdown() override;
+
+		bool LoadAppAssembly(const std::string& filepath);
+		bool ReloadAssembly(const std::string& assemblyPath);
+		bool RequestAssemblyReload(const std::string& assemblyPath, const char* requestSource);
+
+		Coral::Type* GetScriptClass(const std::string& name);
+		const std::unordered_map<std::string, Coral::Type>& GetScriptClasses() const
+		{
+			return m_Registry.GetScriptClasses();
+		}
+
+		ScriptHost& GetHost()
+		{
+			return m_Host;
+		}
+		const ScriptHost& GetHost() const
+		{
+			return m_Host;
+		}
+
+		ScriptRegistry& GetRegistry()
+		{
+			return m_Registry;
+		}
+		const ScriptRegistry& GetRegistry() const
+		{
+			return m_Registry;
+		}
+
+		bool IsHostInitialized() const
+		{
+			return m_Host.IsInitialized();
+		}
+		bool IsReloadInProgress() const
+		{
+			return m_Host.IsReloadInProgress();
+		}
+		bool CanExecuteFrameScripts() const
+		{
+			return m_Host.IsInitialized() && !m_Host.IsReloadInProgress();
+		}
+
+		void SetEnabled(bool enable)
+		{
+			m_EnableScripting = enable;
+		}
+
+		// Resolves the script assembly DLL path from project config.
+		// Checks assets/bin/, exe directory, and MinGW "lib" prefix variants.
+		static std::filesystem::path ResolveAssemblyPath(const ScriptingSettings& scripting,
+														 const std::filesystem::path& projectDir);
+
+		// Attempts to auto-load the script assembly from project config.
+		// Returns true if the assembly was found and loaded.
+		bool TryAutoLoad(const ProjectConfig& config);
+
+		Scene* GetContextScene() const
+		{
+			return m_CurrentScene.load(std::memory_order_acquire);
+		}
+		void SetContextScene(Scene* scene)
+		{
+			m_CurrentScene.store(scene, std::memory_order_release);
+		}
+
+	private:
+		ScriptEngine(const ScriptEngine&) = delete;
+		ScriptEngine& operator=(const ScriptEngine&) = delete;
+
+	private:
+		ScriptHost m_Host;
+		ScriptRegistry m_Registry;
+		bool m_EnableScripting;
+		std::atomic<Scene*> m_CurrentScene{nullptr};
+	};
+
+} // namespace Chained
+#endif // CH_SCRIPT_ENGINE_H
\ No newline at end of file
diff --git a/engine/scripting/scriptengine_services.cpp b/engine/scripting/scriptengine_services.cpp
new file mode 100644
index 000000000..49979e9cd
--- /dev/null
+++ b/engine/scripting/scriptengine_services.cpp
@@ -0,0 +1,573 @@
+#include "scriptengine_services.h"
+
+#include "engine/core/service_locator.h"
+#include "engine/project/project.h"
+#include "script_glue.h"
+#include "script_interop_pointers.h"
+#include "engine/scripting/scene_scripting_manager.h"
+#include "engine/scripting/scriptengine.h"
+#include <Coral/GC.hpp>
+
+#include <cctype>
+#include <exception>
+
+#include <Coral/HostInstance.hpp>
+
+#if CH_PLATFORM_WINDOWS
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+namespace Chained
+{
+
+	namespace
+	{
+		constexpr const char* kGameScriptsAlcName = "GameScriptsALC";
+		static constexpr const char* kBuildConfigs[] = {"Debug", "Release", "RelWithDebInfo"};
+
+		std::filesystem::path GetCurrentBinaryDirectory()
+		{
+#ifdef _WIN32
+			wchar_t buffer[MAX_PATH];
+			GetModuleFileNameW(NULL, buffer, MAX_PATH);
+			return std::filesystem::path(buffer).parent_path();
+#else
+			char buffer[1024];
+			ssize_t len = readlink("/proc/self/exe", buffer, sizeof(buffer) - 1);
+			if (len != -1)
+			{
+				buffer[len] = '\0';
+				return std::filesystem::path(buffer).parent_path();
+			}
+			return std::filesystem::current_path();
+#endif
+		}
+
+		std::string ToLowerCopy(std::string value)
+		{
+			std::transform(value.begin(), value.end(), value.begin(),
+						   [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+			return value;
+		}
+
+		std::string GetShortTypeName(const std::string& fullName)
+		{
+			const size_t lastDot = fullName.find_last_of('.');
+			if (lastDot == std::string::npos || lastDot + 1 >= fullName.size())
+			{
+				return fullName;
+			}
+
+			return fullName.substr(lastDot + 1);
+		}
+
+		void AppendBuildBinCandidates(std::vector<std::filesystem::path>& out, const std::filesystem::path& root)
+		{
+			if (root.empty())
+			{
+				return;
+			}
+
+			const std::filesystem::path buildDir = root / "build";
+			std::error_code ec;
+			if (!std::filesystem::exists(buildDir, ec) || ec)
+			{
+				return;
+			}
+
+			for (const auto& presetEntry : std::filesystem::directory_iterator(buildDir, ec))
+			{
+				if (ec || !presetEntry.is_directory())
+				{
+					continue;
+				}
+
+				// Ninja Multi-Config: build/<preset>/bin/<Config>/
+				for (const char* cfg : kBuildConfigs)
+				{
+					const std::filesystem::path candidate = presetEntry.path() / "bin" / cfg;
+					if (std::find(out.begin(), out.end(), candidate) == out.end())
+					{
+						out.push_back(candidate);
+					}
+				}
+
+				// Also try flat structure: build/<preset>/bin/ (single-config fallback)
+				const std::filesystem::path flat = presetEntry.path() / "bin";
+				if (std::find(out.begin(), out.end(), flat) == out.end())
+				{
+					out.push_back(flat);
+				}
+			}
+		}
+
+		std::filesystem::path ResolveCoralDirectory()
+		{
+			std::vector<std::filesystem::path> candidateDirs;
+			candidateDirs.push_back(GetCurrentBinaryDirectory());
+			candidateDirs.push_back(std::filesystem::current_path());
+
+#ifdef PROJECT_ROOT_DIR
+			const std::filesystem::path engineRoot = std::filesystem::path(PROJECT_ROOT_DIR);
+			candidateDirs.push_back(engineRoot);
+			AppendBuildBinCandidates(candidateDirs, engineRoot);
+#endif
+
+			if (auto project = Project::GetActive())
+			{
+				const std::filesystem::path projectDir = project->GetConfig().ProjectDirectory;
+				candidateDirs.push_back(projectDir);
+				AppendBuildBinCandidates(candidateDirs, projectDir);
+			}
+
+			std::vector<std::string> checkedPaths;
+			for (const auto& candidateRaw : candidateDirs)
+			{
+				if (candidateRaw.empty())
+				{
+					continue;
+				}
+
+				std::error_code ec;
+				const std::filesystem::path candidate = std::filesystem::absolute(candidateRaw, ec).lexically_normal();
+				const std::filesystem::path managedPath =
+					ec ? (candidateRaw / "Coral.Managed.dll") : (candidate / "Coral.Managed.dll");
+				checkedPaths.push_back(managedPath.string());
+
+				if (std::filesystem::exists(managedPath))
+				{
+					return ec ? candidateRaw : candidate;
+				}
+			}
+
+			const std::filesystem::path fallback = GetCurrentBinaryDirectory();
+			CH_CORE_WARN("ScriptEngine: Coral.Managed.dll not found. Using fallback directory: '{}'.",
+						 fallback.string());
+			for (const auto& checked : checkedPaths)
+			{
+				CH_CORE_TRACE("ScriptEngine: Checked '{}'", checked);
+			}
+			return fallback;
+		}
+
+		std::filesystem::path ResolveCoreAssemblyPath(const std::filesystem::path& coralDir)
+		{
+			std::vector<std::filesystem::path> coreCandidates;
+
+			if (auto project = Project::GetActive())
+			{
+				coreCandidates.push_back(project->GetConfig().Scripting.ModuleDirectory / "Chained.Managed.dll");
+				AppendBuildBinCandidates(coreCandidates, project->GetConfig().ProjectDirectory);
+			}
+
+			const std::filesystem::path exeDir = GetCurrentBinaryDirectory();
+			coreCandidates.push_back(exeDir / "scripts" / "ChainedDecos" / "Chained.Managed.dll");
+
+			if (!coralDir.empty())
+			{
+				coreCandidates.push_back(coralDir / "Chained.Managed.dll");
+			}
+
+			coreCandidates.push_back(exeDir / "Chained.Managed.dll");
+			coreCandidates.push_back(std::filesystem::current_path() / "Chained.Managed.dll");
+
+#ifdef PROJECT_ROOT_DIR
+			AppendBuildBinCandidates(coreCandidates, std::filesystem::path(PROJECT_ROOT_DIR));
+#endif
+
+			for (const auto& candidate : coreCandidates)
+			{
+				if (!candidate.empty() && std::filesystem::exists(candidate))
+				{
+					return candidate;
+				}
+			}
+
+			return std::filesystem::path("Chained.Managed.dll");
+		}
+
+	} // namespace
+
+	ScriptHost& GetScriptHost()
+	{
+		auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>();
+		CH_ASSERT(scriptEngine && "ScriptEngine module is not registered in ServiceLocator!");
+		return scriptEngine->GetHost();
+	}
+
+	ScriptRegistry& GetScriptRegistry()
+	{
+		auto* scriptEngine = ServiceLocator::TryGet<ScriptEngine>();
+		CH_ASSERT(scriptEngine && "ScriptEngine module is not registered in ServiceLocator!");
+		return scriptEngine->GetRegistry();
+	}
+
+	void ScriptHost::ClearLoadedAssemblyState()
+	{
+		m_AppAssembly = nullptr;
+		m_CoreAssembly = nullptr;
+	}
+
+	bool ScriptHost::Init()
+	{
+		if (m_IsInitialized)
+		{
+			return true;
+		}
+
+		Coral::HostSettings coralSettings;
+
+		m_CoralDirectory = ResolveCoralDirectory();
+		coralSettings.CoralDirectory = m_CoralDirectory.string();
+		CH_CORE_INFO("ScriptEngine: Using Coral directory '{}'.", m_CoralDirectory.string());
+
+		coralSettings.MessageCallback = [](std::string_view message, Coral::MessageLevel level) {
+			switch (level)
+			{
+			case Coral::MessageLevel::Info:
+				CH_CORE_INFO("[Coral] {}", message);
+				break;
+			case Coral::MessageLevel::Warning:
+				CH_CORE_WARN("[Coral] {}", message);
+				break;
+			case Coral::MessageLevel::Error:
+				CH_CORE_ERROR("[Coral] {}", message);
+				break;
+			default:
+				CH_CORE_TRACE("[Coral](Trace): {}", message);
+				break;
+			}
+		};
+
+		coralSettings.ExceptionCallback = [](std::string_view message) {
+			CH_CORE_ERROR("[Coral] Unhandled Exception: {}", message);
+		};
+
+		auto status = m_Host.Initialize(coralSettings);
+		if (status != Coral::CoralInitStatus::Success)
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to initialize Coral! Status: {}", (int)status);
+			return false;
+		}
+
+		m_IsInitialized = true;
+
+		if (!RecreateAssemblyLoadContext(false))
+		{
+			m_Host.Shutdown();
+			m_IsInitialized = false;
+			return false;
+		}
+
+		return true;
+	}
+
+	void ScriptHost::Shutdown()
+	{
+		if (!m_IsInitialized)
+		{
+			ClearLoadedAssemblyState();
+			m_CoralDirectory.clear();
+			return;
+		}
+
+		try
+		{
+			m_Host.UnloadAssemblyLoadContext(m_AppAssemblyContext);
+			Coral::GC::Collect();
+			Coral::GC::WaitForPendingFinalizers();
+			Coral::GC::Collect();
+			Coral::GC::Collect();
+		} catch (const std::exception& e)
+		{
+			CH_CORE_WARN("ScriptEngine: Final scripting cleanup failed: {}", e.what());
+		} catch (...)
+		{
+			CH_CORE_WARN("ScriptEngine: Final scripting cleanup failed (unknown exception).");
+		}
+
+		ClearLoadedAssemblyState();
+		m_CoralDirectory.clear();
+
+		m_Host.Shutdown();
+		m_IsInitialized = false;
+	}
+
+	bool ScriptHost::RecreateAssemblyLoadContext(bool unloadCurrent)
+	{
+		if (!m_IsInitialized)
+		{
+			CH_CORE_ERROR("ScriptEngine: Cannot recreate ALC before host initialization.");
+			return false;
+		}
+
+		if (unloadCurrent)
+		{
+			try
+			{
+				m_Host.UnloadAssemblyLoadContext(m_AppAssemblyContext);
+			} catch (const std::exception& e)
+			{
+				CH_CORE_ERROR("ScriptEngine: Failed to unload current ALC: {}", e.what());
+				return false;
+			} catch (...)
+			{
+				CH_CORE_ERROR("ScriptEngine: Failed to unload current ALC (unknown exception).");
+				return false;
+			}
+		}
+
+		try
+		{
+			m_AppAssemblyContext = m_Host.CreateAssemblyLoadContext(kGameScriptsAlcName);
+			return true;
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to create ALC '{}': {}", kGameScriptsAlcName, e.what());
+			return false;
+		} catch (...)
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to create ALC '{}' (unknown exception).", kGameScriptsAlcName);
+			return false;
+		}
+	}
+
+	bool ScriptHost::LoadAssembliesTransactional(const std::filesystem::path& appAssemblyPath)
+	{
+		Coral::ManagedAssembly* loadedCore = nullptr;
+		Coral::ManagedAssembly* loadedApp = nullptr;
+
+		auto rollback = [&]() {
+			ClearLoadedAssemblyState();
+			if (!RecreateAssemblyLoadContext(true))
+			{
+				CH_CORE_ERROR("ScriptEngine: Rollback failed to recreate ALC. Scripting remains unavailable.");
+			}
+		};
+
+		const std::filesystem::path corePath = ResolveCoreAssemblyPath(m_CoralDirectory);
+
+		try
+		{
+			loadedCore = &m_AppAssemblyContext.LoadAssembly(corePath.string());
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("ScriptEngine: Exception loading core assembly '{}': {}", corePath.string(), e.what());
+			rollback();
+			return false;
+		} catch (...)
+		{
+			CH_CORE_ERROR("ScriptEngine: Unknown exception loading core assembly '{}'.", corePath.string());
+			rollback();
+			return false;
+		}
+
+		if (!loadedCore || loadedCore->GetLoadStatus() != Coral::AssemblyLoadStatus::Success)
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to load core assembly '{}'. Status: {}", corePath.string(),
+						  loadedCore ? (int)loadedCore->GetLoadStatus() : -1);
+			rollback();
+			return false;
+		}
+
+		try
+		{
+			loadedApp = &m_AppAssemblyContext.LoadAssembly(appAssemblyPath.string());
+		} catch (const std::exception& e)
+		{
+			CH_CORE_ERROR("ScriptEngine: Exception loading app assembly '{}': {}", appAssemblyPath.string(), e.what());
+			rollback();
+			return false;
+		} catch (...)
+		{
+			CH_CORE_ERROR("ScriptEngine: Unknown exception loading app assembly '{}'.", appAssemblyPath.string());
+			rollback();
+			return false;
+		}
+
+		if (!loadedApp || loadedApp->GetLoadStatus() != Coral::AssemblyLoadStatus::Success)
+		{
+			CH_CORE_ERROR("ScriptEngine: Failed to load app assembly '{}'. Status: {}", appAssemblyPath.string(),
+						  loadedApp ? (int)loadedApp->GetLoadStatus() : -1);
+			rollback();
+			return false;
+		}
+
+		m_CoreAssembly = loadedCore;
+		m_AppAssembly = loadedApp;
+
+		ScriptGlue::RegisterInternalCalls(*m_CoreAssembly);
+		// Internal calls are registered only on the core assembly —
+		// Coral resolves them from there for the app assembly via type forwarding.
+
+		Coral::Type interopType = m_CoreAssembly->GetLocalType("Chained.Interop");
+		if (interopType)
+		{
+			interopType.InvokeStaticMethod("RegisterCallbacks");
+			CH_CORE_INFO("ScriptEngine: Registered managed callbacks via Coral AddInternalCall.");
+		}
+		else
+		{
+			CH_CORE_ERROR("ScriptEngine: Could not find Chained.Interop to register callbacks!");
+		}
+
+		CH_CORE_INFO("ScriptEngine: Loaded core assembly '{}'.", corePath.string());
+		CH_CORE_INFO("ScriptEngine: Loaded app assembly '{}'.", appAssemblyPath.string());
+		return true;
+	}
+
+	bool ScriptHost::LoadAppAssembly(const std::string& filepath)
+	{
+		if (!m_IsInitialized)
+		{
+			CH_CORE_WARN("ScriptEngine::LoadAppAssembly called before Init().");
+			return false;
+		}
+
+		if (filepath.empty())
+		{
+			CH_CORE_WARN("ScriptEngine::LoadAppAssembly called with empty filepath.");
+			return false;
+		}
+
+		if (!std::filesystem::exists(filepath))
+		{
+			CH_CORE_ERROR("ScriptEngine: Assembly not found at '{}'.", filepath);
+			return false;
+		}
+
+		return LoadAssembliesTransactional(std::filesystem::path(filepath));
+	}
+
+	bool ScriptHost::ReloadAppAssembly(const std::string& filepath)
+	{
+		if (!m_IsInitialized)
+		{
+			CH_CORE_WARN("ScriptEngine::ReloadAssembly called before Init().");
+			return false;
+		}
+
+		if (filepath.empty())
+		{
+			CH_CORE_WARN("ScriptEngine::ReloadAssembly called with empty filepath.");
+			return false;
+		}
+
+		if (!std::filesystem::exists(filepath))
+		{
+			CH_CORE_ERROR("ScriptEngine: Assembly not found at '{}'.", filepath);
+			return false;
+		}
+
+		// Tear down existing scripts in the OLD ALC before unloading it:
+		// run ClearAll (OnDestroy on live scripts, clears static collections) and
+		// reset per-entity instantiation flags so OnUpdate re-instantiates from
+		// the reloaded assembly instead of keeping zombie instances.
+		SceneScriptingManager::ResetAll();
+
+		// Safety step: Clear stale Coral::Type entries from the registry before unloading the context
+		GetScriptRegistry().Clear();
+
+		ClearLoadedAssemblyState();
+		if (!RecreateAssemblyLoadContext(true))
+		{
+			return false;
+		}
+
+		return LoadAssembliesTransactional(std::filesystem::path(filepath));
+	}
+
+	void ScriptRegistry::Clear()
+	{
+		m_ScriptClasses.clear();
+		m_ShortNameToFullName.clear();
+		m_MissingScriptsWarnings.clear();
+	}
+
+	void ScriptRegistry::Discover(Coral::ManagedAssembly& appAssembly, Coral::ManagedAssembly& coreAssembly)
+	{
+		Clear();
+
+		Coral::Type scriptBaseType = coreAssembly.GetLocalType("Chained.Script");
+
+		if (!scriptBaseType)
+		{
+			CH_CORE_ERROR(
+				"ScriptEngine: Could not find base class 'Chained.Script' in Core assembly! Type discovery aborted.");
+			return;
+		}
+
+		CH_CORE_INFO("ScriptEngine: Found base script type '{}'.", (std::string)scriptBaseType.GetFullName());
+
+		auto types = appAssembly.GetTypes();
+		CH_CORE_INFO("ScriptEngine: Discovery - searching {} types in assembly '{}'...", types.size(),
+					 (std::string)appAssembly.GetName());
+
+		for (auto& type : types)
+		{
+			if (*type == scriptBaseType)
+			{
+				continue;
+			}
+
+			if (!type->IsSubclassOf(scriptBaseType))
+			{
+				continue;
+			}
+
+			std::string fullName = (std::string)type->GetFullName();
+			std::string key = ToLowerCopy(fullName);
+
+			m_ScriptClasses[key] = *type;
+
+			std::string shortKey = ToLowerCopy(GetShortTypeName(fullName));
+			auto [shortIt, inserted] = m_ShortNameToFullName.emplace(shortKey, key);
+			if (!inserted && shortIt->second != key)
+			{
+				shortIt->second.clear();
+			}
+
+			CH_CORE_INFO("ScriptEngine: Registered script '{}' (key: '{}')", fullName, key);
+		}
+
+		CH_CORE_INFO("ScriptEngine: {} script(s) registered ({} short-name keys).", m_ScriptClasses.size(),
+					 m_ShortNameToFullName.size());
+	}
+
+	Coral::Type* ScriptRegistry::GetScriptClass(const std::string& name)
+	{
+		std::string key = ToLowerCopy(name);
+
+		auto it = m_ScriptClasses.find(key);
+		if (it != m_ScriptClasses.end())
+		{
+			return &it->second;
+		}
+
+		auto shortIt = m_ShortNameToFullName.find(key);
+		if (shortIt != m_ShortNameToFullName.end())
+		{
+			if (shortIt->second.empty())
+			{
+				CH_CORE_WARN("ScriptEngine: Ambiguous short script name '{}'. Use fully-qualified name.", name);
+				return nullptr;
+			}
+
+			auto fullIt = m_ScriptClasses.find(shortIt->second);
+			if (fullIt != m_ScriptClasses.end())
+			{
+				return &fullIt->second;
+			}
+		}
+
+		if (m_MissingScriptsWarnings.find(key) == m_MissingScriptsWarnings.end())
+		{
+			CH_CORE_WARN("ScriptEngine: No script found for name '{}' (key: '{}')", name, key);
+			m_MissingScriptsWarnings.insert(key);
+		}
+		return nullptr;
+	}
+
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/scripting/scriptengine_services.h b/engine/scripting/scriptengine_services.h
new file mode 100644
index 000000000..89cbe87d7
--- /dev/null
+++ b/engine/scripting/scriptengine_services.h
@@ -0,0 +1,88 @@
+#ifndef CH_SCRIPT_ENGINE_SERVICES_H
+#define CH_SCRIPT_ENGINE_SERVICES_H
+
+#include <Coral/Assembly.hpp>
+#include <Coral/HostInstance.hpp>
+#include <atomic>
+#include <filesystem>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace Chained
+{
+
+	class ScriptHost
+	{
+	public:
+		bool Init();
+		void Shutdown();
+
+		bool LoadAppAssembly(const std::string& filepath);
+		bool ReloadAppAssembly(const std::string& filepath);
+
+		bool IsInitialized() const
+		{
+			return m_IsInitialized;
+		}
+
+		bool IsReloadInProgress() const
+		{
+			return m_ReloadInProgress;
+		}
+
+		void SetReloadInProgress(bool inProgress)
+		{
+			m_ReloadInProgress = inProgress;
+		}
+
+		Coral::ManagedAssembly* GetAppAssembly() const
+		{
+			return m_AppAssembly;
+		}
+
+		Coral::ManagedAssembly* GetCoreAssembly() const
+		{
+			return m_CoreAssembly;
+		}
+
+		void ClearLoadedAssemblyState();
+
+	private:
+		bool RecreateAssemblyLoadContext(bool unloadCurrent);
+		bool LoadAssembliesTransactional(const std::filesystem::path& appAssemblyPath);
+
+	private:
+		std::filesystem::path m_CoralDirectory;
+		Coral::HostInstance m_Host;
+		Coral::AssemblyLoadContext m_AppAssemblyContext;
+		Coral::ManagedAssembly* m_AppAssembly = nullptr;
+		Coral::ManagedAssembly* m_CoreAssembly = nullptr;
+		std::atomic<bool> m_IsInitialized{false};
+		std::atomic<bool> m_ReloadInProgress{false};
+	};
+
+	class ScriptRegistry
+	{
+	public:
+		void Clear();
+		void Discover(Coral::ManagedAssembly& appAssembly, Coral::ManagedAssembly& coreAssembly);
+		Coral::Type* GetScriptClass(const std::string& name);
+
+		const std::unordered_map<std::string, Coral::Type>& GetScriptClasses() const
+		{
+			return m_ScriptClasses;
+		}
+
+	private:
+		std::unordered_map<std::string, Coral::Type> m_ScriptClasses;
+		std::unordered_map<std::string, std::string> m_ShortNameToFullName;
+		std::unordered_set<std::string> m_MissingScriptsWarnings;
+	};
+
+	ScriptHost& GetScriptHost();
+	ScriptRegistry& GetScriptRegistry();
+
+} // namespace Chained
+
+#endif // CH_SCRIPT_ENGINE_SERVICES_H
\ No newline at end of file
diff --git a/engine/ui/CMakeLists.txt b/engine/ui/CMakeLists.txt
new file mode 100644
index 000000000..468876d5f
--- /dev/null
+++ b/engine/ui/CMakeLists.txt
@@ -0,0 +1,47 @@
+add_library(engine_ui STATIC
+    ui_animation_system.h
+    ui_animation_system.cpp
+    ui_control_renderer.h
+    ui_control_renderer.cpp
+    ui_data_components.h
+    ui_data_components.cpp
+    ui_font_registry.h
+    ui_font_registry.cpp
+    ui_input_system.h
+    ui_input_system.cpp
+    ui_layout_system.h
+    ui_layout_system.cpp
+    ui_render_basic.cpp
+    ui_render_container.cpp
+    ui_render_helpers.h
+    ui_render_image.cpp
+    ui_render_input.cpp
+    ui_render_plot.cpp
+    ui_render_widgets.h
+    ui_style.h
+    ui_types.h
+    widget_renderer.h
+    widget_renderer.cpp
+)
+
+target_include_directories(engine_ui PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
+)
+
+target_link_libraries(engine_ui PUBLIC
+    engine_scene_core
+    engine_core
+    engine_assets
+    engine_project
+    yaml-cpp
+    engine_external_entt
+    glm
+    engine_external_imgui
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_ui PRIVATE engine_pch)
+endif()
+
+set_target_properties(engine_ui PROPERTIES UNITY_BUILD OFF)
diff --git a/engine/ui/ui_animation_system.cpp b/engine/ui/ui_animation_system.cpp
new file mode 100644
index 000000000..9fd2c71fa
--- /dev/null
+++ b/engine/ui/ui_animation_system.cpp
@@ -0,0 +1,44 @@
+#include "ui_animation_system.h"
+
+namespace Chained
+{
+
+	static Color LerpColor(Color c1, Color c2, float t)
+	{
+		return {(uint8_t)(c1.r + (c2.r - c1.r) * t), (uint8_t)(c1.g + (c2.g - c1.g) * t),
+				(uint8_t)(c1.b + (c2.b - c1.b) * t), (uint8_t)(c1.a + (c2.a - c1.a) * t)};
+	}
+
+	void UIAnimationSystem::Update(entt::registry& registry, float dt)
+	{
+		auto view = registry.view<UIControlComponent>();
+		for (auto entity : view)
+		{
+			auto& widget = view.get<UIControlComponent>(entity);
+			UpdateStyle(widget.BoxStyle, widget.IsHovered, widget.IsDown, dt);
+		}
+	}
+
+	void UIAnimationSystem::UpdateStyle(UIStyle& style, bool isHovered, bool isDown, float dt)
+	{
+		float target = isDown ? 1.0f : (isHovered ? 0.5f : 0.0f);
+
+		if (style.TransitionSpeed > 0.0f)
+		{
+			style.State.AnimationAlpha +=
+				(target - style.State.AnimationAlpha) * std::min(1.0f, dt / style.TransitionSpeed);
+		}
+		else
+		{
+			style.State.AnimationAlpha = target;
+		}
+
+		float a = style.State.AnimationAlpha;
+		style.State.CurrentScale =
+			1.0f + (isDown ? (style.PressedScale - 1.0f) : (isHovered ? (style.HoverScale - 1.0f) : 0.0f)) * a;
+
+		style.State.CurrentColor = (a <= 0.5f) ? LerpColor(style.BackgroundColor, style.HoverColor, a * 2.0f)
+											   : LerpColor(style.HoverColor, style.PressedColor, (a - 0.5f) * 2.0f);
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_animation_system.h b/engine/ui/ui_animation_system.h
new file mode 100644
index 000000000..526f6ad99
--- /dev/null
+++ b/engine/ui/ui_animation_system.h
@@ -0,0 +1,21 @@
+#ifndef CH_UI_ANIMATION_SYSTEM_H
+#define CH_UI_ANIMATION_SYSTEM_H
+
+#include "engine/scene/components/ui/control_component.h"
+#include "entt/entt.hpp"
+
+namespace Chained
+{
+
+	class UIAnimationSystem
+	{
+	public:
+		void Update(entt::registry& registry, float dt);
+
+	private:
+		void UpdateStyle(UIStyle& style, bool isHovered, bool isDown, float dt);
+	};
+
+} // namespace Chained
+
+#endif // CH_UI_ANIMATION_SYSTEM_H
diff --git a/engine/ui/ui_control_renderer.cpp b/engine/ui/ui_control_renderer.cpp
new file mode 100644
index 000000000..5fe81d5df
--- /dev/null
+++ b/engine/ui/ui_control_renderer.cpp
@@ -0,0 +1,123 @@
+#include "ui_control_renderer.h"
+#include "ui_font_registry.h"
+#include "ui_render_helpers.h"
+#include "ui_render_widgets.h"
+
+namespace Chained
+{
+
+	bool RenderControl(UIFontRegistry& fontRegistry, UIControlComponent& control, const ImVec2& screenPos,
+					   const ImVec2& size)
+	{
+		if (std::holds_alternative<std::monostate>(control.Data))
+		{
+			return false;
+		}
+
+		const std::string* fontName = &control.TextStyle.FontName;
+
+		ImFont* activeFont = nullptr;
+		if (!fontName->empty() && *fontName != "Default")
+		{
+			activeFont = fontRegistry.GetFont(*fontName, control.TextStyle.FontSize);
+		}
+
+		// Fall back to the project's default font, not the editor's ImGui font.
+		if (!activeFont)
+		{
+			activeFont = fontRegistry.GetDefaultFont();
+		}
+
+		bool changed = false;
+
+		std::visit(
+			[&](auto&& arg) {
+				using T = std::decay_t<decltype(arg)>;
+				if constexpr (std::is_same_v<T, ButtonData>)
+				{
+					changed = RenderButton(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, PanelData>)
+				{
+					changed = RenderPanel(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, LabelData>)
+				{
+					changed = RenderLabel(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, CheckboxData>)
+				{
+					changed = RenderCheckbox(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, SliderData>)
+				{
+					changed = RenderSlider(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, ProgressBarData>)
+				{
+					changed = RenderProgressBar(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, ImageData>)
+				{
+					changed = RenderImage(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, ImageButtonData>)
+				{
+					changed = RenderImageButton(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, ComboBoxData>)
+				{
+					changed = RenderComboBox(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, InputTextData>)
+				{
+					changed = RenderInputText(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, SeparatorData>)
+				{
+					changed = RenderSeparator(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, RadioButtonData>)
+				{
+					changed = RenderRadioButton(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, ColorPickerData>)
+				{
+					changed = RenderColorPicker(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, DragFloatData>)
+				{
+					changed = RenderDragFloat(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, DragIntData>)
+				{
+					changed = RenderDragInt(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, TreeNodeData>)
+				{
+					changed = RenderTreeNode(arg, control, screenPos, size, activeFont, control.TextStyle);
+				}
+				else if constexpr (std::is_same_v<T, TabBarData>)
+				{
+					changed = RenderTabBar(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, TabItemData>)
+				{
+					changed = RenderTabItem(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, CollapsingHeaderData>)
+				{
+					changed = RenderCollapsingHeader(arg, control, screenPos, size);
+				}
+				else if constexpr (std::is_same_v<T, PlotData>)
+				{
+					changed = RenderPlot(arg, control, screenPos, size);
+				}
+			},
+			control.Data);
+
+		control.ValueChanged = changed;
+		return changed;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_control_renderer.h b/engine/ui/ui_control_renderer.h
new file mode 100644
index 000000000..0e711c8ea
--- /dev/null
+++ b/engine/ui/ui_control_renderer.h
@@ -0,0 +1,18 @@
+#ifndef CH_UI_CONTROL_RENDERER_H
+#define CH_UI_CONTROL_RENDERER_H
+
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+#include "imgui.h"
+
+namespace Chained
+{
+	class UIFontRegistry;
+
+	// Free function to render any UI control based on its variant type.
+	// Eliminates the boilerplate single-function Dispatcher struct.
+	bool RenderControl(UIFontRegistry& fontRegistry, UIControlComponent& control, const ImVec2& screenPos,
+					   const ImVec2& size);
+
+} // namespace Chained
+#endif // CH_UI_CONTROL_RENDERER_H
diff --git a/engine/ui/ui_data_components.cpp b/engine/ui/ui_data_components.cpp
new file mode 100644
index 000000000..02acfc660
--- /dev/null
+++ b/engine/ui/ui_data_components.cpp
@@ -0,0 +1,910 @@
+#include "ui_data_components.h"
+#include "engine/scene/yaml.h"
+
+namespace Chained
+{
+
+	void ButtonData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Button;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Interactable" << YAML::Value << IsInteractable;
+		out << YAML::Key << "Auto Size" << YAML::Value << AutoSize;
+	}
+
+	ButtonData ButtonData::Deserialize(YAML::Node widgetNode)
+	{
+		ButtonData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Interactable"])
+		{
+			data.IsInteractable = widgetNode["Interactable"].as<bool>();
+		}
+		if (widgetNode["Auto Size"])
+		{
+			data.AutoSize = widgetNode["Auto Size"].as<bool>();
+		}
+		return data;
+	}
+
+	void PanelData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Panel;
+		out << YAML::Key << "Texture Path" << YAML::Value << TexturePath;
+		out << YAML::Key << "Full Screen" << YAML::Value << FullScreen;
+	}
+
+	PanelData PanelData::Deserialize(YAML::Node widgetNode)
+	{
+		PanelData data;
+		if (widgetNode["Texture Path"])
+		{
+			data.TexturePath = widgetNode["Texture Path"].as<std::string>();
+		}
+		if (widgetNode["Full Screen"])
+		{
+			data.FullScreen = widgetNode["Full Screen"].as<bool>();
+		}
+		return data;
+	}
+
+	void LabelData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Label;
+		out << YAML::Key << "Text" << YAML::Value << Text;
+		out << YAML::Key << "Auto Size" << YAML::Value << AutoSize;
+	}
+
+	LabelData LabelData::Deserialize(YAML::Node widgetNode)
+	{
+		LabelData data;
+		if (widgetNode["Text"])
+		{
+			data.Text = widgetNode["Text"].as<std::string>();
+		}
+		if (widgetNode["Auto Size"])
+		{
+			data.AutoSize = widgetNode["Auto Size"].as<bool>();
+		}
+		return data;
+	}
+
+	void SliderData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Slider;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Value" << YAML::Value << Value;
+		out << YAML::Key << "Min" << YAML::Value << Min;
+		out << YAML::Key << "Max" << YAML::Value << Max;
+	}
+
+	SliderData SliderData::Deserialize(YAML::Node widgetNode)
+	{
+		SliderData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Value"])
+		{
+			data.Value = widgetNode["Value"].as<float>();
+		}
+		if (widgetNode["Min"])
+		{
+			data.Min = widgetNode["Min"].as<float>();
+		}
+		if (widgetNode["Max"])
+		{
+			data.Max = widgetNode["Max"].as<float>();
+		}
+		return data;
+	}
+
+	void CheckboxData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Checkbox;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Checked" << YAML::Value << Checked;
+	}
+
+	CheckboxData CheckboxData::Deserialize(YAML::Node widgetNode)
+	{
+		CheckboxData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Checked"])
+		{
+			data.Checked = widgetNode["Checked"].as<bool>();
+		}
+		return data;
+	}
+
+	void InputTextData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_InputText;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Text" << YAML::Value << Text;
+		out << YAML::Key << "Placeholder" << YAML::Value << Placeholder;
+		out << YAML::Key << "Max Length" << YAML::Value << MaxLength;
+		out << YAML::Key << "Multiline" << YAML::Value << Multiline;
+		out << YAML::Key << "Read Only" << YAML::Value << ReadOnly;
+		out << YAML::Key << "Password" << YAML::Value << Password;
+	}
+
+	InputTextData InputTextData::Deserialize(YAML::Node widgetNode)
+	{
+		InputTextData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Text"])
+		{
+			data.Text = widgetNode["Text"].as<std::string>();
+		}
+		if (widgetNode["Placeholder"])
+		{
+			data.Placeholder = widgetNode["Placeholder"].as<std::string>();
+		}
+		if (widgetNode["Max Length"])
+		{
+			data.MaxLength = widgetNode["Max Length"].as<int>();
+		}
+		if (widgetNode["Multiline"])
+		{
+			data.Multiline = widgetNode["Multiline"].as<bool>();
+		}
+		if (widgetNode["Read Only"])
+		{
+			data.ReadOnly = widgetNode["Read Only"].as<bool>();
+		}
+		if (widgetNode["Password"])
+		{
+			data.Password = widgetNode["Password"].as<bool>();
+		}
+		return data;
+	}
+
+	void ComboBoxData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_ComboBox;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Items" << YAML::Value << YAML::BeginSeq;
+		for (auto& item : Items)
+		{
+			out << item;
+		}
+		out << YAML::EndSeq;
+		out << YAML::Key << "Selected Index" << YAML::Value << SelectedIndex;
+	}
+
+	ComboBoxData ComboBoxData::Deserialize(YAML::Node widgetNode)
+	{
+		ComboBoxData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Items"])
+		{
+			for (auto item : widgetNode["Items"])
+			{
+				data.Items.push_back(item.as<std::string>());
+			}
+		}
+		if (widgetNode["Selected Index"])
+		{
+			data.SelectedIndex = widgetNode["Selected Index"].as<int>();
+		}
+		return data;
+	}
+
+	void ProgressBarData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_ProgressBar;
+		out << YAML::Key << "Progress" << YAML::Value << Progress;
+		out << YAML::Key << "Overlay Text" << YAML::Value << OverlayText;
+		out << YAML::Key << "Show Percentage" << YAML::Value << ShowPercentage;
+	}
+
+	ProgressBarData ProgressBarData::Deserialize(YAML::Node widgetNode)
+	{
+		ProgressBarData data;
+		if (widgetNode["Progress"])
+		{
+			data.Progress = widgetNode["Progress"].as<float>();
+		}
+		if (widgetNode["Overlay Text"])
+		{
+			data.OverlayText = widgetNode["Overlay Text"].as<std::string>();
+		}
+		if (widgetNode["Show Percentage"])
+		{
+			data.ShowPercentage = widgetNode["Show Percentage"].as<bool>();
+		}
+		return data;
+	}
+
+	void ImageData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Image;
+		out << YAML::Key << "Texture Path" << YAML::Value << TexturePath;
+		out << YAML::Key << "Tint Color" << YAML::Value << TintColor;
+		out << YAML::Key << "Border Color" << YAML::Value << BorderColor;
+	}
+
+	ImageData ImageData::Deserialize(YAML::Node widgetNode)
+	{
+		ImageData data;
+		if (widgetNode["Texture Path"])
+		{
+			data.TexturePath = widgetNode["Texture Path"].as<std::string>();
+		}
+		if (widgetNode["Tint Color"])
+		{
+			data.TintColor = widgetNode["Tint Color"].as<Color>();
+		}
+		if (widgetNode["Border Color"])
+		{
+			data.BorderColor = widgetNode["Border Color"].as<Color>();
+		}
+		return data;
+	}
+
+	void ImageButtonData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_ImageButton;
+		out << YAML::Key << "Texture Path" << YAML::Value << TexturePath;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Tint Color" << YAML::Value << TintColor;
+		out << YAML::Key << "Background Color" << YAML::Value << BackgroundColor;
+		out << YAML::Key << "Frame Padding" << YAML::Value << FramePadding;
+	}
+
+	ImageButtonData ImageButtonData::Deserialize(YAML::Node widgetNode)
+	{
+		ImageButtonData data;
+		if (widgetNode["Texture Path"])
+		{
+			data.TexturePath = widgetNode["Texture Path"].as<std::string>();
+		}
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Tint Color"])
+		{
+			data.TintColor = widgetNode["Tint Color"].as<Color>();
+		}
+		if (widgetNode["Background Color"])
+		{
+			data.BackgroundColor = widgetNode["Background Color"].as<Color>();
+		}
+		if (widgetNode["Frame Padding"])
+		{
+			data.FramePadding = widgetNode["Frame Padding"].as<int>();
+		}
+		return data;
+	}
+
+	void SeparatorData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_Separator;
+		out << YAML::Key << "Thickness" << YAML::Value << Thickness;
+		out << YAML::Key << "Line Color" << YAML::Value << LineColor;
+	}
+
+	SeparatorData SeparatorData::Deserialize(YAML::Node widgetNode)
+	{
+		SeparatorData data;
+		if (widgetNode["Thickness"])
+		{
+			data.Thickness = widgetNode["Thickness"].as<float>();
+		}
+		if (widgetNode["Line Color"])
+		{
+			data.LineColor = widgetNode["Line Color"].as<Color>();
+		}
+		return data;
+	}
+
+	void RadioButtonData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_RadioButton;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Options" << YAML::Value << YAML::BeginSeq;
+		for (auto& option : Options)
+		{
+			out << option;
+		}
+		out << YAML::EndSeq;
+		out << YAML::Key << "Selected Index" << YAML::Value << SelectedIndex;
+		out << YAML::Key << "Horizontal" << YAML::Value << Horizontal;
+	}
+
+	RadioButtonData RadioButtonData::Deserialize(YAML::Node widgetNode)
+	{
+		RadioButtonData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Options"])
+		{
+			for (auto option : widgetNode["Options"])
+			{
+				data.Options.push_back(option.as<std::string>());
+			}
+		}
+		if (widgetNode["Selected Index"])
+		{
+			data.SelectedIndex = widgetNode["Selected Index"].as<int>();
+		}
+		if (widgetNode["Horizontal"])
+		{
+			data.Horizontal = widgetNode["Horizontal"].as<bool>();
+		}
+		return data;
+	}
+
+	void ColorPickerData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_ColorPicker;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Selected Color" << YAML::Value << SelectedColor;
+		out << YAML::Key << "Show Alpha" << YAML::Value << ShowAlpha;
+		out << YAML::Key << "Show Picker" << YAML::Value << ShowPicker;
+	}
+
+	ColorPickerData ColorPickerData::Deserialize(YAML::Node widgetNode)
+	{
+		ColorPickerData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Selected Color"])
+		{
+			data.SelectedColor = widgetNode["Selected Color"].as<Color>();
+		}
+		if (widgetNode["Show Alpha"])
+		{
+			data.ShowAlpha = widgetNode["Show Alpha"].as<bool>();
+		}
+		if (widgetNode["Show Picker"])
+		{
+			data.ShowPicker = widgetNode["Show Picker"].as<bool>();
+		}
+		return data;
+	}
+
+	void DragFloatData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_DragFloat;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Value" << YAML::Value << Value;
+		out << YAML::Key << "Speed" << YAML::Value << Speed;
+		out << YAML::Key << "Min" << YAML::Value << Min;
+		out << YAML::Key << "Max" << YAML::Value << Max;
+		out << YAML::Key << "Format" << YAML::Value << Format;
+	}
+
+	DragFloatData DragFloatData::Deserialize(YAML::Node widgetNode)
+	{
+		DragFloatData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Value"])
+		{
+			data.Value = widgetNode["Value"].as<float>();
+		}
+		if (widgetNode["Speed"])
+		{
+			data.Speed = widgetNode["Speed"].as<float>();
+		}
+		if (widgetNode["Min"])
+		{
+			data.Min = widgetNode["Min"].as<float>();
+		}
+		if (widgetNode["Max"])
+		{
+			data.Max = widgetNode["Max"].as<float>();
+		}
+		if (widgetNode["Format"])
+		{
+			data.Format = widgetNode["Format"].as<std::string>();
+		}
+		return data;
+	}
+
+	void DragIntData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_DragInt;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Value" << YAML::Value << Value;
+		out << YAML::Key << "Speed" << YAML::Value << Speed;
+		out << YAML::Key << "Min" << YAML::Value << Min;
+		out << YAML::Key << "Max" << YAML::Value << Max;
+		out << YAML::Key << "Format" << YAML::Value << Format;
+	}
+
+	DragIntData DragIntData::Deserialize(YAML::Node widgetNode)
+	{
+		DragIntData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Value"])
+		{
+			data.Value = widgetNode["Value"].as<int>();
+		}
+		if (widgetNode["Speed"])
+		{
+			data.Speed = widgetNode["Speed"].as<float>();
+		}
+		if (widgetNode["Min"])
+		{
+			data.Min = widgetNode["Min"].as<int>();
+		}
+		if (widgetNode["Max"])
+		{
+			data.Max = widgetNode["Max"].as<int>();
+		}
+		if (widgetNode["Format"])
+		{
+			data.Format = widgetNode["Format"].as<std::string>();
+		}
+		return data;
+	}
+
+	void TreeNodeData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_TreeNode;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Is Open" << YAML::Value << IsOpen;
+		out << YAML::Key << "Default Open" << YAML::Value << DefaultOpen;
+		out << YAML::Key << "Is Leaf" << YAML::Value << IsLeaf;
+	}
+
+	TreeNodeData TreeNodeData::Deserialize(YAML::Node widgetNode)
+	{
+		TreeNodeData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Is Open"])
+		{
+			data.IsOpen = widgetNode["Is Open"].as<bool>();
+		}
+		if (widgetNode["Default Open"])
+		{
+			data.DefaultOpen = widgetNode["Default Open"].as<bool>();
+		}
+		if (widgetNode["Is Leaf"])
+		{
+			data.IsLeaf = widgetNode["Is Leaf"].as<bool>();
+		}
+		return data;
+	}
+
+	void TabBarData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_TabBar;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Reorderable" << YAML::Value << Reorderable;
+		out << YAML::Key << "Auto Select New Tabs" << YAML::Value << AutoSelectNewTabs;
+	}
+
+	TabBarData TabBarData::Deserialize(YAML::Node widgetNode)
+	{
+		TabBarData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Reorderable"])
+		{
+			data.Reorderable = widgetNode["Reorderable"].as<bool>();
+		}
+		if (widgetNode["Auto Select New Tabs"])
+		{
+			data.AutoSelectNewTabs = widgetNode["Auto Select New Tabs"].as<bool>();
+		}
+		return data;
+	}
+
+	void TabItemData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_TabItem;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Is Open" << YAML::Value << IsOpen;
+		out << YAML::Key << "Selected" << YAML::Value << Selected;
+	}
+
+	TabItemData TabItemData::Deserialize(YAML::Node widgetNode)
+	{
+		TabItemData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Is Open"])
+		{
+			data.IsOpen = widgetNode["Is Open"].as<bool>();
+		}
+		if (widgetNode["Selected"])
+		{
+			data.Selected = widgetNode["Selected"].as<bool>();
+		}
+		return data;
+	}
+
+	void CollapsingHeaderData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_CollapsingHeader;
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Is Open" << YAML::Value << IsOpen;
+		out << YAML::Key << "Default Open" << YAML::Value << DefaultOpen;
+	}
+
+	CollapsingHeaderData CollapsingHeaderData::Deserialize(YAML::Node widgetNode)
+	{
+		CollapsingHeaderData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Is Open"])
+		{
+			data.IsOpen = widgetNode["Is Open"].as<bool>();
+		}
+		if (widgetNode["Default Open"])
+		{
+			data.DefaultOpen = widgetNode["Default Open"].as<bool>();
+		}
+		return data;
+	}
+
+	void PlotData::Serialize(YAML::Emitter& out) const
+	{
+		if (Mode == PlotMode::Lines)
+		{
+			out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_PlotLines;
+		}
+		else
+		{
+			out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_PlotHistogram;
+		}
+		out << YAML::Key << "Label" << YAML::Value << Label;
+		out << YAML::Key << "Values" << YAML::Value << YAML::BeginSeq;
+		for (auto value : Values)
+		{
+			out << value;
+		}
+		out << YAML::EndSeq;
+		out << YAML::Key << "Overlay Text" << YAML::Value << OverlayText;
+		out << YAML::Key << "Scale Min" << YAML::Value << ScaleMin;
+		out << YAML::Key << "Scale Max" << YAML::Value << ScaleMax;
+	}
+
+	PlotData PlotData::Deserialize(YAML::Node widgetNode)
+	{
+		PlotData data;
+		if (widgetNode["Label"])
+		{
+			data.Label = widgetNode["Label"].as<std::string>();
+		}
+		if (widgetNode["Values"])
+		{
+			for (auto value : widgetNode["Values"])
+			{
+				data.Values.push_back(value.as<float>());
+			}
+		}
+		if (widgetNode["Overlay Text"])
+		{
+			data.OverlayText = widgetNode["Overlay Text"].as<std::string>();
+		}
+		if (widgetNode["Scale Min"])
+		{
+			data.ScaleMin = widgetNode["Scale Min"].as<float>();
+		}
+		if (widgetNode["Scale Max"])
+		{
+			data.ScaleMax = widgetNode["Scale Max"].as<float>();
+		}
+		return data;
+	}
+
+	void VerticalLayoutGroupData::Serialize(YAML::Emitter& out) const
+	{
+		out << YAML::Key << "Widget Type" << YAML::Value << WidgetType_VerticalLayoutGroup;
+		out << YAML::Key << "Spacing" << YAML::Value << Spacing;
+		out << YAML::Key << "Padding" << YAML::Value << Padding;
+	}
+
+	VerticalLayoutGroupData VerticalLayoutGroupData::Deserialize(YAML::Node widgetNode)
+	{
+		VerticalLayoutGroupData data;
+		if (widgetNode["Spacing"])
+		{
+			data.Spacing = widgetNode["Spacing"].as<float>();
+		}
+		if (widgetNode["Padding"])
+		{
+			data.Padding = widgetNode["Padding"].as<glm::vec2>();
+		}
+		return data;
+	}
+
+	ControlData DeserializeControlData(int widgetType, YAML::Node widgetNode)
+	{
+		if (widgetType == WidgetType_None)
+		{
+			if (widgetNode["ButtonControl"])
+			{
+				return ButtonData::Deserialize(widgetNode["ButtonControl"]);
+			}
+			if (widgetNode["InputTextControl"])
+			{
+				return InputTextData::Deserialize(widgetNode["InputTextControl"]);
+			}
+			if (widgetNode["LabelControl"])
+			{
+				return LabelData::Deserialize(widgetNode["LabelControl"]);
+			}
+			if (widgetNode["PanelControl"])
+			{
+				return PanelData::Deserialize(widgetNode["PanelControl"]);
+			}
+			if (widgetNode["SliderControl"])
+			{
+				return SliderData::Deserialize(widgetNode["SliderControl"]);
+			}
+			if (widgetNode["CheckboxControl"])
+			{
+				return CheckboxData::Deserialize(widgetNode["CheckboxControl"]);
+			}
+			if (widgetNode["ComboBoxControl"])
+			{
+				return ComboBoxData::Deserialize(widgetNode["ComboBoxControl"]);
+			}
+			if (widgetNode["ImageControl"])
+			{
+				return ImageData::Deserialize(widgetNode["ImageControl"]);
+			}
+			if (widgetNode["ImageButtonControl"])
+			{
+				return ImageButtonData::Deserialize(widgetNode["ImageButtonControl"]);
+			}
+			if (widgetNode["SeparatorControl"])
+			{
+				return SeparatorData::Deserialize(widgetNode["SeparatorControl"]);
+			}
+			if (widgetNode["RadioButtonControl"])
+			{
+				return RadioButtonData::Deserialize(widgetNode["RadioButtonControl"]);
+			}
+			if (widgetNode["ColorPickerControl"])
+			{
+				return ColorPickerData::Deserialize(widgetNode["ColorPickerControl"]);
+			}
+			if (widgetNode["DragFloatControl"])
+			{
+				return DragFloatData::Deserialize(widgetNode["DragFloatControl"]);
+			}
+			if (widgetNode["DragIntControl"])
+			{
+				return DragIntData::Deserialize(widgetNode["DragIntControl"]);
+			}
+			if (widgetNode["TreeNodeControl"])
+			{
+				return TreeNodeData::Deserialize(widgetNode["TreeNodeControl"]);
+			}
+			if (widgetNode["TabBarControl"])
+			{
+				return TabBarData::Deserialize(widgetNode["TabBarControl"]);
+			}
+			if (widgetNode["TabItemControl"])
+			{
+				return TabItemData::Deserialize(widgetNode["TabItemControl"]);
+			}
+			if (widgetNode["CollapsingHeaderControl"])
+			{
+				return CollapsingHeaderData::Deserialize(widgetNode["CollapsingHeaderControl"]);
+			}
+			if (widgetNode["VerticalLayoutGroupControl"])
+			{
+				return VerticalLayoutGroupData::Deserialize(widgetNode["VerticalLayoutGroupControl"]);
+			}
+
+			// Explicit widget type is required here. Falling back to a generic panel
+			// causes unrelated widgets to reuse the wrong payload and look identical.
+			return std::monostate{};
+		}
+
+		auto getNode = [&widgetNode](const char* subkey) -> YAML::Node {
+			return widgetNode[subkey] ? widgetNode[subkey] : widgetNode;
+		};
+
+		switch (widgetType)
+		{
+		case WidgetType_Button:
+			return ButtonData::Deserialize(getNode("ButtonControl"));
+		case WidgetType_Label:
+			return LabelData::Deserialize(getNode("LabelControl"));
+		case WidgetType_Slider:
+			return SliderData::Deserialize(getNode("SliderControl"));
+		case WidgetType_Checkbox:
+			return CheckboxData::Deserialize(getNode("CheckboxControl"));
+		case WidgetType_ProgressBar:
+			return ProgressBarData::Deserialize(getNode("ProgressBarControl"));
+		case WidgetType_Panel:
+			return PanelData::Deserialize(getNode("PanelControl"));
+		case WidgetType_Image:
+			return ImageData::Deserialize(getNode("ImageControl"));
+		case WidgetType_ComboBox:
+			return ComboBoxData::Deserialize(getNode("ComboBoxControl"));
+		case WidgetType_ImageButton:
+			return ImageButtonData::Deserialize(getNode("ImageButtonControl"));
+		case WidgetType_InputText:
+			return InputTextData::Deserialize(getNode("InputTextControl"));
+		case WidgetType_Separator:
+			return SeparatorData::Deserialize(getNode("SeparatorControl"));
+		case WidgetType_RadioButton:
+			return RadioButtonData::Deserialize(getNode("RadioButtonControl"));
+		case WidgetType_ColorPicker:
+			return ColorPickerData::Deserialize(getNode("ColorPickerControl"));
+		case WidgetType_DragFloat:
+			return DragFloatData::Deserialize(getNode("DragFloatControl"));
+		case WidgetType_DragInt:
+			return DragIntData::Deserialize(getNode("DragIntControl"));
+		case WidgetType_TreeNode:
+			return TreeNodeData::Deserialize(getNode("TreeNodeControl"));
+		case WidgetType_TabBar:
+			return TabBarData::Deserialize(getNode("TabBarControl"));
+		case WidgetType_TabItem:
+			return TabItemData::Deserialize(getNode("TabItemControl"));
+		case WidgetType_CollapsingHeader:
+			return CollapsingHeaderData::Deserialize(getNode("CollapsingHeaderControl"));
+		case WidgetType_PlotLines: {
+			auto data = PlotData::Deserialize(getNode("PlotControl"));
+			data.Mode = PlotMode::Lines;
+			return data;
+		}
+		case WidgetType_PlotHistogram: {
+			auto data = PlotData::Deserialize(getNode("PlotControl"));
+			data.Mode = PlotMode::Histogram;
+			return data;
+		}
+		case WidgetType_VerticalLayoutGroup:
+			return VerticalLayoutGroupData::Deserialize(getNode("VerticalLayoutGroupControl"));
+		default:
+			return std::monostate{};
+		}
+	}
+
+	ControlData CreateDefaultWidgetData(WidgetType type)
+	{
+		switch (type)
+		{
+		case WidgetType_Button:
+			return ButtonData{};
+		case WidgetType_Panel:
+			return PanelData{};
+		case WidgetType_Label:
+			return LabelData{};
+		case WidgetType_Slider:
+			return SliderData{};
+		case WidgetType_Checkbox:
+			return CheckboxData{};
+		case WidgetType_InputText:
+			return InputTextData{};
+		case WidgetType_ComboBox:
+			return ComboBoxData{};
+		case WidgetType_ProgressBar:
+			return ProgressBarData{};
+		case WidgetType_Image:
+			return ImageData{};
+		case WidgetType_ImageButton:
+			return ImageButtonData{};
+		case WidgetType_Separator:
+			return SeparatorData{};
+		case WidgetType_RadioButton:
+			return RadioButtonData{};
+		case WidgetType_ColorPicker:
+			return ColorPickerData{};
+		case WidgetType_DragFloat:
+			return DragFloatData{};
+		case WidgetType_DragInt:
+			return DragIntData{};
+		case WidgetType_TreeNode:
+			return TreeNodeData{};
+		case WidgetType_TabBar:
+			return TabBarData{};
+		case WidgetType_TabItem:
+			return TabItemData{};
+		case WidgetType_CollapsingHeader:
+			return CollapsingHeaderData{};
+		case WidgetType_PlotLines: {
+			PlotData d;
+			d.Mode = PlotMode::Lines;
+			return d;
+		}
+		case WidgetType_PlotHistogram: {
+			PlotData d;
+			d.Mode = PlotMode::Histogram;
+			return d;
+		}
+		case WidgetType_VerticalLayoutGroup:
+			return VerticalLayoutGroupData{};
+		case WidgetType_None:
+		default:
+			return std::monostate{};
+		}
+	}
+
+	const char* WidgetTypeName(WidgetType type)
+	{
+		switch (type)
+		{
+		case WidgetType_Button:
+			return "Button";
+		case WidgetType_Panel:
+			return "Panel";
+		case WidgetType_Label:
+			return "Label";
+		case WidgetType_Slider:
+			return "Slider";
+		case WidgetType_Checkbox:
+			return "Checkbox";
+		case WidgetType_InputText:
+			return "InputText";
+		case WidgetType_ComboBox:
+			return "ComboBox";
+		case WidgetType_ProgressBar:
+			return "ProgressBar";
+		case WidgetType_Image:
+			return "Image";
+		case WidgetType_ImageButton:
+			return "ImageButton";
+		case WidgetType_Separator:
+			return "Separator";
+		case WidgetType_RadioButton:
+			return "RadioButton";
+		case WidgetType_ColorPicker:
+			return "ColorPicker";
+		case WidgetType_DragFloat:
+			return "DragFloat";
+		case WidgetType_DragInt:
+			return "DragInt";
+		case WidgetType_TreeNode:
+			return "TreeNode";
+		case WidgetType_TabBar:
+			return "TabBar";
+		case WidgetType_TabItem:
+			return "TabItem";
+		case WidgetType_CollapsingHeader:
+			return "CollapsingHeader";
+		case WidgetType_PlotLines:
+			return "PlotLines";
+		case WidgetType_PlotHistogram:
+			return "PlotHistogram";
+		case WidgetType_VerticalLayoutGroup:
+			return "VerticalLayoutGroup";
+		case WidgetType_None:
+		default:
+			return "None";
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_data_components.h b/engine/ui/ui_data_components.h
new file mode 100644
index 000000000..ec4ad86b9
--- /dev/null
+++ b/engine/ui/ui_data_components.h
@@ -0,0 +1,299 @@
+#ifndef CH_UI_DATA_COMPONENTS_H
+#define CH_UI_DATA_COMPONENTS_H
+
+#include "engine/assets/asset.h"
+
+#include <variant>
+
+namespace YAML
+{
+	class Emitter;
+	class Node;
+} // namespace YAML
+
+namespace Chained
+{
+
+	enum WidgetType : int
+	{
+		WidgetType_None = 0,
+		WidgetType_Button = 1,
+		// 2 was removed (legacy)
+		WidgetType_Label = 3,
+		// 4 was removed (legacy)
+		WidgetType_Slider = 5,
+		WidgetType_Checkbox = 6,
+		WidgetType_ProgressBar = 7,
+		WidgetType_Panel = 8,
+		WidgetType_Image = 9,
+		WidgetType_ComboBox = 10,
+		WidgetType_ImageButton = 11,
+		WidgetType_InputText = 12,
+		WidgetType_Separator = 13,
+		WidgetType_RadioButton = 14,
+		WidgetType_ColorPicker = 15,
+		WidgetType_DragFloat = 16,
+		WidgetType_DragInt = 17,
+		WidgetType_TreeNode = 18,
+		WidgetType_TabBar = 19,
+		WidgetType_TabItem = 20,
+		WidgetType_CollapsingHeader = 21,
+		WidgetType_PlotLines = 22,
+		WidgetType_PlotHistogram = 23,
+		WidgetType_VerticalLayoutGroup = 24,
+	};
+
+	struct ButtonData
+	{
+		std::string Label = "Button";
+		bool IsInteractable = true;
+		bool AutoSize = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static ButtonData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct PanelData
+	{
+		AssetHandle TextureHandle = 0;
+		std::string TexturePath = "";
+		bool FullScreen = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static PanelData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct LabelData
+	{
+		std::string Text = "Text Label";
+		bool AutoSize = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static LabelData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct SliderData
+	{
+		std::string Label = "Slider";
+		float Value = 0.5f;
+		float Min = 0.0f;
+		float Max = 1.0f;
+
+		void Serialize(YAML::Emitter& out) const;
+		static SliderData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct CheckboxData
+	{
+		std::string Label = "Checkbox";
+		bool Checked = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static CheckboxData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct InputTextData
+	{
+		std::string Label = "Input";
+		std::string Text = "";
+		std::string Placeholder = "Enter text...";
+		int MaxLength = 256;
+		bool Multiline = false;
+		bool ReadOnly = false;
+		bool Password = false;
+		std::vector<char> InputBuffer;
+
+		void Serialize(YAML::Emitter& out) const;
+		static InputTextData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct ComboBoxData
+	{
+		std::string Label = "Combo";
+		std::vector<std::string> Items;
+		int SelectedIndex = 0;
+
+		void Serialize(YAML::Emitter& out) const;
+		static ComboBoxData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct ProgressBarData
+	{
+		float Progress = 0.5f;
+		std::string OverlayText = "";
+		bool ShowPercentage = true;
+
+		void Serialize(YAML::Emitter& out) const;
+		static ProgressBarData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct ImageData
+	{
+		AssetHandle TextureHandle = 0;
+		std::string TexturePath = "";
+		Color TintColor = {255, 255, 255, 255};
+		Color BorderColor = {0, 0, 0, 0};
+
+		void Serialize(YAML::Emitter& out) const;
+		static ImageData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct ImageButtonData
+	{
+		AssetHandle TextureHandle = 0;
+		std::string TexturePath = "";
+		std::string Label = "ImageButton";
+		Color TintColor = {255, 255, 255, 255};
+		Color BackgroundColor = {0, 0, 0, 0};
+		int FramePadding = -1;
+
+		void Serialize(YAML::Emitter& out) const;
+		static ImageButtonData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct SeparatorData
+	{
+		float Thickness = 1.0f;
+		Color LineColor = {127, 127, 127, 255};
+
+		void Serialize(YAML::Emitter& out) const;
+		static SeparatorData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct RadioButtonData
+	{
+		std::string Label = "RadioGroup";
+		std::vector<std::string> Options = {"Option 1", "Option 2", "Option 3"};
+		int SelectedIndex = 0;
+		bool Horizontal = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static RadioButtonData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct ColorPickerData
+	{
+		std::string Label = "Color";
+		Color SelectedColor = {255, 255, 255, 255};
+		bool ShowAlpha = true;
+		bool ShowPicker = true;
+
+		void Serialize(YAML::Emitter& out) const;
+		static ColorPickerData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct DragFloatData
+	{
+		std::string Label = "DragFloat";
+		float Value = 0.0f;
+		float Speed = 0.1f;
+		float Min = 0.0f;
+		float Max = 100.0f;
+		std::string Format = "%.3f";
+
+		void Serialize(YAML::Emitter& out) const;
+		static DragFloatData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct DragIntData
+	{
+		std::string Label = "DragInt";
+		int Value = 0;
+		float Speed = 1.0f;
+		int Min = 0;
+		int Max = 100;
+		std::string Format = "%d";
+
+		void Serialize(YAML::Emitter& out) const;
+		static DragIntData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct TreeNodeData
+	{
+		std::string Label = "TreeNode";
+		bool IsOpen = false;
+		bool DefaultOpen = false;
+		bool IsLeaf = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static TreeNodeData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct TabBarData
+	{
+		std::string Label = "TabBar";
+		bool Reorderable = true;
+		bool AutoSelectNewTabs = true;
+
+		void Serialize(YAML::Emitter& out) const;
+		static TabBarData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct TabItemData
+	{
+		std::string Label = "Tab";
+		bool IsOpen = true;
+		bool Selected = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static TabItemData Deserialize(YAML::Node widgetNode);
+	};
+
+	struct CollapsingHeaderData
+	{
+		std::string Label = "Header";
+		bool IsOpen = false;
+		bool DefaultOpen = false;
+
+		void Serialize(YAML::Emitter& out) const;
+		static CollapsingHeaderData Deserialize(YAML::Node widgetNode);
+	};
+
+	enum class PlotMode : uint8_t
+	{
+		Lines,
+		Histogram,
+	};
+
+	struct PlotData
+	{
+		PlotMode Mode = PlotMode::Lines;
+		std::string Label = "Plot";
+		std::vector<float> Values = {0.0f, 0.5f, 1.0f, 0.5f, 0.0f};
+		std::string OverlayText = "";
+		float ScaleMin = 0.0f;
+		float ScaleMax = 1.0f;
+		glm::vec2 GraphSize = {0, 80};
+
+		void Serialize(YAML::Emitter& out) const;
+		static PlotData Deserialize(YAML::Node widgetNode);
+	};
+
+	// Backward-compatible aliases for existing code
+	using PlotLinesData = PlotData;
+	using PlotHistogramData = PlotData;
+
+	struct VerticalLayoutGroupData
+	{
+		float Spacing = 10.0f;
+		glm::vec2 Padding = {10, 10};
+
+		void Serialize(YAML::Emitter& out) const;
+		static VerticalLayoutGroupData Deserialize(YAML::Node widgetNode);
+	};
+
+	using ControlData =
+		std::variant<std::monostate, ButtonData, PanelData, LabelData, SliderData, CheckboxData, InputTextData,
+					 ComboBoxData, ProgressBarData, ImageData, ImageButtonData, SeparatorData, RadioButtonData,
+					 ColorPickerData, DragFloatData, DragIntData, TreeNodeData, TabBarData, TabItemData,
+					 CollapsingHeaderData, PlotData, VerticalLayoutGroupData>;
+
+	ControlData DeserializeControlData(int widgetType, YAML::Node widgetNode);
+
+	ControlData CreateDefaultWidgetData(WidgetType type);
+
+	const char* WidgetTypeName(WidgetType type);
+
+} // namespace Chained
+
+#endif
diff --git a/engine/ui/ui_font_registry.cpp b/engine/ui/ui_font_registry.cpp
new file mode 100644
index 000000000..773764e1e
--- /dev/null
+++ b/engine/ui/ui_font_registry.cpp
@@ -0,0 +1,613 @@
+#include "ui_font_registry.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/common/asset_path.h"
+#include "engine/core/service_locator.h"
+#include "engine/project/project.h"
+#include "thirdparty/imgui/imstb_truetype.h" // Або шлях, де у вас лежить stb_truetype.h
+#include "engine/platform/dialogs/dialogs.h"
+
+#include <array>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+
+#include <system_error>
+#include <thread>
+
+namespace Chained
+{
+
+	// stb_truetype (used by ImGui) ONLY supports TrueType glyph outlines (glyf table).
+	// It cannot render OpenType CFF/PostScript outlines ('OTTO' header, CFF/CFF2 table)
+	// or Variable Fonts (fvar table).
+	static bool IsValidFontMetrics(const std::filesystem::path& path)
+	{
+		std::ifstream file(path, std::ios::binary | std::ios::ate);
+		if (!file.is_open())
+		{
+			return false;
+		}
+
+		std::streamsize size = file.tellg();
+		if (size <= 0)
+		{
+			return false;
+		}
+		file.seekg(0, std::ios::beg);
+
+		std::vector<char> fontFileData(size);
+		if (!file.read(fontFileData.data(), size))
+		{
+			return false;
+		}
+
+		stbtt_fontinfo fontInfo;
+		if (!stbtt_InitFont(&fontInfo, reinterpret_cast<const unsigned char*>(fontFileData.data()), 0))
+		{
+			return false;
+		}
+
+		for (int cp = 33; cp <= 126; cp++)
+		{
+			if (cp == ' ' || cp == '\t' || cp == '\n' || cp == '\r')
+			{
+				continue;
+			}
+
+			if (stbtt_FindGlyphIndex(&fontInfo, cp) == 0)
+			{
+				continue;
+			}
+
+			int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
+			if (stbtt_GetCodepointBox(&fontInfo, cp, &x0, &y0, &x1, &y1))
+			{
+				if (x1 < x0 || y1 < y0)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	static bool IsSupportedFontFormat(const std::filesystem::path& path)
+	{
+		std::ifstream f(path, std::ios::binary);
+		if (!f.is_open())
+		{
+			return false;
+		}
+
+		uint8_t hdr[12];
+		if (!f.read(reinterpret_cast<char*>(hdr), sizeof(hdr)))
+		{
+			return false;
+		}
+
+		uint32_t sfntVersion = (static_cast<uint32_t>(hdr[0]) << 24) | (static_cast<uint32_t>(hdr[1]) << 16) |
+							   (static_cast<uint32_t>(hdr[2]) << 8) | static_cast<uint32_t>(hdr[3]);
+
+		if (sfntVersion != 0x00010000 && sfntVersion != 0x74727565 /* 'true' */)
+		{
+			return false;
+		}
+
+		const uint16_t numTables = (static_cast<uint16_t>(hdr[4]) << 8) | hdr[5];
+
+		for (uint16_t i = 0; i < numTables; ++i)
+		{
+			uint8_t rec[16];
+			if (!f.read(reinterpret_cast<char*>(rec), sizeof(rec)))
+			{
+				break;
+			}
+
+			if ((rec[0] == 'f' && rec[1] == 'v' && rec[2] == 'a' && rec[3] == 'r') ||
+				(rec[0] == 'C' && rec[1] == 'F' && rec[2] == 'F'))
+			{
+				return false;
+			}
+		}
+
+		f.close();
+		return IsValidFontMetrics(path);
+	}
+
+	std::string UIFontRegistry::NormalizeFontName(std::string name)
+	{
+		return NormalizeAssetPath(name);
+	}
+
+	ImFont* UIFontRegistry::CommitFont(const std::string& normalizedName, ImFont* font)
+	{
+		m_Fonts[normalizedName] = font;
+		if (!m_DefaultFont)
+		{
+			m_DefaultFont = font;
+		}
+		if (ImGui::GetFrameCount() > 0)
+		{
+			m_NeedsRebuild = true;
+		}
+		CH_CORE_INFO("UIFontRegistry: Loaded '{}'", normalizedName);
+		return font;
+	}
+
+	void UIFontRegistry::RegisterKnownFont(const std::string& relKey, const std::string& path, int& discovered)
+	{
+		if (m_KnownPaths.emplace(relKey, path).second)
+		{
+			++discovered;
+		}
+		// Compatibility alias between legacy "font/" and "fonts/" prefixes.
+		if (relKey.rfind("font/", 0) == 0)
+		{
+			m_KnownPaths.emplace("fonts/" + relKey.substr(5), path);
+		}
+		else if (relKey.rfind("fonts/", 0) == 0)
+		{
+			m_KnownPaths.emplace("font/" + relKey.substr(6), path);
+		}
+	}
+
+	void UIFontRegistry::LoadProjectFonts()
+	{
+		m_KnownPaths.clear();
+
+		if (!Project::GetActive())
+		{
+			CH_CORE_WARN("UIFontRegistry: No active project, skipping font load.");
+			return;
+		}
+
+		const std::filesystem::path assetDir = Project::GetActive()->GetAssetDirectory();
+		const std::array<std::filesystem::path, 2> candidateDirs = {
+			assetDir / "fonts",
+			assetDir / "font",
+		};
+
+		const std::array<std::string, 2> validExtensions = {".ttf", ".otf"};
+		int discovered = 0;
+
+		for (const auto& fontsDir : candidateDirs)
+		{
+			if (!FileExists(fontsDir))
+			{
+				continue;
+			}
+
+			std::error_code iterError;
+			std::filesystem::recursive_directory_iterator it(
+				fontsDir, std::filesystem::directory_options::skip_permission_denied, iterError);
+			std::filesystem::recursive_directory_iterator end;
+
+			if (iterError)
+			{
+				CH_CORE_WARN("UIFontRegistry: Failed to scan '{}' ({})", fontsDir.string(), iterError.message());
+				continue;
+			}
+
+			for (; it != end; it.increment(iterError))
+			{
+				if (iterError)
+				{
+					CH_CORE_WARN("UIFontRegistry: Iteration failed in '{}' ({})", fontsDir.string(),
+								 iterError.message());
+					iterError.clear();
+					continue;
+				}
+
+				const auto& entry = *it;
+				if (!entry.is_regular_file(iterError) || iterError)
+				{
+					iterError.clear();
+					continue;
+				}
+
+				auto ext = entry.path().extension().string();
+				std::transform(ext.begin(), ext.end(), ext.begin(),
+							   [](unsigned char ch) { return static_cast<char>(std::tolower(ch)); });
+
+				bool validExt = false;
+				for (const auto& ve : validExtensions)
+				{
+					if (ext == ve)
+					{
+						validExt = true;
+						break;
+					}
+				}
+				if (!validExt)
+				{
+					continue;
+				}
+
+				auto relativePath = std::filesystem::relative(entry.path(), assetDir, iterError);
+				if (iterError)
+				{
+					CH_CORE_WARN("UIFontRegistry: Failed to build relative path for '{}' ({})", entry.path().string(),
+								 iterError.message());
+					iterError.clear();
+					continue;
+				}
+
+				if (!IsSupportedFontFormat(entry.path()))
+				{
+					CH_CORE_WARN("UIFontRegistry: Skipping font '{}' (unsupported format or CFF/Variable outlines).",
+								 entry.path().string());
+					continue;
+				}
+
+				std::string relKey = NormalizeFontName(relativePath.generic_string());
+				const std::string absPath = entry.path().string();
+
+				if (m_KnownPaths.find(relKey) == m_KnownPaths.end())
+				{
+					CH_CORE_INFO("UIFontRegistry: Discovered font '{}'", relKey);
+				}
+				RegisterKnownFont(relKey, absPath, discovered);
+			}
+		}
+
+		// ── Also discover fonts from pack archive ─────────────────────────────────
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (am && am->IsPacked())
+		{
+			const std::array<std::string, 2> validExts = {".ttf", ".otf"};
+			am->EnumeratePackedPaths([&](std::string_view packPath) {
+				std::filesystem::path p(packPath);
+				auto ext = p.extension().string();
+				std::transform(ext.begin(), ext.end(), ext.begin(),
+							   [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+
+				bool validExt = false;
+				for (const auto& ve : validExts)
+				{
+					if (ext == ve)
+					{
+						validExt = true;
+						break;
+					}
+				}
+				if (!validExt)
+				{
+					return;
+				}
+
+				// Only fonts under assets/fonts/ or assets/font/
+				std::string ps(packPath);
+				const bool underFonts = ps.find("assets/fonts/") == 0;
+				const bool underFont = ps.find("assets/font/") == 0;
+				if (!underFonts && !underFont)
+				{
+					return;
+				}
+
+				// Relative key: strip "assets/" prefix → "fonts/..." or "font/..."
+				const std::string relKey = NormalizeFontName(ps.substr(7));
+				const std::string packVirtualPath = "PACK:" + ps;
+
+				if (m_KnownPaths.find(relKey) == m_KnownPaths.end())
+				{
+					CH_CORE_INFO("UIFontRegistry: Discovered pack font '{}'", relKey);
+				}
+				RegisterKnownFont(relKey, packVirtualPath, discovered);
+			});
+		}
+
+		if (discovered == 0)
+		{
+			CH_CORE_INFO("UIFontRegistry: No project fonts found in '{}' or '{}' (disk or pack).",
+						 (assetDir / "font").string(), (assetDir / "fonts").string());
+			return;
+		}
+
+		CH_CORE_INFO("UIFontRegistry: Discovered {} font file(s).", discovered);
+		// Fonts are loaded on demand via PreloadFonts() / GetFont().
+		// Do not bulk-load all discovered fonts here — the atlas has finite space
+		// and most fonts will never be used in a given scene.
+	}
+
+	ImFont* UIFontRegistry::EnsureDefaultProjectFont(float pixelSize, bool allowRuntimeMutation)
+	{
+		const float size = (pixelSize > 0.0f) ? pixelSize : 16.0f;
+
+		if (m_KnownPaths.empty())
+		{
+			CH_CORE_WARN("UIFontRegistry: EnsureDefaultProjectFont — m_KnownPaths is empty, no fonts to use.");
+			return nullptr;
+		}
+
+		// Pick the first discovered font that is truly a project font (font/ or fonts/ prefix).
+		// Prioritize a regular/standard font variant if available.
+		std::string chosen;
+		for (const auto& [name, absPath] : m_KnownPaths)
+		{
+			if (name.rfind("font/", 0) == 0 || name.rfind("fonts/", 0) == 0)
+			{
+				if (name.find("regular") != std::string::npos || name.find("alansans") != std::string::npos)
+				{
+					if (IsSupportedFontFormat(std::filesystem::path(absPath)))
+					{
+						chosen = name;
+						break;
+					}
+				}
+			}
+		}
+
+		if (chosen.empty())
+		{
+			for (const auto& [name, absPath] : m_KnownPaths)
+			{
+				if (name.rfind("font/", 0) == 0 || name.rfind("fonts/", 0) == 0)
+				{
+					if (IsSupportedFontFormat(std::filesystem::path(absPath)))
+					{
+						chosen = name;
+						break;
+					}
+				}
+			}
+		}
+
+		if (chosen.empty())
+		{
+			CH_CORE_WARN("UIFontRegistry: EnsureDefaultProjectFont — no supported font found in {} known path(s).",
+						 m_KnownPaths.size());
+			return nullptr;
+		}
+
+		CH_CORE_INFO("UIFontRegistry: EnsureDefaultProjectFont — chosen '{}' at {}px (runtime={})", chosen, size,
+					 allowRuntimeMutation);
+		PreloadFonts({{chosen, size}}, allowRuntimeMutation);
+		ImFont* result = GetFont(chosen, size);
+		if (!result)
+		{
+			CH_CORE_WARN(
+				"UIFontRegistry: EnsureDefaultProjectFont — GetFont('{}', {}) returned nullptr after PreloadFonts.",
+				chosen, size);
+		}
+		if (result && !m_DefaultFont)
+		{
+			m_DefaultFont = result;
+		}
+		return result;
+	}
+
+	ImFont* UIFontRegistry::GetFont(const std::string& relativeName, float pixelSize)
+	{
+		const std::string normalizedName = NormalizeFontName(relativeName);
+		if (normalizedName.empty() || normalizedName == "Default" || normalizedName == "default")
+		{
+			if (m_DefaultFont)
+			{
+				return m_DefaultFont;
+			}
+			return EnsureDefaultProjectFont(pixelSize, true);
+		}
+
+		// Fonts are keyed by name only — with ImGui 1.92 dynamic fonts, one ImFont*
+		// renders at any size (pass the size to PushFont()/ImDrawList::AddText()).
+		auto it = m_Fonts.find(normalizedName);
+		if (it != m_Fonts.end())
+		{
+			if (it->second)
+			{
+				return it->second;
+			}
+			m_Fonts.erase(it);
+		}
+
+		m_FailedFonts.erase(normalizedName);
+
+		// Lazy registration. Safe at any time with the dynamic font atlas
+		// (ImGuiBackendFlags_RendererHasTextures) — glyphs bake on demand.
+		auto pathIt = m_KnownPaths.find(normalizedName);
+		if (pathIt != m_KnownPaths.end())
+		{
+			return RegisterFont(normalizedName, pathIt->second, pixelSize);
+		}
+
+		std::filesystem::path directPath(normalizedName);
+		if (directPath.is_absolute() && FileExists(directPath))
+		{
+			return RegisterFont(normalizedName, directPath.string(), pixelSize);
+		}
+
+		CH_CORE_WARN("UIFontRegistry: Font '{}' not discovered. Check assets/font or assets/fonts.", normalizedName);
+		m_FailedFonts.insert(normalizedName);
+		return nullptr;
+	}
+
+	const ImFont* UIFontRegistry::GetFont(const std::string& relativeName, float pixelSize) const
+	{
+		const std::string normalizedName = NormalizeFontName(relativeName);
+		if (normalizedName.empty() || normalizedName == "Default")
+		{
+			return nullptr;
+		}
+
+		auto it = m_Fonts.find(normalizedName);
+		if (it != m_Fonts.end())
+		{
+			return it->second;
+		}
+		return nullptr;
+	}
+
+	int UIFontRegistry::PreloadFonts(const std::vector<std::pair<std::string, float>>& requests,
+									 bool allowRuntimeMutation)
+	{
+		if (requests.empty())
+		{
+			return 0;
+		}
+
+		if (ImGui::GetFrameCount() > 0 && !allowRuntimeMutation)
+		{
+			CH_CORE_WARN("UIFontRegistry: Ignoring preload request after first frame (runtime mutation disabled).");
+			return 0;
+		}
+
+		int loaded = 0;
+		std::unordered_set<std::string> seenKeys;
+		std::unordered_set<std::string> missingFonts;
+
+		for (const auto& [fontNameRaw, pixelSizeRaw] : requests)
+		{
+			const std::string fontName = NormalizeFontName(fontNameRaw);
+			if (fontName.empty() || fontName == "Default")
+			{
+				continue;
+			}
+
+			const float pixelSize = (pixelSizeRaw > 0.0f) ? pixelSizeRaw : 16.0f;
+			if (!seenKeys.insert(fontName).second)
+			{
+				continue;
+			}
+
+			if (m_Fonts.find(fontName) != m_Fonts.end())
+			{
+				continue;
+			}
+
+			std::string absolutePath;
+			auto knownPathIt = m_KnownPaths.find(fontName);
+			if (knownPathIt != m_KnownPaths.end())
+			{
+				absolutePath = knownPathIt->second;
+			}
+			else
+			{
+				std::filesystem::path directPath(fontName);
+				if (directPath.is_absolute() && FileExists(directPath))
+				{
+					absolutePath = directPath.string();
+				}
+			}
+
+			if (absolutePath.empty())
+			{
+				missingFonts.insert(fontName);
+				continue;
+			}
+
+			if (RegisterFont(fontName, absolutePath, pixelSize))
+			{
+				loaded++;
+			}
+		}
+
+		for (const auto& fontName : missingFonts)
+		{
+			CH_CORE_WARN("UIFontRegistry: Missing font '{}' requested by runtime scene.", fontName);
+		}
+
+		return loaded;
+	}
+
+	ImFont* UIFontRegistry::RegisterFont(const std::string& relativeName, const std::string& absolutePath,
+										 float pixelSize)
+	{
+		const std::string normalizedName = NormalizeFontName(relativeName);
+		if (normalizedName.empty())
+		{
+			return nullptr;
+		}
+
+		// Already registered (or a cached failure) — don't touch the atlas again.
+		{
+			auto it = m_Fonts.find(normalizedName);
+			if (it != m_Fonts.end())
+			{
+				return it->second;
+			}
+		}
+
+		// ── Pack font: load raw bytes via AssetManager, use AddFontFromMemoryTTF ──
+		// absolutePath starts with "PACK:" when the font was discovered inside the
+		// pack archive (set by LoadProjectFonts). IsSupportedFontFormat is skipped
+		// because it needs a real file path; ImGui returns nullptr on unsupported data.
+		static constexpr std::string_view kPackPrefix = "PACK:";
+		if (absolutePath.size() > kPackPrefix.size() && absolutePath.compare(0, kPackPrefix.size(), kPackPrefix) == 0)
+		{
+			auto* am = ServiceLocator::TryGet<AssetManager>();
+			if (am)
+			{
+				const std::string packKey = absolutePath.substr(kPackPrefix.size());
+				auto data = am->ReadAssetData(packKey);
+				if (!data.empty())
+				{
+					// Keep the buffer alive — ImGui does NOT own it (FontDataOwnedByAtlas=false)
+					auto& buf = m_PackFontData[normalizedName];
+					buf = std::move(data);
+
+					ImFontConfig cfg;
+					cfg.FontDataOwnedByAtlas = false;
+					const float defaultSize = (pixelSize > 0.0f) ? pixelSize : 16.0f;
+					ImGuiIO& io = ImGui::GetIO();
+					ImFont* font = io.Fonts->AddFontFromMemoryTTF(buf.data(), static_cast<int>(buf.size()), defaultSize,
+																  &cfg, io.Fonts->GetGlyphRangesCyrillic());
+					if (font)
+					{
+						m_FailedFonts.erase(normalizedName);
+						return CommitFont(normalizedName, font);
+					}
+				}
+			}
+			CH_CORE_WARN("UIFontRegistry: Failed to load pack font '{}'", absolutePath);
+			m_FailedFonts.insert(normalizedName);
+			return nullptr;
+		}
+
+		if (!IsSupportedFontFormat(std::filesystem::path(absolutePath)))
+		{
+			CH_CORE_WARN("UIFontRegistry: Skipped font '{}' (unsupported format or CFF/Variable outlines).",
+						 absolutePath);
+			m_FailedFonts.insert(normalizedName);
+			return nullptr;
+		}
+
+		// The size passed here is only the legacy default — with dynamic fonts the
+		// actual render size comes from PushFont()/AddText() at each call site.
+		const float defaultSize = (pixelSize > 0.0f) ? pixelSize : 16.0f;
+
+		ImGuiIO& io = ImGui::GetIO();
+		ImFont* font = io.Fonts->AddFontFromFileTTF(absolutePath.c_str(), defaultSize, nullptr,
+													io.Fonts->GetGlyphRangesCyrillic());
+		if (!font)
+		{
+			CH_CORE_ERROR("UIFontRegistry: Failed to load font '{}'", absolutePath);
+			m_FailedFonts.insert(normalizedName);
+			return nullptr;
+		}
+
+		m_FailedFonts.erase(normalizedName);
+		return CommitFont(normalizedName, font);
+	}
+
+	void UIFontRegistry::Clear()
+	{
+		m_Fonts.clear();
+		m_FailedFonts.clear();
+		m_KnownPaths.clear();
+		m_PackFontData.clear();
+		m_DefaultFont = nullptr;
+	}
+
+	std::vector<std::string> UIFontRegistry::GetKnownFontNames() const
+	{
+		std::vector<std::string> names;
+		names.reserve(m_KnownPaths.size());
+		for (const auto& [name, _] : m_KnownPaths)
+		{
+			names.push_back(name);
+		}
+		std::sort(names.begin(), names.end());
+		return names;
+	}
+} // namespace Chained
\ No newline at end of file
diff --git a/engine/ui/ui_font_registry.h b/engine/ui/ui_font_registry.h
new file mode 100644
index 000000000..c0d2da09f
--- /dev/null
+++ b/engine/ui/ui_font_registry.h
@@ -0,0 +1,118 @@
+#ifndef CH_UI_FONT_REGISTRY_H
+#define CH_UI_FONT_REGISTRY_H
+
+#include "engine/core/service.h"
+#include "imgui.h"
+#include <string>
+#include <utility>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+namespace Chained
+{
+
+	// Manages ImGui font atlas entries for UI rendering.
+	// Fonts must be registered before BuildAtlas() is called (before the first frame).
+	// Typical usage: call LoadProjectFonts() between ImGui::CreateContext() and the first frame.
+	class UIFontRegistry : public Service
+	{
+	public:
+		UIFontRegistry() = default;
+		~UIFontRegistry() override = default;
+
+		void Initialize() override
+		{
+		}
+		void Shutdown() override
+		{
+		}
+
+		// Scans <ProjectAssetDir>/fonts/ for all TTF/OTF files and discovers paths.
+		// FontName key = relative path from assets/, e.g. "fonts/Roboto-Regular.ttf".
+		// Multiple sizes are loaded explicitly via PreloadFonts().
+		void LoadProjectFonts();
+
+		// Preloads explicit font tuples into ImGui atlas.
+		// Returns number of newly registered tuples.
+		int PreloadFonts(const std::vector<std::pair<std::string, float>>& requests, bool allowRuntimeMutation);
+
+		// Ensures project default font is available and returns it.
+		// Falls back to nullptr if no project font files are found.
+		ImFont* EnsureDefaultProjectFont(float pixelSize, bool allowRuntimeMutation);
+
+		// Returns the ImFont* for the given relative font name and pixel size.
+		// If not found or not loaded, returns nullptr (ImGui will use its default font).
+		// Non-const version allows lazy registration of fonts discovered but not yet loaded.
+		ImFont* GetFont(const std::string& relativeName, float pixelSize);
+
+		// Const version — returns nullptr if font is not yet loaded (no lazy registration).
+		const ImFont* GetFont(const std::string& relativeName, float pixelSize) const;
+
+		// Returns the default font (first registered, or ImGui built-in default).
+		ImFont* GetDefaultFont() const
+		{
+			return m_DefaultFont;
+		}
+
+		// True if any fonts were successfully loaded.
+		bool HasFonts() const
+		{
+			return !m_Fonts.empty();
+		}
+
+		// Returns all discovered font names (relative paths from assets/).
+		std::vector<std::string> GetKnownFontNames() const;
+
+		// Clears all registered fonts (call before re-loading a new project).
+		void Clear();
+
+		// Returns true if fonts were registered after the first frame and the GPU
+		// atlas texture must be rebuilt via ImGuiLayer::RefreshFontAtlasTexture().
+		bool NeedsAtlasRebuild() const
+		{
+			return m_NeedsRebuild;
+		}
+
+		// Clears the rebuild flag (call after the atlas GPU texture has been refreshed).
+		void ClearRebuildFlag()
+		{
+			m_NeedsRebuild = false;
+		}
+
+	private:
+		// Registers a single TTF/OTF file at the given absolute path under a relative name key.
+		// Returns the loaded ImFont* or nullptr on failure (failures are cached as nullptr).
+		ImFont* RegisterFont(const std::string& relativeName, const std::string& absolutePath, float pixelSize);
+
+		// Finalises font registration: stores in m_Fonts, sets m_DefaultFont, flags atlas rebuild.
+		ImFont* CommitFont(const std::string& normalizedName, ImFont* font);
+
+		// Registers relKey → path in m_KnownPaths, increments discovered, and adds font/↔fonts/ alias.
+		void RegisterKnownFont(const std::string& relKey, const std::string& path, int& discovered);
+
+		static std::string NormalizeFontName(std::string name);
+
+		// Keyed by normalized relative name, e.g. "fonts/Roboto.ttf". One ImFont* per
+		// file — with ImGui 1.92 dynamic fonts any render size works from a single entry
+		// (pass the size to PushFont()/ImDrawList::AddText()).
+		std::unordered_map<std::string, ImFont*> m_Fonts;
+
+		// Failed font names are tracked separately so the registry can retry pack/file loads
+		// instead of permanently caching a null font pointer from a transient failure.
+		std::unordered_set<std::string> m_FailedFonts;
+
+		// Tracks which relative paths have been discovered (name -> absolute path)
+		std::unordered_map<std::string, std::string> m_KnownPaths;
+
+		ImFont* m_DefaultFont = nullptr;
+		bool m_NeedsRebuild = false;
+
+		// Raw TTF/OTF byte buffers for fonts read from pack.
+		// FontDataOwnedByAtlas = false, so these must outlive the atlas build.
+		std::unordered_map<std::string, std::vector<uint8_t>> m_PackFontData;
+	};
+
+} // namespace Chained
+
+#endif // CH_UI_FONT_REGISTRY_H
diff --git a/engine/ui/ui_input_system.cpp b/engine/ui/ui_input_system.cpp
new file mode 100644
index 000000000..e8384fb13
--- /dev/null
+++ b/engine/ui/ui_input_system.cpp
@@ -0,0 +1,88 @@
+// ui_input_system.cpp
+// Chained Engine — UI input processing for widget interaction.
+// Maps ImGui click/hover state to UIControlComponent flags each frame.
+
+#include "ui_input_system.h"
+#include "engine/scene/components/ui/control_component.h"
+#include "imgui.h"
+
+namespace Chained
+{
+
+	void UpdateUIInput(entt::registry& registry, const UILayoutSystem& layout, bool suppress)
+	{
+		auto view = registry.view<UIControlComponent, ControlComponent>();
+
+		// Reset per-frame flags. PrevIsDown is NOT reset here — it carries over so the
+		// edge detector (!PrevIsDown && IsDown) works correctly the next frame.
+		for (auto entityID : view)
+		{
+			auto& widget = view.get<UIControlComponent>(entityID);
+			widget.IsHovered = false;
+			widget.IsDown = false;
+			widget.PressedThisFrame = false;
+		}
+
+		ImVec2 mousePos = ImGui::GetMousePos();
+		bool mouseDown = ImGui::IsMouseDown(0);
+
+		// Collect active entities for Z-order sorted processing.
+		std::vector<entt::entity> sorted;
+		sorted.reserve(view.size_hint());
+		for (auto entityID : view)
+		{
+			if (view.get<ControlComponent>(entityID).IsActive)
+			{
+				sorted.push_back(entityID);
+			}
+		}
+
+		// Sort by Z-order: highest (topmost) first.
+		std::sort(sorted.begin(), sorted.end(), [&](entt::entity a, entt::entity b) {
+			return view.get<ControlComponent>(a).ZOrder > view.get<ControlComponent>(b).ZOrder;
+		});
+
+		// Input consumption flags — only the topmost hovered element receives events.
+		bool hoverConsumed = false;
+
+		for (auto entityID : sorted)
+		{
+			auto& widget = view.get<UIControlComponent>(entityID);
+			UIRect rect = layout.GetEntityRect(entityID);
+
+			bool isOver = mousePos.x >= rect.x && mousePos.x <= rect.x + rect.width && mousePos.y >= rect.y &&
+						  mousePos.y <= rect.y + rect.height;
+
+			bool wasDown = widget.PrevIsDown;
+
+			if (isOver && !hoverConsumed)
+			{
+				widget.IsHovered = true;
+				hoverConsumed = true;
+
+				if (mouseDown)
+				{
+					widget.IsDown = true;
+				}
+
+				// Own edge detection: click = rising edge of IsDown
+				if (widget.IsDown && !wasDown)
+				{
+					widget.PressedThisFrame = true;
+				}
+			}
+
+			// Suppress inputs globally at the end (e.g. crossing Edit->Play boundary).
+			// This ensures PrevIsDown is still properly updated so human hold-overs
+			// don't trigger false edges on the frame AFTER suppression ends.
+			if (suppress)
+			{
+				widget.PressedThisFrame = false;
+			}
+
+			// Update previous state for next frame's edge detection.
+			widget.PrevIsDown = widget.IsDown;
+		}
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_input_system.h b/engine/ui/ui_input_system.h
new file mode 100644
index 000000000..be2e144fd
--- /dev/null
+++ b/engine/ui/ui_input_system.h
@@ -0,0 +1,18 @@
+#ifndef CH_UI_INPUT_SYSTEM_H
+#define CH_UI_INPUT_SYSTEM_H
+
+#include "ui_layout_system.h"
+#include "entt/entt.hpp"
+
+namespace Chained
+{
+
+	// Processes mouse input against UI widgets each frame.
+	// Resets all widget flags, then hit-tests active widgets by Z-order.
+	// When suppress is true, flags are reset but no input is processed
+	// (used on the first frame after a scene load).
+	void UpdateUIInput(entt::registry& registry, const UILayoutSystem& layout, bool suppress = false);
+
+} // namespace Chained
+
+#endif // CH_UI_INPUT_SYSTEM_H
diff --git a/engine/ui/ui_layout_system.cpp b/engine/ui/ui_layout_system.cpp
new file mode 100644
index 000000000..fd0d95388
--- /dev/null
+++ b/engine/ui/ui_layout_system.cpp
@@ -0,0 +1,131 @@
+#include "ui_layout_system.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/components/core/hierarchy_component.h"
+#include "engine/scene/components/ui/control_component.h"
+#include "imgui.h"
+
+namespace Chained
+{
+	namespace
+	{
+		UIRect CalculateRect(const RectTransform& rt, glm::vec2 viewportSize, glm::vec2 viewportOffset = {0.0f, 0.0f})
+		{
+			glm::vec2 clAnchMin = glm::clamp(rt.AnchorMin, 0.0f, 1.0f);
+			glm::vec2 clAnchMax = glm::clamp(rt.AnchorMax, 0.0f, 1.0f);
+
+			glm::vec2 anchorMinPos = {viewportSize.x * clAnchMin.x, viewportSize.y * clAnchMin.y};
+			glm::vec2 anchorMaxPos = {viewportSize.x * clAnchMax.x, viewportSize.y * clAnchMax.y};
+
+			glm::vec2 pMin = {anchorMinPos.x + rt.OffsetMin.x, anchorMinPos.y + rt.OffsetMin.y};
+			glm::vec2 pMax = {anchorMaxPos.x + rt.OffsetMax.x, anchorMaxPos.y + rt.OffsetMax.y};
+
+			return UIRect{viewportOffset.x + pMin.x, viewportOffset.y + pMin.y, pMax.x - pMin.x, pMax.y - pMin.y};
+		}
+	} // namespace
+
+	void UILayoutSystem::Update(Scene* scene, const ImVec2& viewportSize, const ImVec2& viewportPos)
+	{
+		m_RectCache.clear();
+		if (!scene)
+		{
+			return;
+		}
+
+		const CanvasSettings& canvas = scene->GetSettings().Canvas;
+		m_ScaleFactor = 1.0f;
+
+		if (canvas.ScaleMode == CanvasScaleMode::ScaleWithScreenSize && canvas.ReferenceResolution.x > 0 &&
+			canvas.ReferenceResolution.y > 0)
+		{
+			float scaleX = viewportSize.x / canvas.ReferenceResolution.x;
+			float scaleY = viewportSize.y / canvas.ReferenceResolution.y;
+			m_ScaleFactor = scaleX * (1.0f - canvas.MatchWidthOrHeight) + scaleY * canvas.MatchWidthOrHeight;
+		}
+
+		m_VirtualCanvas = {
+			0,
+			0,
+			viewportSize.x / m_ScaleFactor,
+			viewportSize.y / m_ScaleFactor,
+		};
+
+		auto& registry = scene->GetRegistry();
+		auto view = registry.view<ControlComponent>();
+
+		for (auto entityID : view)
+		{
+			Entity entity(entityID, &registry);
+			CalculateRecursive(entity, m_VirtualCanvas);
+		}
+
+		// Final pass to apply scale and viewport position
+		for (auto& [id, rect] : m_RectCache)
+		{
+			rect.x = viewportPos.x + rect.x * m_ScaleFactor;
+			rect.y = viewportPos.y + rect.y * m_ScaleFactor;
+			rect.width *= m_ScaleFactor;
+			rect.height *= m_ScaleFactor;
+		}
+	}
+
+	UIRect UILayoutSystem::GetEntityRect(entt::entity entity) const
+	{
+		auto it = m_RectCache.find(entity);
+		if (it != m_RectCache.end())
+		{
+			return it->second;
+		}
+		return {0, 0, 0, 0};
+	}
+
+	UIRect UILayoutSystem::CalculateRecursive(Entity entity, const UIRect& canvasRect)
+	{
+		entt::entity id = (entt::entity)entity;
+		if (m_RectCache.count(id))
+		{
+			return m_RectCache[id];
+		}
+
+		// Insert sentinel before recursing to break any parent↔child cycles.
+		m_RectCache[id] = {0, 0, canvasRect.width, canvasRect.height};
+
+		auto& control = entity.GetComponent<ControlComponent>();
+		UIRect parentRect = {0, 0, canvasRect.width, canvasRect.height};
+
+		if (entity.HasComponent<HierarchyComponent>())
+		{
+			auto parentID = entity.GetComponent<HierarchyComponent>().Parent;
+			if (parentID != entt::null && entity.GetRegistryPtr()->valid(parentID))
+			{
+				Entity parent(parentID, entity.GetRegistryPtr());
+				if (parent.HasComponent<ControlComponent>())
+				{
+					parentRect = CalculateRecursive(parent, canvasRect);
+				}
+			}
+		}
+
+		// Auto-size logic for labels (moved from WidgetRenderer)
+		if (entity.HasComponent<UIControlComponent>())
+		{
+			auto& widget = entity.GetComponent<UIControlComponent>();
+			if (std::holds_alternative<LabelData>(widget.Data))
+			{
+				auto& label = std::get<LabelData>(widget.Data);
+				if (label.AutoSize)
+				{
+					ImVec2 ts = ImGui::CalcTextSize(label.Text.c_str());
+					control.Transform.OffsetMax = {control.Transform.OffsetMin.x + ts.x + 10.0f,
+												   control.Transform.OffsetMin.y + ts.y + 4.0f};
+				}
+			}
+		}
+
+		UIRect r =
+			CalculateRect(control.Transform, {parentRect.width, parentRect.height}, {parentRect.x, parentRect.y});
+
+		m_RectCache[id] = r;
+		return r;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_layout_system.h b/engine/ui/ui_layout_system.h
new file mode 100644
index 000000000..3e0d80013
--- /dev/null
+++ b/engine/ui/ui_layout_system.h
@@ -0,0 +1,41 @@
+#ifndef CH_UI_LAYOUT_SYSTEM_H
+#define CH_UI_LAYOUT_SYSTEM_H
+
+#include "ui_types.h"
+#include "engine/scene/entity.h"
+#include "entt/entt.hpp"
+#include "imgui.h"
+#include <map>
+
+namespace Chained
+{
+	class Scene;
+
+	class UILayoutSystem
+	{
+	public:
+		UILayoutSystem() = default;
+
+		void Update(Scene* scene, const ImVec2& viewportSize, const ImVec2& viewportPos);
+
+		UIRect GetEntityRect(entt::entity entity) const;
+		float GetScaleFactor() const
+		{
+			return m_ScaleFactor;
+		}
+		const UIRect& GetVirtualCanvas() const
+		{
+			return m_VirtualCanvas;
+		}
+
+	private:
+		UIRect CalculateRecursive(Entity entity, const UIRect& canvasRect);
+
+		std::map<entt::entity, UIRect> m_RectCache;
+		float m_ScaleFactor = 1.0f;
+		UIRect m_VirtualCanvas;
+	};
+
+} // namespace Chained
+
+#endif // CH_UI_LAYOUT_SYSTEM_H
diff --git a/engine/ui/ui_render_basic.cpp b/engine/ui/ui_render_basic.cpp
new file mode 100644
index 000000000..835001ff7
--- /dev/null
+++ b/engine/ui/ui_render_basic.cpp
@@ -0,0 +1,189 @@
+// ui_render_basic.cpp
+// Renders: Panel, Button, Label, Checkbox, ProgressBar, Separator
+#include "ui_render_helpers.h"
+
+namespace Chained
+{
+
+	bool RenderPanel(PanelData& panel, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		ImVec2 pMax = {pos.x + size.x, pos.y + size.y};
+
+		auto textureAsset = ResolveTexture(panel.TextureHandle, panel.TexturePath);
+		if (textureAsset && textureAsset->GetState() == AssetState::Ready)
+		{
+			if (auto tex = textureAsset->GetTexture())
+			{
+				ImTextureID texId = (ImTextureID)(uintptr_t)tex->GetNativeHandle();
+				dl->AddImageRounded(texId, pos, pMax, {0, 0}, {1, 1}, IM_COL32_WHITE, wc.BoxStyle.Rounding);
+			}
+		}
+		else
+		{
+			dl->AddRectFilled(pos, pMax, ToImU32(wc.BoxStyle.BackgroundColor), wc.BoxStyle.Rounding);
+		}
+
+		if (wc.BoxStyle.BorderSize > 0.0f)
+		{
+			dl->AddRect(pos, pMax, ToImU32(wc.BoxStyle.BorderColor), wc.BoxStyle.Rounding, 0, wc.BoxStyle.BorderSize);
+		}
+		return false;
+	}
+
+	bool RenderButton(const ButtonData& button, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+					  ImFont* font, const TextStyle& textStyle)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		ImVec2 pMax = {pos.x + size.x, pos.y + size.y};
+
+		ImU32 btnColor = GetControlColor(wc.BoxStyle, wc);
+		dl->AddRectFilled(pos, pMax, btnColor, wc.BoxStyle.Rounding);
+
+		if (wc.BoxStyle.BorderSize > 0.0f)
+		{
+			dl->AddRect(pos, pMax, ToImU32(wc.BoxStyle.BorderColor), wc.BoxStyle.Rounding, 0, wc.BoxStyle.BorderSize);
+		}
+
+		RenderAlignedTextureText(dl, font, textStyle.FontSize, button.Label, pos, size, textStyle);
+
+		return wc.PressedThisFrame;
+	}
+
+	bool RenderLabel(const LabelData& label, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+					 ImFont* font, const TextStyle& textStyle)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		RenderAlignedTextureText(dl, font, textStyle.FontSize, label.Text, pos, size, textStyle);
+		return false;
+	}
+
+	bool RenderCheckbox(CheckboxData& checkbox, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						ImFont* font, const TextStyle& textStyle)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+
+		float boxSize = size.y > 0.0f ? size.y : 18.0f;
+		ImVec2 boxMax = {pos.x + boxSize, pos.y + boxSize};
+
+		ImU32 boxColor = GetControlColor(wc.BoxStyle, wc);
+		dl->AddRectFilled(pos, boxMax, boxColor, wc.BoxStyle.Rounding);
+		dl->AddRect(pos, boxMax, ToImU32(wc.BoxStyle.BorderColor), wc.BoxStyle.Rounding, 0, 1.0f);
+
+		if (checkbox.Checked)
+		{
+			float pad = boxSize * 0.25f;
+			dl->AddRectFilled({pos.x + pad, pos.y + pad}, {boxMax.x - pad, boxMax.y - pad},
+							  ToImU32(textStyle.TextColor), wc.BoxStyle.Rounding);
+		}
+
+		ImVec2 textPos = {pos.x + boxSize + 8.0f, pos.y};
+		ImVec2 textSize = {size.x - boxSize - 8.0f, size.y};
+		RenderAlignedTextureText(dl, font, textStyle.FontSize, checkbox.Label, textPos, textSize, textStyle);
+
+		if (wc.PressedThisFrame)
+		{
+			checkbox.Checked = !checkbox.Checked;
+			return true;
+		}
+
+		return false;
+	}
+
+	bool RenderProgressBar(const ProgressBarData& pb, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		ImVec2 pMax = {pos.x + size.x, pos.y + size.y};
+
+		dl->AddRectFilled(pos, pMax, ToImU32(wc.BoxStyle.BackgroundColor), wc.BoxStyle.Rounding);
+
+		float currentProgressWidth = size.x * std::clamp(pb.Progress, 0.0f, 1.0f);
+		if (currentProgressWidth > 0.0f)
+		{
+			ImVec2 progressMax = {pos.x + currentProgressWidth, pos.y + size.y};
+			dl->AddRectFilled(pos, progressMax, ToImU32(wc.BoxStyle.HoverColor), wc.BoxStyle.Rounding);
+		}
+
+		if (wc.BoxStyle.BorderSize > 0.0f)
+		{
+			dl->AddRect(pos, pMax, ToImU32(wc.BoxStyle.BorderColor), wc.BoxStyle.Rounding, 0, wc.BoxStyle.BorderSize);
+		}
+
+		return false;
+	}
+
+	bool RenderSeparator(const SeparatorData& sep, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		float midY = pos.y + size.y * 0.5f;
+		dl->AddLine({pos.x, midY}, {pos.x + size.x, midY}, ToImU32(sep.LineColor), sep.Thickness);
+		return false;
+	}
+
+	bool RenderRadioButton(RadioButtonData& radio, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						   ImFont* font, const TextStyle& textStyle)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		bool changed = false;
+
+		if (radio.Horizontal)
+		{
+			float itemW = (radio.Options.empty()) ? size.x : size.x / static_cast<float>(radio.Options.size());
+			for (int i = 0; i < (int)radio.Options.size(); i++)
+			{
+				ImVec2 itemPos = {pos.x + itemW * i, pos.y};
+				float radius = std::min(size.y * 0.35f, 8.0f);
+				ImVec2 circleCenter = {itemPos.x + radius + 4.0f, pos.y + size.y * 0.5f};
+				ImU32 circleColor =
+					(i == radio.SelectedIndex) ? ToImU32(textStyle.TextColor) : ToImU32(wc.BoxStyle.BorderColor);
+				dl->AddCircle(circleCenter, radius, circleColor, 12, 1.5f);
+				if (i == radio.SelectedIndex)
+				{
+					dl->AddCircleFilled(circleCenter, radius * 0.5f, ToImU32(textStyle.TextColor));
+				}
+				ImVec2 labelPos = {circleCenter.x + radius + 4.0f, pos.y};
+				ImVec2 labelSize = {itemW - radius * 2.0f - 12.0f, size.y};
+				RenderAlignedTextureText(dl, font, textStyle.FontSize, radio.Options[i], labelPos, labelSize,
+										 textStyle);
+
+				ImVec2 itemMax = {itemPos.x + itemW, pos.y + size.y};
+				ImGui::SetCursorScreenPos(itemPos);
+				if (ImGui::InvisibleButton(("##radio" + std::to_string(i)).c_str(), {itemW, size.y}))
+				{
+					radio.SelectedIndex = i;
+					changed = true;
+				}
+			}
+		}
+		else
+		{
+			float itemH = (radio.Options.empty()) ? size.y : size.y / static_cast<float>(radio.Options.size());
+			for (int i = 0; i < (int)radio.Options.size(); i++)
+			{
+				ImVec2 itemPos = {pos.x, pos.y + itemH * i};
+				float radius = std::min(itemH * 0.35f, 8.0f);
+				ImVec2 circleCenter = {itemPos.x + radius + 4.0f, itemPos.y + itemH * 0.5f};
+				ImU32 circleColor =
+					(i == radio.SelectedIndex) ? ToImU32(textStyle.TextColor) : ToImU32(wc.BoxStyle.BorderColor);
+				dl->AddCircle(circleCenter, radius, circleColor, 12, 1.5f);
+				if (i == radio.SelectedIndex)
+				{
+					dl->AddCircleFilled(circleCenter, radius * 0.5f, ToImU32(textStyle.TextColor));
+				}
+				ImVec2 labelPos = {circleCenter.x + radius + 4.0f, itemPos.y};
+				ImVec2 labelSize = {size.x - radius * 2.0f - 12.0f, itemH};
+				RenderAlignedTextureText(dl, font, textStyle.FontSize, radio.Options[i], labelPos, labelSize,
+										 textStyle);
+
+				ImGui::SetCursorScreenPos(itemPos);
+				if (ImGui::InvisibleButton(("##radio" + std::to_string(i)).c_str(), {size.x, itemH}))
+				{
+					radio.SelectedIndex = i;
+					changed = true;
+				}
+			}
+		}
+		return changed;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_render_container.cpp b/engine/ui/ui_render_container.cpp
new file mode 100644
index 000000000..44ace7312
--- /dev/null
+++ b/engine/ui/ui_render_container.cpp
@@ -0,0 +1,72 @@
+// ui_render_container.cpp
+// Renders: TabBar, TabItem, CollapsingHeader, TreeNode, VerticalLayoutGroup
+#include "ui_render_helpers.h"
+
+namespace Chained
+{
+
+	bool RenderTreeNode(TreeNodeData& node, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size, ImFont* font,
+						const TextStyle& textStyle)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_SpanAvailWidth;
+		if (node.DefaultOpen)
+		{
+			flags |= ImGuiTreeNodeFlags_DefaultOpen;
+		}
+		if (node.IsLeaf)
+		{
+			flags |= ImGuiTreeNodeFlags_Leaf;
+		}
+		node.IsOpen = ImGui::TreeNodeEx(node.Label.c_str(), flags);
+		if (node.IsOpen)
+		{
+			ImGui::TreePop();
+		}
+		return false;
+	}
+
+	bool RenderTabBar(TabBarData& bar, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGuiTabBarFlags flags = 0;
+		if (bar.Reorderable)
+		{
+			flags |= ImGuiTabBarFlags_Reorderable;
+		}
+		if (bar.AutoSelectNewTabs)
+		{
+			flags |= ImGuiTabBarFlags_AutoSelectNewTabs;
+		}
+		ImGui::BeginTabBar(bar.Label.c_str(), flags);
+		ImGui::EndTabBar();
+		return false;
+	}
+
+	bool RenderTabItem(TabItemData& item, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		bool open = item.IsOpen;
+		item.Selected = ImGui::BeginTabItem(item.Label.c_str(), item.IsOpen ? &open : nullptr);
+		if (item.Selected)
+		{
+			ImGui::EndTabItem();
+		}
+		item.IsOpen = open;
+		return false;
+	}
+
+	bool RenderCollapsingHeader(CollapsingHeaderData& header, UIControlComponent& wc, const ImVec2& pos,
+								const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGuiTreeNodeFlags flags = 0;
+		if (header.DefaultOpen)
+		{
+			flags |= ImGuiTreeNodeFlags_DefaultOpen;
+		}
+		header.IsOpen = ImGui::CollapsingHeader(header.Label.c_str(), flags);
+		return false;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_render_helpers.h b/engine/ui/ui_render_helpers.h
new file mode 100644
index 000000000..058feca84
--- /dev/null
+++ b/engine/ui/ui_render_helpers.h
@@ -0,0 +1,107 @@
+#ifndef CH_UI_RENDER_HELPERS_H
+#define CH_UI_RENDER_HELPERS_H
+
+#include "engine/scene/components/ui/control_component.h"
+#include "engine/assets/types/texture_asset.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/core/service_locator.h"
+#include "imgui.h"
+
+namespace Chained
+{
+
+	inline ImVec4 ToImVec4(const Color& c)
+	{
+		return ImVec4(c.r / 255.0f, c.g / 255.0f, c.b / 255.0f, c.a / 255.0f);
+	}
+
+	inline ImU32 ToImU32(const Color& c)
+	{
+		return IM_COL32(c.r, c.g, c.b, c.a);
+	}
+
+	inline ImU32 GetControlColor(const UIStyle& style, const UIControlComponent& wc)
+	{
+		return ToImU32(style.State.CurrentColor);
+	}
+
+	inline void RenderAlignedTextureText(ImDrawList* dl, ImFont* font, float fontSize, const std::string& text,
+										 const ImVec2& pos, const ImVec2& size, const TextStyle& textStyle)
+	{
+		if (text.empty())
+		{
+			return;
+		}
+
+		// No per-widget font -> fall back to the current (default) font, but still
+		// honor the widget's FontSize. ImGui 1.92 renders any font at any size.
+		ImFont* activeFont = font ? font : ImGui::GetFont();
+		const float activeSize = (fontSize > 0.0f) ? fontSize : ImGui::GetFontSize();
+
+		// Measure at the exact size the text will be drawn at.
+		ImGui::PushFont(activeFont, activeSize);
+		ImVec2 textSize = ImGui::CalcTextSize(text.c_str());
+		ImGui::PopFont();
+
+		ImVec2 textPos = pos;
+
+		if (textStyle.Horizontal == HorizontalAlignment::Center)
+		{
+			textPos.x += (size.x - textSize.x) * 0.5f;
+		}
+		else if (textStyle.Horizontal == HorizontalAlignment::Right)
+		{
+			textPos.x += (size.x - textSize.x);
+		}
+
+		if (textStyle.Vertical == VerticalAlignment::Center)
+		{
+			textPos.y += (size.y - textSize.y) * 0.5f;
+		}
+		else if (textStyle.Vertical == VerticalAlignment::Bottom)
+		{
+			textPos.y += (size.y - textSize.y);
+		}
+
+		if (textStyle.Shadow)
+		{
+			ImVec2 shadowPos = {textPos.x + textStyle.ShadowOffset, textPos.y + textStyle.ShadowOffset};
+			dl->AddText(activeFont, activeSize, shadowPos, ToImU32(textStyle.ShadowColor), text.c_str());
+		}
+
+		dl->AddText(activeFont, activeSize, textPos, ToImU32(textStyle.TextColor), text.c_str());
+	}
+
+	inline std::shared_ptr<TextureAsset> ResolveTexture(AssetHandle& handle, const std::string& path)
+	{
+		auto* am = ServiceLocator::TryGet<AssetManager>();
+		if (!am)
+		{
+			return nullptr;
+		}
+
+		if (handle != 0)
+		{
+			auto asset = am->Get<TextureAsset>(handle);
+			if (asset)
+			{
+				return asset;
+			}
+		}
+
+		if (!path.empty())
+		{
+			auto asset = am->Get<TextureAsset>(path);
+			if (asset)
+			{
+				handle = static_cast<AssetHandle>(asset->GetID());
+				return asset;
+			}
+		}
+
+		return nullptr;
+	}
+
+} // namespace Chained
+
+#endif // CH_UI_RENDER_HELPERS_H
diff --git a/engine/ui/ui_render_image.cpp b/engine/ui/ui_render_image.cpp
new file mode 100644
index 000000000..042a43649
--- /dev/null
+++ b/engine/ui/ui_render_image.cpp
@@ -0,0 +1,80 @@
+// ui_render_image.cpp
+// Renders: Image, ImageButton
+#include "ui_render_helpers.h"
+
+namespace Chained
+{
+
+	bool RenderImage(ImageData& img, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		ImVec2 pMax = {pos.x + size.x, pos.y + size.y};
+
+		bool changed = false;
+		auto textureAsset = ResolveTexture(img.TextureHandle, img.TexturePath);
+		if (textureAsset && textureAsset->GetState() == AssetState::Ready)
+		{
+			if (auto tex = textureAsset->GetTexture())
+			{
+				ImTextureID texId = (ImTextureID)(uintptr_t)tex->GetNativeHandle();
+				dl->AddImageRounded(texId, pos, pMax, {0, 0}, {1, 1}, ToImU32(img.TintColor), wc.BoxStyle.Rounding);
+				changed = true;
+			}
+		}
+		else if (!img.TexturePath.empty())
+		{
+			dl->AddRectFilled(pos, pMax, IM_COL32(60, 60, 60, 200), wc.BoxStyle.Rounding);
+			changed = true;
+		}
+		else
+		{
+			dl->AddRectFilled(pos, pMax, ToImU32(wc.BoxStyle.BackgroundColor), wc.BoxStyle.Rounding);
+			changed = true;
+		}
+
+		if (wc.BoxStyle.BorderSize > 0.0f)
+		{
+			dl->AddRect(pos, pMax, ToImU32(wc.BoxStyle.BorderColor), wc.BoxStyle.Rounding, 0, wc.BoxStyle.BorderSize);
+		}
+
+		return changed;
+	}
+
+	bool RenderImageButton(ImageButtonData& imgBtn, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						   ImFont* font, const TextStyle& textStyle)
+	{
+		ImDrawList* dl = ImGui::GetWindowDrawList();
+		ImVec2 pMax = {pos.x + size.x, pos.y + size.y};
+
+		ImU32 btnColor = GetControlColor(wc.BoxStyle, wc);
+		dl->AddRectFilled(pos, pMax, btnColor, wc.BoxStyle.Rounding);
+
+		float pad = imgBtn.FramePadding >= 0 ? static_cast<float>(imgBtn.FramePadding) : 4.0f;
+		ImVec2 imgPos = {pos.x + pad, pos.y + pad};
+		ImVec2 imgMax = {pMax.x - pad, pMax.y - pad};
+
+		auto textureAsset = ResolveTexture(imgBtn.TextureHandle, imgBtn.TexturePath);
+		if (textureAsset && textureAsset->GetState() == AssetState::Ready)
+		{
+			if (auto tex = textureAsset->GetTexture())
+			{
+				ImTextureID texId = (ImTextureID)(uintptr_t)tex->GetNativeHandle();
+				dl->AddImageRounded(texId, imgPos, imgMax, {0, 0}, {1, 1}, ToImU32(imgBtn.TintColor),
+									wc.BoxStyle.Rounding);
+			}
+		}
+
+		if (!imgBtn.Label.empty())
+		{
+			RenderAlignedTextureText(dl, font, textStyle.FontSize, imgBtn.Label, pos, size, textStyle);
+		}
+
+		if (wc.BoxStyle.BorderSize > 0.0f)
+		{
+			dl->AddRect(pos, pMax, ToImU32(wc.BoxStyle.BorderColor), wc.BoxStyle.Rounding, 0, wc.BoxStyle.BorderSize);
+		}
+
+		return wc.PressedThisFrame;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_render_input.cpp b/engine/ui/ui_render_input.cpp
new file mode 100644
index 000000000..fb293e4eb
--- /dev/null
+++ b/engine/ui/ui_render_input.cpp
@@ -0,0 +1,149 @@
+// ui_render_input.cpp
+// Renders: Slider, ComboBox, InputText, DragFloat, DragInt, ColorPicker
+#include "ui_render_helpers.h"
+
+namespace Chained
+{
+
+	bool RenderSlider(SliderData& slider, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGui::SetNextItemWidth(size.x);
+
+		ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, wc.BoxStyle.Rounding);
+		bool changed = ImGui::SliderFloat("##slider", &slider.Value, slider.Min, slider.Max, "%.2f");
+		ImGui::PopStyleVar();
+
+		return changed;
+	}
+
+	bool RenderComboBox(ComboBoxData& combo, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						ImFont* font, const TextStyle& textStyle)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGui::SetNextItemWidth(size.x);
+
+		const char* preview = (combo.SelectedIndex >= 0 && combo.SelectedIndex < (int)combo.Items.size())
+								  ? combo.Items[combo.SelectedIndex].c_str()
+								  : "Select...";
+
+		bool changed = false;
+		if (ImGui::BeginCombo("##combo", preview))
+		{
+			for (int i = 0; i < (int)combo.Items.size(); i++)
+			{
+				bool isSelected = (combo.SelectedIndex == i);
+				if (ImGui::Selectable(combo.Items[i].c_str(), isSelected))
+				{
+					combo.SelectedIndex = i;
+					changed = true;
+				}
+				if (isSelected)
+				{
+					ImGui::SetItemDefaultFocus();
+				}
+			}
+			ImGui::EndCombo();
+		}
+		return changed;
+	}
+
+	bool RenderInputText(InputTextData& input, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		if (input.InputBuffer.empty())
+		{
+			input.InputBuffer.resize(static_cast<size_t>(input.MaxLength) + 1, '\0');
+			std::copy(input.Text.begin(),
+					  input.Text.begin() + std::min(input.Text.size(), static_cast<size_t>(input.MaxLength)),
+					  input.InputBuffer.begin());
+		}
+
+		ImGui::SetCursorScreenPos(pos);
+		ImGui::SetNextItemWidth(size.x);
+
+		ImGuiInputTextFlags flags = 0;
+		if (input.ReadOnly)
+		{
+			flags |= ImGuiInputTextFlags_ReadOnly;
+		}
+		if (input.Password)
+		{
+			flags |= ImGuiInputTextFlags_Password;
+		}
+
+		bool changed = false;
+		if (input.Multiline)
+		{
+			changed = ImGui::InputTextMultiline("##inputtext", input.InputBuffer.data(), input.InputBuffer.size(), size,
+												flags);
+		}
+		else
+		{
+			changed = ImGui::InputText("##inputtext", input.InputBuffer.data(), input.InputBuffer.size(), flags);
+		}
+
+		if (changed)
+		{
+			input.Text = input.InputBuffer.data();
+		}
+
+		return changed;
+	}
+
+	bool RenderDragFloat(DragFloatData& drag, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGui::SetNextItemWidth(size.x);
+		return ImGui::DragFloat("##dragfloat", &drag.Value, drag.Speed, drag.Min, drag.Max, drag.Format.c_str());
+	}
+
+	bool RenderDragInt(DragIntData& drag, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		ImGui::SetNextItemWidth(size.x);
+		return ImGui::DragInt("##dragint", &drag.Value, drag.Speed, drag.Min, drag.Max, drag.Format.c_str());
+	}
+
+	bool RenderColorPicker(ColorPickerData& picker, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		float col[4] = {
+			picker.SelectedColor.r / 255.0f,
+			picker.SelectedColor.g / 255.0f,
+			picker.SelectedColor.b / 255.0f,
+			picker.SelectedColor.a / 255.0f,
+		};
+
+		ImGuiColorEditFlags flags = ImGuiColorEditFlags_NoLabel;
+		if (!picker.ShowAlpha)
+		{
+			flags |= ImGuiColorEditFlags_NoAlpha;
+		}
+		if (!picker.ShowPicker)
+		{
+			flags |= ImGuiColorEditFlags_NoPicker;
+		}
+
+		bool changed = false;
+		if (picker.ShowPicker)
+		{
+			changed = ImGui::ColorPicker4("##colorpicker", col, flags);
+		}
+		else
+		{
+			changed = ImGui::ColorEdit4("##coloredit", col, flags);
+		}
+
+		if (changed)
+		{
+			picker.SelectedColor = {
+				static_cast<uint8_t>(col[0] * 255.0f),
+				static_cast<uint8_t>(col[1] * 255.0f),
+				static_cast<uint8_t>(col[2] * 255.0f),
+				static_cast<uint8_t>(col[3] * 255.0f),
+			};
+		}
+		return changed;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_render_plot.cpp b/engine/ui/ui_render_plot.cpp
new file mode 100644
index 000000000..85ebc581f
--- /dev/null
+++ b/engine/ui/ui_render_plot.cpp
@@ -0,0 +1,25 @@
+// ui_render_plot.cpp
+// Renders: Plot (lines + histogram)
+#include "ui_render_helpers.h"
+
+namespace Chained
+{
+
+	bool RenderPlot(const PlotData& plot, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size)
+	{
+		ImGui::SetCursorScreenPos(pos);
+		const char* overlay = plot.OverlayText.empty() ? nullptr : plot.OverlayText.c_str();
+		if (plot.Mode == PlotMode::Lines)
+		{
+			ImGui::PlotLines("##plotlines", plot.Values.data(), static_cast<int>(plot.Values.size()), 0, overlay,
+							 plot.ScaleMin, plot.ScaleMax, {size.x, size.y});
+		}
+		else
+		{
+			ImGui::PlotHistogram("##plothisto", plot.Values.data(), static_cast<int>(plot.Values.size()), 0, overlay,
+								 plot.ScaleMin, plot.ScaleMax, {size.x, size.y});
+		}
+		return false;
+	}
+
+} // namespace Chained
diff --git a/engine/ui/ui_render_widgets.h b/engine/ui/ui_render_widgets.h
new file mode 100644
index 000000000..5aea17d69
--- /dev/null
+++ b/engine/ui/ui_render_widgets.h
@@ -0,0 +1,50 @@
+#ifndef CH_UI_RENDER_WIDGETS_H
+#define CH_UI_RENDER_WIDGETS_H
+
+#include "engine/scene/components/ui/control_component.h"
+#include "engine/scene/entity.h"
+#include "imgui.h"
+
+namespace Chained
+{
+
+	// Basic
+	bool RenderPanel(PanelData& panel, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderButton(const ButtonData& button, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+					  ImFont* font, const TextStyle& textStyle);
+	bool RenderLabel(const LabelData& label, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+					 ImFont* font, const TextStyle& textStyle);
+	bool RenderCheckbox(CheckboxData& checkbox, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						ImFont* font, const TextStyle& textStyle);
+	bool RenderProgressBar(const ProgressBarData& pb, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderSeparator(const SeparatorData& sep, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderRadioButton(RadioButtonData& radio, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						   ImFont* font, const TextStyle& textStyle);
+
+	// Input
+	bool RenderSlider(SliderData& slider, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderComboBox(ComboBoxData& combo, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						ImFont* font, const TextStyle& textStyle);
+	bool RenderInputText(InputTextData& input, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderDragFloat(DragFloatData& drag, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderDragInt(DragIntData& drag, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderColorPicker(ColorPickerData& picker, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+
+	// Image
+	bool RenderImage(ImageData& img, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderImageButton(ImageButtonData& imgBtn, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size,
+						   ImFont* font, const TextStyle& textStyle);
+
+	// Container
+	bool RenderTreeNode(TreeNodeData& node, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size, ImFont* font,
+						const TextStyle& textStyle);
+	bool RenderTabBar(TabBarData& bar, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderTabItem(TabItemData& item, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+	bool RenderCollapsingHeader(CollapsingHeaderData& header, UIControlComponent& wc, const ImVec2& pos,
+								const ImVec2& size);
+
+	// Plot
+	bool RenderPlot(const PlotData& plot, UIControlComponent& wc, const ImVec2& pos, const ImVec2& size);
+
+} // namespace Chained
+#endif // CH_UI_RENDER_WIDGETS_H
diff --git a/engine/ui/ui_style.h b/engine/ui/ui_style.h
new file mode 100644
index 000000000..e61c3053b
--- /dev/null
+++ b/engine/ui/ui_style.h
@@ -0,0 +1,88 @@
+#ifndef CH_UI_STYLE_H
+#define CH_UI_STYLE_H
+
+#include <string>
+#include <cstdint>
+#include <glm/glm.hpp>
+#include "engine/reflection/reflection_rfl.h"
+
+namespace Chained
+{
+	// Typography & Visual Styles
+	enum class HorizontalAlignment
+	{
+		Left = 0,
+		Center = 1,
+		Right = 2
+	};
+
+	enum class VerticalAlignment
+	{
+		Top = 0,
+		Center = 1,
+		Bottom = 2
+	};
+
+	enum class CanvasScaleMode : uint8_t
+	{
+		ConstantPixelSize,
+		ScaleWithScreenSize,
+	};
+
+	struct CanvasSettings
+	{
+		glm::vec2 ReferenceResolution = {1920.0f, 1080.0f};
+		CanvasScaleMode ScaleMode = CanvasScaleMode::ConstantPixelSize;
+		float MatchWidthOrHeight = 0.5f;
+	};
+
+	struct TextStyle
+	{
+		std::string FontName = "font/static/Figtree-Regular.ttf";
+		float FontSize = 18.0f;
+		Color TextColor = {255, 255, 255, 255};
+		bool Shadow = false;
+		float ShadowOffset = 2.0f;
+		Color ShadowColor = {0, 0, 0, 255};
+		float LetterSpacing = {1.0f};
+		float LineHeight = 1.2f;
+		HorizontalAlignment Horizontal = HorizontalAlignment::Center;
+		VerticalAlignment Vertical = VerticalAlignment::Center;
+
+		static const char* GetStaticName()
+		{
+			return "TextStyle";
+		}
+	};
+
+	struct UIStyle
+	{
+		Color BackgroundColor = {40, 40, 40, 255};
+		Color HoverColor = {60, 60, 60, 255};
+		Color PressedColor = {30, 30, 30, 255};
+
+		float Rounding = 4.0f;
+		float BorderSize = 0.0f;
+		Color BorderColor = {255, 255, 255, 255};
+
+		bool UseGradient = false;
+		Color GradientColor = {20, 20, 20, 255};
+
+		float Padding = 4.0f;
+
+		float HoverScale = 1.0f;
+		float PressedScale = 1.0f;
+		float TransitionSpeed = 0.1f;
+
+		// Runtime state (not serialized)
+		struct RuntimeState
+		{
+			float AnimationAlpha = 0.0f; // 0 = idle, 1 = hover/pressed
+			float CurrentScale = 1.0f;
+			Color CurrentColor = {255, 255, 255, 255};
+		} State;
+	};
+
+} // namespace Chained
+
+#endif // CH_UI_STYLE_H
\ No newline at end of file
diff --git a/engine/ui/ui_types.h b/engine/ui/ui_types.h
new file mode 100644
index 000000000..b695d506f
--- /dev/null
+++ b/engine/ui/ui_types.h
@@ -0,0 +1,15 @@
+#ifndef CH_UI_TYPES_H
+#define CH_UI_TYPES_H
+
+namespace Chained
+{
+
+	// Screen-space rectangle used for UI layout and hit testing.
+	struct UIRect
+	{
+		float x, y, width, height;
+	};
+
+} // namespace Chained
+
+#endif // CH_UI_TYPES_H
diff --git a/engine/ui/widget_renderer.cpp b/engine/ui/widget_renderer.cpp
new file mode 100644
index 000000000..a52fe00f8
--- /dev/null
+++ b/engine/ui/widget_renderer.cpp
@@ -0,0 +1,196 @@
+// widget_renderer.cpp
+// Chained Engine — ImGui-based UI rendering for in-game widgets and HUD.
+// Draws WidgetComponent hierarchy, handles Z-order sorting, scissor clipping, and font management.
+
+#include "widget_renderer.h"
+#include "ui_font_registry.h"
+#include "engine/core/service_locator.h"
+
+#include "engine/scene/components/core/hierarchy_component.h"
+#include "engine/scene/components/core/tag_component.h"
+#include "engine/scene/scene.h"
+#include "ui_control_renderer.h"
+
+namespace Chained
+{
+
+	void WidgetRenderer::Initialize()
+	{
+		CH_CORE_INFO("[UI] Initializing UI Renderer...");
+	}
+
+	void WidgetRenderer::Shutdown()
+	{
+	}
+
+	UIFontRegistry& WidgetRenderer::GetFontRegistry()
+	{
+		return *ServiceLocator::TryGet<UIFontRegistry>();
+	}
+
+	void WidgetRenderer::LoadProjectFonts()
+	{
+		auto& fontRegistry = GetFontRegistry();
+		fontRegistry.LoadProjectFonts();
+		fontRegistry.EnsureDefaultProjectFont(18.0f, true);
+	}
+
+	UIRect WidgetRenderer::GetEntityRect(Entity entity)
+	{
+		return m_LayoutSystem.GetEntityRect((entt::entity)entity);
+	}
+
+	void WidgetRenderer::ResetButtonStates(Scene* scene)
+	{
+		if (!scene)
+		{
+			return;
+		}
+
+		auto& registry = scene->GetRegistry();
+		auto view = registry.view<UIControlComponent>();
+		for (entt::entity id : view)
+		{
+			view.get<UIControlComponent>(id).PressedThisFrame = false;
+		}
+	}
+
+	std::vector<entt::entity> WidgetRenderer::SortUIEntities(entt::registry& registry)
+	{
+		auto view = registry.view<ControlComponent>();
+		std::vector<entt::entity> sorted(view.begin(), view.end());
+
+		// Sort by Z-order for correct back-to-front rendering sequence
+		std::sort(sorted.begin(), sorted.end(), [&](entt::entity a, entt::entity b) {
+			return view.get<ControlComponent>(a).ZOrder < view.get<ControlComponent>(b).ZOrder;
+		});
+
+		return sorted;
+	}
+
+	void WidgetRenderer::ProcessInput(Scene* scene, bool suppressInput)
+	{
+		if (!scene)
+		{
+			return;
+		}
+
+		auto& registry = scene->GetRegistry();
+
+		if (!m_HasCanvasRect)
+		{
+			UpdateUIInput(registry, m_LayoutSystem, /*suppress=*/true);
+			return;
+		}
+
+		ImVec2 refSize = (m_CanvasSize.x > 0) ? m_CanvasSize : ImGui::GetIO().DisplaySize;
+		m_LayoutSystem.Update(scene, refSize, m_CanvasPos);
+		UpdateUIInput(registry, m_LayoutSystem, suppressInput);
+	}
+
+	void WidgetRenderer::DrawCanvas(Scene* scene, const ImVec2& referencePosition, const ImVec2& referenceSize,
+									bool editMode)
+	{
+		CH_CORE_ASSERT(scene, "Scene is null!");
+
+		ImVec2 refSize = (referenceSize.x > 0) ? referenceSize : ImGui::GetIO().DisplaySize;
+		if (refSize.x <= 0 || refSize.y <= 0)
+		{
+			return;
+		}
+
+		auto& registry = scene->GetRegistry();
+
+		// Cache canvas geometry so next frame's ProcessInput can hit-test without
+		// depending on this render path executing.
+		m_CanvasPos = referencePosition;
+		m_CanvasSize = refSize;
+		m_HasCanvasRect = true;
+
+		// 1. Update layout, then render (input is handled separately in ProcessInput).
+		m_LayoutSystem.Update(scene, refSize, referencePosition);
+		m_AnimationSystem.Update(registry, ImGui::GetIO().DeltaTime);
+
+		// 2. Render UI elements
+		auto uiEntities = SortUIEntities(registry);
+
+		ImVec2 canvasClipMin = referencePosition;
+		ImVec2 canvasClipMax = {referencePosition.x + refSize.x, referencePosition.y + refSize.y};
+		ImGui::PushClipRect(canvasClipMin, canvasClipMax, true);
+
+		auto& fontRegistry = GetFontRegistry();
+
+		for (entt::entity id : uiEntities)
+		{
+			Entity entity(id, scene->GetRegistryPtr());
+
+			auto& control = registry.get<ControlComponent>(id);
+			if (!control.IsActive)
+			{
+				continue;
+			}
+
+			UIRect rect = m_LayoutSystem.GetEntityRect(id);
+			ImVec2 screenPos = {rect.x, rect.y};
+			ImVec2 size = {rect.width, rect.height};
+
+			bool needsClipPop = false;
+
+			// Safely retrieve parent hierarchy for scissor clipping
+			if (entity.HasComponent<HierarchyComponent>())
+			{
+				auto& hierarchy = entity.GetComponent<HierarchyComponent>();
+				auto parentID = hierarchy.Parent;
+
+				if (parentID != entt::null && registry.valid(parentID))
+				{
+					UIRect parentRect = m_LayoutSystem.GetEntityRect(parentID);
+					if (parentRect.width > 1.0f && parentRect.height > 1.0f)
+					{
+						ImGui::PushClipRect({parentRect.x, parentRect.y},
+											{parentRect.x + parentRect.width, parentRect.y + parentRect.height}, true);
+						needsClipPop = true;
+					}
+				}
+			}
+
+			if (size.x > 0.0f && size.y > 0.0f)
+			{
+				ImGui::SetCursorScreenPos(screenPos);
+				ImGui::BeginGroup();
+				ImGui::PushID((int)id);
+
+				// Render the control component
+				if (entity.HasComponent<UIControlComponent>())
+				{
+					auto& widget = entity.GetComponent<UIControlComponent>();
+					if (!RenderControl(fontRegistry, widget, screenPos, size))
+					{
+						if (std::holds_alternative<std::monostate>(widget.Data))
+						{
+							CH_CORE_WARN("[UI] Entity '{}' has UIControlComponent with empty ControlData",
+										 entity.GetComponent<TagComponent>().Tag);
+						}
+					}
+				}
+
+				// In edit mode, overlay with an invisible button to prevent game logic from firing
+				if (editMode)
+				{
+					ImGui::SetCursorScreenPos(screenPos);
+					ImGui::InvisibleButton("##DragZone", size);
+				}
+
+				ImGui::PopID();
+				ImGui::EndGroup();
+			}
+
+			if (needsClipPop)
+			{
+				ImGui::PopClipRect();
+			}
+		}
+
+		ImGui::PopClipRect();
+	}
+} // namespace Chained
diff --git a/engine/ui/widget_renderer.h b/engine/ui/widget_renderer.h
new file mode 100644
index 000000000..504440ff5
--- /dev/null
+++ b/engine/ui/widget_renderer.h
@@ -0,0 +1,74 @@
+#ifndef CH_WIDGET_RENDERER_H
+#define CH_WIDGET_RENDERER_H
+
+#include "ui_types.h"
+#include "ui_layout_system.h"
+#include "ui_animation_system.h"
+#include "ui_input_system.h"
+#include "engine/scene/entity.h"
+#include "engine/scene/components.h"
+#include "imgui.h"
+#include <entt/entt.hpp>
+#include <map>
+
+#include <vector>
+#include "engine/core/service.h"
+
+namespace Chained
+{
+	class Scene;
+	class AssetManager;
+	class UIFontRegistry;
+
+	// Singleton renderer for in-game UI canvases.
+	class WidgetRenderer : public Service
+	{
+	public:
+		WidgetRenderer() = default;
+		~WidgetRenderer() override = default;
+
+		void Initialize() override;
+		void Shutdown() override;
+
+		// Processes widget input (hover / press hit-testing) for the scene.
+		// MUST be called once per frame in the update phase, BEFORE scripts read
+		// widget state. Decoupled from DrawCanvas so the per-frame flag reset always
+		// runs — even on frames where the canvas is clipped/collapsed and not drawn.
+		// Uses the canvas rect cached by the previous DrawCanvas call.
+		// When suppressInput is true, flags are reset but no hit-testing is done
+		// (used on the first frame after a scene load to drop stale mouse state).
+		void ProcessInput(Scene* scene, bool suppressInput = false);
+
+		// Draws a UI canvas for the given scene. Rendering only — input is handled
+		// by ProcessInput. Caches the canvas rect for the next frame's ProcessInput.
+		void DrawCanvas(Scene* scene, const ImVec2& referencePosition, const ImVec2& referenceSize,
+						bool editMode = false);
+
+		// Resets per-frame button press flags for all ButtonControl/ImageButtonControl components.
+		void ResetButtonStates(Scene* scene);
+
+		// Loads fonts required by the current project/UI theme.
+		void LoadProjectFonts();
+
+		// Computes the screen-space bounds for a UI entity.
+		UIRect GetEntityRect(Entity entity);
+
+		UIFontRegistry& GetFontRegistry();
+
+	private:
+		std::vector<entt::entity> SortUIEntities(entt::registry& registry);
+
+		UILayoutSystem m_LayoutSystem;
+		UIAnimationSystem m_AnimationSystem;
+
+		// Canvas geometry captured by the last DrawCanvas, reused by ProcessInput on
+		// the next frame so input hit-testing does not depend on the render phase
+		// actually running this frame.
+		ImVec2 m_CanvasPos = {0.0f, 0.0f};
+		ImVec2 m_CanvasSize = {0.0f, 0.0f};
+		bool m_HasCanvasRect = false;
+	};
+
+} // namespace Chained
+
+#endif // CH_WIDGET_RENDERER_H
diff --git a/game/NewProject5/CMakeLists.txt b/game/NewProject5/CMakeLists.txt
new file mode 100644
index 000000000..d7c96a4f5
--- /dev/null
+++ b/game/NewProject5/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+chained_add_game($TARGET_NAME
+    PROJECT_GAME $GAME_DIR
+    CSHARP_PROJECT "assets/scripts/$TARGET_NAME.Scripts.csproj"
+    SOURCES
+)
diff --git a/game/NewProject5/NewProject5.chproject b/game/NewProject5/NewProject5.chproject
new file mode 100644
index 000000000..0836e2c0f
--- /dev/null
+++ b/game/NewProject5/NewProject5.chproject
@@ -0,0 +1,41 @@
+Project:
+  Name: NewProject5
+  IconPath: ""
+  StartScene: ""
+  AssetDirectory: assets
+  ActiveScene: assets/scenes/start_world
+  Physics:
+    Gravity: 20
+    FixedTimestep: 0.0166666675
+  Animation:
+    TargetFPS: 30
+  Render:
+    ShadowResolution: 2048
+    EnableShadows: true
+    AntiAliasingSamples: 4
+  Mesh:
+    ImportMaterials: true
+    CalculateTangents: true
+    FlipUVs: true
+  Window:
+    Width: 1280
+    Height: 720
+    VSync: true
+  Audio:
+    MasterVolume: 1
+    MusicVolume: 1
+    SFXVolume: 1
+  Runtime:
+    Fullscreen: false
+    ShowStats: true
+    EnableConsole: false
+    TargetFPS: 0
+  Scripting:
+    ModuleName: NewProject5.Scripts.dll
+    ModuleDirectory: assets/bin
+    AutoLoad: true
+  Export:
+    Mode: 1
+    ZipThreshold: 0.0500000007
+    DataVersion: 0
+  BuildConfig: 0
\ No newline at end of file
diff --git a/game/NewProject5/assets/primitives/Cube.chmesh b/game/NewProject5/assets/primitives/Cube.chmesh
new file mode 100644
index 000000000..d7e2778cb
Binary files /dev/null and b/game/NewProject5/assets/primitives/Cube.chmesh differ
diff --git a/game/NewProject5/assets/primitives/Cube.chmesh.meta b/game/NewProject5/assets/primitives/Cube.chmesh.meta
new file mode 100644
index 000000000..58f98b6e2
--- /dev/null
+++ b/game/NewProject5/assets/primitives/Cube.chmesh.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 12643116894998701231
+Type: Model
+ContentHash: 9459737832028389654
+IsGenerated: true
\ No newline at end of file
diff --git a/game/NewProject5/assets/primitives/Cube_material_0.chmat b/game/NewProject5/assets/primitives/Cube_material_0.chmat
new file mode 100644
index 000000000..802178f15
--- /dev/null
+++ b/game/NewProject5/assets/primitives/Cube_material_0.chmat
@@ -0,0 +1,17 @@
+Material:
+  Name: Primitive Material
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.5
+  Transparent: false
+  Alpha: 1
\ No newline at end of file
diff --git a/game/NewProject5/assets/primitives/Cube_material_0.chmat.meta b/game/NewProject5/assets/primitives/Cube_material_0.chmat.meta
new file mode 100644
index 000000000..563fa9f9e
--- /dev/null
+++ b/game/NewProject5/assets/primitives/Cube_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8064084681202732527
+Type: Material
+ContentHash: 13042119374352731267
+IsGenerated: true
\ No newline at end of file
diff --git a/game/NewProject5/assets/scenes/start_world b/game/NewProject5/assets/scenes/start_world
new file mode 100644
index 000000000..45c543726
--- /dev/null
+++ b/game/NewProject5/assets/scenes/start_world
@@ -0,0 +1,94 @@
+Scene: Untitled Scene
+SceneType: 0
+Background:
+  Mode: 2
+  Color: [30, 30, 30, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 0
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ../../chaineddecos/assets/skyboxes/kloppenheim_02_puresky_2k.hdr
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [158, 148, 148, 255]
+  Density: 0.00100000005
+  Start: 10
+  End: 5000
+Grid:
+  Spacing: 1
+  SecondarySpacing: 10
+  Color:
+    r: 1
+    g: 1
+    b: 1
+    a: 0.400000006
+  FadeStart: 0
+  FadeEnd: 8000
+  PlaneSize: 15000
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: true
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 1326165574427290455
+    TransformComponent:
+      Translation: [0, 1.53216136, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    PrimitiveComponent:
+      Type: 1
+      Radius: 0.5
+      InnerRadius: 7.5
+      Height: 7.0999999
+      Slices: 77
+      Stacks: 16
+      Dimensions: [1, 1, 1]
+      AlbedoPath: ""
+      AlbedoColor: [0.136452466, 0.383886278, 0.31000793, 1]
+      NormalPath: ""
+      MetallicRoughnessPath: ""
+      EmissivePath: ""
+      EmissiveColor: [0, 0, 0, 1]
+      EmissiveIntensity: 0
+      Metalness: 0
+      Roughness: 0.5
+      Transparent: false
+      Alpha: 1
+    TagComponent:
+      Tag: Cube
+    IDComponent:
+      {}
+  - Entity: 4746396569347534496
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [84.7428207, 17.449728, -16.8321877]
+      Rotation: [0.0479999669, -1.62900317, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Main Camera
+    IDComponent:
+      {}
\ No newline at end of file
diff --git a/game/NewProject5/assets/scenes/start_world.chscene b/game/NewProject5/assets/scenes/start_world.chscene
new file mode 100644
index 000000000..bf0c42a8c
--- /dev/null
+++ b/game/NewProject5/assets/scenes/start_world.chscene
@@ -0,0 +1,83 @@
+Scene: Untitled Scene
+SceneType: 0
+Background:
+  Mode: 2
+  Color: [30, 30, 30, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 0
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ../../chaineddecos/assets/skyboxes/kloppenheim_02_puresky_2k.hdr
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [158, 148, 148, 255]
+  Density: 0.00100000005
+  Start: 10
+  End: 5000
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: true
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 404705867326071996
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [-84.6855469, 131.022461, 194.383133]
+      Rotation: [0.528000116, 5.65199995, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Main Camera
+    IDComponent:
+      {}
+  - Entity: 8688834695131463887
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    PrimitiveComponent:
+      Type: 1
+      Radius: 0.5
+      InnerRadius: 7.5
+      Height: 7.0999999
+      Slices: 77
+      Stacks: 16
+      Dimensions: [1, 1, 1]
+      AlbedoPath: ""
+      AlbedoColor: [1, 1, 1, 1]
+      NormalPath: ""
+      MetallicRoughnessPath: ""
+      EmissivePath: ""
+      EmissiveColor: [0, 0, 0, 1]
+      EmissiveIntensity: 0
+      Metalness: 0
+      Roughness: 0.5
+      Transparent: false
+      Alpha: 1
+    TagComponent:
+      Tag: Cube
+    IDComponent:
+      {}
\ No newline at end of file
diff --git a/game/NewProject5/assets/scripts/NewProject5.Scripts.csproj b/game/NewProject5/assets/scripts/NewProject5.Scripts.csproj
new file mode 100644
index 000000000..f982ed584
--- /dev/null
+++ b/game/NewProject5/assets/scripts/NewProject5.Scripts.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <AssemblyName>NewProject5.Scripts</AssemblyName>
+    <RootNamespace>NewProject5.Scripts</RootNamespace>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <OutputPath>../bin</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="src/**/*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\scripting\managed\Chained.Managed.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/game/NewProject5/assets/scripts/src/Starter.cs b/game/NewProject5/assets/scripts/src/Starter.cs
new file mode 100644
index 000000000..ad06b39af
--- /dev/null
+++ b/game/NewProject5/assets/scripts/src/Starter.cs
@@ -0,0 +1,15 @@
+using Chained;
+
+namespace NewProject5.Scripts
+{
+    public class Starter : Script
+    {
+        public override void OnCreate()
+        {
+        }
+
+        public override void OnUpdate(float dt)
+        {
+        }
+    }
+}
diff --git a/game/NewProject5/src/main.cpp b/game/NewProject5/src/main.cpp
new file mode 100644
index 000000000..573fd633d
--- /dev/null
+++ b/game/NewProject5/src/main.cpp
@@ -0,0 +1,22 @@
+
+#include "engine/app/entry_point.h"
+#include "engine/core/platform.h"
+#include "engine/runtime/runtime_layer.h"
+
+namespace Chained
+{
+	Application* CreateApplication(ApplicationCommandLineArgs args)
+	{
+		ApplicationSpecification spec;
+		spec.Name = "$PROJECT_NAME";
+		spec.CommandLineArgs = args;
+		spec.Headless = false;
+		spec.EnableScripting = true;
+		spec.EngineRoot = Platform::GetExecutableDirectory();
+		spec.WorkingDirectory = Platform::GetExecutableDirectory().string();
+
+		auto* app = new Application(spec);
+		app->PushLayer(std::make_unique<RuntimeLayer>(spec.WorkingDirectory));
+		return app;
+	}
+} // namespace Chained
diff --git a/game/chaineddecos/CMakeLists.txt b/game/chaineddecos/CMakeLists.txt
index 3fb066da0..efad909c4 100644
--- a/game/chaineddecos/CMakeLists.txt
+++ b/game/chaineddecos/CMakeLists.txt
@@ -2,20 +2,33 @@
 # Signature: TARGET_NAME PROJECT_GAME [CSHARP_PROJECT_PATH] [native_sources...]
 chained_add_game(ChainedDecos
     PROJECT_GAME ChainedDecos
-    CSHARP_PROJECT "scripts/ChainedDecos.Scripts.csproj"
+    CSHARP_PROJECT "assets/scripts/ChainedDecos.Scripts.csproj"
 )
 
-# Use centralized engine resources
-chained_add_engine_resources_copy()
-add_dependencies(ChainedDecosExe EngineResources)
-
-# Copy game assets (only if source files changed)
+# Copy game assets (only if source files-- changed)
 set(GAME_ASSET_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 set(GAME_ASSET_DST_DIR "$<TARGET_FILE_DIR:ChainedDecosExe>/assets")
 
 add_custom_command(TARGET ChainedDecosExe POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory "${GAME_ASSET_DST_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${GAME_ASSET_SRC_DIR}" "${GAME_ASSET_DST_DIR}"
-    COMMENT "Copying game assets from ${GAME_ASSET_SRC_DIR} to ${GAME_ASSET_DST_DIR}..."
+    COMMAND ${CMAKE_COMMAND} -DSOURCE="${GAME_ASSET_SRC_DIR}" -DDEST="${GAME_ASSET_DST_DIR}" -P "${CMAKE_SOURCE_DIR}/cmake/CopyIfDifferent.cmake"
+    COMMENT "Syncing game assets from ${GAME_ASSET_SRC_DIR} to ${GAME_ASSET_DST_DIR}..."
+)
+
+# Copy project file next to the executable so RuntimeLayer can find it
+add_custom_command(TARGET ChainedDecosExe POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        "${CMAKE_CURRENT_SOURCE_DIR}/ChainedDecos.chproject"
+        "$<TARGET_FILE_DIR:ChainedDecosExe>/ChainedDecos.chproject"
+    COMMENT "Copying ChainedDecos.chproject to output directory..."
+)
+
+# Sync engine resources (shaders, fonts, icons, config) to game output
+if(COMMAND ch_add_resource_sync)
+    ch_add_resource_sync(ChainedDecosExe)
+endif()
+
+# Pass source game directory so runtime can load assets from source during development
+target_compile_definitions(ChainedDecosExe PRIVATE
+    CH_SOURCE_GAME_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
 )
-# Additional configurations can go here if needed
diff --git a/game/chaineddecos/ChainedDecos.chproject b/game/chaineddecos/ChainedDecos.chproject
index da423d6de..14951ee1e 100644
--- a/game/chaineddecos/ChainedDecos.chproject
+++ b/game/chaineddecos/ChainedDecos.chproject
@@ -1,32 +1,18 @@
 Project:
   Name: ChainedDecos
-  IconPath: resources/icons/chaineddecos.jpg
+  IconPath: engine/resources/icons/chaineddecos.jpg
   StartScene: scenes\start_menu.chscene
   AssetDirectory: assets
-  ActiveScene: assets/scenes/rpg_strategy_scene.chscene
-  Environment: ""
-  BuildScenes:
-    - scenes/start_menu.chscene
-    - scenes/title_image.chscene
-    - scenes/main_menu.chscene
-    - scenes/game_mode_selection.chscene
-    - scenes/map_selection.chscene
-    - scenes/video_scene.chscene
-    - scenes/info_scene.chscene
-    - scenes/untitled100.chscene
-    - scenes/scene_tem.chscene
-    - scenes/test_platform_scene.chscene
+  ActiveScene: assets/scenes/untitled100.chscene
   Physics:
-    Gravity: 20
+    Gravity: 17.2999992
     FixedTimestep: 0.00416666688
   Animation:
     TargetFPS: 60
   Render:
-    AmbientIntensity: 1
-    DefaultExposure: 0.140000001
-  Texture:
-    GenerateMipmaps: true
-    Filter: 5
+    ShadowResolution: 2048
+    EnableShadows: true
+    AntiAliasingSamples: 8
   Mesh:
     ImportMaterials: true
     CalculateTangents: true
@@ -35,23 +21,23 @@ Project:
     Width: 1920
     Height: 1080
     VSync: false
-    Resizable: true
+  Audio:
+    MasterVolume: 1
+    MusicVolume: 1
+    SFXVolume: 1
   Runtime:
-    Fullscreen: true
-    ShowStats: false
+    Fullscreen: false
+    ShowStats: true
     EnableConsole: false
-  Editor:
-    CameraMoveSpeed: 47
-    CameraRotationSpeed: 1
-    CameraBoostMultiplier: 11.8000002
+    TargetFPS: 0
   Scripting:
     ModuleName: ChainedDecos.Scripts.dll
-    ModuleDirectory: scripts/bin
+    ModuleDirectory: assets/bin
     AutoLoad: true
-  LaunchProfiles:
-    - Name: Debug Runtime
-      BinaryPath: ${BUILD}/ChainedRuntime.exe
-      Arguments: --project "${PROJECT_FILE}"
-      UseDefaultArgs: false
-  ActiveLaunchProfile: 0
+  Export:
+    Mode: 2
+    ZipThreshold: 1
+    DataVersion: 0
+    SplitSizeMB: 0
+    PackName: resources
   BuildConfig: 0
\ No newline at end of file
diff --git a/game/chaineddecos/assets/Models/skeleton_animated_material_0.chmat b/game/chaineddecos/assets/Models/skeleton_animated_material_0.chmat
new file mode 100644
index 000000000..7c01612e1
--- /dev/null
+++ b/game/chaineddecos/assets/Models/skeleton_animated_material_0.chmat
@@ -0,0 +1,17 @@
+Material:
+  Name: Fight_Rework_skeleton_MAT1
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0
+  Transparent: false
+  Alpha: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/Models/skeleton_animated_material_0.chmat.meta b/game/chaineddecos/assets/Models/skeleton_animated_material_0.chmat.meta
new file mode 100644
index 000000000..573bf2bb0
--- /dev/null
+++ b/game/chaineddecos/assets/Models/skeleton_animated_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 666490751268722511
+Type: Material
+ContentHash: 280111274850183057
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/Models/skeleton_animated_material_1.chmat b/game/chaineddecos/assets/Models/skeleton_animated_material_1.chmat
new file mode 100644
index 000000000..4125cc63d
--- /dev/null
+++ b/game/chaineddecos/assets/Models/skeleton_animated_material_1.chmat
@@ -0,0 +1,17 @@
+Material:
+  Name: Fight_Rework_Shield_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0
+  Transparent: false
+  Alpha: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/Models/skeleton_animated_material_1.chmat.meta b/game/chaineddecos/assets/Models/skeleton_animated_material_1.chmat.meta
new file mode 100644
index 000000000..84656eef4
--- /dev/null
+++ b/game/chaineddecos/assets/Models/skeleton_animated_material_1.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15820825822128769112
+Type: Material
+ContentHash: 13200884604766586492
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/Models/skeleton_animated_material_2.chmat b/game/chaineddecos/assets/Models/skeleton_animated_material_2.chmat
new file mode 100644
index 000000000..7a5b0901b
--- /dev/null
+++ b/game/chaineddecos/assets/Models/skeleton_animated_material_2.chmat
@@ -0,0 +1,17 @@
+Material:
+  Name: Fight_Rework_Sword_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0
+  Transparent: false
+  Alpha: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/Models/skeleton_animated_material_2.chmat.meta b/game/chaineddecos/assets/Models/skeleton_animated_material_2.chmat.meta
new file mode 100644
index 000000000..3cca94fc5
--- /dev/null
+++ b/game/chaineddecos/assets/Models/skeleton_animated_material_2.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17979961680619878788
+Type: Material
+ContentHash: 12102911947493831372
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/animations/island_graph.chag b/game/chaineddecos/assets/animations/island_graph.chag
new file mode 100644
index 000000000..1a95d23e5
--- /dev/null
+++ b/game/chaineddecos/assets/animations/island_graph.chag
@@ -0,0 +1,8 @@
+AnimationGraph:
+  EntryNodeID: -1
+  NextNodeID: 1
+  NextLinkID: 1
+  Nodes:
+    []
+  Transitions:
+    []
\ No newline at end of file
diff --git a/game/chaineddecos/assets/animations/island_graph.chag.meta b/game/chaineddecos/assets/animations/island_graph.chag.meta
new file mode 100644
index 000000000..b5c0b34ae
--- /dev/null
+++ b/game/chaineddecos/assets/animations/island_graph.chag.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15906332236033768914
+Type: AnimationGraph
+ContentHash: 9220280589782332570
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/animations/island_graph_1.chag b/game/chaineddecos/assets/animations/island_graph_1.chag
new file mode 100644
index 000000000..1a95d23e5
--- /dev/null
+++ b/game/chaineddecos/assets/animations/island_graph_1.chag
@@ -0,0 +1,8 @@
+AnimationGraph:
+  EntryNodeID: -1
+  NextNodeID: 1
+  NextLinkID: 1
+  Nodes:
+    []
+  Transitions:
+    []
\ No newline at end of file
diff --git a/game/chaineddecos/assets/animations/island_graph_1.chag.meta b/game/chaineddecos/assets/animations/island_graph_1.chag.meta
new file mode 100644
index 000000000..c1ea04364
--- /dev/null
+++ b/game/chaineddecos/assets/animations/island_graph_1.chag.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 4562395160109936136
+Type: AnimationGraph
+ContentHash: 9220280589782332570
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/animations/new_graph.chag b/game/chaineddecos/assets/animations/new_graph.chag
new file mode 100644
index 000000000..52e9879dc
--- /dev/null
+++ b/game/chaineddecos/assets/animations/new_graph.chag
@@ -0,0 +1,96 @@
+AnimationGraph:
+  EntryNodeID: 4
+  NextNodeID: 5
+  NextLinkID: 1
+  Nodes:
+    - ID: 1
+      Name: Walk
+      AnimationIndex: 0
+      IsLooping: true
+      StartFrame: 690
+      EndFrame: 780
+      Speed: 0.959999979
+      EditorX: 342.039978
+      EditorY: -232.528412
+    - ID: 2
+      Name: Run
+      AnimationIndex: 0
+      IsLooping: true
+      StartFrame: 1450
+      EndFrame: 1500
+      Speed: 1
+      EditorX: 127.624664
+      EditorY: 128.917786
+    - ID: 4
+      Name: Stop
+      AnimationIndex: 0
+      IsLooping: true
+      StartFrame: 0
+      EndFrame: 0
+      Speed: 1
+      EditorX: 543.386963
+      EditorY: 124.709152
+  Transitions:
+    - ID: 1
+      SourceNodeID: 1
+      TargetNodeID: 2
+      BlendDuration: 0.200000003
+      HasExitTime: false
+      ExitTime: 0.899999976
+      ExitTimeMode: 0
+      Priority: 0
+      Conditions:
+        - VariableName: speed
+          Op: 4
+          Value: 0.899999976
+    - ID: 2
+      SourceNodeID: 2
+      TargetNodeID: 1
+      BlendDuration: 0.200000003
+      HasExitTime: false
+      ExitTime: 0.899999976
+      ExitTimeMode: 0
+      Priority: 0
+      Conditions:
+        - VariableName: speed
+          Op: 3
+          Value: 0.5
+    - ID: 3
+      SourceNodeID: 4
+      TargetNodeID: 1
+      BlendDuration: 0.200000003
+      HasExitTime: false
+      ExitTime: 0.899999976
+      ExitTimeMode: 0
+      Priority: 0
+      Conditions:
+        - VariableName: isMoving
+          Op: 0
+          Value: 1
+    - ID: 4
+      SourceNodeID: 1
+      TargetNodeID: 4
+      BlendDuration: 0.200000003
+      HasExitTime: false
+      ExitTime: 0.899999976
+      ExitTimeMode: 0
+      Priority: 0
+      Conditions:
+        - VariableName: isMoving
+          Op: 0
+          Value: 0
+    - ID: 5
+      SourceNodeID: 2
+      TargetNodeID: 4
+      BlendDuration: 0.200000003
+      HasExitTime: false
+      ExitTime: 0.899999976
+      ExitTimeMode: 0
+      Priority: 0
+      Conditions:
+        - VariableName: isMoving
+          Op: 0
+          Value: 0
+  Variables:
+    speed: 0
+    isMoving: 0
\ No newline at end of file
diff --git a/game/chaineddecos/assets/animations/new_graph.chag.meta b/game/chaineddecos/assets/animations/new_graph.chag.meta
new file mode 100644
index 000000000..3eda425fa
--- /dev/null
+++ b/game/chaineddecos/assets/animations/new_graph.chag.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6686238511088300392
+Type: None
+ContentHash: 14199801024448625399
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/11256001941825664687.chasset.meta b/game/chaineddecos/assets/assets/primitives/11256001941825664687.chasset.meta
new file mode 100644
index 000000000..7f810bc50
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/11256001941825664687.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15841047104670149172
+Type: Model
+ContentHash: 9714243435668774104
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/12187713077697119462.chasset.meta b/game/chaineddecos/assets/assets/primitives/12187713077697119462.chasset.meta
new file mode 100644
index 000000000..6481be8a3
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/12187713077697119462.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14120141571552690601
+Type: Model
+ContentHash: 9714243435668774104
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/16002549200946283646.chasset.meta b/game/chaineddecos/assets/assets/primitives/16002549200946283646.chasset.meta
new file mode 100644
index 000000000..9d436546a
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/16002549200946283646.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2205353892882851551
+Type: Model
+ContentHash: 11048681508110351057
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/17277815443438121800.chasset.meta b/game/chaineddecos/assets/assets/primitives/17277815443438121800.chasset.meta
new file mode 100644
index 000000000..19f253581
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/17277815443438121800.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9494453917851021637
+Type: Model
+ContentHash: 9714243435668774104
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/183049633084531099.chasset.meta b/game/chaineddecos/assets/assets/primitives/183049633084531099.chasset.meta
new file mode 100644
index 000000000..1eca7446c
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/183049633084531099.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2935546517188103165
+Type: Model
+ContentHash: 17627387973105942365
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/2247338818410023426.chasset.meta b/game/chaineddecos/assets/assets/primitives/2247338818410023426.chasset.meta
new file mode 100644
index 000000000..9c24b246d
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/2247338818410023426.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6111296713627958855
+Type: Model
+ContentHash: 10518525888632338100
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/5408107685489119331.chasset.meta b/game/chaineddecos/assets/assets/primitives/5408107685489119331.chasset.meta
new file mode 100644
index 000000000..8a91ecfdc
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/5408107685489119331.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3053465690750254391
+Type: Model
+ContentHash: 14842843501204746932
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/6190497594531059495.chasset.meta b/game/chaineddecos/assets/assets/primitives/6190497594531059495.chasset.meta
new file mode 100644
index 000000000..7ffd1bd0f
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/6190497594531059495.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 1200623232915194742
+Type: Model
+ContentHash: 10518525888632338100
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/assets/primitives/9901744512960296879.chasset.meta b/game/chaineddecos/assets/assets/primitives/9901744512960296879.chasset.meta
new file mode 100644
index 000000000..5059ceeca
--- /dev/null
+++ b/game/chaineddecos/assets/assets/primitives/9901744512960296879.chasset.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 4350836097536935117
+Type: Model
+ContentHash: 10518525888632338100
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/audio/freesound_community-helicopter-1-60738.mp3 b/game/chaineddecos/assets/audio/freesound_community-helicopter-1-60738.mp3
new file mode 100644
index 000000000..62d2468ec
--- /dev/null
+++ b/game/chaineddecos/assets/audio/freesound_community-helicopter-1-60738.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:562d9655bb35a477b980abe1599681642984d9f5c618b5d4784c2be964c89dfa
+size 827520
diff --git a/game/chaineddecos/assets/audio/freesound_community-helicopter-1-60738.mp3.meta b/game/chaineddecos/assets/audio/freesound_community-helicopter-1-60738.mp3.meta
new file mode 100644
index 000000000..6fac1bcb6
--- /dev/null
+++ b/game/chaineddecos/assets/audio/freesound_community-helicopter-1-60738.mp3.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 11610455394737938315
+Type: Audio
+ContentHash: 16860749260479894609
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/audio/soundreality-wind-plain-sfx-522910.mp3 b/game/chaineddecos/assets/audio/soundreality-wind-plain-sfx-522910.mp3
new file mode 100644
index 000000000..516e7ea2e
--- /dev/null
+++ b/game/chaineddecos/assets/audio/soundreality-wind-plain-sfx-522910.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7103fdb5c82f3a02b7a8836aab2b2c468c62e86dc045ce0c3783a05b6d41acda
+size 1536768
diff --git a/game/chaineddecos/assets/audio/soundreality-wind-plain-sfx-522910.mp3.meta b/game/chaineddecos/assets/audio/soundreality-wind-plain-sfx-522910.mp3.meta
new file mode 100644
index 000000000..39e06b90e
--- /dev/null
+++ b/game/chaineddecos/assets/audio/soundreality-wind-plain-sfx-522910.mp3.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 18016372891088584835
+Type: Audio
+ContentHash: 14871482264689575245
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/audio/soundsurfer-parkour-262367.mp3 b/game/chaineddecos/assets/audio/soundsurfer-parkour-262367.mp3
new file mode 100644
index 000000000..531186655
--- /dev/null
+++ b/game/chaineddecos/assets/audio/soundsurfer-parkour-262367.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f835d2876971dc0664b22b8e3ffc8660ea40dc8e69f27486c07d63bd2b522ade
+size 3966432
diff --git a/game/chaineddecos/assets/audio/soundsurfer-parkour-262367.mp3.meta b/game/chaineddecos/assets/audio/soundsurfer-parkour-262367.mp3.meta
new file mode 100644
index 000000000..a45f089ee
--- /dev/null
+++ b/game/chaineddecos/assets/audio/soundsurfer-parkour-262367.mp3.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3168299162844103994
+Type: Audio
+ContentHash: 7478550729815379811
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/audio/storegraphic-soft-wind-477404.mp3.meta b/game/chaineddecos/assets/audio/storegraphic-soft-wind-477404.mp3.meta
new file mode 100644
index 000000000..6571c92a3
--- /dev/null
+++ b/game/chaineddecos/assets/audio/storegraphic-soft-wind-477404.mp3.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15777826227937802990
+Type: Audio
+ContentHash: 16578972701321179455
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/audio/universfield-solar-system-space-journey-153272.mp3 b/game/chaineddecos/assets/audio/universfield-solar-system-space-journey-153272.mp3
new file mode 100644
index 000000000..ec43a31a6
--- /dev/null
+++ b/game/chaineddecos/assets/audio/universfield-solar-system-space-journey-153272.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b40d7dff281b5ce0ff88ed1ebb427fc9992e1b1f8ec76a2c6907103f77e7fd81
+size 519941
diff --git a/game/chaineddecos/assets/audio/universfield-solar-system-space-journey-153272.mp3.meta b/game/chaineddecos/assets/audio/universfield-solar-system-space-journey-153272.mp3.meta
new file mode 100644
index 000000000..66f2cc818
--- /dev/null
+++ b/game/chaineddecos/assets/audio/universfield-solar-system-space-journey-153272.mp3.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 12612596251818134300
+Type: Audio
+ContentHash: 7329910634382822574
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/environments/menu_environment.chenv.meta b/game/chaineddecos/assets/environments/menu_environment.chenv.meta
new file mode 100644
index 000000000..06211dc30
--- /dev/null
+++ b/game/chaineddecos/assets/environments/menu_environment.chenv.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 11871567502901038049
+Type: Environment
+ContentHash: 17190942155302824579
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/environments/new_environment.chenv.meta b/game/chaineddecos/assets/environments/new_environment.chenv.meta
new file mode 100644
index 000000000..25b15af91
--- /dev/null
+++ b/game/chaineddecos/assets/environments/new_environment.chenv.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14396950692642584413
+Type: Environment
+ContentHash: 8103762242232851116
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/Figtree-Italic-VariableFont_wght.ttf b/game/chaineddecos/assets/font/Figtree-Italic-VariableFont_wght.ttf
new file mode 100644
index 000000000..06d4ee3a1
Binary files /dev/null and b/game/chaineddecos/assets/font/Figtree-Italic-VariableFont_wght.ttf differ
diff --git a/game/chaineddecos/assets/font/Figtree-VariableFont_wght.ttf b/game/chaineddecos/assets/font/Figtree-VariableFont_wght.ttf
new file mode 100644
index 000000000..f93a4b6cd
Binary files /dev/null and b/game/chaineddecos/assets/font/Figtree-VariableFont_wght.ttf differ
diff --git a/game/chaineddecos/assets/font/OFL.txt b/game/chaineddecos/assets/font/OFL.txt
new file mode 100644
index 000000000..c10a6279e
--- /dev/null
+++ b/game/chaineddecos/assets/font/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Figtree Project Authors (https://github.com/erikdkennedy/figtree)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/game/chaineddecos/assets/font/README.txt b/game/chaineddecos/assets/font/README.txt
new file mode 100644
index 000000000..3814098c0
--- /dev/null
+++ b/game/chaineddecos/assets/font/README.txt
@@ -0,0 +1,77 @@
+Figtree Variable Font
+=====================
+
+This download contains Figtree as both variable fonts and static fonts.
+
+Figtree is a variable font with this axis:
+  wght
+
+This means all the styles are contained in these files:
+  Figtree-VariableFont_wght.ttf
+  Figtree-Italic-VariableFont_wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Figtree:
+  static/Figtree-Light.ttf
+  static/Figtree-Regular.ttf
+  static/Figtree-Medium.ttf
+  static/Figtree-SemiBold.ttf
+  static/Figtree-Bold.ttf
+  static/Figtree-ExtraBold.ttf
+  static/Figtree-Black.ttf
+  static/Figtree-LightItalic.ttf
+  static/Figtree-Italic.ttf
+  static/Figtree-MediumItalic.ttf
+  static/Figtree-SemiBoldItalic.ttf
+  static/Figtree-BoldItalic.ttf
+  static/Figtree-ExtraBoldItalic.ttf
+  static/Figtree-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.
diff --git a/game/chaineddecos/assets/font/alan_sans,lato.zip b/game/chaineddecos/assets/font/alan_sans,lato.zip
deleted file mode 100644
index 22a2f6bd9..000000000
--- a/game/chaineddecos/assets/font/alan_sans,lato.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de5f9d133a8e6012187c9ce37c99c9cf24ade6ec7429cc9a2d8be58b63c3db87
-size 1389457
diff --git a/game/chaineddecos/assets/font/alan_sans/alansans-variablefont_wght.ttf b/game/chaineddecos/assets/font/alan_sans/alansans-variablefont_wght.ttf
deleted file mode 100644
index 72ba326bc..000000000
Binary files a/game/chaineddecos/assets/font/alan_sans/alansans-variablefont_wght.ttf and /dev/null differ
diff --git a/game/chaineddecos/assets/font/alan_sans/alansans-variablefont_wght.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/alansans-variablefont_wght.ttf.chmeta
deleted file mode 100644
index 98a5a3b2c..000000000
--- a/game/chaineddecos/assets/font/alan_sans/alansans-variablefont_wght.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 13960442862197381602
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/ofl.txt b/game/chaineddecos/assets/font/alan_sans/ofl.txt
deleted file mode 100644
index 2f2516da8..000000000
--- a/game/chaineddecos/assets/font/alan_sans/ofl.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2025 The Alan Sans Project Authors (https://github.com/alan-eu/Alan-Sans)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/game/chaineddecos/assets/font/alan_sans/readme.txt b/game/chaineddecos/assets/font/alan_sans/readme.txt
deleted file mode 100644
index bfe6a8505..000000000
--- a/game/chaineddecos/assets/font/alan_sans/readme.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Alan Sans Variable Font
-=======================
-
-This download contains Alan Sans as both a variable font and static fonts.
-
-Alan Sans is a variable font with this axis:
-  wght
-
-This means all the styles are contained in a single file:
-  Alan_Sans/AlanSans-VariableFont_wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Alan Sans:
-  Alan_Sans/static/AlanSans-Light.ttf
-  Alan_Sans/static/AlanSans-Regular.ttf
-  Alan_Sans/static/AlanSans-Medium.ttf
-  Alan_Sans/static/AlanSans-SemiBold.ttf
-  Alan_Sans/static/AlanSans-Bold.ttf
-  Alan_Sans/static/AlanSans-ExtraBold.ttf
-  Alan_Sans/static/AlanSans-Black.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
-  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
-  https://variablefonts.typenetwork.com
-  https://medium.com/variable-fonts
-
-In desktop apps
-
-  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
-  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
-  https://developers.google.com/fonts/docs/getting_started
-  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
-  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
-  MacOS: https://support.apple.com/en-us/HT201749
-  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
-  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
-  https://developers.google.com/fonts/docs/android
-  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-License
--------
-Please read the full license text (OFL.txt) to understand the permissions,
-restrictions and requirements for usage, redistribution, and modification.
-
-You can use them in your products & projects – print or digital,
-commercial or otherwise.
-
-This isn't legal advice, please consider consulting a lawyer and see the full
-license for all details.
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-black.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-black.ttf.chmeta
deleted file mode 100644
index ac5bc3707..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-black.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 13742674742649920220
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-bold.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-bold.ttf.chmeta
deleted file mode 100644
index fdb1fbd9e..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-bold.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 3780601162924556019
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-extrabold.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-extrabold.ttf.chmeta
deleted file mode 100644
index 45735639a..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-extrabold.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 9332910564477789788
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-light.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-light.ttf.chmeta
deleted file mode 100644
index 3945933c3..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-light.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 3985386473827481313
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-medium.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-medium.ttf.chmeta
deleted file mode 100644
index c1a1efd0b..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-medium.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 8374521035010668920
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-regular.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-regular.ttf.chmeta
deleted file mode 100644
index 8fbc17a0a..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-regular.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 4184947066711477405
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-semibold.ttf.chmeta b/game/chaineddecos/assets/font/alan_sans/static/alansans-semibold.ttf.chmeta
deleted file mode 100644
index 608320666..000000000
--- a/game/chaineddecos/assets/font/alan_sans/static/alansans-semibold.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 3542095726288280296
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/alansans.ttf b/game/chaineddecos/assets/font/alansans.ttf
new file mode 100644
index 000000000..938d9f427
Binary files /dev/null and b/game/chaineddecos/assets/font/alansans.ttf differ
diff --git a/game/chaineddecos/assets/font/fa-solid-900.ttf b/game/chaineddecos/assets/font/fa-solid-900.ttf
new file mode 100644
index 000000000..5297885b7
Binary files /dev/null and b/game/chaineddecos/assets/font/fa-solid-900.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/gantari-italic-variablefont_wght.ttf b/game/chaineddecos/assets/font/gantari/gantari-italic-variablefont_wght.ttf
new file mode 100644
index 000000000..5c3407d30
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/gantari-italic-variablefont_wght.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/gantari-variablefont_wght.ttf b/game/chaineddecos/assets/font/gantari/gantari-variablefont_wght.ttf
new file mode 100644
index 000000000..ae424c51c
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/gantari-variablefont_wght.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/ofl.txt b/game/chaineddecos/assets/font/gantari/ofl.txt
new file mode 100644
index 000000000..359879370
--- /dev/null
+++ b/game/chaineddecos/assets/font/gantari/ofl.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Gantari Project Authors (https://github.com/Lafontype/Gantari)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/game/chaineddecos/assets/font/gantari/readme.txt b/game/chaineddecos/assets/font/gantari/readme.txt
new file mode 100644
index 000000000..fd663fff4
--- /dev/null
+++ b/game/chaineddecos/assets/font/gantari/readme.txt
@@ -0,0 +1,81 @@
+Gantari Variable Font
+=====================
+
+This download contains Gantari as both variable fonts and static fonts.
+
+Gantari is a variable font with this axis:
+  wght
+
+This means all the styles are contained in these files:
+  Gantari/Gantari-VariableFont_wght.ttf
+  Gantari/Gantari-Italic-VariableFont_wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Gantari:
+  Gantari/static/Gantari-Thin.ttf
+  Gantari/static/Gantari-ExtraLight.ttf
+  Gantari/static/Gantari-Light.ttf
+  Gantari/static/Gantari-Regular.ttf
+  Gantari/static/Gantari-Medium.ttf
+  Gantari/static/Gantari-SemiBold.ttf
+  Gantari/static/Gantari-Bold.ttf
+  Gantari/static/Gantari-ExtraBold.ttf
+  Gantari/static/Gantari-Black.ttf
+  Gantari/static/Gantari-ThinItalic.ttf
+  Gantari/static/Gantari-ExtraLightItalic.ttf
+  Gantari/static/Gantari-LightItalic.ttf
+  Gantari/static/Gantari-Italic.ttf
+  Gantari/static/Gantari-MediumItalic.ttf
+  Gantari/static/Gantari-SemiBoldItalic.ttf
+  Gantari/static/Gantari-BoldItalic.ttf
+  Gantari/static/Gantari-ExtraBoldItalic.ttf
+  Gantari/static/Gantari-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-black.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-black.ttf
new file mode 100644
index 000000000..250b6f0bf
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-black.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-blackitalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-blackitalic.ttf
new file mode 100644
index 000000000..d4ac0f32e
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-blackitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-bold.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-bold.ttf
new file mode 100644
index 000000000..9b365a3cc
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-bold.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-bolditalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-bolditalic.ttf
new file mode 100644
index 000000000..3d80259de
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-bolditalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-extrabold.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-extrabold.ttf
new file mode 100644
index 000000000..6db6d374b
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-extrabold.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-extrabolditalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-extrabolditalic.ttf
new file mode 100644
index 000000000..d7957f62f
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-extrabolditalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-extralight.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-extralight.ttf
new file mode 100644
index 000000000..4b4e3847c
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-extralight.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-extralightitalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-extralightitalic.ttf
new file mode 100644
index 000000000..8712459b8
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-extralightitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-italic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-italic.ttf
new file mode 100644
index 000000000..55b032f75
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-italic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-light.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-light.ttf
new file mode 100644
index 000000000..7b4a596a8
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-light.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-lightitalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-lightitalic.ttf
new file mode 100644
index 000000000..6865d2536
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-lightitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-medium.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-medium.ttf
new file mode 100644
index 000000000..314d752e6
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-medium.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-mediumitalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-mediumitalic.ttf
new file mode 100644
index 000000000..37874defa
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-mediumitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-regular.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-regular.ttf
new file mode 100644
index 000000000..ed957f259
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-regular.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-semibold.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-semibold.ttf
new file mode 100644
index 000000000..ff5d75842
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-semibold.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-semibolditalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-semibolditalic.ttf
new file mode 100644
index 000000000..68ea3929f
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-semibolditalic.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-thin.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-thin.ttf
new file mode 100644
index 000000000..4fa10b4f2
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-thin.ttf differ
diff --git a/game/chaineddecos/assets/font/gantari/static/gantari-thinitalic.ttf b/game/chaineddecos/assets/font/gantari/static/gantari-thinitalic.ttf
new file mode 100644
index 000000000..541c4fa7f
Binary files /dev/null and b/game/chaineddecos/assets/font/gantari/static/gantari-thinitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-black.ttf b/game/chaineddecos/assets/font/lato/lato-black.ttf
index bc6f9480a..4340502d9 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-black.ttf and b/game/chaineddecos/assets/font/lato/lato-black.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-black.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-black.ttf.chmeta
deleted file mode 100644
index 24ada2eee..000000000
--- a/game/chaineddecos/assets/font/lato/lato-black.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 2536144422685398950
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf b/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf
index 3002fe8d9..4df1555e6 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf and b/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf.chmeta
deleted file mode 100644
index b17dd3035..000000000
--- a/game/chaineddecos/assets/font/lato/lato-blackitalic.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 3343325232432482674
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-bold.ttf b/game/chaineddecos/assets/font/lato/lato-bold.ttf
index 1f74da2bc..016068b48 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-bold.ttf and b/game/chaineddecos/assets/font/lato/lato-bold.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-bold.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-bold.ttf.chmeta
deleted file mode 100644
index f78a3624f..000000000
--- a/game/chaineddecos/assets/font/lato/lato-bold.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 5595085112118335241
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf b/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf
index 8ec47e4ea..a05d50320 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf and b/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf.chmeta
deleted file mode 100644
index 138b99413..000000000
--- a/game/chaineddecos/assets/font/lato/lato-bolditalic.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 16189385497568534730
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-italic.ttf b/game/chaineddecos/assets/font/lato/lato-italic.ttf
index 449c4a2b1..0d0f69ea0 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-italic.ttf and b/game/chaineddecos/assets/font/lato/lato-italic.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-italic.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-italic.ttf.chmeta
deleted file mode 100644
index 86f6bfde2..000000000
--- a/game/chaineddecos/assets/font/lato/lato-italic.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 2902352411495564598
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-light.ttf b/game/chaineddecos/assets/font/lato/lato-light.ttf
index 3114ea8e5..dfa72ce80 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-light.ttf and b/game/chaineddecos/assets/font/lato/lato-light.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-light.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-light.ttf.chmeta
deleted file mode 100644
index 37087a72d..000000000
--- a/game/chaineddecos/assets/font/lato/lato-light.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 1386333854378003468
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf b/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf
index 17d37d7f9..12f2b6c7d 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf and b/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf.chmeta
deleted file mode 100644
index a617220de..000000000
--- a/game/chaineddecos/assets/font/lato/lato-lightitalic.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 15521068725592318639
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-regular.ttf b/game/chaineddecos/assets/font/lato/lato-regular.ttf
index 9c9da76d2..bb2e8875a 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-regular.ttf and b/game/chaineddecos/assets/font/lato/lato-regular.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-regular.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-regular.ttf.chmeta
deleted file mode 100644
index 98d9598ac..000000000
--- a/game/chaineddecos/assets/font/lato/lato-regular.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 17774264419762386901
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-regular.ttf.meta b/game/chaineddecos/assets/font/lato/lato-regular.ttf.meta
new file mode 100644
index 000000000..16212316b
--- /dev/null
+++ b/game/chaineddecos/assets/font/lato/lato-regular.ttf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 4505706516596819572
+Type: Font
+ContentHash: 1963586652466317813
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-thin.ttf b/game/chaineddecos/assets/font/lato/lato-thin.ttf
index aecdd4685..ba58da1a1 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-thin.ttf and b/game/chaineddecos/assets/font/lato/lato-thin.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-thin.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-thin.ttf.chmeta
deleted file mode 100644
index b6eb5f3e1..000000000
--- a/game/chaineddecos/assets/font/lato/lato-thin.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 5002899247691329587
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf b/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf
index 2e856a21b..4d82766d1 100644
Binary files a/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf and b/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf differ
diff --git a/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf.chmeta b/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf.chmeta
deleted file mode 100644
index 4bae5d9d9..000000000
--- a/game/chaineddecos/assets/font/lato/lato-thinitalic.ttf.chmeta
+++ /dev/null
@@ -1,2 +0,0 @@
-Asset: 13203584241885367442
-Type: 7
\ No newline at end of file
diff --git a/game/chaineddecos/assets/font/static/Figtree-Black.ttf b/game/chaineddecos/assets/font/static/Figtree-Black.ttf
new file mode 100644
index 000000000..526fe1dda
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-Black.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-BlackItalic.ttf b/game/chaineddecos/assets/font/static/Figtree-BlackItalic.ttf
new file mode 100644
index 000000000..f67766c42
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-BlackItalic.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-Bold.ttf b/game/chaineddecos/assets/font/static/Figtree-Bold.ttf
new file mode 100644
index 000000000..6f8ad6404
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-Bold.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-BoldItalic.ttf b/game/chaineddecos/assets/font/static/Figtree-BoldItalic.ttf
new file mode 100644
index 000000000..6b3e86cd4
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-BoldItalic.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-ExtraBold.ttf b/game/chaineddecos/assets/font/static/Figtree-ExtraBold.ttf
new file mode 100644
index 000000000..8589c0440
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-ExtraBold.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-ExtraBoldItalic.ttf b/game/chaineddecos/assets/font/static/Figtree-ExtraBoldItalic.ttf
new file mode 100644
index 000000000..8ad84e828
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-ExtraBoldItalic.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-Italic.ttf b/game/chaineddecos/assets/font/static/Figtree-Italic.ttf
new file mode 100644
index 000000000..7ff07e582
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-Italic.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-Light.ttf b/game/chaineddecos/assets/font/static/Figtree-Light.ttf
new file mode 100644
index 000000000..e23887831
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-Light.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-LightItalic.ttf b/game/chaineddecos/assets/font/static/Figtree-LightItalic.ttf
new file mode 100644
index 000000000..ff188b9bd
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-LightItalic.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-Medium.ttf b/game/chaineddecos/assets/font/static/Figtree-Medium.ttf
new file mode 100644
index 000000000..5b89c890b
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-Medium.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-MediumItalic.ttf b/game/chaineddecos/assets/font/static/Figtree-MediumItalic.ttf
new file mode 100644
index 000000000..d612e1788
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-MediumItalic.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-Regular.ttf b/game/chaineddecos/assets/font/static/Figtree-Regular.ttf
new file mode 100644
index 000000000..4b42cdb30
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-Regular.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-SemiBold.ttf b/game/chaineddecos/assets/font/static/Figtree-SemiBold.ttf
new file mode 100644
index 000000000..aa2b78c2c
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-SemiBold.ttf differ
diff --git a/game/chaineddecos/assets/font/static/Figtree-SemiBoldItalic.ttf b/game/chaineddecos/assets/font/static/Figtree-SemiBoldItalic.ttf
new file mode 100644
index 000000000..fd8b3a4ee
Binary files /dev/null and b/game/chaineddecos/assets/font/static/Figtree-SemiBoldItalic.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-black.ttf b/game/chaineddecos/assets/font/static/alansans-black.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-black.ttf
rename to game/chaineddecos/assets/font/static/alansans-black.ttf
index 16df942ca..084eac65e 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-black.ttf and b/game/chaineddecos/assets/font/static/alansans-black.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-bold.ttf b/game/chaineddecos/assets/font/static/alansans-bold.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-bold.ttf
rename to game/chaineddecos/assets/font/static/alansans-bold.ttf
index f8c815480..0487d96fb 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-bold.ttf and b/game/chaineddecos/assets/font/static/alansans-bold.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-extrabold.ttf b/game/chaineddecos/assets/font/static/alansans-extrabold.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-extrabold.ttf
rename to game/chaineddecos/assets/font/static/alansans-extrabold.ttf
index 6d44d069e..92eb0d6cf 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-extrabold.ttf and b/game/chaineddecos/assets/font/static/alansans-extrabold.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-light.ttf b/game/chaineddecos/assets/font/static/alansans-light.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-light.ttf
rename to game/chaineddecos/assets/font/static/alansans-light.ttf
index 2347c8a8b..c8677f6cb 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-light.ttf and b/game/chaineddecos/assets/font/static/alansans-light.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-medium.ttf b/game/chaineddecos/assets/font/static/alansans-medium.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-medium.ttf
rename to game/chaineddecos/assets/font/static/alansans-medium.ttf
index e7db4daa8..b283ad3d3 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-medium.ttf and b/game/chaineddecos/assets/font/static/alansans-medium.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-regular.ttf b/game/chaineddecos/assets/font/static/alansans-regular.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-regular.ttf
rename to game/chaineddecos/assets/font/static/alansans-regular.ttf
index 7e434b99d..b793f4b64 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-regular.ttf and b/game/chaineddecos/assets/font/static/alansans-regular.ttf differ
diff --git a/game/chaineddecos/assets/font/alan_sans/static/alansans-semibold.ttf b/game/chaineddecos/assets/font/static/alansans-semibold.ttf
similarity index 99%
rename from game/chaineddecos/assets/font/alan_sans/static/alansans-semibold.ttf
rename to game/chaineddecos/assets/font/static/alansans-semibold.ttf
index 533735a7b..f5c412a46 100644
Binary files a/game/chaineddecos/assets/font/alan_sans/static/alansans-semibold.ttf and b/game/chaineddecos/assets/font/static/alansans-semibold.ttf differ
diff --git a/game/chaineddecos/assets/map_previews/imguizmo.chscene b/game/chaineddecos/assets/map_previews/imguizmo.chscene
index 9295f0783..5680ede16 100644
--- a/game/chaineddecos/assets/map_previews/imguizmo.chscene
+++ b/game/chaineddecos/assets/map_previews/imguizmo.chscene
@@ -495,7 +495,6 @@ Entities:
     NativeScriptComponent:
       ? Scripts:
           - ScriptName: PlayerController
-          - ScriptName: CameraController
           - ScriptName: GameHUD
           - ScriptName: SpawnZoneRespawn
     ModelComponent:
diff --git a/game/chaineddecos/assets/materials/300px-Gamelogo.jpg b/game/chaineddecos/assets/materials/300px-Gamelogo.jpg
deleted file mode 100644
index b5eea2194..000000000
--- a/game/chaineddecos/assets/materials/300px-Gamelogo.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e75ed6ee3b49c3056ca62f24b550914a8ff3c030d6d935865532da795622b77e
-size 29273
diff --git a/game/chaineddecos/assets/materials/300px-Gamelogo.jpg.chmeta b/game/chaineddecos/assets/materials/300px-Gamelogo.jpg.chmeta
deleted file mode 100644
index 904c4c665..000000000
--- a/game/chaineddecos/assets/materials/300px-Gamelogo.jpg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9252009529160143194
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/materials/300px-Gamelogo.png b/game/chaineddecos/assets/materials/300px-Gamelogo.png
new file mode 100644
index 000000000..a819e97c4
--- /dev/null
+++ b/game/chaineddecos/assets/materials/300px-Gamelogo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bf2de82929929b36b519d4015b5271eeed8846854ba69c61176211be5050690
+size 126149
diff --git a/game/chaineddecos/assets/materials/b500c85b-07cb-4818-8010-b2c2eaee3e9a.jpg b/game/chaineddecos/assets/materials/chaineddecos.jpg
similarity index 100%
rename from game/chaineddecos/assets/materials/b500c85b-07cb-4818-8010-b2c2eaee3e9a.jpg
rename to game/chaineddecos/assets/materials/chaineddecos.jpg
diff --git a/game/chaineddecos/assets/materials/chaineddecos.jpg.meta b/game/chaineddecos/assets/materials/chaineddecos.jpg.meta
new file mode 100644
index 000000000..e26fd6fb0
--- /dev/null
+++ b/game/chaineddecos/assets/materials/chaineddecos.jpg.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8383086386477552579
+Type: Texture
+ContentHash: 7225428352759837902
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/materials/chaineddecos.png b/game/chaineddecos/assets/materials/chaineddecos.png
new file mode 100644
index 000000000..708699e67
--- /dev/null
+++ b/game/chaineddecos/assets/materials/chaineddecos.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f5ab4ca282bc8a0cb42b11604663389bf699339bc887dacf4f6a373e0c4ed5f
+size 204363
diff --git a/game/chaineddecos/assets/materials/logo.png b/game/chaineddecos/assets/materials/logo.png
new file mode 100644
index 000000000..d86a04b61
--- /dev/null
+++ b/game/chaineddecos/assets/materials/logo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7a1b66815b369da52101380654c16f018cee8b4b5f9e141d61fef9894c78c8f
+size 1073957
diff --git a/game/chaineddecos/assets/materials/logo.png.meta b/game/chaineddecos/assets/materials/logo.png.meta
new file mode 100644
index 000000000..d3955dcb5
--- /dev/null
+++ b/game/chaineddecos/assets/materials/logo.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9106975390109092961
+Type: Texture
+ContentHash: 12950118444313323876
+IsGenerated: true
\ No newline at end of file
diff --git "a/game/chaineddecos/assets/materials/\320\232\320\223-\320\233\320\260\320\261\320\276\321\200\320\260\321\202\320\276\321\200\320\275\320\2601_26 (1).pdf" "b/game/chaineddecos/assets/materials/\320\232\320\223-\320\233\320\260\320\261\320\276\321\200\320\260\321\202\320\276\321\200\320\275\320\2601_26 (1).pdf"
deleted file mode 100644
index 2fdb9b7a3..000000000
Binary files "a/game/chaineddecos/assets/materials/\320\232\320\223-\320\233\320\260\320\261\320\276\321\200\320\260\321\202\320\276\321\200\320\275\320\2601_26 (1).pdf" and /dev/null differ
diff --git "a/game/chaineddecos/assets/materials/\320\232\320\223-\320\233\320\260\320\261\320\276\321\200\320\260\321\202\320\276\321\200\320\275\320\2601_26 (2).pdf" "b/game/chaineddecos/assets/materials/\320\232\320\223-\320\233\320\260\320\261\320\276\321\200\320\260\321\202\320\276\321\200\320\275\320\2601_26 (2).pdf"
deleted file mode 100644
index 2fdb9b7a3..000000000
Binary files "a/game/chaineddecos/assets/materials/\320\232\320\223-\320\233\320\260\320\261\320\276\321\200\320\260\321\202\320\276\321\200\320\275\320\2601_26 (2).pdf" and /dev/null differ
diff --git a/game/chaineddecos/assets/models/6_buildings_low-poly_pack_1.zip b/game/chaineddecos/assets/models/6_buildings_low-poly_pack_1.zip
deleted file mode 100644
index 8cdf994d6..000000000
--- a/game/chaineddecos/assets/models/6_buildings_low-poly_pack_1.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdb362a5ea8fa28a95791e159f90b66abb88f3eb2a4101329c3897637373db7a
-size 31538569
diff --git a/game/chaineddecos/assets/models/arena.glb.meta b/game/chaineddecos/assets/models/arena.glb.meta
new file mode 100644
index 000000000..070c3b9ea
--- /dev/null
+++ b/game/chaineddecos/assets/models/arena.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 10755992412146045657
+Type: Model
+ContentHash: 14117734859952089255
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/bridge.glb.meta b/game/chaineddecos/assets/models/bridge.glb.meta
new file mode 100644
index 000000000..e68af6d1a
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9850403329235179652
+Type: Model
+ContentHash: 10084500929464785500
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/bridge_two/gurley-_burt-on-_bridge-300.glb b/game/chaineddecos/assets/models/bridge_two/gurley-_burt-on-_bridge-300.glb
new file mode 100644
index 000000000..089a74aab
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge_two/gurley-_burt-on-_bridge-300.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4cb3d43aeb3677c0e38a016b11e64231d4bb5335b6bde7bfd39c38329c34b057
+size 19276556
diff --git a/game/chaineddecos/assets/models/bridge_two/lowpoly_mountain_bridge.glb b/game/chaineddecos/assets/models/bridge_two/lowpoly_mountain_bridge.glb
new file mode 100644
index 000000000..691325348
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge_two/lowpoly_mountain_bridge.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0400c1406422186e69c3084ec7e3efcc9a0a99ea24e27f5ff1719bd9f6e4a297
+size 1208872
diff --git a/game/chaineddecos/assets/models/bridge_two/most_bridge.glb b/game/chaineddecos/assets/models/bridge_two/most_bridge.glb
new file mode 100644
index 000000000..3b72b7289
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge_two/most_bridge.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cba25164ca7475033218e5a8ec540310f0671e3959489f990faa5d9012040c7b
+size 60836460
diff --git a/game/chaineddecos/assets/models/bridge_two/most_bridge/license.txt b/game/chaineddecos/assets/models/bridge_two/most_bridge/license.txt
new file mode 100644
index 000000000..c6b95e5c5
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge_two/most_bridge/license.txt
@@ -0,0 +1,11 @@
+Model Information:
+* title:	MOST (bridge)
+* source:	https://sketchfab.com/3d-models/most-bridge-beabe372cec941c697ffad61abdcd82b
+* author:	Nikitos & 3130 (https://sketchfab.com/vrcityphoto)
+
+Model License:
+* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
+* requirements:	Author must be credited. Commercial use is allowed.
+
+If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
+This work is based on "MOST (bridge)" (https://sketchfab.com/3d-models/most-bridge-beabe372cec941c697ffad61abdcd82b) by Nikitos & 3130 (https://sketchfab.com/vrcityphoto) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/bridge_two/most_bridge/scene.bin b/game/chaineddecos/assets/models/bridge_two/most_bridge/scene.bin
new file mode 100644
index 000000000..26f4a2f7f
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge_two/most_bridge/scene.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31dbb5d8de0f1f679945cb41d68e24ce1277d151ca84383647be32e8762afe6a
+size 60090564
diff --git a/game/chaineddecos/assets/models/bridge_two/most_bridge/scene.gltf b/game/chaineddecos/assets/models/bridge_two/most_bridge/scene.gltf
new file mode 100644
index 000000000..44bfc15f8
--- /dev/null
+++ b/game/chaineddecos/assets/models/bridge_two/most_bridge/scene.gltf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:960885f2af9d7d4a8b8063261fe97b187e982fd38287f279bca4deb587f5162c
+size 1366599
diff --git a/game/chaineddecos/assets/models/building/scene.gltf.meta b/game/chaineddecos/assets/models/building/scene.gltf.meta
new file mode 100644
index 000000000..3114ff4ab
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 16285444420064967065
+Type: Model
+ContentHash: 977092149160565127
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_0.chmat b/game/chaineddecos/assets/models/building/scene_material_0.chmat
new file mode 100644
index 000000000..2fe398348
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_0.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: standardSurface2
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.600000024
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/building\textures/standardSurface2_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_0.chmat.meta b/game/chaineddecos/assets/models/building/scene_material_0.chmat.meta
new file mode 100644
index 000000000..5880973bd
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8367046337489426198
+Type: Material
+ContentHash: 14076106626030940230
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_1.chmat b/game/chaineddecos/assets/models/building/scene_material_1.chmat
new file mode 100644
index 000000000..f705c33e5
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_1.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: standardSurface3
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.600000024
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/building\textures/standardSurface3_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_1.chmat.meta b/game/chaineddecos/assets/models/building/scene_material_1.chmat.meta
new file mode 100644
index 000000000..0c9159f4c
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_1.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 1976195374638768145
+Type: Material
+ContentHash: 11024478643814725154
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_2.chmat b/game/chaineddecos/assets/models/building/scene_material_2.chmat
new file mode 100644
index 000000000..ec8cf68c1
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_2.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: standardSurface4
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.600000024
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/building\textures/standardSurface4_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_2.chmat.meta b/game/chaineddecos/assets/models/building/scene_material_2.chmat.meta
new file mode 100644
index 000000000..c5abe4968
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_2.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 12456327613757572179
+Type: Material
+ContentHash: 17168256428364933498
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_3.chmat b/game/chaineddecos/assets/models/building/scene_material_3.chmat
new file mode 100644
index 000000000..373d6f0af
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_3.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: standardSurface5
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.600000024
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/building\textures/standardSurface5_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_3.chmat.meta b/game/chaineddecos/assets/models/building/scene_material_3.chmat.meta
new file mode 100644
index 000000000..5b47fef4e
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_3.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 11936669392775959805
+Type: Material
+ContentHash: 6770581819343979518
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_4.chmat b/game/chaineddecos/assets/models/building/scene_material_4.chmat
new file mode 100644
index 000000000..9106792fd
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_4.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: standardSurface6
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.600000024
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/building\textures/standardSurface6_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_4.chmat.meta b/game/chaineddecos/assets/models/building/scene_material_4.chmat.meta
new file mode 100644
index 000000000..c820f0bed
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_4.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5390259755485473108
+Type: Material
+ContentHash: 2155540453650670358
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_5.chmat b/game/chaineddecos/assets/models/building/scene_material_5.chmat
new file mode 100644
index 000000000..bc839b3d9
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_5.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: standardSurface8
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.600000024
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/building\textures/standardSurface8_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/scene_material_5.chmat.meta b/game/chaineddecos/assets/models/building/scene_material_5.chmat.meta
new file mode 100644
index 000000000..1a8d7ecde
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/scene_material_5.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 1046845630542337310
+Type: Material
+ContentHash: 7189851031499706802
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/textures/standardSurface2_baseColor.png.meta b/game/chaineddecos/assets/models/building/textures/standardSurface2_baseColor.png.meta
new file mode 100644
index 000000000..6f1c68f6f
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/textures/standardSurface2_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 12521000343269426659
+Type: Texture
+ContentHash: 15243947484944809699
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/textures/standardSurface3_baseColor.png.meta b/game/chaineddecos/assets/models/building/textures/standardSurface3_baseColor.png.meta
new file mode 100644
index 000000000..9845ead47
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/textures/standardSurface3_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17700789771717510297
+Type: Texture
+ContentHash: 8675014478827646774
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/textures/standardSurface4_baseColor.png.meta b/game/chaineddecos/assets/models/building/textures/standardSurface4_baseColor.png.meta
new file mode 100644
index 000000000..7c786dcab
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/textures/standardSurface4_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9438923091346132695
+Type: Texture
+ContentHash: 13678853671383614066
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/textures/standardSurface5_baseColor.png.meta b/game/chaineddecos/assets/models/building/textures/standardSurface5_baseColor.png.meta
new file mode 100644
index 000000000..b150880fb
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/textures/standardSurface5_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15905822913368433008
+Type: Texture
+ContentHash: 13450892470478118157
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/textures/standardSurface6_baseColor.png.meta b/game/chaineddecos/assets/models/building/textures/standardSurface6_baseColor.png.meta
new file mode 100644
index 000000000..9c355f2ab
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/textures/standardSurface6_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 93259085704066036
+Type: Texture
+ContentHash: 17194025727483652059
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/building/textures/standardSurface8_baseColor.png.meta b/game/chaineddecos/assets/models/building/textures/standardSurface8_baseColor.png.meta
new file mode 100644
index 000000000..75d9454b9
--- /dev/null
+++ b/game/chaineddecos/assets/models/building/textures/standardSurface8_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14035567330719388090
+Type: Texture
+ContentHash: 11165881276825295214
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/cathedral/cathedral.zip b/game/chaineddecos/assets/models/cathedral/cathedral.zip
deleted file mode 100644
index 25707fb88..000000000
--- a/game/chaineddecos/assets/models/cathedral/cathedral.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7819dbb9ee8d900e8307a2d21ec60f8a64e9b672d89ce0018f352e26794542a8
-size 78142693
diff --git a/game/chaineddecos/assets/models/cathedral/source/625a809678574856b07560fbe66f5035.zip b/game/chaineddecos/assets/models/cathedral/source/625a809678574856b07560fbe66f5035.zip
deleted file mode 100644
index efb705af5..000000000
--- a/game/chaineddecos/assets/models/cathedral/source/625a809678574856b07560fbe66f5035.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:869ed25c114a3f2512167ea3ac25036ade48936c3ebaf93d6df3eafb98609e68
-size 49097492
diff --git a/game/chaineddecos/assets/models/city/after_the_rain..._-_vr__sound.glb.meta b/game/chaineddecos/assets/models/city/after_the_rain..._-_vr__sound.glb.meta
new file mode 100644
index 000000000..b73c2dec7
--- /dev/null
+++ b/game/chaineddecos/assets/models/city/after_the_rain..._-_vr__sound.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9063345529843979990
+Type: Model
+ContentHash: 14773500401762543346
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene.gltf.meta b/game/chaineddecos/assets/models/container_ship/scene.gltf.meta
new file mode 100644
index 000000000..cbe6d6ee1
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 16650958288931697221
+Type: Model
+ContentHash: 1697179282134114314
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene_material_0.chmat b/game/chaineddecos/assets/models/container_ship/scene_material_0.chmat
new file mode 100644
index 000000000..173297433
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene_material_0.chmat
@@ -0,0 +1,21 @@
+Material:
+  Name: Bridge
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Bridge_baseColor.png
+  NormalMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Bridge_normal.png
+  MetallicRoughnessMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Bridge_metallicRoughness.png
+  EmissiveMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Bridge_emissive.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene_material_0.chmat.meta b/game/chaineddecos/assets/models/container_ship/scene_material_0.chmat.meta
new file mode 100644
index 000000000..7b9cb48fe
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3143123460861915735
+Type: Material
+ContentHash: 15951343713492596075
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene_material_1.chmat b/game/chaineddecos/assets/models/container_ship/scene_material_1.chmat
new file mode 100644
index 000000000..f32195d8a
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene_material_1.chmat
@@ -0,0 +1,20 @@
+Material:
+  Name: Hull
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Hull_baseColor.png
+  NormalMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Hull_normal.png
+  MetallicRoughnessMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Hull_metallicRoughness.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene_material_1.chmat.meta b/game/chaineddecos/assets/models/container_ship/scene_material_1.chmat.meta
new file mode 100644
index 000000000..f1164ef1b
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene_material_1.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 7955892971173306220
+Type: Material
+ContentHash: 8840915948645856316
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene_material_2.chmat b/game/chaineddecos/assets/models/container_ship/scene_material_2.chmat
new file mode 100644
index 000000000..b493ba595
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene_material_2.chmat
@@ -0,0 +1,20 @@
+Material:
+  Name: Containers
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Containers_baseColor.png
+  NormalMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Containers_normal.png
+  MetallicRoughnessMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/container_ship\textures/Containers_metallicRoughness.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/scene_material_2.chmat.meta b/game/chaineddecos/assets/models/container_ship/scene_material_2.chmat.meta
new file mode 100644
index 000000000..b00da75bd
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/scene_material_2.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 12309654505504891823
+Type: Material
+ContentHash: 4613841707137952212
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Bridge_baseColor.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Bridge_baseColor.png.meta
new file mode 100644
index 000000000..8821f064d
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Bridge_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2254035890017370952
+Type: Texture
+ContentHash: 10780115704265556398
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Bridge_emissive.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Bridge_emissive.png.meta
new file mode 100644
index 000000000..55efe77b7
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Bridge_emissive.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 11356429478613870454
+Type: Texture
+ContentHash: 17347694839658554176
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Bridge_metallicRoughness.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Bridge_metallicRoughness.png.meta
new file mode 100644
index 000000000..87ba252ec
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Bridge_metallicRoughness.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14253571792943737241
+Type: Texture
+ContentHash: 210566554136007657
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Bridge_normal.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Bridge_normal.png.meta
new file mode 100644
index 000000000..88bdccb95
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Bridge_normal.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 7727715656472522199
+Type: Texture
+ContentHash: 1879327456860645016
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Containers_baseColor.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Containers_baseColor.png.meta
new file mode 100644
index 000000000..eed6f6bf9
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Containers_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9469318672030470312
+Type: Texture
+ContentHash: 15027608620875234634
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Containers_metallicRoughness.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Containers_metallicRoughness.png.meta
new file mode 100644
index 000000000..755b811c4
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Containers_metallicRoughness.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5472828540488311313
+Type: Texture
+ContentHash: 7665597582498522694
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Containers_normal.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Containers_normal.png.meta
new file mode 100644
index 000000000..5646bd3c4
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Containers_normal.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17021850510466679143
+Type: Texture
+ContentHash: 15398240096978688096
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Hull_baseColor.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Hull_baseColor.png.meta
new file mode 100644
index 000000000..4ea9ad143
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Hull_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15583666803248405733
+Type: Texture
+ContentHash: 15297301051726643584
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Hull_metallicRoughness.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Hull_metallicRoughness.png.meta
new file mode 100644
index 000000000..5cd8abcf8
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Hull_metallicRoughness.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5067613855249902741
+Type: Texture
+ContentHash: 2224411807731613946
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/container_ship/textures/Hull_normal.png.meta b/game/chaineddecos/assets/models/container_ship/textures/Hull_normal.png.meta
new file mode 100644
index 000000000..8944c5179
--- /dev/null
+++ b/game/chaineddecos/assets/models/container_ship/textures/Hull_normal.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2421877379357487738
+Type: Texture
+ContentHash: 6302515276809350419
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/diorama/diorama_slope.glb b/game/chaineddecos/assets/models/diorama/diorama_slope.glb
new file mode 100644
index 000000000..e0e75f2bb
--- /dev/null
+++ b/game/chaineddecos/assets/models/diorama/diorama_slope.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fd71c1b39c3f30036b20ead524f5a8bf475a9a14c188b3823cb3abe060ff88d
+size 7908452
diff --git a/game/chaineddecos/assets/models/ghost+with+sword+3d+model.glb.meta b/game/chaineddecos/assets/models/ghost+with+sword+3d+model.glb.meta
new file mode 100644
index 000000000..2d163d0b1
--- /dev/null
+++ b/game/chaineddecos/assets/models/ghost+with+sword+3d+model.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 16359669984788571615
+Type: Model
+ContentHash: 2889520968283533040
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/ghost.zip b/game/chaineddecos/assets/models/ghost.zip
deleted file mode 100644
index f453feb22..000000000
--- a/game/chaineddecos/assets/models/ghost.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:362776b45da7c7433cd0f52ca80c4397d6a5b353a81f46df962fa0f04e8795cd
-size 1236054
diff --git a/game/chaineddecos/assets/models/house_of_ghosts_material_0.chmat b/game/chaineddecos/assets/models/house_of_ghosts_material_0.chmat
new file mode 100644
index 000000000..ffec5b24f
--- /dev/null
+++ b/game/chaineddecos/assets/models/house_of_ghosts_material_0.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_skeleton_MAT1
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_skeleton_MAT1_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/house_of_ghosts_material_1.chmat b/game/chaineddecos/assets/models/house_of_ghosts_material_1.chmat
new file mode 100644
index 000000000..6f20e5fe8
--- /dev/null
+++ b/game/chaineddecos/assets/models/house_of_ghosts_material_1.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Shield_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Shield_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/house_of_ghosts_material_2.chmat b/game/chaineddecos/assets/models/house_of_ghosts_material_2.chmat
new file mode 100644
index 000000000..583903d89
--- /dev/null
+++ b/game/chaineddecos/assets/models/house_of_ghosts_material_2.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Sword_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Sword_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/island.glb.meta b/game/chaineddecos/assets/models/island.glb.meta
new file mode 100644
index 000000000..c18553c8d
--- /dev/null
+++ b/game/chaineddecos/assets/models/island.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 580609141673989832
+Type: Model
+ContentHash: 13566568879756206854
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/minigames/hub_for_minigames_server.glb.meta b/game/chaineddecos/assets/models/minigames/hub_for_minigames_server.glb.meta
new file mode 100644
index 000000000..8e56f6bb5
--- /dev/null
+++ b/game/chaineddecos/assets/models/minigames/hub_for_minigames_server.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8378150816431493396
+Type: Model
+ContentHash: 17675924409644684253
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis.zip b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis.zip
deleted file mode 100644
index 6a62943ee..000000000
--- a/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c223906029417928a83f142c6998f9f1a4e9c65ec518c2fcbcccbbb350fd16c
-size 527170
diff --git a/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/scene.gltf.meta b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/scene.gltf.meta
new file mode 100644
index 000000000..2b6c5f588
--- /dev/null
+++ b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6481625887406353999
+Type: Model
+ContentHash: 15356699419461743712
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/scene_material_0.chmat.meta b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/scene_material_0.chmat.meta
new file mode 100644
index 000000000..31130ad2f
--- /dev/null
+++ b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/scene_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 4984865583027711699
+Type: Material
+ContentHash: 0
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png.meta b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png.meta
new file mode 100644
index 000000000..5eaf65591
--- /dev/null
+++ b/game/chaineddecos/assets/models/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5041301996340678708
+Type: Texture
+ContentHash: 10879816452167962497
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/license.txt b/game/chaineddecos/assets/models/new_model/a109082005619/license.txt
new file mode 100644
index 000000000..1b71d1d39
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/license.txt
@@ -0,0 +1,11 @@
+Model Information:
+* title:	A109082005619
+* source:	https://sketchfab.com/3d-models/a109082005619-97dd7b8410074ede888821943b4cb000
+* author:	A109082019 (https://sketchfab.com/A109082019)
+
+Model License:
+* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
+* requirements:	Author must be credited. Commercial use is allowed.
+
+If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
+This work is based on "A109082005619" (https://sketchfab.com/3d-models/a109082005619-97dd7b8410074ede888821943b4cb000) by A109082019 (https://sketchfab.com/A109082019) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene.bin b/game/chaineddecos/assets/models/new_model/a109082005619/scene.bin
new file mode 100644
index 000000000..23145628c
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de636919a1104c72e847f72ce7bc81174ba40baa23fc02ae8021abfd52d30d2c
+size 374220
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene.gltf b/game/chaineddecos/assets/models/new_model/a109082005619/scene.gltf
new file mode 100644
index 000000000..172e4a07a
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene.gltf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67b599a227157b7d66c488016a03ad005a3e9ac5dd53c7cee8405a9f1fb60dc9
+size 346681
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene.gltf.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene.gltf.meta
new file mode 100644
index 000000000..b55ab9b93
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 18003340254112658511
+Type: Model
+ContentHash: 12399203401211157839
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_1.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_1.chmat
new file mode 100644
index 000000000..fccadf1cb
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_1.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: rock
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/rock_diffuse.jpeg
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_1.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_1.chmat.meta
new file mode 100644
index 000000000..c02197633
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_1.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2325883602816395713
+Type: Material
+ContentHash: 2663405098090018968
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_10.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_10.chmat
new file mode 100644
index 000000000..77e407c62
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_10.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: water2
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/water2_diffuse.jpeg
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_10.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_10.chmat.meta
new file mode 100644
index 000000000..4c5f7a170
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_10.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 16751664094409920296
+Type: Material
+ContentHash: 5883014834692457832
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_14.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_14.chmat
new file mode 100644
index 000000000..3799d9b27
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_14.chmat
@@ -0,0 +1,19 @@
+Material:
+  Name: material
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/material_diffuse.png
+  EmissiveMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/material_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_14.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_14.chmat.meta
new file mode 100644
index 000000000..96f13bdf7
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_14.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15976599937860562521
+Type: Material
+ContentHash: 4360381241406009488
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_2.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_2.chmat
new file mode 100644
index 000000000..213d406e0
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_2.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: grass_and_ground
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/grass_and_ground_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_2.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_2.chmat.meta
new file mode 100644
index 000000000..07d71aa65
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_2.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 12392875101151869242
+Type: Material
+ContentHash: 15927758765484207835
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_3.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_3.chmat
new file mode 100644
index 000000000..19484b5fe
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_3.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: mountaion
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/mountaion_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_3.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_3.chmat.meta
new file mode 100644
index 000000000..e233be399
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_3.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17548058369350368626
+Type: Material
+ContentHash: 11797313572890188513
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_4.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_4.chmat
new file mode 100644
index 000000000..f32ff9959
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_4.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Material_25
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/Material_25_diffuse.jpeg
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_4.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_4.chmat.meta
new file mode 100644
index 000000000..08d980254
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_4.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15246011022288597533
+Type: Material
+ContentHash: 14569867123941583876
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_5.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_5.chmat
new file mode 100644
index 000000000..7496e4051
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_5.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Material_26
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/Material_26_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_5.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_5.chmat.meta
new file mode 100644
index 000000000..b474b78e0
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_5.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8151647875989410111
+Type: Material
+ContentHash: 4871137265224012617
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_6.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_6.chmat
new file mode 100644
index 000000000..062f6c0d6
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_6.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Material_27
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/Material_27_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_6.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_6.chmat.meta
new file mode 100644
index 000000000..1c39fb645
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_6.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 11862177760266012152
+Type: Material
+ContentHash: 13219067707361327597
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_7.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_7.chmat
new file mode 100644
index 000000000..d995e2ffb
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_7.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Material_28
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/Material_28_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_7.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_7.chmat.meta
new file mode 100644
index 000000000..aa0512c73
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_7.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14523496353850184668
+Type: Material
+ContentHash: 14644571692578218653
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_8.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_8.chmat
new file mode 100644
index 000000000..b3cf61bca
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_8.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Material_47
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/Material_47_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_8.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_8.chmat.meta
new file mode 100644
index 000000000..ddee93802
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_8.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 4862227148965671978
+Type: Material
+ContentHash: 81602863319894409
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_9.chmat b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_9.chmat
new file mode 100644
index 000000000..f4b03c397
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_9.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Material_48
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/new_model/a109082005619\textures/Material_48_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_9.chmat.meta b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_9.chmat.meta
new file mode 100644
index 000000000..0d999e33e
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/scene_material_9.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5133910782869450166
+Type: Material
+ContentHash: 14415035498414939733
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_25_diffuse.jpeg b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_25_diffuse.jpeg
new file mode 100644
index 000000000..c4e1d5077
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_25_diffuse.jpeg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92ebd3d34fd54b1296427ec11f407cd7dd8607c41ff0b8d8af5b4a5b36af9e4f
+size 41813
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_25_diffuse.jpeg.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_25_diffuse.jpeg.meta
new file mode 100644
index 000000000..ea6617e13
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_25_diffuse.jpeg.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8141210959877412237
+Type: Texture
+ContentHash: 2557316937414716985
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_26_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_26_diffuse.png
new file mode 100644
index 000000000..46b864386
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_26_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36c0db1c47c6f7658daacfadebd7e13b3abebb044db26769b6c60ec21d2d0a1c
+size 190974
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_26_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_26_diffuse.png.meta
new file mode 100644
index 000000000..1aabc7e92
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_26_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3855410003287145010
+Type: Texture
+ContentHash: 14858120528288415944
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_27_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_27_diffuse.png
new file mode 100644
index 000000000..fa2b42a74
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_27_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c58e4f6ef12a842a9b92c5da383ce86b28bedfbc940cc4a13cd039e466c8dde9
+size 346634
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_27_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_27_diffuse.png.meta
new file mode 100644
index 000000000..0bcc6ca4a
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_27_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 181315027893331133
+Type: Texture
+ContentHash: 495662312060007761
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_28_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_28_diffuse.png
new file mode 100644
index 000000000..b4ace08ac
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_28_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2ecdb40203fbe151c13288e52d739b5bb3d44822df8802569e2bc5e1d730a88
+size 121520
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_28_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_28_diffuse.png.meta
new file mode 100644
index 000000000..33f165c1e
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_28_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6769211658971474709
+Type: Texture
+ContentHash: 8771615025367121089
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_47_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_47_diffuse.png
new file mode 100644
index 000000000..ebfce6fef
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_47_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e267cfa35dc29147cfb118fdb9dc86113fbed3f9184905d7b857ecdc90fcf5a9
+size 487777
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_47_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_47_diffuse.png.meta
new file mode 100644
index 000000000..acb5ef0b8
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_47_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 15406858367212219799
+Type: Texture
+ContentHash: 5534641263707236789
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_48_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_48_diffuse.png
new file mode 100644
index 000000000..410b8bc8b
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_48_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5e76ed27e692d87c08151dcb066b02ee782a3fdd9f4c5318066b3eb4440aacf
+size 335436
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_48_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_48_diffuse.png.meta
new file mode 100644
index 000000000..e9e1cf353
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/Material_48_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 16575932270445538912
+Type: Texture
+ContentHash: 6146180360093167012
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/grass_and_ground_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/grass_and_ground_diffuse.png
new file mode 100644
index 000000000..6438b2f57
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/grass_and_ground_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4183017b6acaf7aa12f7a9f911771a5384bc598921ab470375a1c6b65fd5bf0
+size 76808
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/grass_and_ground_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/grass_and_ground_diffuse.png.meta
new file mode 100644
index 000000000..f769178ab
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/grass_and_ground_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8706996675150981892
+Type: Texture
+ContentHash: 12086772016411562884
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/material_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/material_diffuse.png
new file mode 100644
index 000000000..e2133903b
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/material_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8304b67f3e8d001b33d642918b73a1d60f5d998992978d047cbeb79cba250028
+size 32180
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/material_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/material_diffuse.png.meta
new file mode 100644
index 000000000..c19c70755
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/material_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2861498834722630171
+Type: Texture
+ContentHash: 9017060137039735870
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/mountaion_diffuse.png b/game/chaineddecos/assets/models/new_model/a109082005619/textures/mountaion_diffuse.png
new file mode 100644
index 000000000..795ef29dd
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/mountaion_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b849914720a4c33ece0cd9a5d86dc929c810267e9a0046918d3b563f459fef89
+size 570974
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/mountaion_diffuse.png.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/mountaion_diffuse.png.meta
new file mode 100644
index 000000000..687952915
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/mountaion_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17720999573792717976
+Type: Texture
+ContentHash: 10834903378527208237
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/rock_diffuse.jpeg b/game/chaineddecos/assets/models/new_model/a109082005619/textures/rock_diffuse.jpeg
new file mode 100644
index 000000000..b21dcc6ad
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/rock_diffuse.jpeg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5b59b0605646a4487f01fe372a48dfdf5dbd3239263c163597151cffe1c7232
+size 12371
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/rock_diffuse.jpeg.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/rock_diffuse.jpeg.meta
new file mode 100644
index 000000000..aee99bae9
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/rock_diffuse.jpeg.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 1257233199524884313
+Type: Texture
+ContentHash: 13206581388495353764
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/water2_diffuse.jpeg b/game/chaineddecos/assets/models/new_model/a109082005619/textures/water2_diffuse.jpeg
new file mode 100644
index 000000000..b7c2d22af
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/water2_diffuse.jpeg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63097eb1322d7848bc7b5357b91eb99c1f6017ea5524ac870495e2b3f9e13faa
+size 26102
diff --git a/game/chaineddecos/assets/models/new_model/a109082005619/textures/water2_diffuse.jpeg.meta b/game/chaineddecos/assets/models/new_model/a109082005619/textures/water2_diffuse.jpeg.meta
new file mode 100644
index 000000000..f1d61bd65
--- /dev/null
+++ b/game/chaineddecos/assets/models/new_model/a109082005619/textures/water2_diffuse.jpeg.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2642785091069666136
+Type: Texture
+ContentHash: 1681713413117320272
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter.zip b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter.zip
deleted file mode 100644
index a8ae1ef0a..000000000
--- a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e03e43632b6422d77907bf77d26e642dd4cab7c0acdd5e74f30093571e0108d
-size 14208223
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene.gltf.meta b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene.gltf.meta
new file mode 100644
index 000000000..326d2f7fc
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6922423336282928323
+Type: Model
+ContentHash: 6177593458130176135
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene_material_0.chmat b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene_material_0.chmat
new file mode 100644
index 000000000..63bfbbfd2
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene_material_0.chmat
@@ -0,0 +1,21 @@
+Material:
+  Name: Helicopter
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter\textures/Helicopter_baseColor.jpeg
+  NormalMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter\textures/Helicopter_normal.png
+  MetallicRoughnessMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter\textures/Helicopter_metallicRoughness.png
+  OcclusionMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter\textures/Helicopter_metallicRoughness.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene_material_0.chmat.meta b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene_material_0.chmat.meta
new file mode 100644
index 000000000..ddfa756e7
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/scene_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 1696628781254437465
+Type: Material
+ContentHash: 4078315393001306025
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg.meta b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg.meta
new file mode 100644
index 000000000..448b50aec
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6134799164449010806
+Type: Texture
+ContentHash: 12215574838627569288
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png.meta b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png.meta
new file mode 100644
index 000000000..fbb103186
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8598950276531288784
+Type: Texture
+ContentHash: 6111309944967751231
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png.meta b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png.meta
new file mode 100644
index 000000000..0066fb1ea
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6538759378283404410
+Type: Texture
+ContentHash: 14663042358419533712
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/dae_stylized_plane_comet_88.zip b/game/chaineddecos/assets/models/pilot/dae_stylized_plane_comet_88.zip
deleted file mode 100644
index 80660d9d2..000000000
--- a/game/chaineddecos/assets/models/pilot/dae_stylized_plane_comet_88.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c951f60f45e80870fdb95ca4fe9de1d49d194e8a46298ba848e822361026f6a1
-size 1330488
diff --git a/game/chaineddecos/assets/models/pilot/ferris_wheel-animated.zip b/game/chaineddecos/assets/models/pilot/ferris_wheel-animated.zip
deleted file mode 100644
index dcc2a332f..000000000
--- a/game/chaineddecos/assets/models/pilot/ferris_wheel-animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d3b4d327b146cd3b6e3b9f50caae54513effc67c458b11289f3a1107e2b389d
-size 16570644
diff --git a/game/chaineddecos/assets/models/pilot/mobile_home.zip b/game/chaineddecos/assets/models/pilot/mobile_home.zip
deleted file mode 100644
index 1d420c0ef..000000000
--- a/game/chaineddecos/assets/models/pilot/mobile_home.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a1b4db9eb5b42f2d393ded5ec89545b4c47433d63b3971f1ad2b392a3f78408
-size 100122213
diff --git a/game/chaineddecos/assets/models/pilot/the_last_stronghold_animated.zip b/game/chaineddecos/assets/models/pilot/the_last_stronghold_animated.zip
deleted file mode 100644
index 2d57debf5..000000000
--- a/game/chaineddecos/assets/models/pilot/the_last_stronghold_animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95867e7f06fb9934eb44ce07d32acffdec49751d1147a3904d5088e7c45f16ab
-size 43775443
diff --git a/game/chaineddecos/assets/models/pilot/tree_mill_animated.zip b/game/chaineddecos/assets/models/pilot/tree_mill_animated.zip
deleted file mode 100644
index 9454bc2ea..000000000
--- a/game/chaineddecos/assets/models/pilot/tree_mill_animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:814ec31cc41c442df1ff46e9cf7db7a26876bba4ff86dacf1902f03cdf3cda0a
-size 863321
diff --git a/game/chaineddecos/assets/models/pilot/wizard_tower_animated.glb.meta b/game/chaineddecos/assets/models/pilot/wizard_tower_animated.glb.meta
new file mode 100644
index 000000000..60ea36777
--- /dev/null
+++ b/game/chaineddecos/assets/models/pilot/wizard_tower_animated.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 13486165926194482105
+Type: Model
+ContentHash: 12839961086266309507
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/pilot/wizard_tower_animated.zip b/game/chaineddecos/assets/models/pilot/wizard_tower_animated.zip
deleted file mode 100644
index 13b460f27..000000000
--- a/game/chaineddecos/assets/models/pilot/wizard_tower_animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f901346792b59648026790c3b1411be243564603946131864bfe5617a60d485
-size 584942
diff --git a/game/chaineddecos/assets/models/player_anim_material_0.chmat b/game/chaineddecos/assets/models/player_anim_material_0.chmat
new file mode 100644
index 000000000..ffec5b24f
--- /dev/null
+++ b/game/chaineddecos/assets/models/player_anim_material_0.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_skeleton_MAT1
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_skeleton_MAT1_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/player_anim_material_1.chmat b/game/chaineddecos/assets/models/player_anim_material_1.chmat
new file mode 100644
index 000000000..6f20e5fe8
--- /dev/null
+++ b/game/chaineddecos/assets/models/player_anim_material_1.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Shield_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Shield_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/player_anim_material_2.chmat b/game/chaineddecos/assets/models/player_anim_material_2.chmat
new file mode 100644
index 000000000..583903d89
--- /dev/null
+++ b/game/chaineddecos/assets/models/player_anim_material_2.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Sword_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Sword_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/player_low.glb.meta b/game/chaineddecos/assets/models/player_low.glb.meta
new file mode 100644
index 000000000..a5d2b183d
--- /dev/null
+++ b/game/chaineddecos/assets/models/player_low.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6152005881347795059
+Type: Model
+ContentHash: 3675158635311907196
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/railway_stone_bridge.glb b/game/chaineddecos/assets/models/railway_stone_bridge.glb
deleted file mode 100644
index a7527abd3..000000000
--- a/game/chaineddecos/assets/models/railway_stone_bridge.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62f031dc9e838b2413a765d35c6761aefe8a6b20c64c82afe846722b16209440
-size 61789244
diff --git a/game/chaineddecos/assets/models/rungholt.zip b/game/chaineddecos/assets/models/rungholt.zip
deleted file mode 100644
index 0e17ce0c9..000000000
--- a/game/chaineddecos/assets/models/rungholt.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd927901828e19e042e02448f3814e18592c9c076b39bff226bb8dc7a5ad6f4a
-size 49767647
diff --git a/game/chaineddecos/assets/models/skeleton/scene.gltf.meta b/game/chaineddecos/assets/models/skeleton/scene.gltf.meta
new file mode 100644
index 000000000..ba8ea445a
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3520787229482223369
+Type: Model
+ContentHash: 5243457651963128927
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/scene_material_0.chmat b/game/chaineddecos/assets/models/skeleton/scene_material_0.chmat
new file mode 100644
index 000000000..ffec5b24f
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene_material_0.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_skeleton_MAT1
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_skeleton_MAT1_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/scene_material_0.chmat.meta b/game/chaineddecos/assets/models/skeleton/scene_material_0.chmat.meta
new file mode 100644
index 000000000..548777c16
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17732132592438947349
+Type: Material
+ContentHash: 10866470636250451896
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/scene_material_1.chmat b/game/chaineddecos/assets/models/skeleton/scene_material_1.chmat
new file mode 100644
index 000000000..6f20e5fe8
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene_material_1.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Shield_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Shield_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/scene_material_1.chmat.meta b/game/chaineddecos/assets/models/skeleton/scene_material_1.chmat.meta
new file mode 100644
index 000000000..bed8f5399
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene_material_1.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5152122952207645159
+Type: Material
+ContentHash: 7203974431644931028
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/scene_material_2.chmat b/game/chaineddecos/assets/models/skeleton/scene_material_2.chmat
new file mode 100644
index 000000000..583903d89
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene_material_2.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Sword_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Sword_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/scene_material_2.chmat.meta b/game/chaineddecos/assets/models/skeleton/scene_material_2.chmat.meta
new file mode 100644
index 000000000..f7c5b9262
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/scene_material_2.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8112167308573584408
+Type: Material
+ContentHash: 8574514933117412684
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/source/625a809678574856b07560fbe66f5035.zip b/game/chaineddecos/assets/models/skeleton/source/625a809678574856b07560fbe66f5035.zip
deleted file mode 100644
index efb705af5..000000000
--- a/game/chaineddecos/assets/models/skeleton/source/625a809678574856b07560fbe66f5035.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:869ed25c114a3f2512167ea3ac25036ade48936c3ebaf93d6df3eafb98609e68
-size 49097492
diff --git a/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_Shield_MAT_baseColor.png.meta b/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_Shield_MAT_baseColor.png.meta
new file mode 100644
index 000000000..d9bafd1da
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_Shield_MAT_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2612454737336597472
+Type: Texture
+ContentHash: 15904502762302429903
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_Sword_MAT_baseColor.png.meta b/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_Sword_MAT_baseColor.png.meta
new file mode 100644
index 000000000..469cde4e5
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_Sword_MAT_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17739465231616217204
+Type: Texture
+ContentHash: 12887958663746350743
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_skeleton_MAT1_baseColor.png.meta b/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_skeleton_MAT1_baseColor.png.meta
new file mode 100644
index 000000000..001469e07
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton/textures/Fight_Rework_skeleton_MAT1_baseColor.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14847113873655002033
+Type: Texture
+ContentHash: 2097675040203088480
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/skeleton_animated.glb.meta b/game/chaineddecos/assets/models/skeleton_animated.glb.meta
new file mode 100644
index 000000000..a86138b54
--- /dev/null
+++ b/game/chaineddecos/assets/models/skeleton_animated.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 7289248424465903313
+Type: Model
+ContentHash: 1378971988582530170
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/stairs.glb.meta b/game/chaineddecos/assets/models/stairs.glb.meta
new file mode 100644
index 000000000..d206c6fad
--- /dev/null
+++ b/game/chaineddecos/assets/models/stairs.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2777666302803713364
+Type: Model
+ContentHash: 6212682810885593807
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/stone/section_of_walls_material_0.chmat b/game/chaineddecos/assets/models/stone/section_of_walls_material_0.chmat
new file mode 100644
index 000000000..ffec5b24f
--- /dev/null
+++ b/game/chaineddecos/assets/models/stone/section_of_walls_material_0.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_skeleton_MAT1
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_skeleton_MAT1_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/stone/section_of_walls_material_1.chmat b/game/chaineddecos/assets/models/stone/section_of_walls_material_1.chmat
new file mode 100644
index 000000000..6f20e5fe8
--- /dev/null
+++ b/game/chaineddecos/assets/models/stone/section_of_walls_material_1.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Shield_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Shield_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/stone/section_of_walls_material_2.chmat b/game/chaineddecos/assets/models/stone/section_of_walls_material_2.chmat
new file mode 100644
index 000000000..583903d89
--- /dev/null
+++ b/game/chaineddecos/assets/models/stone/section_of_walls_material_2.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Fight_Rework_Sword_MAT
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/skeleton\textures/Fight_Rework_Sword_MAT_baseColor.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/stone_floor.glb.meta b/game/chaineddecos/assets/models/stone_floor.glb.meta
new file mode 100644
index 000000000..ecc7dd8ab
--- /dev/null
+++ b/game/chaineddecos/assets/models/stone_floor.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5231694586974801729
+Type: Model
+ContentHash: 10640684550707659810
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/license.txt b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/license.txt
new file mode 100644
index 000000000..e3f0def28
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/license.txt
@@ -0,0 +1,11 @@
+Model Information:
+* title:	The Thankful Glory - Fantasy Tavern
+* source:	https://sketchfab.com/3d-models/the-thankful-glory-fantasy-tavern-d6dcffe59b464727ac83cfc935d53575
+* author:	PhoenixJSF (https://sketchfab.com/PhoenixJSF)
+
+Model License:
+* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
+* requirements:	Author must be credited. Commercial use is allowed.
+
+If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
+This work is based on "The Thankful Glory - Fantasy Tavern" (https://sketchfab.com/3d-models/the-thankful-glory-fantasy-tavern-d6dcffe59b464727ac83cfc935d53575) by PhoenixJSF (https://sketchfab.com/PhoenixJSF) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.bin b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.bin
new file mode 100644
index 000000000..ada064588
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50e19b01421c0c9e03e3adc855eb15a89e0ca57bf83e0beb172611094b9c3522
+size 6264484
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf
new file mode 100644
index 000000000..691c05602
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f64367564d56e66877a746d1cc9e37fbf4a2fce06ed8268f50cc7742d1ace185
+size 2494073
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf.meta b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf.meta
new file mode 100644
index 000000000..84cfe3f81
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 1053756312646906489
+Type: Model
+ContentHash: 3220123647713479435
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat
new file mode 100644
index 000000000..aa076369c
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: Untitled_drawing
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern\textures/Untitled_drawing_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat.meta b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat.meta
new file mode 100644
index 000000000..4191917b7
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 11077579673632748163
+Type: Material
+ContentHash: 4906823511431611624
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat
new file mode 100644
index 000000000..c40917788
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat
@@ -0,0 +1,18 @@
+Material:
+  Name: flower_small
+  AlbedoColor:
+    - 1
+    - 1
+    - 1
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 1
+  Roughness: 1
+  Transparent: false
+  Alpha: 1
+  AlbedoMap: D:/gitnext/Chained Decos/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern\textures/flower_small_diffuse.png
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat.meta b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat.meta
new file mode 100644
index 000000000..87b6976f8
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 383669224431831560
+Type: Material
+ContentHash: 15061608272489592544
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/Untitled_drawing_diffuse.png b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/Untitled_drawing_diffuse.png
new file mode 100644
index 000000000..2274d3993
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/Untitled_drawing_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0adef9603d93de5c039303539449e97f9bf6ac23ba41f772d11f6328d0539240
+size 17941
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/Untitled_drawing_diffuse.png.meta b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/Untitled_drawing_diffuse.png.meta
new file mode 100644
index 000000000..223cf743e
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/Untitled_drawing_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 5366396256783180864
+Type: Texture
+ContentHash: 13420536649100504881
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/flower_small_diffuse.png b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/flower_small_diffuse.png
new file mode 100644
index 000000000..4054927fa
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/flower_small_diffuse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daa0abc3311da8b7ab0e1b8fc650ad27e72794f0fb6deb879682268785243570
+size 188627
diff --git a/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/flower_small_diffuse.png.meta b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/flower_small_diffuse.png.meta
new file mode 100644
index 000000000..e0541e023
--- /dev/null
+++ b/game/chaineddecos/assets/models/tavern/the_thankful_glory_-_fantasy_tavern/textures/flower_small_diffuse.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3188748954809340798
+Type: Texture
+ContentHash: 8945134440252989252
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/the_house_lost_at_sea.zip b/game/chaineddecos/assets/models/the_house_lost_at_sea.zip
deleted file mode 100644
index d0ae2a2a5..000000000
--- a/game/chaineddecos/assets/models/the_house_lost_at_sea.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3ba8b0c28738abe607cd312413b44ce32557704b7f70358fcfa1507e8d518c6
-size 56598128
diff --git a/game/chaineddecos/assets/models/toy_train/toy_train.zip b/game/chaineddecos/assets/models/toy_train/toy_train.zip
deleted file mode 100644
index ba605f4e1..000000000
--- a/game/chaineddecos/assets/models/toy_train/toy_train.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ba723ef001f11f56337c3ba125248c0cba786e83ee5708e6faeab12f5d1cea6
-size 116
diff --git a/game/chaineddecos/assets/models/toy_train/train_vagon.glb.meta b/game/chaineddecos/assets/models/toy_train/train_vagon.glb.meta
new file mode 100644
index 000000000..2b58fa0d1
--- /dev/null
+++ b/game/chaineddecos/assets/models/toy_train/train_vagon.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 13349678835275148188
+Type: Model
+ContentHash: 13448110344540002960
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/toy_train/wooden_train.glb.meta b/game/chaineddecos/assets/models/toy_train/wooden_train.glb.meta
new file mode 100644
index 000000000..04945ea56
--- /dev/null
+++ b/game/chaineddecos/assets/models/toy_train/wooden_train.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 6503497834854385828
+Type: Model
+ContentHash: 7340216144921756005
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models/toy_train/wooden_train.zip b/game/chaineddecos/assets/models/toy_train/wooden_train.zip
deleted file mode 100644
index 9a9326861..000000000
--- a/game/chaineddecos/assets/models/toy_train/wooden_train.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5cd24185faa4350ffe4f8ce48116801b00a2edbfaaa051c49b956fb4b3218a13
-size 17948536
diff --git a/game/chaineddecos/assets/models/windmill_game_ready.zip b/game/chaineddecos/assets/models/windmill_game_ready.zip
deleted file mode 100644
index f45a4edf6..000000000
--- a/game/chaineddecos/assets/models/windmill_game_ready.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:347d4f1a5cc83f0adbc67c3a1199cbee0bc073eb2ea3971a87e3b1c3f31b3ee5
-size 18460530
diff --git a/game/chaineddecos/assets/models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb.meta b/game/chaineddecos/assets/models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb.meta
new file mode 100644
index 000000000..36605d2a7
--- /dev/null
+++ b/game/chaineddecos/assets/models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 4537241321556691418
+Type: Model
+ContentHash: 3623525809825697925
+IsGenerated: true
\ No newline at end of file
diff --git "a/game/chaineddecos/assets/models_backup/3d\320\240\321\230\320\240\321\225\320\240\322\221\320\240\302\265\320\240\302\273\320\241\320\212\320\240\321\227\320\241\320\202\320\240\321\221\320\240\320\206\320\240\321\221\320\240\322\221\320\240\302\260\320\240\302\267\320\240\321\230\320\240\302\265\320\241\342\200\241\320\240\302\265\320\240\321\230_basecolor.jpg.chmeta" "b/game/chaineddecos/assets/models_backup/3d\320\240\321\230\320\240\321\225\320\240\322\221\320\240\302\265\320\240\302\273\320\241\320\212\320\240\321\227\320\241\320\202\320\240\321\221\320\240\320\206\320\240\321\221\320\240\322\221\320\240\302\260\320\240\302\267\320\240\321\230\320\240\302\265\320\241\342\200\241\320\240\302\265\320\240\321\230_basecolor.jpg.chmeta"
deleted file mode 100644
index ff4bd282f..000000000
--- "a/game/chaineddecos/assets/models_backup/3d\320\240\321\230\320\240\321\225\320\240\322\221\320\240\302\265\320\240\302\273\320\241\320\212\320\240\321\227\320\241\320\202\320\240\321\221\320\240\320\206\320\240\321\221\320\240\322\221\320\240\302\260\320\240\302\267\320\240\321\230\320\240\302\265\320\241\342\200\241\320\240\302\265\320\240\321\230_basecolor.jpg.chmeta"
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16656345239098888328
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/6_buildings_low-poly_pack_1.glb b/game/chaineddecos/assets/models_backup/6_buildings_low-poly_pack_1.glb
deleted file mode 100644
index d94796f60..000000000
--- a/game/chaineddecos/assets/models_backup/6_buildings_low-poly_pack_1.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9704233f6ab25000c7a8082eee5ca600428f13366967074cf8411598932a9d30
-size 34688124
diff --git a/game/chaineddecos/assets/models_backup/6_buildings_low-poly_pack_1.zip b/game/chaineddecos/assets/models_backup/6_buildings_low-poly_pack_1.zip
deleted file mode 100644
index 8cdf994d6..000000000
--- a/game/chaineddecos/assets/models_backup/6_buildings_low-poly_pack_1.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdb362a5ea8fa28a95791e159f90b66abb88f3eb2a4101329c3897637373db7a
-size 31538569
diff --git a/game/chaineddecos/assets/models_backup/Textures/1622793658-eye-01-mask_0.jpeg b/game/chaineddecos/assets/models_backup/Textures/1622793658-eye-01-mask_0.jpeg
deleted file mode 100644
index a24b4f705..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/1622793658-eye-01-mask_0.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/1622793658-eye-01-mask_0.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/1622793658-eye-01-mask_0.jpeg.chmeta
deleted file mode 100644
index 7bf7e746a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/1622793658-eye-01-mask_0.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11892971600805708263
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/body_texture_2.jpeg b/game/chaineddecos/assets/models_backup/Textures/body_texture_2.jpeg
deleted file mode 100644
index 284a344eb..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/body_texture_2.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/body_texture_2.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/body_texture_2.jpeg.chmeta
deleted file mode 100644
index d862aae9e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/body_texture_2.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10123816974214212260
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_basecolor.png
deleted file mode 100644
index d0965062e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f37b5bc6d165649cab49c4adf179ac97afd8e87ea653669a22f77e7a4b2344c4
-size 1339917
diff --git a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_basecolor.png.chmeta
deleted file mode 100644
index b617c470d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12796073707027145276
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_metallicroughness.png
deleted file mode 100644
index 07601a8e9..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6db30d9606165b8ab7724c61230fa07b5c672421c95ca512744a59a191a1dfca
-size 349
diff --git a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_metallicroughness.png.chmeta
deleted file mode 100644
index 4a3291372..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15333585046592248420
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_specularf0.png b/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_specularf0.png
deleted file mode 100644
index 49ce59445..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_specularf0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dff34464ecd872085f0468f0a08c0e47398cbd0caafc04bbb4ba57fdb5526672
-size 700628
diff --git a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_specularf0.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_specularf0.png.chmeta
deleted file mode 100644
index 9db55a6fa..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/bodyshape_mesh0003_specularf0.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16381079967640410558
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/brick.jpg b/game/chaineddecos/assets/models_backup/Textures/brick.jpg
deleted file mode 100644
index 38579cd02..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/brick.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30e146bfd23da7be8b012baf60843890599d9a92cfc57df0a7ab8e2bd4d0702b
-size 12756
diff --git a/game/chaineddecos/assets/models_backup/Textures/brick.jpg.chmeta b/game/chaineddecos/assets/models_backup/Textures/brick.jpg.chmeta
deleted file mode 100644
index 2ffc6681d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/brick.jpg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6675978907581153393
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_diff.jpg b/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_diff.jpg
deleted file mode 100644
index 42a372766..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_diff.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92023ea18cb0a6f17e159f296cfee243f6f1f41be4bb94ac67706b77366779e5
-size 734461
diff --git a/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_metal-cannon_01_rough.png b/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_metal-cannon_01_rough.png
deleted file mode 100644
index 061b53d8e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_metal-cannon_01_rough.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ad90ad08e63757e04edd50c54e0ba50f9525d1067952f09975ae3ff4db2b376
-size 1367017
diff --git a/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_nor_gl.png b/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_nor_gl.png
deleted file mode 100644
index 4bb2c9f54..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/cannon_01_1k_cannon_01_nor_gl.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0441e7dc11cf0ee4befb45a0a922c62eea99ba6fcbed84598188a0f3a6642243
-size 4237639
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_0.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_0.jpg
deleted file mode 100644
index 42a372766..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_0.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92023ea18cb0a6f17e159f296cfee243f6f1f41be4bb94ac67706b77366779e5
-size 734461
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_0.png b/game/chaineddecos/assets/models_backup/Textures/embedded_0.png
deleted file mode 100644
index c6c3b96bc..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf7f7b7fa96074a9ba39e40908b5691e6e5fe2de7fd914d23c4c5928ca865d5c
-size 4409487
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_1.png b/game/chaineddecos/assets/models_backup/Textures/embedded_1.png
deleted file mode 100644
index ce92d7b14..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da3427183639653257a06dd01ea4fa1c37b777ac104eb9370a0cc9887245b664
-size 4378027
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_10.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_10.jpg
deleted file mode 100644
index a62586449..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_10.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:345bb440412dd50a8200bffc0fca4bd495f36de81f14c74a5f8c30e13708c363
-size 341942
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_12.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_12.jpg
deleted file mode 100644
index cc42cdb7e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_12.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4dae8cf5187bd7b4cd353b44238e97955546b8fe216e0c79124fab46a85caff6
-size 367209
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_13.png b/game/chaineddecos/assets/models_backup/Textures/embedded_13.png
deleted file mode 100644
index 855883527..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_13.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71ff11ff8005237e2b89d7abeed16e6bac57a9c7f3f86721d3d68811e0beee96
-size 82232
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_16.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_16.jpg
deleted file mode 100644
index 5a37b68df..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_16.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35310b26674909006cafcc235f890821ba3a4e9fdd1d4bf66eb867049c827686
-size 69347
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_18.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_18.jpg
deleted file mode 100644
index 784bd5ab6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_18.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e33578adbe1c5e4e125479289f2273d26d233a1c110de32fd7a2e4ee824bff9
-size 81002
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_2.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_2.jpg
deleted file mode 100644
index 879231b6a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_2.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60d0e06b3a73688901984c94260d742b9cf6b5bf4d7dbf15578f52b567e212c9
-size 53880
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_2.png b/game/chaineddecos/assets/models_backup/Textures/embedded_2.png
deleted file mode 100644
index 4bb2c9f54..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0441e7dc11cf0ee4befb45a0a922c62eea99ba6fcbed84598188a0f3a6642243
-size 4237639
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_20.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_20.jpg
deleted file mode 100644
index c39a2bb50..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_20.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f8790e1a78ccb102ec605900b4d838e3be6734a1c8d18365e60838b0a811b86
-size 275225
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_22.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_22.jpg
deleted file mode 100644
index f747e8b35..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_22.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05e60eefb5b12d99ba8819ba82fb3a9bb96171dfd68a43c7c3aca9a6413611c4
-size 71001
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_23.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_23.jpg
deleted file mode 100644
index 56f621f8c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_23.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:adca0b70da6282e5942f4ab602109e316a9d07aecbea453a2f93bb8878de6060
-size 530243
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_25.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_25.jpg
deleted file mode 100644
index d76f8dd03..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_25.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4af77645e348c25281ca6cbc7429982495fe39719867ac0805fc649b2b7f1db1
-size 49635
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_27.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_27.jpg
deleted file mode 100644
index 902a2d469..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_27.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f3b8ea340a7470fc1821b49e174e87528114baa2320dd7979fde8e879796775
-size 351012
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_29.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_29.jpg
deleted file mode 100644
index da7d8877f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_29.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72fc8a93ee097553d79e3a5460adf7ed7d811be4efab1f71a3ff772643eaf743
-size 117563
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_3.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_3.jpg
deleted file mode 100644
index 43c4900f7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_3.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cd506bc430224938a2cf75b89ba4204e3fe0c8524accc3b09eb9506fe6080f2
-size 68541
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_3.png b/game/chaineddecos/assets/models_backup/Textures/embedded_3.png
deleted file mode 100644
index 612f5bbac..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:228ca43ec27ca7a2268a9ce1d553368a8e87260467fbafa208b5e41e57d4f66b
-size 4447893
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_30.png b/game/chaineddecos/assets/models_backup/Textures/embedded_30.png
deleted file mode 100644
index 944c5b9f6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_30.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b960a9cffddbf91c2e3b99371a0ace4c2354e5d54ce9533f5ce8141edf1a73b
-size 129020
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_31.png b/game/chaineddecos/assets/models_backup/Textures/embedded_31.png
deleted file mode 100644
index d483ef5c1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_31.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:289ea083ce5dcfc3df3b5667f125ed1d52e097378a379fe0fdc92683a2313416
-size 22895
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_32.png b/game/chaineddecos/assets/models_backup/Textures/embedded_32.png
deleted file mode 100644
index 70229963b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_32.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b025386ab6ecc02154e45406051d71a16c13e17e5b2a4bcb9d7004554da7508
-size 2996
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_33.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_33.jpg
deleted file mode 100644
index 9d48abf1f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_33.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7162d861dc05b8eeaf62e7c1152c8df15319520399df023d4b99662e560144b
-size 307391
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_35.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_35.jpg
deleted file mode 100644
index 512621d06..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_35.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09edb0a8f0c289d3af24e27161d547ff8f197ddae9964145022761794886b866
-size 121947
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_36.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_36.jpg
deleted file mode 100644
index 622b6386a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_36.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be9be6f627691bdb4ebdf6271cc7b4ec9367b8cef83aa171ef2267e1e366ebb7
-size 331440
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_38.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_38.jpg
deleted file mode 100644
index 7846bc5ff..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_38.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e168e2f886dd6b5ab48bb5dd404f05647b7e1fd0a6b5512125586cf378f7e9c5
-size 56774
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_39.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_39.jpg
deleted file mode 100644
index 916e3c6dd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_39.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:706f343d8b4c2079eac15792a1568e9ac3c48640fdae8e90aac33600de66006c
-size 61083
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_4.png b/game/chaineddecos/assets/models_backup/Textures/embedded_4.png
deleted file mode 100644
index f4d1131f0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e9661149f9884e706636d9fe87c6af361a4b79c645841fa2afd7596bd893968
-size 4781955
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_40.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_40.jpg
deleted file mode 100644
index a466b8866..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_40.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ad7cb10e270a3d294e0ff8fc28becfd9073463eb7934f130c85eb568c9a21b5
-size 288724
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_42.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_42.jpg
deleted file mode 100644
index 3208fb253..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_42.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0794a7730c3fbb2bb69d63d85c09d2117eb94ff0b82f301f4ada208e3377ee4c
-size 91313
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_5.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_5.jpg
deleted file mode 100644
index 9d03aaa97..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_5.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1d4c39048b0d08d98d36e3517fc101893fc89ed4b3a0698bc85c61ddd77f328
-size 534533
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_5.png b/game/chaineddecos/assets/models_backup/Textures/embedded_5.png
deleted file mode 100644
index d7509f5b1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_5.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44075493461faa3805a82a288924a219975eecc6f2ff6c611f1ae890f91e0ab0
-size 3716560
diff --git a/game/chaineddecos/assets/models_backup/Textures/embedded_8.jpg b/game/chaineddecos/assets/models_backup/Textures/embedded_8.jpg
deleted file mode 100644
index eac2457b1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/embedded_8.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:735ca38312d645c119874e6b5893e07aca6bb9c6d73d074ac80568ffb6d85a28
-size 77346
diff --git a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_basecolor.png
deleted file mode 100644
index 7dc510514..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbd24cfb4bcd5ad9aaf6ea5b9d1216108e70d671a907ff11c062eeb78833d3d8
-size 178629
diff --git a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_basecolor.png.chmeta
deleted file mode 100644
index 709dcd603..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16610568440769568791
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_metallicroughness.png
deleted file mode 100644
index 2f7cf9db2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d4b51cbafc4da1507435c2abfd840502b979751aed44eb2e67dc6759e695ac1
-size 2088
diff --git a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_metallicroughness.png.chmeta
deleted file mode 100644
index 8acb58e78..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/eyeshape_mesh0001_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11111008556883472168
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/face_texture_8.jpeg b/game/chaineddecos/assets/models_backup/Textures/face_texture_8.jpeg
deleted file mode 100644
index d3a85dcfb..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/face_texture_8.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/face_texture_8.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/face_texture_8.jpeg.chmeta
deleted file mode 100644
index cfcef2b6b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/face_texture_8.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3288408800643771205
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_basecolor.png
deleted file mode 100644
index d3661e433..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76517a3793403294395c477cbc1a6b2846a317df51b6c480d6cf271a5b86c7a2
-size 4056943
diff --git a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_basecolor.png.chmeta
deleted file mode 100644
index 89558ec73..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16145826840863655954
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_metallicroughness.png
deleted file mode 100644
index d23803bc5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bc3099f0dc90911c3acb6e88e8570a64856c9e67aa4f2b77c74336672ebb480
-size 222
diff --git a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_metallicroughness.png.chmeta
deleted file mode 100644
index fb19b2255..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16195452606666085042
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_specularf0.png b/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_specularf0.png
deleted file mode 100644
index 5d66a5c6b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_specularf0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88a239bc33d259545835f7d4bb2ef0722ce8b622289f8383dcec78ec92ce0b13
-size 1550458
diff --git a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_specularf0.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_specularf0.png.chmeta
deleted file mode 100644
index 957a4201a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/faceshape_mesh0000_specularf0.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15278575025333657231
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=b.png b/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=b.png
deleted file mode 100644
index e02ab5f0d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=b.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eef679d4921bcc3f33311afa037c1004e6351e528328443e35015f5ffa633ce8
-size 1441
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=b.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=b.png.chmeta
deleted file mode 100644
index a430e6efe..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=b.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7923605479033877136
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=g.png b/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=g.png
deleted file mode 100644
index 44bc3e6fb..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=g.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a029ee3736211aa0a630f7086d215c5a713d5de40d7315e28bd5ef95fb1c1a18
-size 6295
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=g.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=g.png.chmeta
deleted file mode 100644
index 95a287970..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64-m-glasses-64-r_5@channels=g.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8530741989692654641
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64-n_3.png b/game/chaineddecos/assets/models_backup/Textures/glasses-64-n_3.png
deleted file mode 100644
index 3bf89db78..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64-n_3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f79ca5e328d72b7c26de2bee5b64d74576f82b98d40f9326da04dd0cfb404f22
-size 11529
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64-n_3.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/glasses-64-n_3.png.chmeta
deleted file mode 100644
index 24291931d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64-n_3.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 5035373359023151142
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64_4.png b/game/chaineddecos/assets/models_backup/Textures/glasses-64_4.png
deleted file mode 100644
index 57a5fa8f1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64_4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31c4f10ecfde0814604dc78506a057fe6069e32587e9af9f42c467e1c535ccd8
-size 21226
diff --git a/game/chaineddecos/assets/models_backup/Textures/glasses-64_4.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/glasses-64_4.png.chmeta
deleted file mode 100644
index ee78f0be0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/glasses-64_4.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1985742537813336298
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_0.jpeg b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_0.jpeg
deleted file mode 100644
index b4e3d48f9..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_0.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_0.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_0.jpeg.chmeta
deleted file mode 100644
index 482d56803..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_0.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3909530773343404004
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=b.jpeg b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=b.jpeg
deleted file mode 100644
index 80a38d7e2..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=b.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=b.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=b.jpeg.chmeta
deleted file mode 100644
index ddf7b6803..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=b.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3241491708107834438
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=g.jpeg b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=g.jpeg
deleted file mode 100644
index 440abca5c..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=g.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=g.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=g.jpeg.chmeta
deleted file mode 100644
index 267c04117..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_1@channels=g.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16282399412264716571
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_2.jpeg b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_2.jpeg
deleted file mode 100644
index 18be917dc..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_2.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_2.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_2.jpeg.chmeta
deleted file mode 100644
index 671ffc34e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/gltf_embedded_2.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16008594077233899705
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/hair-07-n_6.png b/game/chaineddecos/assets/models_backup/Textures/hair-07-n_6.png
deleted file mode 100644
index b5b702568..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/hair-07-n_6.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c430546e5426f3101fec2d8212f40125738a8439e2445a216828e78df9f004cf
-size 68553
diff --git a/game/chaineddecos/assets/models_backup/Textures/hair-07-n_6.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/hair-07-n_6.png.chmeta
deleted file mode 100644
index 1ff436a8c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/hair-07-n_6.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7450938677999581772
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/hair_color_7.jpeg b/game/chaineddecos/assets/models_backup/Textures/hair_color_7.jpeg
deleted file mode 100644
index 26418d0e3..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/hair_color_7.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/hair_color_7.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/hair_color_7.jpeg.chmeta
deleted file mode 100644
index 7e582b446..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/hair_color_7.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9829722058560578624
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/hairshape_mesh0004_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/hairshape_mesh0004_basecolor.png
deleted file mode 100644
index cf8e975ca..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/hairshape_mesh0004_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a7a3d34b0cd5f2fe1d361e874dd32b072adcd5ad9fe6f1a596e36d58f61e08e
-size 771313
diff --git a/game/chaineddecos/assets/models_backup/Textures/hairshape_mesh0004_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/hairshape_mesh0004_basecolor.png.chmeta
deleted file mode 100644
index 87fe296e8..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/hairshape_mesh0004_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17107250792730171953
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/jacket-01-02-d_15.jpeg b/game/chaineddecos/assets/models_backup/Textures/jacket-01-02-d_15.jpeg
deleted file mode 100644
index fb1b62958..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/jacket-01-02-d_15.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/jacket-01-02-d_15.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/jacket-01-02-d_15.jpeg.chmeta
deleted file mode 100644
index f186854a6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/jacket-01-02-d_15.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13443959393028187883
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-n_14.jpeg b/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-n_14.jpeg
deleted file mode 100644
index fdaa1384f..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-n_14.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-n_14.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-n_14.jpeg.chmeta
deleted file mode 100644
index 3a05ef806..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-n_14.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15753768723079773155
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-r_16@channels=g.png b/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-r_16@channels=g.png
deleted file mode 100644
index e4fd86670..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-r_16@channels=g.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92253880bb49aa26b30c72d03ac30814a9b19789c758f40b28934dbbe8f13230
-size 260885
diff --git a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-r_16@channels=g.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-r_16@channels=g.png.chmeta
deleted file mode 100644
index ec307611f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/jacket-02-01-r_16@channels=g.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2303048695594017744
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png
deleted file mode 100644
index 97eaabf6b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5261a729e4accd9f312a057d037b03c80241b29df43f3bd8003603957360594b
-size 4362075
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png.chmeta
deleted file mode 100644
index 1dd1feb96..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8355035694952429598
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png
deleted file mode 100644
index 80eddb87b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e07851ade05a2e9bb3e03850eaf7ce1b914410c0225dfdbb114c601e711b627
-size 987369
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png.chmeta
deleted file mode 100644
index b091f5d5c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11894353225408084384
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png
deleted file mode 100644
index 70de31f88..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a59cc5de70fd8490053ed11351294de6267a8b5abea37dcc7c08dd5fae6d3e39
-size 10592176
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png.chmeta
deleted file mode 100644
index f60d19672..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4100466068370112946
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png
deleted file mode 100644
index 2b15dffc0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:128718fbeea8a84ab631a0b14d7f96a69433b03bfc69f67784613edd560cfaba
-size 5327521
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png.chmeta
deleted file mode 100644
index c5a12be53..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3650804123467810978
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png
deleted file mode 100644
index ee12ed418..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc2252adf7f6f85c95037d396eb881ef4757cd840c83caf1b2f5c8204126a259
-size 471403
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 9af5d40b2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17296411595453485063
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png
deleted file mode 100644
index a270f0733..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26599beb3838602ef60c17d9897cb773c4241242c40fbd33c72b1e1ac42bfc84
-size 7429723
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png.chmeta
deleted file mode 100644
index b92db459c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12477973959234581912
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png
deleted file mode 100644
index 2f729e76c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:704e17a656901ea23ef75153e1dd5be2d2e0c5a9ab399562004ee298ebc5f8f6
-size 5469139
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png.chmeta
deleted file mode 100644
index 8db9395d6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17697291453876047961
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png
deleted file mode 100644
index c0f8e8628..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79de9ba7f354a0da4558af8e557501ceae6c7533824085fc6a74821a964990c6
-size 885089
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png.chmeta
deleted file mode 100644
index d7c3baca0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 18438473684788820443
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_normal.png
deleted file mode 100644
index bbe90b404..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccb622268ab0e2bee4b09b71ec6dc6cc8d7724c266ab973c596042251ac0e98f
-size 6724756
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_normal.png.chmeta
deleted file mode 100644
index 7e0ddc9dc..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wood_plate_xixsfgd_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12369609522566479156
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png
deleted file mode 100644
index f628b1c0d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da4f83c08bff725e4e2352989ae8de60513eae853d4e7e2717a29883fec8baaf
-size 5807382
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png.chmeta
deleted file mode 100644
index caf9d881f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10063080583642854195
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png
deleted file mode 100644
index 1b516c790..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:029655284f32ac4303d7b54b40a617534e69bddc3292d5d6c0790bf35580ea8e
-size 1306455
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 55b39e382..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2940858514936020399
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_normal.png
deleted file mode 100644
index 90906e61c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc7bd6dd1fafa2339d171851daa7ef1272d8795e48931a237a77199241d6ebd2
-size 7017119
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_normal.png.chmeta
deleted file mode 100644
index 473eeec9e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbfb_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10226633705422367518
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png
deleted file mode 100644
index 16c870db8..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d22a0cb9ba22160f163c1f6a680ac5d0918f2c7ac4e7ee7e8280b71aaa35f4e
-size 5322136
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png.chmeta
deleted file mode 100644
index 3197713bd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16284891014339628768
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png
deleted file mode 100644
index 7467031bb..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b550ce8e38f3ec0258777922dd479f3bd08ca5280db893c6ff8479fa54326ae
-size 1224082
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png.chmeta
deleted file mode 100644
index e821880ec..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1906901529533068048
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_normal.png
deleted file mode 100644
index b9e27fc5e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae871eed3697e1e3f76c18393c0e001ba46155c12a7f250f34d6403c74ec2627
-size 7684342
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_normal.png.chmeta
deleted file mode 100644
index ad7d0d02c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_banquet_wooden_cup_xfphbgf_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2737206105772050936
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png
deleted file mode 100644
index fcd614769..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ef5378af44026c8b3ee2a651c1a68e838e10ed31b216c1b6dcb56baaa472c71
-size 5760352
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png.chmeta
deleted file mode 100644
index fbd58815b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9607597402510882102
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png
deleted file mode 100644
index 8e3cd9037..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d032cfd260da3d4125e64436a49570da517f9ffd3ea2d617d61e88e7522a8f1
-size 1373581
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 8c2eb26a5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7018333556405947669
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_normal.png
deleted file mode 100644
index 124a74aa2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:162b4aa92d1e734524be117a3c5d1d492318126dba2caa4e879c07944a618302
-size 9840406
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_normal.png.chmeta
deleted file mode 100644
index ecee3e4fd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckmegpfa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17220416166433386669
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png
deleted file mode 100644
index acd9cd80b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8552e4820436b5ed2c8bf21295a1ca2ea9a2466e5a190b4e5ce1089c8dbf605
-size 5462962
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png.chmeta
deleted file mode 100644
index 91a8b78e0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13009436645793141539
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png
deleted file mode 100644
index 284aeec3a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40cac10412b74d3ae7209ff5e96925c036c9910eccc91ea6f15552d6b993b151
-size 1220669
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index df58818d8..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4337615120654293310
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_normal.png
deleted file mode 100644
index 72521f706..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:529a433d7a5819a126696b2d1235b18bc6e75d2f8a2d726bc4d0019ff1e637f6
-size 7431060
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_normal.png.chmeta
deleted file mode 100644
index 643b08ee2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_blacksmith_anvil_uckoci3fa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 5683287546430725535
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_basecolor.png
deleted file mode 100644
index 92e1d4fb4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86aad3729a41c6e94d6696803b4ba8ade1deb18454796b979bd66b045cd9e20a
-size 5586693
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_basecolor.png.chmeta
deleted file mode 100644
index b8427d0a7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13389610901226330694
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_metallicroughness.png
deleted file mode 100644
index cde891ec1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f522b5689ad3701d012668894922fa96fe83345d4cfa2614a03e0ed8fc1a06d
-size 1427336
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_metallicroughness.png.chmeta
deleted file mode 100644
index cc2b9b99a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17884840066970177615
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_normal.png
deleted file mode 100644
index 5f777163d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4acba746dd3a46bc9f916968f01debd7bf5c5d6e08a500281f47713abed04af3
-size 8801180
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_normal.png.chmeta
deleted file mode 100644
index 7d8ea7afb..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_book_wldobc3_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4660234001439010380
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_basecolor.png
deleted file mode 100644
index 17efacc84..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7932760833e41eb5906dc02f92345c571e43fd41f0fb11a3a84445ff2b031c23
-size 5070830
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_basecolor.png.chmeta
deleted file mode 100644
index b6e65a665..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7753801788668306306
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png
deleted file mode 100644
index 06fe980ac..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25f3f3f9a540e4de8b3c50d88a5d905fe8858fd770fece678119c7318f1816bf
-size 2011569
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 0e692a017..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2791055140333405226
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_normal.png
deleted file mode 100644
index ebee5c1f7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f359dfb72f07c21dbc1170fba2bee8f704c5ed3572c6cce9d6a46106248a5efb
-size 7061993
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_normal.png.chmeta
deleted file mode 100644
index 8f376982a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthchoiw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 18269455452637410187
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_basecolor.png
deleted file mode 100644
index d67c33296..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63e5feeaf0822f7ff79e2fabbe37ea9226fc2d42ad4a7fe8cf235d3d882f4ce8
-size 5248303
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_basecolor.png.chmeta
deleted file mode 100644
index c5b8d4f7d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4228647171043760427
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png
deleted file mode 100644
index ab3a561f3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26da29a4bb1f899d8f34688d397b8c0c85e9f4db4b3be972e46fadaf89f458f8
-size 1294099
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f73ff8500..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 761868074612830086
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_normal.png
deleted file mode 100644
index c0c555542..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9e4826ef9701d1cec08b14e2bb19b2fdaa9d62994b4fb457d124b9dbf9e788f
-size 6859659
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_normal.png.chmeta
deleted file mode 100644
index 214b188e3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_burnt_firewood_udthdasiw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1196285256398550754
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_basecolor.png
deleted file mode 100644
index 518b77800..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f62f4d4e63a2e23bfc4570045f3d81f0841373f8a25a5451a02f8a66142bcf09
-size 8318402
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_basecolor.png.chmeta
deleted file mode 100644
index ec8cd5316..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13312767381583178847
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_metallicroughness.png
deleted file mode 100644
index 961a09bad..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df3e8073322bd4ea7ac8ee65c8fb997040ea42468c380434c5c6517e844f2466
-size 1830281
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_metallicroughness.png.chmeta
deleted file mode 100644
index cb078a894..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14119901884350323470
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_normal.png
deleted file mode 100644
index 4c8239f1e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54a5943df6b7704dd4c9a15978afb88f8ac947c380184b55e7f37dc4545f1b2e
-size 9495398
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_normal.png.chmeta
deleted file mode 100644
index ac70c65d4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_castle_wall_sctv3_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7259857805570525571
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png
deleted file mode 100644
index a582ba752..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62757de77ad625410cda612e3033ae00c9c029c062368659b627dada54f48462
-size 3518668
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png.chmeta
deleted file mode 100644
index 3b4e2a9c4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4267321297740346206
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png
deleted file mode 100644
index 95d1b5462..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71d646a26ad27464fe93f8c3661cbfdebee00f0b67a206fa3726bf9ed5cfa474
-size 964752
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 63a39adf0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1009477518590853444
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_normal.png
deleted file mode 100644
index 65099c452..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9113bba34235e9fa819e3093cdb7814375ff4078711f7fe697d394cd237dd1aa
-size 6184936
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_normal.png.chmeta
deleted file mode 100644
index 01b55fd22..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_decorative_hardcover_book_vdkvag3_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7278398685767217411
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_basecolor.png
deleted file mode 100644
index 32543d6c6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbd5352fb7296d1120bbe19397fe436727d7e6e9520e211303519c9fdafed524
-size 4388240
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_basecolor.png.chmeta
deleted file mode 100644
index e159e61ae..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11027376050565506413
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_metallicroughness.png
deleted file mode 100644
index 9675815b1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daf4b1d1e95e7041d85715efd7883b71cfcaa67329befd484179d91368c70d2e
-size 2224438
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_metallicroughness.png.chmeta
deleted file mode 100644
index dd580f666..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8168544848033982796
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_normal.png
deleted file mode 100644
index b158f3427..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cba78bad6e1ea3a909ff4e777521090b771c2f949316862614c8748b23ae9b1f
-size 5071084
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_normal.png.chmeta
deleted file mode 100644
index 304182839..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_green_book_vdkvbb2_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12478115823831811100
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png
deleted file mode 100644
index 44c519ddd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f24f4596a464a473031b788ced693267a89f374fd98756eda616eafc36162c1f
-size 4188592
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png.chmeta
deleted file mode 100644
index 851e8e34e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 674598255068384201
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png
deleted file mode 100644
index 7206eaa6f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5236ea39bd1f242a59ec367fd7f12ca14f4729642e2c62e009a73c56f340f809
-size 839040
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 1cdc0147f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 301929263882095038
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png
deleted file mode 100644
index ad439f99f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8fb9f1e0938c3adbf1966d76d028ce9cdd73f06e4af002a347677d47796ae38
-size 9997580
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png.chmeta
deleted file mode 100644
index bcc4c8410..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16144396576323237476
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png
deleted file mode 100644
index 3685c1aad..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6885bc73ffde0c9770c2f3087e94fea9c4e7798c413ba4f649cf8881fec347a
-size 3672468
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png.chmeta
deleted file mode 100644
index cb96dc36f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15007824778795263153
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png
deleted file mode 100644
index 0ccc6f6a6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:645aca4ced76f7800d7c6b2822f431a0318813ddc49c9c49f1cd806105f6d23e
-size 2227355
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png.chmeta
deleted file mode 100644
index fb24bf81f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11162460978252259236
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_normal.png
deleted file mode 100644
index 0ee925da5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:780eb2288ba9171af30558c56868aea578c1eb0dfdac56f425720efdca15b9e3
-size 7097428
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_normal.png.chmeta
deleted file mode 100644
index 3c3a09133..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_leather_wooden_chest_vigiaeoga_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9893424352186931897
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png
deleted file mode 100644
index b8e6cb43e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:690411d8f82c200c6b2fea54384b0aa0622448df3278f1595295500b1d3f3abf
-size 4500997
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png.chmeta
deleted file mode 100644
index 0150379ff..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16334636961785026140
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png
deleted file mode 100644
index 7676739f8..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ba5ed27c3999ed9bdbbd9839bd57e4cb8e01abaa921c2639fda17c8d0d5decc
-size 1626775
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index fa7fee7de..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 18329276768078739186
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_normal.png
deleted file mode 100644
index 0879f2e5a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4797d9af0703a9c99234e7635f238e1fe6ffc7410be75aca42313cbf373aa48c
-size 8795323
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_normal.png.chmeta
deleted file mode 100644
index 873a8ff89..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_modular_iron_fence_xdiiajjdw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13505678139111093674
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png
deleted file mode 100644
index 8caf2da66..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b00bc4e62cde340d8d5bfba710406d353f50ec9063c03dd8d91950f4275b087
-size 9057907
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png.chmeta
deleted file mode 100644
index 53413bb00..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12105968572301876229
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png
deleted file mode 100644
index 87ce0a6d5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d3ecd9dd31396b46e07b3a4c06c461a15684480d28b74963ab2a5f497127fd8
-size 3529751
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 6acf96dea..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14054615493688335691
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png
deleted file mode 100644
index 57c94b880..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04b759ad9d54fa5c207e77e0e61277e38bfbfc7502b4a5ce7dc9d0292a8eb92d
-size 11068045
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png.chmeta
deleted file mode 100644
index 891a20f9a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17606336349276338006
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png
deleted file mode 100644
index 06aa71b07..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b4d78e3c2b424083f362117e3b0e7a778f5277a26fb5107ce3c31f8b7aaa950
-size 3163128
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png.chmeta
deleted file mode 100644
index 2125449ba..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14389235999392594995
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_basecolor.png
deleted file mode 100644
index ad425d944..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3801ea467071e3360db2816a1bdb94cc3ac9b219431f1848792611d1b6ee3859
-size 5599058
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_basecolor.png.chmeta
deleted file mode 100644
index 3487725af..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2135988316934440988
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_metallicroughness.png
deleted file mode 100644
index 3065b14a2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71e9accf0c05f1d3e920475a2984a8249ac52b74218b120db19e0fa43d565be8
-size 2118227
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_metallicroughness.png.chmeta
deleted file mode 100644
index ba66698ae..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 502307147362551661
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_normal.png
deleted file mode 100644
index 5987ca1bb..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be8bedaf38b029315d78b95b4ffed86447912866da719355f5dac70d5eb706ab
-size 7929852
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_normal.png.chmeta
deleted file mode 100644
index 3879e7c3d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_book_wldodjd_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3585387327748513759
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_basecolor.png
deleted file mode 100644
index c0b9d01ca..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19af2e9ea1bd8c0b5f081038912e85dd8d8d0f3a029365d603b9741815039e40
-size 5638195
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_basecolor.png.chmeta
deleted file mode 100644
index b5c4d1441..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15865634863683057768
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_metallicroughness.png
deleted file mode 100644
index 04b34b94b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a0ae15df7088e025b2c7257ab975c700a85372683515ba8f13cf8c1a8d45345
-size 2868378
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 6edbacb3b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16065817323670871163
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_normal.png
deleted file mode 100644
index d0a5e0138..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95c9722b825779f59ef00de8eed6126aa06a16f7779d78b1ee6fc42bb217e497
-size 9492493
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_normal.png.chmeta
deleted file mode 100644
index 2b8918fb7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vishcehdb_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17347011657996533939
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_basecolor.png
deleted file mode 100644
index 29e0506b6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9687c0a981b2c6c21ce42f0b632a7ffeea1dc4c02fe86ad1581a0627737156
-size 5443854
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_basecolor.png.chmeta
deleted file mode 100644
index 3249c2ba5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2161415335634304962
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_metallicroughness.png
deleted file mode 100644
index d1397aa71..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61c949736e9caa4542b36798e039fe3ac5611b2bc1d6d9ff7ba761a26a4bc358
-size 740338
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f05e2534d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2025018904398031833
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_normal.png
deleted file mode 100644
index 0b8e21ad1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9d9e7efab2f7e13f3b46b9e890c2e001b1ba3c5a259371ee043aa5292db1672
-size 10210103
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_normal.png.chmeta
deleted file mode 100644
index 33140632f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_cushion_vizmci3va_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17782876215416709375
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png
deleted file mode 100644
index 4d596bf22..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab41a1b17a99132b36675e7b57f573e632bc782e20382b7b6fb8480bb8a87954
-size 3136953
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png.chmeta
deleted file mode 100644
index 5dbad4d3e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4242124865181585599
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png
deleted file mode 100644
index ca87bee37..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16c76d6406cf3a08130b4ad1f9f38acda4726fc5efd86d678e318f34d376fd16
-size 724493
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 0a82c0c2c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12599556962247913642
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_normal.png
deleted file mode 100644
index 88fc2182b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:539d308b2857e20d73a5c091d101390f6bbe753b1793b0855dbf7bdada9013d5
-size 8695804
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_normal.png.chmeta
deleted file mode 100644
index 45856dab1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_metal_pot_ufljdc2fa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9845351810820537768
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png
deleted file mode 100644
index 2fd118839..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40d65e18065fc075adb6104a2c6908892cc291213182d8cfa6703c59ca299fe2
-size 5796360
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png.chmeta
deleted file mode 100644
index cb26ad0c6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17463081206819496342
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png
deleted file mode 100644
index ac4707d0c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0372255b6e6ca0791a5552d7e557f8e65143f012449920c1815bebcc854dceb
-size 1461105
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f423e906f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12355590674694925057
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_normal.png
deleted file mode 100644
index 5267a2966..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b608fe9c38dd623535e280c37eb7da9540d2613eab133f33192574aacbbb3a0e
-size 8757471
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_normal.png.chmeta
deleted file mode 100644
index d08b39e10..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bench_uchpfjefa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4666628383579609520
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png
deleted file mode 100644
index 092bcd039..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:141a0e21c6c4a055c13b5417d1536aa29ec130f31c7b91e7d39c4278a28e2698
-size 4653923
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png.chmeta
deleted file mode 100644
index 44d2a4b51..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8044049891105592356
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png
deleted file mode 100644
index a9efe98e4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8e4195e09abc76a89a552b73fdc424e306f1a457eefaf3e655440d2122e449a
-size 1249680
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f4c4cdbff..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13144122716512036780
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_normal.png
deleted file mode 100644
index dd666b85f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34ea8032d3bd9f221eda26e4cd20f97f10bac8d462ee5f1b23f37086c291907e
-size 8071958
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_normal.png.chmeta
deleted file mode 100644
index bcb026ba0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_old_wooden_bucket_ubupeirfa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9601297229170566099
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png
deleted file mode 100644
index f980bd403..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ae2f4f7d60c9b4750e2abca3ac557d4007970f799072a8563ef984a7f67ad79
-size 7277390
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png.chmeta
deleted file mode 100644
index 0ead0edb5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4129110725502834618
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png
deleted file mode 100644
index b722661ed..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7adfff080cfc7b0c209f9ef7e42c0008e05a60acac65390e2f5f4f44186206cd
-size 2600118
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png.chmeta
deleted file mode 100644
index 97974a057..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6080736548767352501
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_normal.png
deleted file mode 100644
index c11d5c3fd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e4d6434aebffcae64dac6956b5985dc6cbf648c2c6be1ca28b1cb236564df3c
-size 9843984
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_normal.png.chmeta
deleted file mode 100644
index 5f7165532..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4160974779750182135
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png
deleted file mode 100644
index 32d036586..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fe56684e8f4e7a003143e96e973759ae7731594d7b05c040b053b5727fceeac
-size 3433969
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png.chmeta
deleted file mode 100644
index 4f5f2d954..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3960927228956391683
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_basecolor.png
deleted file mode 100644
index 6d92bd265..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca757f5b2320b7f032b233a464bd3911815a9dab4c3d59cc886e0a4d8b36e1aa
-size 5664157
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_basecolor.png.chmeta
deleted file mode 100644
index 0b9dc75e7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15464364694230570975
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_metallicroughness.png
deleted file mode 100644
index 1829d6f2a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed7734759ae3f7ebb3bd74cc64f91608fdae9a293af992dfcbb6ff0dea8e608d
-size 631254
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 78d349a84..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16325034366857185151
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_normal.png
deleted file mode 100644
index e8fd460a1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aece5689e097c9c6a03a4b799bd48cef0a02dc5a674b435297bc27324e674d52
-size 8774408
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_normal.png.chmeta
deleted file mode 100644
index e12273609..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_rusty_teapot_wdktcew_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6783323272466315091
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png
deleted file mode 100644
index a49dd59f2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7528420e8dcf01766ab8e0959e447b071620c09e991691f34e660ed98fe1f81d
-size 6440460
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png.chmeta
deleted file mode 100644
index a8670b0c2..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17347953578652763974
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png
deleted file mode 100644
index 9921217ba..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45a983c276e78352ffd026f085a556a51e9ce5b06891421643fcb6aa7e9d413f
-size 1473285
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png.chmeta
deleted file mode 100644
index cdc4d006a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13835278854922566990
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_normal.png
deleted file mode 100644
index 25c927ef4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95b9cbe00f10a07c692e9c190d284e83358b72b35ff363f0285cf0c622fa10aa
-size 8450103
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_normal.png.chmeta
deleted file mode 100644
index a199b6c37..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14870512047370563048
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png
deleted file mode 100644
index 386464f84..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e6cecefd8fece13cd0ebac4bcc645edee332d9459e3d8406ce0a825c8cdde9b
-size 982853
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png.chmeta
deleted file mode 100644
index c7b927a55..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15812018682070412583
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_basecolor.png
deleted file mode 100644
index 27201a3ad..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66f68c4b79f320f09a5dbfdedb7b90a86ab0849318d3f8f7f5deb4e81ed200f7
-size 8210313
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_basecolor.png.chmeta
deleted file mode 100644
index fd10c5fd1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2595136728882683976
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_metallicroughness.png
deleted file mode 100644
index 0dec124a7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f31335263973040c1fcccd11c39bf534025cec065a08d3d09a1256b41b229c4
-size 2346603
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_metallicroughness.png.chmeta
deleted file mode 100644
index b4e1884d3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6105499573396677035
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_normal.png
deleted file mode 100644
index 994bdd1b3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b1efa6918a31a1021da1fd7a8ebb0736da17e91ed46d79bfdadb93266175b44
-size 8048673
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_normal.png.chmeta
deleted file mode 100644
index 673775135..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_pillar_selvf_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4989787440866398922
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_basecolor.png
deleted file mode 100644
index 7f1e3333f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7d9ebf25f9216b8245ce86069cb3569dbd8b3e94cebea5db5c46f4686168196
-size 7644490
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_basecolor.png.chmeta
deleted file mode 100644
index e15442e08..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9233894863765479627
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png
deleted file mode 100644
index cc8e277bd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f541960c8351da1aba7ea848cbf71eef5bbab4effafcea64348ba700760c838
-size 2614475
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png.chmeta
deleted file mode 100644
index a3ba7509d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4796961879031702056
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_normal.png
deleted file mode 100644
index 522c58b3b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bf92c80c77fb97016d1890d7b275777c7f2d3dfc1573f626ba0570fff42f6a8
-size 10864797
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_normal.png.chmeta
deleted file mode 100644
index 54f73c7e4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16881677657840266176
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_occlusion.png b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_occlusion.png
deleted file mode 100644
index 1e14a33d1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7d4a1338f476004555a32b8a14a6fcb732ea52fbb7f4ac5634e8ddf009c1e96
-size 3670092
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_occlusion.png.chmeta
deleted file mode 100644
index de4f41738..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_stone_wall_uk3lfbyfw_4k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13035702995242192282
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_basecolor.png
deleted file mode 100644
index 8c71137c5..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6664f94a452289af048a23b90107ce027eb021005c0fb4fe6fec070ccd89e3dc
-size 6875859
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_basecolor.png.chmeta
deleted file mode 100644
index 4afb42255..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9394663393535342669
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png
deleted file mode 100644
index fe850e318..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08b5921998fcd727e4769c2f9353ef10bd6b5695339b97293d4a9fdf859cd0ac
-size 1262360
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png.chmeta
deleted file mode 100644
index 4af3cd672..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17334556007044475557
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_normal.png
deleted file mode 100644
index 763f6cfb6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af745baf875a2ab22087f6b6b67b42a69f3800b0cc8ce0c8cde57001d3734501
-size 8497782
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_normal.png.chmeta
deleted file mode 100644
index d9415e064..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_traditional_lantern_xccpecydw_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15983207656972901979
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png
deleted file mode 100644
index d0f0812f6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f19317f24d81ffbd148c93eb6299dde8aeaef333b025c60bb65853384adb5e2
-size 6401968
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png.chmeta
deleted file mode 100644
index 971aadbef..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15518876575534692739
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png
deleted file mode 100644
index 0d1485ee9..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4a3e0630896798c944ad08c30514465c983dff6214e6237d6234dd50728dea6
-size 3826451
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 3388b76c9..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14122739329229967779
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_normal.png
deleted file mode 100644
index d0ab81a7d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc659f4dfe25d00b3b7beaf1d70660f363e1c37f9509db52e2848e1d90117ad3
-size 8371853
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_normal.png.chmeta
deleted file mode 100644
index 68218ecee..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_war_hammer_axe_uh1pbcufa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15195545685549254020
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png
deleted file mode 100644
index 1320fb429..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bbf6b1e46d6d5464cbd1f1ba9869f8ddbc6a68afec019a7456726c63e0608ca
-size 5502544
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png.chmeta
deleted file mode 100644
index 32162580f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12212167697529682422
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png
deleted file mode 100644
index c446384fa..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c3a72764d971471dc09e61e6232a412454fe902d83c76067e80ac31b5c5aa777
-size 1404615
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 3e46ccc6c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12709434446159243852
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_normal.png
deleted file mode 100644
index 64e4d693b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da54270a167c71b50993cca9b5f1b122363316e3c546a4252dc70bee8f7a08b3
-size 7633052
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_normal.png.chmeta
deleted file mode 100644
index fcbea2ca1..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_barrel_udlmcdhqx_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8967811227093238861
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png
deleted file mode 100644
index d07f9a8a0..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea3b5cbdc8c2fe97ca78643abeb99c0ea3e66ddf1ab69746f4d6e73491593551
-size 5508721
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png.chmeta
deleted file mode 100644
index 475928852..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7443285474221448671
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png
deleted file mode 100644
index 967822def..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b497a0a11ed979ba7841d6462f645a9795248c767b574e9f89f6fb8bf63ae247
-size 3317969
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f23e6b6d9..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14623862430767624770
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_normal.png
deleted file mode 100644
index 7b2e502ec..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b523ba0342d1d4d4fe22f85958c82675e61b5cd6a25acdcc10613c5f5403c619
-size 9427237
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_normal.png.chmeta
deleted file mode 100644
index 1afa7e8bd..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_caddy_ukwteiiaw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6548409887708040608
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_basecolor.png
deleted file mode 100644
index b3d2c20b3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:538c8ae2be44354eacd42bcd7f6b919d5ec89d2d10c3ae93a00f79029d68a52b
-size 5207588
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_basecolor.png.chmeta
deleted file mode 100644
index 1c790e06b..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14639293144420681888
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png
deleted file mode 100644
index 07a9edab3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b87ea743296b9b645f88135102beff125ea01825354b5b48723f73326c6995e
-size 1602156
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 67900b2cb..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4450860577507999549
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_normal.png
deleted file mode 100644
index 77d86648a..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aadc2c67c868868e995918aa9f3d7a102aa061f54d3541df8c04eb5f5794ab3
-size 9221823
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_normal.png.chmeta
deleted file mode 100644
index 8a075a490..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_stool_ucspai0fa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10086807946387587782
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_basecolor.png
deleted file mode 100644
index 2cbd13eca..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:237aa71c9c5b0ea43fcf28de7a6ba85a62c190beb03305739c896ac2fdaad038
-size 4623521
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_basecolor.png.chmeta
deleted file mode 100644
index d637889e3..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17408445493563965038
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png
deleted file mode 100644
index 02a53b11e..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2b597e2a0fe86df8b49253c8d916fb09384baae0530baf444b8b3bc0537acd7
-size 1721272
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png.chmeta
deleted file mode 100644
index e3073a69f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4745874082357480800
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_normal.png b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_normal.png
deleted file mode 100644
index c263a9087..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f4823c2a318551307c6d68181054a26240f3c6fd0d307222f5d73c0caf85881
-size 8248589
diff --git a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_normal.png.chmeta
deleted file mode 100644
index 14629cde9..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/mi_wooden_wheel_ugljehkga_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13776280355791400106
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_basecolor.png b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_basecolor.png
deleted file mode 100644
index 77927a79c..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:443691694481044b2c96294ece190c7dceadccca997521ee6906cddb22328602
-size 5313711
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_basecolor.png.chmeta
deleted file mode 100644
index 7c49076ac..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16156240813432594959
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_clearcoat.png b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_clearcoat.png
deleted file mode 100644
index 829e84c96..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_clearcoat.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:933f7d4becfead57dd0953fd4f5a83aba7699a711e2c9737b7d577809a892570
-size 15310
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_clearcoat.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_clearcoat.png.chmeta
deleted file mode 100644
index 25d1a6044..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_clearcoat.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1498178118633789091
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_metallicroughness.png b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_metallicroughness.png
deleted file mode 100644
index d5560ad2f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d517ad33d87d20005cfcdf1160287fbe808affca8d1a0ef2d28f906be4d2bf1c
-size 15310
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_metallicroughness.png.chmeta
deleted file mode 100644
index bd71702e6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9249473587127473235
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_specularf0.png b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_specularf0.png
deleted file mode 100644
index b1b02b3fe..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_specularf0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aa8972f63a243d1b489fd5d27ac91fe2ed143443bea689618de19498efe2ebc
-size 2389320
diff --git a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_specularf0.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_specularf0.png.chmeta
deleted file mode 100644
index 9c35258a6..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/neckshape_mesh0005_specularf0.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8514822168176899688
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-d_10.jpeg b/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-d_10.jpeg
deleted file mode 100644
index 0c3cc7ba0..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-d_10.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-d_10.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-d_10.jpeg.chmeta
deleted file mode 100644
index 3cbb0fe2f..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-d_10.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3349309227253188008
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-n_9.jpeg b/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-n_9.jpeg
deleted file mode 100644
index 428642e7f..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-n_9.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-n_9.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-n_9.jpeg.chmeta
deleted file mode 100644
index 1eb50bcf4..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/outfit-m-casual-05-v2-bottom-n_9.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15979013010388214079
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-d_12.jpeg b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-d_12.jpeg
deleted file mode 100644
index 62109d965..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-d_12.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-d_12.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-d_12.jpeg.chmeta
deleted file mode 100644
index 53669fc41..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-d_12.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12626602746699308466
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=b.png b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=b.png
deleted file mode 100644
index 8d6a64745..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=b.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1e16d7ec1cea16b51ebcd0240756377516df1fc45910bc44b001ffad62232f7
-size 111
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=b.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=b.png.chmeta
deleted file mode 100644
index 0c675c1b7..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=b.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17849816024213016901
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=g.png b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=g.png
deleted file mode 100644
index 8e9c01fae..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=g.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50a7e6ecc1456f2c702e6b23da065b2f500fc69416ae54cb662bbee11a021794
-size 139630
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=g.png.chmeta b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=g.png.chmeta
deleted file mode 100644
index c6bb8008d..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-m-sneakers-02-05-r_13@channels=g.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17651652333017013578
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-n_11.jpeg b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-n_11.jpeg
deleted file mode 100644
index 9c09ff0ef..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-n_11.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-n_11.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-n_11.jpeg.chmeta
deleted file mode 100644
index 2bc7b23df..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/sneakers-02-05-n_11.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8812393550642881825
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/wolf3d_male_athletic_nm_1.jpeg b/game/chaineddecos/assets/models_backup/Textures/wolf3d_male_athletic_nm_1.jpeg
deleted file mode 100644
index b421b6edd..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/wolf3d_male_athletic_nm_1.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/wolf3d_male_athletic_nm_1.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/wolf3d_male_athletic_nm_1.jpeg.chmeta
deleted file mode 100644
index 9e2bf0f02..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/wolf3d_male_athletic_nm_1.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3658626266839232988
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Textures/wolf3d_teeth_17.jpeg b/game/chaineddecos/assets/models_backup/Textures/wolf3d_teeth_17.jpeg
deleted file mode 100644
index f1fa761f3..000000000
Binary files a/game/chaineddecos/assets/models_backup/Textures/wolf3d_teeth_17.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/Textures/wolf3d_teeth_17.jpeg.chmeta b/game/chaineddecos/assets/models_backup/Textures/wolf3d_teeth_17.jpeg.chmeta
deleted file mode 100644
index 9b12f5ae8..000000000
--- a/game/chaineddecos/assets/models_backup/Textures/wolf3d_teeth_17.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1834184379948940937
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Untitled.glb b/game/chaineddecos/assets/models_backup/Untitled.glb
deleted file mode 100644
index 087f8102f..000000000
--- a/game/chaineddecos/assets/models_backup/Untitled.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d0ae6c2e0ec8893f20964c21d1a8f4f51708175675f092839ef0a13fd95e727
-size 24557540
diff --git a/game/chaineddecos/assets/models_backup/Untitled.glb.chmeta b/game/chaineddecos/assets/models_backup/Untitled.glb.chmeta
deleted file mode 100644
index 996f6c85e..000000000
--- a/game/chaineddecos/assets/models_backup/Untitled.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 1616416114111699037
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/Untitled.mtl b/game/chaineddecos/assets/models_backup/Untitled.mtl
deleted file mode 100644
index 0a3e0da7f..000000000
--- a/game/chaineddecos/assets/models_backup/Untitled.mtl
+++ /dev/null
@@ -1,12 +0,0 @@
-# Blender 4.5.3 LTS Release Candidate MTL File: 'None'
-# www.blender.org
-
-newmtl tripo_mat_5323afc9-96f8-4457-ba2e-b8edf104078d
-Ns 10.000005
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
diff --git a/game/chaineddecos/assets/models_backup/Untitled.obj.chmeta b/game/chaineddecos/assets/models_backup/Untitled.obj.chmeta
deleted file mode 100644
index 09481a7e7..000000000
--- a/game/chaineddecos/assets/models_backup/Untitled.obj.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 17036050580121078908
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/arc.glb b/game/chaineddecos/assets/models_backup/arc.glb
deleted file mode 100644
index 588520d3c..000000000
--- a/game/chaineddecos/assets/models_backup/arc.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f795ec32733b9118be71366dc2ce9b6a0fa3691c430b15e49d1503dfef211e5e
-size 20012
diff --git a/game/chaineddecos/assets/models_backup/arc.glb.chmeta b/game/chaineddecos/assets/models_backup/arc.glb.chmeta
deleted file mode 100644
index da9eba42c..000000000
--- a/game/chaineddecos/assets/models_backup/arc.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 4575842274881157112
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/arc_column.glb b/game/chaineddecos/assets/models_backup/arc_column.glb
deleted file mode 100644
index 117792a34..000000000
--- a/game/chaineddecos/assets/models_backup/arc_column.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ce25314dd544930d710482298437b402896ff7bf9d0699183b6372916ac0688
-size 62580
diff --git a/game/chaineddecos/assets/models_backup/arc_column.glb.chmeta b/game/chaineddecos/assets/models_backup/arc_column.glb.chmeta
deleted file mode 100644
index f95c74b49..000000000
--- a/game/chaineddecos/assets/models_backup/arc_column.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 16979888206177849509
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/arc_lamp_-_victorian_street_lamp.glb b/game/chaineddecos/assets/models_backup/arc_lamp_-_victorian_street_lamp.glb
deleted file mode 100644
index 01c802b3a..000000000
--- a/game/chaineddecos/assets/models_backup/arc_lamp_-_victorian_street_lamp.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:113f8f422a2f810e4ba20cb6bb50c01921a143f554ccd17331a6493353cec575
-size 1965160
diff --git a/game/chaineddecos/assets/models_backup/arena.glb b/game/chaineddecos/assets/models_backup/arena.glb
deleted file mode 100644
index 39d04fc34..000000000
--- a/game/chaineddecos/assets/models_backup/arena.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbcdae29dd1e2204d65e14d6d51d453cfea0acca2ffc3a3fabe7ca49f3be5fe4
-size 570296
diff --git a/game/chaineddecos/assets/models_backup/arena.glb.chmeta b/game/chaineddecos/assets/models_backup/arena.glb.chmeta
deleted file mode 100644
index 20772c4ae..000000000
--- a/game/chaineddecos/assets/models_backup/arena.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 13203645727381513181
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/boy1.glb b/game/chaineddecos/assets/models_backup/boy1.glb
deleted file mode 100644
index 51bb11117..000000000
--- a/game/chaineddecos/assets/models_backup/boy1.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c08df6285dc7f50e8757517cb445ca98c1afd7ef28e3cfbb609d31aa5016f68
-size 23498020
diff --git a/game/chaineddecos/assets/models_backup/boy1.glb.chmeta b/game/chaineddecos/assets/models_backup/boy1.glb.chmeta
deleted file mode 100644
index b6f41d5b0..000000000
--- a/game/chaineddecos/assets/models_backup/boy1.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 12049036949301348110
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/boy_basecolor.jpeg b/game/chaineddecos/assets/models_backup/boy_basecolor.jpeg
deleted file mode 100644
index 3bff092dd..000000000
Binary files a/game/chaineddecos/assets/models_backup/boy_basecolor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/boy_basecolor.jpeg.chmeta b/game/chaineddecos/assets/models_backup/boy_basecolor.jpeg.chmeta
deleted file mode 100644
index df87ccb0b..000000000
--- a/game/chaineddecos/assets/models_backup/boy_basecolor.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13196451603978760307
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/boy_metallic.jpeg b/game/chaineddecos/assets/models_backup/boy_metallic.jpeg
deleted file mode 100644
index 13e6869d1..000000000
Binary files a/game/chaineddecos/assets/models_backup/boy_metallic.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/boy_metallic.jpeg.chmeta b/game/chaineddecos/assets/models_backup/boy_metallic.jpeg.chmeta
deleted file mode 100644
index dd252ceaf..000000000
--- a/game/chaineddecos/assets/models_backup/boy_metallic.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1367321756869306660
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/boy_normal.jpeg b/game/chaineddecos/assets/models_backup/boy_normal.jpeg
deleted file mode 100644
index dc4218182..000000000
Binary files a/game/chaineddecos/assets/models_backup/boy_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/boy_normal.jpeg.chmeta b/game/chaineddecos/assets/models_backup/boy_normal.jpeg.chmeta
deleted file mode 100644
index cebdc427c..000000000
--- a/game/chaineddecos/assets/models_backup/boy_normal.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4416284862157817915
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/boy_roughness.jpeg b/game/chaineddecos/assets/models_backup/boy_roughness.jpeg
deleted file mode 100644
index 0ef5ab2e9..000000000
Binary files a/game/chaineddecos/assets/models_backup/boy_roughness.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/boy_roughness.jpeg.chmeta b/game/chaineddecos/assets/models_backup/boy_roughness.jpeg.chmeta
deleted file mode 100644
index 526f433ca..000000000
--- a/game/chaineddecos/assets/models_backup/boy_roughness.jpeg.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 308150348207093385
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/bridge.glb b/game/chaineddecos/assets/models_backup/bridge.glb
deleted file mode 100644
index 3b19824eb..000000000
--- a/game/chaineddecos/assets/models_backup/bridge.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49d917a7b4e86d01c77c2d5f74b2a3c767a942e1517e5fe0acb61778adc7d913
-size 2792716
diff --git a/game/chaineddecos/assets/models_backup/bridge.glb.chmeta b/game/chaineddecos/assets/models_backup/bridge.glb.chmeta
deleted file mode 100644
index c1618e4e3..000000000
--- a/game/chaineddecos/assets/models_backup/bridge.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 1890761400366260573
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/bridge/railway_stone_bridge.glb b/game/chaineddecos/assets/models_backup/bridge/railway_stone_bridge.glb
deleted file mode 100644
index a7527abd3..000000000
--- a/game/chaineddecos/assets/models_backup/bridge/railway_stone_bridge.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62f031dc9e838b2413a765d35c6761aefe8a6b20c64c82afe846722b16209440
-size 61789244
diff --git a/game/chaineddecos/assets/models_backup/bridge/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/bridge/textures/embedded_0.png
deleted file mode 100644
index 67ff57970..000000000
--- a/game/chaineddecos/assets/models_backup/bridge/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:040a10cbf6d6b194535c9355db251a9cf5c2ddd5b0ce475f45365dcbfbd481bd
-size 19497308
diff --git a/game/chaineddecos/assets/models_backup/bridge/textures/embedded_2.png b/game/chaineddecos/assets/models_backup/bridge/textures/embedded_2.png
deleted file mode 100644
index 2b60535c7..000000000
--- a/game/chaineddecos/assets/models_backup/bridge/textures/embedded_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fa57996fea1e6fc2b5be1f81add246c4354659ada3e701589be28fb8b343f61
-size 34320262
diff --git a/game/chaineddecos/assets/models_backup/building/license.txt b/game/chaineddecos/assets/models_backup/building/license.txt
deleted file mode 100644
index ae28a104f..000000000
--- a/game/chaineddecos/assets/models_backup/building/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	6 Buildings Low-Poly Pack 1
-* source:	https://sketchfab.com/3d-models/6-buildings-low-poly-pack-1-e057b8ad61e542ac8bab48445e4cdeb1
-* author:	haloworld3dassets (https://sketchfab.com/haloworld3dassets)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "6 Buildings Low-Poly Pack 1" (https://sketchfab.com/3d-models/6-buildings-low-poly-pack-1-e057b8ad61e542ac8bab48445e4cdeb1) by haloworld3dassets (https://sketchfab.com/haloworld3dassets) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/building/scene.bin b/game/chaineddecos/assets/models_backup/building/scene.bin
deleted file mode 100644
index 46794ce2a..000000000
--- a/game/chaineddecos/assets/models_backup/building/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d5c77045776b1ad853818f5ade2cfdc88b8848ef94484074734e7b362702296
-size 8846772
diff --git a/game/chaineddecos/assets/models_backup/building/scene.gltf b/game/chaineddecos/assets/models_backup/building/scene.gltf
deleted file mode 100644
index 43d9eccda..000000000
--- a/game/chaineddecos/assets/models_backup/building/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0e383f2f9c465c120dacc51ff38b01a9e380bb1c30ea52fdf6e5f1fd73f0d54
-size 14374
diff --git a/game/chaineddecos/assets/models_backup/building/textures/standardSurface2_baseColor.png b/game/chaineddecos/assets/models_backup/building/textures/standardSurface2_baseColor.png
deleted file mode 100644
index c6c3b96bc..000000000
--- a/game/chaineddecos/assets/models_backup/building/textures/standardSurface2_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf7f7b7fa96074a9ba39e40908b5691e6e5fe2de7fd914d23c4c5928ca865d5c
-size 4409487
diff --git a/game/chaineddecos/assets/models_backup/building/textures/standardSurface3_baseColor.png b/game/chaineddecos/assets/models_backup/building/textures/standardSurface3_baseColor.png
deleted file mode 100644
index ce92d7b14..000000000
--- a/game/chaineddecos/assets/models_backup/building/textures/standardSurface3_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da3427183639653257a06dd01ea4fa1c37b777ac104eb9370a0cc9887245b664
-size 4378027
diff --git a/game/chaineddecos/assets/models_backup/building/textures/standardSurface4_baseColor.png b/game/chaineddecos/assets/models_backup/building/textures/standardSurface4_baseColor.png
deleted file mode 100644
index 248140443..000000000
--- a/game/chaineddecos/assets/models_backup/building/textures/standardSurface4_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f72b2508c5c4caab57c5706bdee07572a62028b7c966f1e075ea40708f21111a
-size 4098934
diff --git a/game/chaineddecos/assets/models_backup/building/textures/standardSurface5_baseColor.png b/game/chaineddecos/assets/models_backup/building/textures/standardSurface5_baseColor.png
deleted file mode 100644
index 612f5bbac..000000000
--- a/game/chaineddecos/assets/models_backup/building/textures/standardSurface5_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:228ca43ec27ca7a2268a9ce1d553368a8e87260467fbafa208b5e41e57d4f66b
-size 4447893
diff --git a/game/chaineddecos/assets/models_backup/building/textures/standardSurface6_baseColor.png b/game/chaineddecos/assets/models_backup/building/textures/standardSurface6_baseColor.png
deleted file mode 100644
index f4d1131f0..000000000
--- a/game/chaineddecos/assets/models_backup/building/textures/standardSurface6_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e9661149f9884e706636d9fe87c6af361a4b79c645841fa2afd7596bd893968
-size 4781955
diff --git a/game/chaineddecos/assets/models_backup/building/textures/standardSurface8_baseColor.png b/game/chaineddecos/assets/models_backup/building/textures/standardSurface8_baseColor.png
deleted file mode 100644
index d7509f5b1..000000000
--- a/game/chaineddecos/assets/models_backup/building/textures/standardSurface8_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44075493461faa3805a82a288924a219975eecc6f2ff6c611f1ae890f91e0ab0
-size 3716560
diff --git a/game/chaineddecos/assets/models_backup/cannon_01_1k.glb b/game/chaineddecos/assets/models_backup/cannon_01_1k.glb
deleted file mode 100644
index 85890ec9c..000000000
--- a/game/chaineddecos/assets/models_backup/cannon_01_1k.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b08c8a2e717dfe9252a052b62fa4573edfa9f203b81689c7ebbd7e985445d6e2
-size 8100048
diff --git a/game/chaineddecos/assets/models_backup/cannon_01_1k.glb.chmeta b/game/chaineddecos/assets/models_backup/cannon_01_1k.glb.chmeta
deleted file mode 100644
index 7c6246966..000000000
--- a/game/chaineddecos/assets/models_backup/cannon_01_1k.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 17944447525679325571
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/cathedral/cathedral.zip b/game/chaineddecos/assets/models_backup/cathedral/cathedral.zip
deleted file mode 100644
index 25707fb88..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/cathedral.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7819dbb9ee8d900e8307a2d21ec60f8a64e9b672d89ce0018f352e26794542a8
-size 78142693
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/625a809678574856b07560fbe66f5035.zip b/game/chaineddecos/assets/models_backup/cathedral/source/625a809678574856b07560fbe66f5035.zip
deleted file mode 100644
index efb705af5..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/625a809678574856b07560fbe66f5035.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:869ed25c114a3f2512167ea3ac25036ade48936c3ebaf93d6df3eafb98609e68
-size 49097492
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/base_diff.jpg b/game/chaineddecos/assets/models_backup/cathedral/source/base_diff.jpg
deleted file mode 100644
index a0d861e8e..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/base_diff.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46460d734783e710781378e4026c862256adf2933b3a8d222d1c538da3b7508f
-size 16154730
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/combined02.mtl b/game/chaineddecos/assets/models_backup/cathedral/source/combined02.mtl
deleted file mode 100644
index 5f1549a4c..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/combined02.mtl
+++ /dev/null
@@ -1,26 +0,0 @@
-# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 11.09.2014 17:50:14
-
-newmtl base
-	Ns 9.999999
-	Ni 1.500000
-	d 1.000000
-	Tr 0.000000
-	Tf 1.000000 1.000000 1.000000 
-	illum 2
-	Ka 0.588235 0.588235 0.588235
-	Kd 0.588235 0.588235 0.588235
-	Ks 0.000000 0.000000 0.000000
-	Ke 0.588235 0.588235 0.588235
-
-newmtl transparent
-	Ns 9.999999
-	Ni 1.500000
-	d 1.000000
-	Tr 0.000000
-	Tf 1.000000 1.000000 1.000000 
-	illum 2
-	Ka 0.588235 0.588235 0.588235
-	Kd 0.588235 0.588235 0.588235
-	Ks 0.000000 0.000000 0.000000
-	Ke 0.000000 0.000000 0.000000
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_alpha.jpg b/game/chaineddecos/assets/models_backup/cathedral/source/transparent_alpha.jpg
deleted file mode 100644
index 744b88380..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_alpha.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baaed53714b7960f0101c296e10053be5531cf3f007a21d37530fd72f608a598
-size 4723402
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_diff.jpg b/game/chaineddecos/assets/models_backup/cathedral/source/transparent_diff.jpg
deleted file mode 100644
index e586774b2..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_diff.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:734d8a70f299793fdfd280895ae2c046dc86706209c7347dc4fb19610e123012
-size 6834201
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_norm.jpg b/game/chaineddecos/assets/models_backup/cathedral/source/transparent_norm.jpg
deleted file mode 100644
index 10e798e30..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_norm.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:533b35e9c23cb516e1981d3c9386d282e62d3242649280aa5209d72515335d80
-size 946397
diff --git a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_spec.jpg b/game/chaineddecos/assets/models_backup/cathedral/source/transparent_spec.jpg
deleted file mode 100644
index 25a39127f..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/source/transparent_spec.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08f46c5269965be8851312c53765948b7813f18005a9c1862964a02d5878d35c
-size 385629
diff --git a/game/chaineddecos/assets/models_backup/cathedral/textures/base_diff.jpg b/game/chaineddecos/assets/models_backup/cathedral/textures/base_diff.jpg
deleted file mode 100644
index a0d861e8e..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/textures/base_diff.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46460d734783e710781378e4026c862256adf2933b3a8d222d1c538da3b7508f
-size 16154730
diff --git a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_alpha.jpg b/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_alpha.jpg
deleted file mode 100644
index 744b88380..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_alpha.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baaed53714b7960f0101c296e10053be5531cf3f007a21d37530fd72f608a598
-size 4723402
diff --git a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_diff.jpg b/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_diff.jpg
deleted file mode 100644
index e586774b2..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_diff.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:734d8a70f299793fdfd280895ae2c046dc86706209c7347dc4fb19610e123012
-size 6834201
diff --git a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_norm.jpg b/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_norm.jpg
deleted file mode 100644
index 10e798e30..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_norm.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:533b35e9c23cb516e1981d3c9386d282e62d3242649280aa5209d72515335d80
-size 946397
diff --git a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_spec.jpg b/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_spec.jpg
deleted file mode 100644
index 25a39127f..000000000
--- a/game/chaineddecos/assets/models_backup/cathedral/textures/transparent_spec.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08f46c5269965be8851312c53765948b7813f18005a9c1862964a02d5878d35c
-size 385629
diff --git a/game/chaineddecos/assets/models_backup/city/after_the_rain..._-_vr__sound.glb b/game/chaineddecos/assets/models_backup/city/after_the_rain..._-_vr__sound.glb
deleted file mode 100644
index 25ba11fae..000000000
--- a/game/chaineddecos/assets/models_backup/city/after_the_rain..._-_vr__sound.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed3364a08befddb9ab811e25774e11b45e2db4841314f6a1bf48bfebb2054e11
-size 216517188
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_0.png
deleted file mode 100644
index 483ff183b..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22fbab88d61145868e0ce03b0cf2fd312e145aa34760456144d625d963a9b38a
-size 1399499
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_1.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_1.png
deleted file mode 100644
index e616ed23e..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:436f43f7c6f0fd403820cf8ddff5f811bd614ea5874a85f9261373b11b75f204
-size 1587978
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_10.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_10.png
deleted file mode 100644
index b1e415f13..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_10.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ea633008cbffbbb73d11efe62f39fb70448c79af05a0769586c49671166b504
-size 723184
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_101.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_101.png
deleted file mode 100644
index 516f88fea..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_101.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e6aaeef0b831020c91228654c5530c10da0b96e157d4bfaa27f1763eb9576ac
-size 483480
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_102.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_102.png
deleted file mode 100644
index 7ade87f35..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_102.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bb08390862f03d80e82046feaff28b7cf0c42f49711f1d42eed4af63fbc2b10
-size 460183
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_104.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_104.png
deleted file mode 100644
index dd771ff24..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_104.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d788057251cd412b784bc804f15855c38d8bc0e27677fa57b667d9bb42aaaaab
-size 754170
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_105.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_105.png
deleted file mode 100644
index e8c043f2e..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_105.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:beb017dcf39823ef124e04f74e7145d852110c000e35a483b7989488bee0ad66
-size 708723
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_107.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_107.png
deleted file mode 100644
index 4b49f459c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_107.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a03bac8daa8e61803adfd3a4b7f5d196a37d2be0f90df7a7437893da7e2f821b
-size 387326
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_109.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_109.png
deleted file mode 100644
index ec2836349..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_109.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9c865c6259f3da7b5e9c53bf3ef932975ac5c81034ebe2e659be1d7ecb0be7a
-size 2383528
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_110.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_110.png
deleted file mode 100644
index 02c8932f9..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_110.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a78ec6de39b7209704a144aa7044faff7e8d17f4687684929d8a2b32150f0c5
-size 2190628
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_112.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_112.png
deleted file mode 100644
index 407e63513..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_112.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b2c1ba2c9d401091a3d3de7b5f3b27d79fc364bc6c6576089c1b526ac69f309
-size 818668
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_113.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_113.png
deleted file mode 100644
index 93a631934..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_113.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e323ecca05838acf7b31b3595a718840e54d1e41b7b9b465fa50e60d660e257c
-size 801994
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_115.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_115.png
deleted file mode 100644
index e45e01c6c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_115.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06fe37ee996b68e045f23b18832fa86a40a163503219de6be62086a3d3a0c8c5
-size 378067
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_117.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_117.png
deleted file mode 100644
index a2060da98..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_117.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d7b2e95855ae9e9b69d7de496991dc6fe776c331adc4d2245b86c02b08fe3d7
-size 791478
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_118.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_118.png
deleted file mode 100644
index ba7d00589..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_118.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c57b5cc38fcecae258c2152707528de35915c9aa8213cdc0c08269806e1c5429
-size 754919
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_12.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_12.png
deleted file mode 100644
index fbf85cb42..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_12.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:079d578ade453c11e544c853e882ef8ea4a27d13c8a67792ad3bfbd9dcf9aa81
-size 401946
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_120.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_120.png
deleted file mode 100644
index 3b41fe985..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_120.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a978cfe1668bcd8bdbab080768f0d2700e2046730fab7f7ad9b535269e35a8d2
-size 2780162
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_121.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_121.png
deleted file mode 100644
index 67463d93c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_121.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e374b99c9c112cf8ef65a44809d816b2b981aec81f29d021bd72e5589c29421f
-size 2558346
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_123.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_123.png
deleted file mode 100644
index 547be65b6..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_123.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb5cfbcd5fe432c0e6c2fedbf4a8a0ae6bbf3f0e32253b18062b41625dd4a227
-size 2057028
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_124.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_124.png
deleted file mode 100644
index 1f77177aa..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_124.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9da57ba5be1d4d9934dffff0bd088926142c6d73e3a7ccf441c44b4b487e01ec
-size 2270331
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_126.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_126.png
deleted file mode 100644
index 734735346..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_126.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24b3bbf88d035e6bcc6bd9f424aa502beb9fa5cd542400d41561e0787a3dfb0b
-size 1377088
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_127.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_127.png
deleted file mode 100644
index 9c109a78d..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_127.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f86d8ca79d38cb6f16917cf2976e23af7f9bb5c1420d6d82876fbd560a16f1a
-size 2058446
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_129.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_129.png
deleted file mode 100644
index 31230bccb..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_129.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c6651853e9647ce6f59722d26f2957b623c7e590c52383db07bd73033cb686b
-size 243359
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_131.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_131.png
deleted file mode 100644
index d334406cf..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_131.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1f4e95c7a448c9d820cb0499739d085bac991687274a1074b07f9c81d8f4c3c
-size 72590
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_133.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_133.png
deleted file mode 100644
index 076174e5f..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_133.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0863b3b0735cec5d03247a6eb63aef22fc98157433a069591901be01b7a47b0
-size 217351
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_135.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_135.png
deleted file mode 100644
index 613608e29..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_135.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e88a571cb8af862f94458f58c86eb7a2131f95a6549a742f45e3933d7952ffe5
-size 3046484
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_136.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_136.png
deleted file mode 100644
index 15c732c83..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_136.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:516dbc6f84116d1efe486f2684677b0f970f8b38dc950772afd49f8003713b5f
-size 2459489
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_138.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_138.png
deleted file mode 100644
index b0155df0d..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_138.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cefb95ac31db8d228c134dcfd756a5ab5c092c7e9e35228fa41bb5db65f40ae8
-size 2774640
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_139.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_139.png
deleted file mode 100644
index e0d100eab..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_139.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c51327cfa0f39761566ccd9072223cbf0ece88858fe17643546d062f4b8ee259
-size 2142092
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_14.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_14.png
deleted file mode 100644
index f1aa5851c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_14.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b2472cd379adacbb386d2eededcd4e9cdb1384cc6ac1986d41ac78186ea5263
-size 10111
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_141.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_141.png
deleted file mode 100644
index 4528fb3fd..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_141.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afe8be1ad077e07ca7bc795292ca7960c4a3368f3d9aa1d5e8acef8322e0f43d
-size 451521
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_143.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_143.png
deleted file mode 100644
index 0b8ff25db..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_143.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60e830335d04d82f794e2be95b606bba1a66be4b63e75a867b63f4264092b289
-size 625182
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_144.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_144.png
deleted file mode 100644
index 27162a8e7..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_144.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39f82d5dc5f9dc7f231569ec160b1be1c379761a499a13ef45ad5ca6dbd0549b
-size 436056
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_146.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_146.png
deleted file mode 100644
index a5f92c24b..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_146.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8b9b10f10a948c0a3eace28f8c53c97c80fb007466730eb6f688970db914ade
-size 269115
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_147.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_147.png
deleted file mode 100644
index 63f7c126b..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_147.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9147858ab0591fc231969bb15fa737be95717a65b8ec263b060c8c27f3fb4e5
-size 391336
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_149.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_149.png
deleted file mode 100644
index 52a35898c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_149.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fdfddf601f59749ac660c3e07aa502adfbb865ac4e16b22984786fc5e2030ad
-size 730280
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_15.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_15.png
deleted file mode 100644
index e0194b30b..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_15.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c6f4d3b48e1ee7c4abd7c360cdaf78365d44c3cbf72f5f1d67771ae14dc68b6
-size 346457
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_150.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_150.png
deleted file mode 100644
index c6c186ece..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_150.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ad8700aaa08bfe7cf582cc9c1ff66a34626c9ebbbcaf72f7a06dfe7c8cd5309
-size 753445
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_152.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_152.png
deleted file mode 100644
index ed414e71c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_152.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54a67d79cb2410ad570c2ddd9451ec55785115b7d4b21704ce25b99ad7cd6ace
-size 202807
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_153.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_153.png
deleted file mode 100644
index b02c580b7..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_153.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd8b67ac02391d532cc2fd63287535906a5f5563c25b49feac7525a3f750c5c6
-size 469423
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_155.jpg b/game/chaineddecos/assets/models_backup/city/textures/embedded_155.jpg
deleted file mode 100644
index c5b227a1d..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_155.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c60d26294cdba9f9b06a40b2b34d182a7e4a9ca66040d1056a2bff19a372c42b
-size 227945
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_157.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_157.png
deleted file mode 100644
index 31319544f..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_157.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:704949cef946b17a5b05b5c3fb569c0aaa1de071bb380b278bd418944eb5a910
-size 514374
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_158.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_158.png
deleted file mode 100644
index e17612274..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_158.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:755f13c90a37b7060930cd7a73dac7332246bd6d5d572e61dc55004c3a871161
-size 532342
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_159.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_159.png
deleted file mode 100644
index 3e42a1dfe..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_159.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10db231b94a38b8c37515b518c8a89996bd4975a683018bb35260648e665f8ad
-size 505597
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_160.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_160.png
deleted file mode 100644
index e4bef9dd7..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_160.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:559c0cb9c8beaf0735011940fbaf54965fc52890fa774cff2afb7aa290865bc8
-size 395681
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_161.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_161.png
deleted file mode 100644
index 1bf2e7a3a..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_161.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ee6a2143a6e75c86200fb7f53cb124ec0ab838a6fcb8eb6d0c9e377a5dbe4bb
-size 324042
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_166.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_166.png
deleted file mode 100644
index 62f031bb5..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_166.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1a9f3f1ccc712c854601174a203be2791b6da87e2b0c43129a2b47d233b259f
-size 729526
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_167.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_167.png
deleted file mode 100644
index db1796e33..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_167.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a27679350b189d72753ec62dc3e578bfe990c20b98a4ddc045beeb62c2cf669
-size 676233
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_169.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_169.png
deleted file mode 100644
index 74cc1c777..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_169.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:826bb6a93f3d696ae37eabffe757a086fd9c968314fde49f3a889b6fe26e9773
-size 199876
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_17.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_17.png
deleted file mode 100644
index de1538fd3..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_17.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ec8a4292eb638fc7b0fc095b78ebb4a2c9fac9b7c5ab1a3ed726f6db4b42c15
-size 61052
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_170.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_170.png
deleted file mode 100644
index 2bfd5ecca..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_170.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f44e073e6ff9472231ed2197c089afe48be8bbd66e23daee0f9fce2cd434c8a
-size 354715
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_171.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_171.png
deleted file mode 100644
index c7eb15d7a..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_171.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2478efb46103c9ecd45e07fc5be5dbb88c162f0e11fa37c473b9a971cea41d5f
-size 89313
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_18.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_18.png
deleted file mode 100644
index 47d7965b2..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_18.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa8d59ee9109e967a847fec059e8068af8c4a3e611f679ec0351ba842d8f5dc4
-size 302758
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_20.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_20.png
deleted file mode 100644
index 609c80251..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_20.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09bddf1ce0dcfbe9b1074469a48a6cac008e175fc67857e77a8d026ddfafd2c5
-size 10271
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_21.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_21.png
deleted file mode 100644
index 845331bf1..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_21.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89e94df13c1513457bce64f3fa711351fe17cc1e6b192c146789afc7fc49deff
-size 568595
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_23.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_23.png
deleted file mode 100644
index 3d45a887c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_23.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:919f7696d468d1de0e9c57ac6e54a5fc7b7a40086627442b79f2089bb10b3f88
-size 7435
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_24.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_24.png
deleted file mode 100644
index 59ce512c0..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_24.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebd12173559a2997cd1b9e11c4784b29a9bbf3abf52b2398574d225c6dcf7630
-size 570299
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_26.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_26.png
deleted file mode 100644
index ead7e5440..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_26.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6422b9bef28b4d1ef5f4f585d71933ed953f14465c8cc0226c6e17a88d7ee8ee
-size 397389
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_28.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_28.png
deleted file mode 100644
index 6d733e4a9..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_28.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:111a3207338e53f6e46c5700ca466469a275dad5e824420c0a8e23e8103abb4b
-size 2685155
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_29.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_29.png
deleted file mode 100644
index 49ccfa652..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_29.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b1a009ee5f8f16843415f69ec670dc3314090421f56b6c6e2de19149f167c9a
-size 2994648
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_3.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_3.png
deleted file mode 100644
index 85b6e5a7a..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:718db7ab43e32a0fcd8c47447b789ec3004b465afca48da7af8fd48b7e74478b
-size 2644698
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_31.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_31.png
deleted file mode 100644
index 72652e892..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_31.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f65f4e8291ab8d116d1dc7f96d325e2ac1518257fef52252da3a9d143ff100ec
-size 2698659
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_32.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_32.png
deleted file mode 100644
index 999c4c5d6..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_32.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dd3a40f381661e021e0b20401398738e24c8861103025bc28c68800b6943411
-size 2897717
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_34.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_34.png
deleted file mode 100644
index dd6d6c24c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_34.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d3504985ce64075e657d0948c424c10c6ab198b67706baf3444104d67da7ecc
-size 148481
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_35.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_35.png
deleted file mode 100644
index f636e40ff..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_35.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e71401213bc6a6f68433870b8533336b1e01cc15acb30793c4a29ee8dd8738c
-size 188228
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_37.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_37.png
deleted file mode 100644
index c5d2bf8ed..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_37.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26bb0b9970325570611b2aca0fdfef31a2b9e5e984e504563997369ce4abb0b9
-size 350265
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_39.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_39.png
deleted file mode 100644
index 44786de42..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_39.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb9ec51b0b0d60f242313232f550c99f3ce830c17ea49abfb4abf3e93619eb9d
-size 2038813
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_4.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_4.png
deleted file mode 100644
index ed2167f7d..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46a351f3e6c24531c915e78695828e2cac351a1bdf2de5135bb46c5f099cbbe5
-size 2707693
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_40.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_40.png
deleted file mode 100644
index f9e7fd9f0..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_40.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b79a6afb7f8dfa80e8963387ef3f8f319bdac5ab2138181e96e8cd818d029238
-size 1469587
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_42.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_42.png
deleted file mode 100644
index c4e2bd757..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_42.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b66093aeecd69176bb53d5064b4566ed7e8a34b6578c66df290437a90243ff2
-size 382775
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_44.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_44.png
deleted file mode 100644
index fb99ef2d3..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_44.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ab62fb3b38aff8445af6d5a77d97be4a2ad14662c71ddb0c24459f32bd502ea
-size 2944568
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_45.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_45.png
deleted file mode 100644
index f157acbe5..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_45.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:695faf1db9c50b8f0838b2e850614eff100d55b34ef919923cbd9d395832bf1b
-size 2502831
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_47.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_47.png
deleted file mode 100644
index 3bc50fc07..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_47.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a7b1096683574c57346ea8bee70d617822c601701784fc88ff04e8a0d8490f8
-size 82433
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_48.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_48.png
deleted file mode 100644
index 039942539..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_48.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31916554589613d7c00a9af7230095b92603c8b07ef95a6a7161e82f87e58bb8
-size 134659
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_50.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_50.png
deleted file mode 100644
index 21158bbad..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_50.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b63b619aeb190ed1280e41e6b5020904826971457708c9302d7079f044465d9
-size 350226
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_52.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_52.png
deleted file mode 100644
index f442aec03..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_52.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8be74afde063ccbde2f940393a16df986d6a17bfd254a4545a4596372620a114
-size 194166
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_53.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_53.png
deleted file mode 100644
index 6f66708f8..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_53.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58449741ff08f237b40b9a5e1492c1bc45af9d6e91ed08ecdd78921da4e00cd9
-size 195762
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_55.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_55.png
deleted file mode 100644
index 4e1d2cc5c..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_55.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a928cb4684808a62cb8f814c47d05a4f63fce8184e3cc73dcc96d4eb6e6d990
-size 2960837
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_56.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_56.png
deleted file mode 100644
index 36dc0c31d..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_56.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fb8412c6c0e447da99476e4390ca724aa4dec0d121e752017b5a8142d34bc5a
-size 2807156
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_58.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_58.png
deleted file mode 100644
index 44976f34e..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_58.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc16503a5ec3f654903a11c04888445651e1765c5e4253a350fb05830f850c4b
-size 139816
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_59.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_59.png
deleted file mode 100644
index 20034c8a7..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_59.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee02f017ebc9af1fe2bc2c17a2766242d98864a0ffa4b0307dbec0b311a69f6c
-size 79862
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_6.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_6.png
deleted file mode 100644
index b4e715359..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_6.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f90a4cb029a2879e6abed7aba02239e67d6275a60c6f455178aff63a074cad1
-size 435196
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_61.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_61.png
deleted file mode 100644
index 57096fae7..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_61.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4a0cf8c32887bc1868eca53c377abc478a29b8827c6cc7d8d941b7e4b6530cc
-size 380033
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_63.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_63.png
deleted file mode 100644
index bba3b47a5..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_63.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e23ea5652f9adf6b397f7fd1afb519401c4208b4526c84427ac209ae6496472
-size 256
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_64.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_64.png
deleted file mode 100644
index 11fdc55af..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_64.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2f23d1ff84bab202cac22f61d31cb7c55348024423263980fee689b711cff29
-size 169163
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_66.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_66.png
deleted file mode 100644
index 6c2a88bd2..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_66.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:141d8c77863d243f627e166b47121896fdd64bacd8b2b7fb478795fee5a4af18
-size 303331
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_68.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_68.png
deleted file mode 100644
index 7d1b3787f..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_68.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cacb7a3ef508978dba155c5d9d3986f5a6d1d80e054aa49b6cb74e1b95e6aa3
-size 3292006
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_69.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_69.png
deleted file mode 100644
index b0d94d902..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_69.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f56449691df874c066df4ce96bbfdfa1b2d6e4bf0e7a9d135f6b89802883178
-size 3071206
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_7.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_7.png
deleted file mode 100644
index 3a783e939..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_7.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d8a38424bfb5864cd090c075d5ee81d7cafeb2b496fe8d9596f600f24618be4
-size 433165
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_71.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_71.png
deleted file mode 100644
index 50f9ac8a5..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_71.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20980f72b97e3566c1751ee86ff9c3358e91833177061b8955d1eddffefbab2f
-size 371988
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_73.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_73.png
deleted file mode 100644
index b541197c8..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_73.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf8a78feb1f0af45057d8e0f5ff6f2aa31ab1ef688b491d6aceca2fd1d55046e
-size 378322
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_75.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_75.png
deleted file mode 100644
index 353b2da51..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_75.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ed37dc61e9c346c25b10091f6ed31bba8b40d098499cb8339849972ac74e6c7
-size 3421840
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_76.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_76.png
deleted file mode 100644
index af6651a9e..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_76.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9fc39f5bbb7a2f18e3dfe7fa575dbfb9d5b46347bbec1162126dbf202652f70e
-size 3250562
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_78.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_78.png
deleted file mode 100644
index 0c3c0e25b..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_78.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35fe68438078281e77f9dd8ca79cafe262107dbf96c00c199b67f827b5f44c43
-size 186488
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_79.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_79.png
deleted file mode 100644
index c78ab6ce5..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_79.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:434619aefc5d2e8b599cd7c928e4b63a8886b7b77b5434a427991e09b4a96bef
-size 189489
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_81.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_81.png
deleted file mode 100644
index 46ce2951d..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_81.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2a9906981507ee2bbd29d09839cf2199db448e2208407f2ad3448300c47936f
-size 372953
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_83.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_83.png
deleted file mode 100644
index ddd290099..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_83.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0eb723893a6015bc68aeb630e8b9afb03724fe442ea911e42f836f16e6fb9bf9
-size 423500
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_84.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_84.png
deleted file mode 100644
index 339f4547a..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_84.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:251a02cdf7f86c310001713b086e108ecdf9948d2a3ad3b97eefd1b3bdc9cce6
-size 484845
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_86.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_86.png
deleted file mode 100644
index 9a02a64e7..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_86.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6541afa1934d7075d183102cd8954879e33c90763ee5e8bcc31c8061658486c
-size 511137
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_87.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_87.png
deleted file mode 100644
index 2c97fce51..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_87.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:517b67c26e912d2d7604f4ba0c9d2ed84fb5658fd965dd73308b3c004f65c874
-size 406359
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_89.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_89.png
deleted file mode 100644
index 868e7eeec..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_89.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27a0ab5a7c97abe2ee41e17ea5fc860e09583e62e244f0d49dc58c88ca93514b
-size 797483
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_9.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_9.png
deleted file mode 100644
index fbcf89445..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_9.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:540ec3731f2ce4fa3027456089c02cd5397601212122ef220e4a3bea3964a6ee
-size 722947
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_90.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_90.png
deleted file mode 100644
index 1262d975b..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_90.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7226cb8f6ff07e5770eeaeabc4aaf457878b79dd49294cb81bd6fd08aedfce32
-size 710726
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_92.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_92.png
deleted file mode 100644
index a480dc5fb..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_92.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd772fdbd4d5807fbc5c205d51a6a929e8fadf152dd529832700ee1ede972c35
-size 637490
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_93.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_93.png
deleted file mode 100644
index 9a59260f2..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_93.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8aaa3cf91a316ae2de120546dbb87fa6d9b142f08dc5e7943b871c98bd340593
-size 671825
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_95.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_95.png
deleted file mode 100644
index 49118004a..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_95.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22808e9099cd2f055b7bc57e21b1d8f94559caa0e48a853b8a13ec7f84826150
-size 564332
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_96.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_96.png
deleted file mode 100644
index 502a49232..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_96.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c23e7f80c23990fe0694f76f4a1434192ddc7df3787eecb51b03c46b3c5db615
-size 452706
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_98.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_98.png
deleted file mode 100644
index bc21bcd19..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_98.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dba52536ffa5cd2ccf6f697067286dd0b13b8b5173998dae55ca29572a75ef14
-size 593666
diff --git a/game/chaineddecos/assets/models_backup/city/textures/embedded_99.png b/game/chaineddecos/assets/models_backup/city/textures/embedded_99.png
deleted file mode 100644
index 85f69a109..000000000
--- a/game/chaineddecos/assets/models_backup/city/textures/embedded_99.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75b14ea028cf3fcc3409b96cf381c42f79e2d121ccc51c5cc55f68c13a1c0b3f
-size 652636
diff --git a/game/chaineddecos/assets/models_backup/container_ship/license.txt b/game/chaineddecos/assets/models_backup/container_ship/license.txt
deleted file mode 100644
index 97cd146e9..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Container Ship
-* source:	https://sketchfab.com/3d-models/container-ship-aaa41cca946b4a08bc08cf692b7757be
-* author:	RM02 (https://sketchfab.com/RM02)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Container Ship" (https://sketchfab.com/3d-models/container-ship-aaa41cca946b4a08bc08cf692b7757be) by RM02 (https://sketchfab.com/RM02) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/container_ship/scene.bin b/game/chaineddecos/assets/models_backup/container_ship/scene.bin
deleted file mode 100644
index 19ae76406..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:901649fe5bdbebcf6ac1d71639eae20780bb7f7250dc8f604ba190186f677960
-size 19188720
diff --git a/game/chaineddecos/assets/models_backup/container_ship/scene.gltf b/game/chaineddecos/assets/models_backup/container_ship/scene.gltf
deleted file mode 100644
index 2ad44b2a8..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a63d90a5a919610679eb1748b193379734d4df0baa6379e4c70aac2ebe684a50
-size 17954
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_baseColor.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_baseColor.png
deleted file mode 100644
index 6a6a92a8f..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab5b8edf2f1743ac44e533acf9bed1ef50af56e02464a9cf14b610b8e90191c9
-size 4100061
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_emissive.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_emissive.png
deleted file mode 100644
index 6e28abe0c..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_emissive.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f76a3526a1d375eb468d9e933bdac21c1d08fa614772e5c86cc26ed41e80da4b
-size 24093
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_metallicRoughness.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_metallicRoughness.png
deleted file mode 100644
index 44266f561..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:283d5c5e89381d6615327848ff28131a398b7e50bf3b873d866b5aed21741900
-size 1233186
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_normal.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_normal.png
deleted file mode 100644
index 3f7bffea3..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Bridge_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30bf6cce5a30282f422c14a8f84ba822cee63700824e55cb9b8a437816e90b19
-size 2363285
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_baseColor.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_baseColor.png
deleted file mode 100644
index c4a2ece91..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80824efed6a651988db3217c5831bf014b20d1d267b8d55032d1f6abb49723ca
-size 220799
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_metallicRoughness.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_metallicRoughness.png
deleted file mode 100644
index 3efc5a332..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9e1fe836fb7628588fe9297aaee17100e659fa511c579d5781606b173a46a03
-size 96322
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_normal.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_normal.png
deleted file mode 100644
index 66ae032ab..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Containers_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b10712e4f010cd904c8f1a22328eb61292672dede2cbaea50e7ef428c8f6195
-size 375147
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_baseColor.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_baseColor.png
deleted file mode 100644
index ed8dcc205..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3279f3c447c84825422cc1ccf2b853d8db83d01f7bebb163b1aa450d532eb439
-size 3304567
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_metallicRoughness.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_metallicRoughness.png
deleted file mode 100644
index f0192702f..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aca390a76f3181cf6337f598e58748681096005a25d3f711b8132f90835333b4
-size 2338175
diff --git a/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_normal.png b/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_normal.png
deleted file mode 100644
index b5deec4b7..000000000
--- a/game/chaineddecos/assets/models_backup/container_ship/textures/Hull_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1666a9eb0969d4e2a89112e73a84ed6d2564cc099a35e24c819db0865adf2860
-size 2199521
diff --git a/game/chaineddecos/assets/models_backup/covered_car_1k.glb b/game/chaineddecos/assets/models_backup/covered_car_1k.glb
deleted file mode 100644
index 42736038b..000000000
--- a/game/chaineddecos/assets/models_backup/covered_car_1k.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d91ed951f88690478225dd04beabc123184fda10169788c95c5593ae525c3e4
-size 6055548
diff --git a/game/chaineddecos/assets/models_backup/covered_car_1k.glb.chmeta b/game/chaineddecos/assets/models_backup/covered_car_1k.glb.chmeta
deleted file mode 100644
index da4ab5d7b..000000000
--- a/game/chaineddecos/assets/models_backup/covered_car_1k.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 7270629949065501046
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/doric_arena.glb b/game/chaineddecos/assets/models_backup/doric_arena.glb
deleted file mode 100644
index 54bb4940b..000000000
--- a/game/chaineddecos/assets/models_backup/doric_arena.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c7b64d22f6890bbbd0827f7d14d80f7c8ca629f00926fa97943a682368f5b5d
-size 78052748
diff --git a/game/chaineddecos/assets/models_backup/doric_arena.glb.chmeta b/game/chaineddecos/assets/models_backup/doric_arena.glb.chmeta
deleted file mode 100644
index 385882117..000000000
--- a/game/chaineddecos/assets/models_backup/doric_arena.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 11266704054347725655
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/ghost (1).glb b/game/chaineddecos/assets/models_backup/ghost (1).glb
deleted file mode 100644
index 5bf3bb87b..000000000
--- a/game/chaineddecos/assets/models_backup/ghost (1).glb	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac29a41eaf19a90357731532b0f8b257c460642ed647b7d9e20e925951a2ceb3
-size 71700
diff --git a/game/chaineddecos/assets/models_backup/ghost (2).glb b/game/chaineddecos/assets/models_backup/ghost (2).glb
deleted file mode 100644
index bd3d7394c..000000000
--- a/game/chaineddecos/assets/models_backup/ghost (2).glb	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fb3de3ac7e9074505748590270be5f1e2bce061d737420c5f02b019cd4f227f
-size 1348144
diff --git a/game/chaineddecos/assets/models_backup/ghost+with+sword+3d+model.glb b/game/chaineddecos/assets/models_backup/ghost+with+sword+3d+model.glb
deleted file mode 100644
index 10e9028a3..000000000
--- a/game/chaineddecos/assets/models_backup/ghost+with+sword+3d+model.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ba16d2b1d5d2408544f2e812f2bba7f0a825cd9fef3dcee54df34469bf9c420
-size 22134952
diff --git a/game/chaineddecos/assets/models_backup/ghost+with+sword+3d+model.glb.chmeta b/game/chaineddecos/assets/models_backup/ghost+with+sword+3d+model.glb.chmeta
deleted file mode 100644
index eefd07c2a..000000000
--- a/game/chaineddecos/assets/models_backup/ghost+with+sword+3d+model.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 2158635647492166971
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/ghost.bin b/game/chaineddecos/assets/models_backup/ghost.bin
deleted file mode 100644
index ecceea82b..000000000
--- a/game/chaineddecos/assets/models_backup/ghost.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06087df09f90805b9199cc1d54bf8709079e1c748974f28dbe606ede8ed2cbad
-size 24486364
diff --git a/game/chaineddecos/assets/models_backup/ghost.glb b/game/chaineddecos/assets/models_backup/ghost.glb
deleted file mode 100644
index 1d889018c..000000000
--- a/game/chaineddecos/assets/models_backup/ghost.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f0f0e41a40355e6e61ff6a28a72581dbccacf8e7c891334ba599248562602f8
-size 2746580
diff --git a/game/chaineddecos/assets/models_backup/ghost.glb.chmeta b/game/chaineddecos/assets/models_backup/ghost.glb.chmeta
deleted file mode 100644
index 6df20b9d9..000000000
--- a/game/chaineddecos/assets/models_backup/ghost.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 18096322076395745822
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/ghost.gltf b/game/chaineddecos/assets/models_backup/ghost.gltf
deleted file mode 100644
index c33325487..000000000
--- a/game/chaineddecos/assets/models_backup/ghost.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f91d76f2d26289bdfc56bca73e01d27e72ee76c7e29b721010026382feb91a6f
-size 3547
diff --git a/game/chaineddecos/assets/models_backup/ghost.gltf.chmeta b/game/chaineddecos/assets/models_backup/ghost.gltf.chmeta
deleted file mode 100644
index 26d64a683..000000000
--- a/game/chaineddecos/assets/models_backup/ghost.gltf.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 18386941504767060599
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/ghost.zip b/game/chaineddecos/assets/models_backup/ghost.zip
deleted file mode 100644
index f453feb22..000000000
--- a/game/chaineddecos/assets/models_backup/ghost.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:362776b45da7c7433cd0f52ca80c4397d6a5b353a81f46df962fa0f04e8795cd
-size 1236054
diff --git "a/game/chaineddecos/assets/models_backup/ghost/3d\320\274\320\276\320\264\320\265\320\273\321\214\320\277\321\200\320\270\320\262\320\270\320\264\320\260\320\267\320\274\320\265\321\207\320\265\320\274_basecolor.jpg" "b/game/chaineddecos/assets/models_backup/ghost/3d\320\274\320\276\320\264\320\265\320\273\321\214\320\277\321\200\320\270\320\262\320\270\320\264\320\260\320\267\320\274\320\265\321\207\320\265\320\274_basecolor.jpg"
deleted file mode 100644
index 78039312a..000000000
--- "a/game/chaineddecos/assets/models_backup/ghost/3d\320\274\320\276\320\264\320\265\320\273\321\214\320\277\321\200\320\270\320\262\320\270\320\264\320\260\320\267\320\274\320\265\321\207\320\265\320\274_basecolor.jpg"
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a799bd30f00042b534abbc2000f6723971a76805dd96746ea7693c47b146482d
-size 68567
diff --git a/game/chaineddecos/assets/models_backup/ghost/Untitledb.bin b/game/chaineddecos/assets/models_backup/ghost/Untitledb.bin
deleted file mode 100644
index ecceea82b..000000000
--- a/game/chaineddecos/assets/models_backup/ghost/Untitledb.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06087df09f90805b9199cc1d54bf8709079e1c748974f28dbe606ede8ed2cbad
-size 24486364
diff --git a/game/chaineddecos/assets/models_backup/ghost/Untitledb.glb b/game/chaineddecos/assets/models_backup/ghost/Untitledb.glb
deleted file mode 100644
index c81f7e97b..000000000
--- a/game/chaineddecos/assets/models_backup/ghost/Untitledb.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf3aae00626c60a6cb1dea087b14e345b8d0444c45da6efecaa975740053d998
-size 24557500
diff --git a/game/chaineddecos/assets/models_backup/ghost/Untitledb.gltf b/game/chaineddecos/assets/models_backup/ghost/Untitledb.gltf
deleted file mode 100644
index 1a8155f89..000000000
--- a/game/chaineddecos/assets/models_backup/ghost/Untitledb.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:050155bc8d9b46e3316d2c77c1bdb074b32f723f2e0c5af0943789649978d7a2
-size 265
diff --git a/game/chaineddecos/assets/models_backup/ghost/Untitledb.mtl b/game/chaineddecos/assets/models_backup/ghost/Untitledb.mtl
deleted file mode 100644
index 4ff67f03e..000000000
--- a/game/chaineddecos/assets/models_backup/ghost/Untitledb.mtl
+++ /dev/null
@@ -1,12 +0,0 @@
-# Blender 4.5.3 LTS Release Candidate MTL File: 'Untitledb.blend'
-# www.blender.org
-
-newmtl tripo_mat_5323afc9-96f8-4457-ba2e-b8edf104078d
-Ns 10.000005
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
diff --git a/game/chaineddecos/assets/models_backup/ghost/textures/embedded_0.jpg b/game/chaineddecos/assets/models_backup/ghost/textures/embedded_0.jpg
deleted file mode 100644
index 78039312a..000000000
--- a/game/chaineddecos/assets/models_backup/ghost/textures/embedded_0.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a799bd30f00042b534abbc2000f6723971a76805dd96746ea7693c47b146482d
-size 68567
diff --git a/game/chaineddecos/assets/models_backup/ghost_2/license.txt b/game/chaineddecos/assets/models_backup/ghost_2/license.txt
deleted file mode 100644
index f035f85f1..000000000
--- a/game/chaineddecos/assets/models_backup/ghost_2/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Ghost
-* source:	https://sketchfab.com/3d-models/ghost-e23cf490057c4f1fb690f9dd480e24cd
-* author:	SimberGI (https://sketchfab.com/SimberGI)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Ghost" (https://sketchfab.com/3d-models/ghost-e23cf490057c4f1fb690f9dd480e24cd) by SimberGI (https://sketchfab.com/SimberGI) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/ghost_2/scene.bin b/game/chaineddecos/assets/models_backup/ghost_2/scene.bin
deleted file mode 100644
index 12ec8165f..000000000
--- a/game/chaineddecos/assets/models_backup/ghost_2/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:148c7f0f4055fdbd63d0ea8abc8f99a30ab520591d231d070382d60c98f802ed
-size 168784
diff --git a/game/chaineddecos/assets/models_backup/ghost_2/scene.gltf b/game/chaineddecos/assets/models_backup/ghost_2/scene.gltf
deleted file mode 100644
index 8adb74075..000000000
--- a/game/chaineddecos/assets/models_backup/ghost_2/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da4109537bfaa7f5e47c7bdc7b0f3ae4c8f37571d068dce88bf73d54962f855c
-size 97818
diff --git a/game/chaineddecos/assets/models_backup/ghost_2/textures/Material.003_diffuse.png b/game/chaineddecos/assets/models_backup/ghost_2/textures/Material.003_diffuse.png
deleted file mode 100644
index 003460021..000000000
--- a/game/chaineddecos/assets/models_backup/ghost_2/textures/Material.003_diffuse.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07cb7a8dc7eb5e06bb4deb546ea6c4c0c07537e0dcaa2052cb119818002c78a2
-size 1124219
diff --git a/game/chaineddecos/assets/models_backup/heli/a_windy_day.glb b/game/chaineddecos/assets/models_backup/heli/a_windy_day.glb
deleted file mode 100644
index da49ea83d..000000000
--- a/game/chaineddecos/assets/models_backup/heli/a_windy_day.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc33f26b466e41d8fb11b4104ace3689aff7ea83bc674eb514d58556ef881853
-size 57717960
diff --git a/game/chaineddecos/assets/models_backup/heli/helicopter_-_minercaft.glb b/game/chaineddecos/assets/models_backup/heli/helicopter_-_minercaft.glb
deleted file mode 100644
index 44aca40ce..000000000
--- a/game/chaineddecos/assets/models_backup/heli/helicopter_-_minercaft.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8701e3666a0844771a517a127c42302ebca658a71fab87d40ca440605612f7e4
-size 624728
diff --git a/game/chaineddecos/assets/models_backup/heli/stylized_airplane_-_the_flying_circus_diorama.glb b/game/chaineddecos/assets/models_backup/heli/stylized_airplane_-_the_flying_circus_diorama.glb
deleted file mode 100644
index 0df132ce2..000000000
--- a/game/chaineddecos/assets/models_backup/heli/stylized_airplane_-_the_flying_circus_diorama.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4adad13dffc69e860390776853153ca00bfac1ef0d97be2e81cd123ea1fd7d69
-size 1992128
diff --git a/game/chaineddecos/assets/models_backup/heli/stylized_ww1_plane.glb b/game/chaineddecos/assets/models_backup/heli/stylized_ww1_plane.glb
deleted file mode 100644
index f7aa89d63..000000000
--- a/game/chaineddecos/assets/models_backup/heli/stylized_ww1_plane.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee6b5fe91512c85a585c4f7c41472839f800da73169cb81a556ce07568de1b85
-size 1474576
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_0.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_0.jpg
deleted file mode 100644
index 324215443..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_0.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51c07141aefc0fe783483bcbb81c62838907cb24df4f79918f4f2eec41d6efcb
-size 379910
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/heli/textures/embedded_0.png
deleted file mode 100644
index 956fc635c..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28f09c844a61e0530ea3a2030364590cf18d7f9411a9dccdf32664993b72f2ab
-size 29565
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_1.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_1.jpg
deleted file mode 100644
index cb01b3717..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_1.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59fe907ea7ef3f4e26aa327575a8a9e6ac951b0f638fae80c880f19961d7370f
-size 374174
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_1.png b/game/chaineddecos/assets/models_backup/heli/textures/embedded_1.png
deleted file mode 100644
index 67f970ee7..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ded4bc7bacf0b756bd4b660e7a83b65b996a0ff61a47dd5e3ff876f4f3a41d04
-size 303648
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_2.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_2.jpg
deleted file mode 100644
index 5e2edcd01..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_2.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66e64e6b4bffd1700450828c890582425d7d26d2c52011fd7b1ca53957b42839
-size 539472
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_3.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_3.jpg
deleted file mode 100644
index 1be8793c0..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_3.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:626311d97a891f6036180a34e47542cf3d02d210356303e0356bbb42b8f7bb04
-size 966343
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_4.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_4.jpg
deleted file mode 100644
index 4f8893bf0..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_4.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fa8722a8ca8719319363da53f72593a7df168c0b076c94ca968fd8412cb08ce
-size 711227
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_5.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_5.jpg
deleted file mode 100644
index 0df1d5f65..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_5.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1519ed594f55b1859eca867c9b549768f0fa857f351bee13c0b81eaca852cd17
-size 720726
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_6.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_6.jpg
deleted file mode 100644
index 497837b72..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_6.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b4672f2499562275d4dc4275c9eed8aa8def16e90912c83bbdeaa3e603e9016
-size 700656
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_7.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_7.jpg
deleted file mode 100644
index f7949b589..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_7.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:950cbe1e34cb0f91fd250f4a7dead2ce70f1895f3e35776b1149e0edbd70cf1c
-size 569284
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_8.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_8.jpg
deleted file mode 100644
index 64ee3edbf..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_8.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae80691a1c28c21ac7c278ba29a3d364e38976f9832ee85d0bbf4e36bc32c902
-size 585233
diff --git a/game/chaineddecos/assets/models_backup/heli/textures/embedded_9.jpg b/game/chaineddecos/assets/models_backup/heli/textures/embedded_9.jpg
deleted file mode 100644
index f824bc5f3..000000000
--- a/game/chaineddecos/assets/models_backup/heli/textures/embedded_9.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c03be9f485d199dce14a67ed458c2bc109286a59b25a47c670a0dab9b688b0e1
-size 768757
diff --git a/game/chaineddecos/assets/models_backup/heli/the_last_stronghold_animated.glb b/game/chaineddecos/assets/models_backup/heli/the_last_stronghold_animated.glb
deleted file mode 100644
index 6b96c4ef0..000000000
--- a/game/chaineddecos/assets/models_backup/heli/the_last_stronghold_animated.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad361fe1cfbf42106a2b1808271a03de8ce925dceb760e039069d20c78c90034
-size 24706872
diff --git a/game/chaineddecos/assets/models_backup/hooded shadow creature 3d model.glb b/game/chaineddecos/assets/models_backup/hooded shadow creature 3d model.glb
deleted file mode 100644
index f877feda1..000000000
--- a/game/chaineddecos/assets/models_backup/hooded shadow creature 3d model.glb	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9177ca65e54c6184ddbc550c3fdea7474eba833d5825ff3f480f6e7d13a2121f
-size 176
diff --git a/game/chaineddecos/assets/models_backup/hooded shadow creature 3d model.glb.chmeta b/game/chaineddecos/assets/models_backup/hooded shadow creature 3d model.glb.chmeta
deleted file mode 100644
index 6c7c223ab..000000000
--- a/game/chaineddecos/assets/models_backup/hooded shadow creature 3d model.glb.chmeta	
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 15489745072799013261
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/house_of_ghosts.glb b/game/chaineddecos/assets/models_backup/house_of_ghosts.glb
deleted file mode 100644
index 8f651f9b8..000000000
--- a/game/chaineddecos/assets/models_backup/house_of_ghosts.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:831422e8c2597972fe256048d3ac66ef0be73c311ce371b41d508baaefc3e700
-size 4577252
diff --git a/game/chaineddecos/assets/models_backup/images.jpg b/game/chaineddecos/assets/models_backup/images.jpg
deleted file mode 100644
index 9abc98206..000000000
--- a/game/chaineddecos/assets/models_backup/images.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6966286dcf7ffa5231689bf0ea117a23c6f848264da019af1ec9737837ec3e8d
-size 15580
diff --git a/game/chaineddecos/assets/models_backup/island.glb b/game/chaineddecos/assets/models_backup/island.glb
deleted file mode 100644
index dba458e4f..000000000
--- a/game/chaineddecos/assets/models_backup/island.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4a137bdc4c3c949ac2c29643fa3ddc0ad9922a1f8d0a30703b3e4b131baa3c8
-size 9625020
diff --git a/game/chaineddecos/assets/models_backup/island/license.txt b/game/chaineddecos/assets/models_backup/island/license.txt
deleted file mode 100644
index f4a020437..000000000
--- a/game/chaineddecos/assets/models_backup/island/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	HEDGEHOG ISLAND LABOLATORY Fan Art
-* source:	https://sketchfab.com/3d-models/hedgehog-island-labolatory-fan-art-a036aa74dd234c07a3a2af19cff18dc6
-* author:	polish_farmer/ Eryk Stańko (https://sketchfab.com/polish_farmer)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "HEDGEHOG ISLAND LABOLATORY Fan Art" (https://sketchfab.com/3d-models/hedgehog-island-labolatory-fan-art-a036aa74dd234c07a3a2af19cff18dc6) by polish_farmer/ Eryk Stańko (https://sketchfab.com/polish_farmer) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/island/scene.bin b/game/chaineddecos/assets/models_backup/island/scene.bin
deleted file mode 100644
index b8099b693..000000000
--- a/game/chaineddecos/assets/models_backup/island/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a980831983a87050cd93d3d3790bda52f6a6f1d49c1c63013fd1ea182bfee2c
-size 2750064
diff --git a/game/chaineddecos/assets/models_backup/island/scene.gltf b/game/chaineddecos/assets/models_backup/island/scene.gltf
deleted file mode 100644
index 08fb3ad14..000000000
--- a/game/chaineddecos/assets/models_backup/island/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47bfe2c7e7a0b31a21a271ffde0f59d4db6f10726406bfe71a1f83c9839e32bb
-size 52592
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_BULB_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/BALOON_BULB_metallicRoughness.png
deleted file mode 100644
index 8d77c188c..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/BALOON_BULB_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:743e29b1f99f194a2bf209543803f9202c294019674421b1fa291098acff7496
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_CURVE_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/BALOON_CURVE_baseColor.jpeg
deleted file mode 100644
index 917854ad1..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/BALOON_CURVE_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_CURVE_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/BALOON_CURVE_metallicRoughness.png
deleted file mode 100644
index 18fb34288..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/BALOON_CURVE_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf78fb0ebdd0e1059d36bc80e32eec4275a8f4b463bb0f08ea1c7ce658527b83
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/BALOON_baseColor.jpeg
deleted file mode 100644
index 236896301..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/BALOON_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_emissive.jpeg b/game/chaineddecos/assets/models_backup/island/textures/BALOON_emissive.jpeg
deleted file mode 100644
index 57b7003a1..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/BALOON_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/BALOON_metallicRoughness.png
deleted file mode 100644
index cede1c077..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/BALOON_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8c5302b81954521b17c61d6dce963389fbbc2b8e4a1159b592598a9addb1f46
-size 41254
diff --git a/game/chaineddecos/assets/models_backup/island/textures/BALOON_normal.jpeg b/game/chaineddecos/assets/models_backup/island/textures/BALOON_normal.jpeg
deleted file mode 100644
index 2471273c4..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/BALOON_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/DROPS_PIPE_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/DROPS_PIPE_metallicRoughness.png
deleted file mode 100644
index 3070ecf4a..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/DROPS_PIPE_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68c55e20350c104bd8a2af64305ffdd93e19e14ff86928c3699507f012c0b9f5
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_SHADOW_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_SHADOW_baseColor.jpeg
deleted file mode 100644
index 3d9ac83b1..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_SHADOW_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_SHADOW_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_SHADOW_metallicRoughness.png
deleted file mode 100644
index d23803bc5..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_SHADOW_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bc3099f0dc90911c3acb6e88e8570a64856c9e67aa4f2b77c74336672ebb480
-size 222
diff --git a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_baseColor.jpeg
deleted file mode 100644
index 3ebc4b794..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_metallicRoughness.png
deleted file mode 100644
index f5631b6c2..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d159cac96907da600e95de95a76e10c07d2ad89ae3321aeaedfe83ae45d7cbe
-size 251724
diff --git a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_normal.jpeg b/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_normal.jpeg
deleted file mode 100644
index 3afed410b..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/ISLAND_BASE_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_BEAM.001_baseColor.png b/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_BEAM.001_baseColor.png
deleted file mode 100644
index 855883527..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_BEAM.001_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71ff11ff8005237e2b89d7abeed16e6bac57a9c7f3f86721d3d68811e0beee96
-size 82232
diff --git a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_baseColor.jpeg
deleted file mode 100644
index a2f7f535e..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_metallicRoughness.png
deleted file mode 100644
index b3ec4a9a9..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8333847a1418b7cfd83e7fc199b50ab6492e97d3e3ab81a0683011d4573e53bc
-size 255515
diff --git a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_normal.jpeg b/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_normal.jpeg
deleted file mode 100644
index a3b244d11..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_transarent_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_transarent_metallicRoughness.png
deleted file mode 100644
index 51572e07a..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/base_island_additional_pipes_transarent_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:314920bb73c5d7c53f54dc8d32efbc2f8a78da6c30bb3ed3b1bdeb2540159192
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/curve_Pipe_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/curve_Pipe_metallicRoughness.png
deleted file mode 100644
index 0c18eff00..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/curve_Pipe_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9e10b867f52e9856ad65aee4a996cc0f15fd2d2bb630c064985624fd15da39e
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_baseColor.jpeg
deleted file mode 100644
index 76f54850d..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_emissive.jpeg b/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_emissive.jpeg
deleted file mode 100644
index 44049ec35..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_metallicRoughness.png
deleted file mode 100644
index 59f332a82..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/island_Connector_CURVE_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59694f2d186d9002e4c3d5f0cdfeaff665790e4f6822d027e97cb94e601618fc
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/island_Metal_holders_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/island_Metal_holders_metallicRoughness.png
deleted file mode 100644
index b7aefe3a6..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/island_Metal_holders_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7626046a851b62bef17607d79994aeab5cfa2ba0504fdda48141c744a7d433f0
-size 33848
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_baseColor.jpeg
deleted file mode 100644
index 820ad6e56..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_metallicRoughness.png
deleted file mode 100644
index 90f2e396d..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5fa85cc77e0b8bff65b7ce2b9e7c58ae8b6e89eb892ab979290905013968b89b
-size 210915
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_normal.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_normal.jpeg
deleted file mode 100644
index 3a2e48f60..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_MAIN_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_baseColor.jpeg
deleted file mode 100644
index d846186ee..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_emissive.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_emissive.jpeg
deleted file mode 100644
index 394e5ce17..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_metallicRoughness.png
deleted file mode 100644
index fe595b7cd..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e5d2ff22302c9c5e7d6d6deccdbe316bbe63b7ebed9beebfdf138fa2decc9f5
-size 111671
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_normal.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_normal.jpeg
deleted file mode 100644
index 57ac2ec37..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_PRINTER_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_baseColor.jpeg
deleted file mode 100644
index 602e15849..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_metallicRoughness.png
deleted file mode 100644
index 2847f2dfb..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6991804ef890e9591fefa3325476bd9ce718372f4f015653ac7042c230beba4b
-size 678855
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_normal.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_normal.jpeg
deleted file mode 100644
index 59c665c3e..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_normal.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_transparent_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_transparent_metallicRoughness.png
deleted file mode 100644
index d35eeacb6..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_REACTOR_transparent_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ffbb375eff4489ad053437bad86d73dec11412bd94b05dc7fc6821b45984a64
-size 605
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_baseColor.jpeg
deleted file mode 100644
index ef9336bd9..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_emissive.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_emissive.jpeg
deleted file mode 100644
index 3d85a672f..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_metallicRoughness.png
deleted file mode 100644
index f87389d4a..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_RENTGEN_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aefdf09e634e29f48f5d632e19d11e70c8ac51553b248d9c4d8b3a1b79a0a698
-size 220419
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_baseColor.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_baseColor.jpeg
deleted file mode 100644
index 554766654..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_emissive.jpeg b/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_emissive.jpeg
deleted file mode 100644
index 1225a97bf..000000000
Binary files a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_flash_baseColor.png b/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_flash_baseColor.png
deleted file mode 100644
index 944c5b9f6..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_flash_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b960a9cffddbf91c2e3b99371a0ace4c2354e5d54ce9533f5ce8141edf1a73b
-size 129020
diff --git a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_metallicRoughness.png b/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_metallicRoughness.png
deleted file mode 100644
index 7dae5fe4b..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/machine_TELEPORT_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:82d52154094947d520d1052ccc5bbc01edf60fe30025a6916442c68bf6fb8f67
-size 73820
diff --git a/game/chaineddecos/assets/models_backup/island/textures/sphere_baseColor.png b/game/chaineddecos/assets/models_backup/island/textures/sphere_baseColor.png
deleted file mode 100644
index d483ef5c1..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/sphere_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:289ea083ce5dcfc3df3b5667f125ed1d52e097378a379fe0fdc92683a2313416
-size 22895
diff --git a/game/chaineddecos/assets/models_backup/island/textures/sphere_emissive.png b/game/chaineddecos/assets/models_backup/island/textures/sphere_emissive.png
deleted file mode 100644
index 70229963b..000000000
--- a/game/chaineddecos/assets/models_backup/island/textures/sphere_emissive.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b025386ab6ecc02154e45406051d71a16c13e17e5b2a4bcb9d7004554da7508
-size 2996
diff --git a/game/chaineddecos/assets/models_backup/license.txt b/game/chaineddecos/assets/models_backup/license.txt
deleted file mode 100644
index f8270d628..000000000
--- a/game/chaineddecos/assets/models_backup/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	pipe structure
-* source:	https://sketchfab.com/3d-models/pipe-structure-8ed97185fb6b4e5ab083d52cbafc624c
-* author:	sam (https://sketchfab.com/pigeons)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "pipe structure" (https://sketchfab.com/3d-models/pipe-structure-8ed97185fb6b4e5ab083d52cbafc624c) by sam (https://sketchfab.com/pigeons) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/map.glb b/game/chaineddecos/assets/models_backup/map.glb
deleted file mode 100644
index f2e64acee..000000000
--- a/game/chaineddecos/assets/models_backup/map.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89d5bfc55e2b4ae38cdcf211f72fb93eb90e7d7cb6ded63379c8ba67d22589d0
-size 50380
diff --git a/game/chaineddecos/assets/models_backup/map.glb.chmeta b/game/chaineddecos/assets/models_backup/map.glb.chmeta
deleted file mode 100644
index 6df8f29fc..000000000
--- a/game/chaineddecos/assets/models_backup/map.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 12860518579605600995
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png
deleted file mode 100644
index 97eaabf6b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5261a729e4accd9f312a057d037b03c80241b29df43f3bd8003603957360594b
-size 4362075
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png.chmeta
deleted file mode 100644
index 5f9b43caf..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14705471364553500456
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png
deleted file mode 100644
index 80eddb87b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e07851ade05a2e9bb3e03850eaf7ce1b914410c0225dfdbb114c601e711b627
-size 987369
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png.chmeta
deleted file mode 100644
index e28a9ee1b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8418366889328688439
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png
deleted file mode 100644
index 70de31f88..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a59cc5de70fd8490053ed11351294de6267a8b5abea37dcc7c08dd5fae6d3e39
-size 10592176
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png.chmeta
deleted file mode 100644
index f011b0be5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_lamb_ribs_wktqbjzs_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 5632787077491525622
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png
deleted file mode 100644
index 2b15dffc0..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:128718fbeea8a84ab631a0b14d7f96a69433b03bfc69f67784613edd560cfaba
-size 5327521
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png.chmeta
deleted file mode 100644
index fe81ec87f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 236678392514578502
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png
deleted file mode 100644
index ee12ed418..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc2252adf7f6f85c95037d396eb881ef4757cd840c83caf1b2f5c8204126a259
-size 471403
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index eece81f50..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6327827763619235990
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png
deleted file mode 100644
index a270f0733..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26599beb3838602ef60c17d9897cb773c4241242c40fbd33c72b1e1ac42bfc84
-size 7429723
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png.chmeta
deleted file mode 100644
index 21d7efbbb..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_metal_plate_xixlcj1mw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 5826399484850858398
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png
deleted file mode 100644
index 2f729e76c..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:704e17a656901ea23ef75153e1dd5be2d2e0c5a9ab399562004ee298ebc5f8f6
-size 5469139
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png.chmeta
deleted file mode 100644
index b995ec265..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15388451115492459277
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png
deleted file mode 100644
index c0f8e8628..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79de9ba7f354a0da4558af8e557501ceae6c7533824085fc6a74821a964990c6
-size 885089
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 29f903545..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11138627109076067175
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_normal.png
deleted file mode 100644
index bbe90b404..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccb622268ab0e2bee4b09b71ec6dc6cc8d7724c266ab973c596042251ac0e98f
-size 6724756
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_normal.png.chmeta
deleted file mode 100644
index 2dc383d24..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wood_plate_xixsfgd_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12263219182792292685
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png
deleted file mode 100644
index f628b1c0d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da4f83c08bff725e4e2352989ae8de60513eae853d4e7e2717a29883fec8baaf
-size 5807382
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png.chmeta
deleted file mode 100644
index b50d03bbe..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 5911294259971056999
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png
deleted file mode 100644
index 1b516c790..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:029655284f32ac4303d7b54b40a617534e69bddc3292d5d6c0790bf35580ea8e
-size 1306455
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f57d48b76..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11948131406187077183
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_normal.png
deleted file mode 100644
index 90906e61c..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc7bd6dd1fafa2339d171851daa7ef1272d8795e48931a237a77199241d6ebd2
-size 7017119
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_normal.png.chmeta
deleted file mode 100644
index e731ee408..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbfb_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14727106356229208431
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png
deleted file mode 100644
index 16c870db8..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d22a0cb9ba22160f163c1f6a680ac5d0918f2c7ac4e7ee7e8280b71aaa35f4e
-size 5322136
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png.chmeta
deleted file mode 100644
index d7f553d25..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16539404388968967729
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png
deleted file mode 100644
index 7467031bb..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b550ce8e38f3ec0258777922dd479f3bd08ca5280db893c6ff8479fa54326ae
-size 1224082
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 7c13ce5e2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2933765706074848483
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_normal.png
deleted file mode 100644
index b9e27fc5e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae871eed3697e1e3f76c18393c0e001ba46155c12a7f250f34d6403c74ec2627
-size 7684342
diff --git a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_normal.png.chmeta
deleted file mode 100644
index 47ee7d917..000000000
--- a/game/chaineddecos/assets/models_backup/mi_banquet_wooden_cup_xfphbgf_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6414482508376450790
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png
deleted file mode 100644
index fcd614769..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ef5378af44026c8b3ee2a651c1a68e838e10ed31b216c1b6dcb56baaa472c71
-size 5760352
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png.chmeta
deleted file mode 100644
index 4aa6ec767..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1546691057536214117
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png
deleted file mode 100644
index 8e3cd9037..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d032cfd260da3d4125e64436a49570da517f9ffd3ea2d617d61e88e7522a8f1
-size 1373581
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index ec263eb38..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14569053068064391119
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_normal.png
deleted file mode 100644
index 124a74aa2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:162b4aa92d1e734524be117a3c5d1d492318126dba2caa4e879c07944a618302
-size 9840406
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_normal.png.chmeta
deleted file mode 100644
index 48e8b8a09..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckmegpfa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4200234079060126046
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png
deleted file mode 100644
index acd9cd80b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8552e4820436b5ed2c8bf21295a1ca2ea9a2466e5a190b4e5ce1089c8dbf605
-size 5462962
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png.chmeta
deleted file mode 100644
index ae2c7a8ca..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13286404885702357680
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png
deleted file mode 100644
index 284aeec3a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40cac10412b74d3ae7209ff5e96925c036c9910eccc91ea6f15552d6b993b151
-size 1220669
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 773027bdc..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 451892909815833005
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_normal.png
deleted file mode 100644
index 72521f706..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:529a433d7a5819a126696b2d1235b18bc6e75d2f8a2d726bc4d0019ff1e637f6
-size 7431060
diff --git a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_normal.png.chmeta
deleted file mode 100644
index 3dfafcec5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_blacksmith_anvil_uckoci3fa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11228217250004375527
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_basecolor.png
deleted file mode 100644
index 92e1d4fb4..000000000
--- a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86aad3729a41c6e94d6696803b4ba8ade1deb18454796b979bd66b045cd9e20a
-size 5586693
diff --git a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_basecolor.png.chmeta
deleted file mode 100644
index f06e43972..000000000
--- a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6688037970459056556
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_metallicroughness.png
deleted file mode 100644
index cde891ec1..000000000
--- a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f522b5689ad3701d012668894922fa96fe83345d4cfa2614a03e0ed8fc1a06d
-size 1427336
diff --git a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 4768fabff..000000000
--- a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13202235279806427491
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_normal.png
deleted file mode 100644
index 5f777163d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4acba746dd3a46bc9f916968f01debd7bf5c5d6e08a500281f47713abed04af3
-size 8801180
diff --git a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_normal.png.chmeta
deleted file mode 100644
index 8a7528ac2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_book_wldobc3_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1691948883858125138
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_basecolor.png
deleted file mode 100644
index 17efacc84..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7932760833e41eb5906dc02f92345c571e43fd41f0fb11a3a84445ff2b031c23
-size 5070830
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_basecolor.png.chmeta
deleted file mode 100644
index f803c26a2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15197397767124079094
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png
deleted file mode 100644
index 06fe980ac..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25f3f3f9a540e4de8b3c50d88a5d905fe8858fd770fece678119c7318f1816bf
-size 2011569
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 162e5562e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14770604178751824679
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_normal.png
deleted file mode 100644
index ebee5c1f7..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f359dfb72f07c21dbc1170fba2bee8f704c5ed3572c6cce9d6a46106248a5efb
-size 7061993
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_normal.png.chmeta
deleted file mode 100644
index 45bbfe512..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthchoiw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6545306847861743067
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_basecolor.png
deleted file mode 100644
index d67c33296..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63e5feeaf0822f7ff79e2fabbe37ea9226fc2d42ad4a7fe8cf235d3d882f4ce8
-size 5248303
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_basecolor.png.chmeta
deleted file mode 100644
index 83560a3c0..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 18413949721595678738
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png
deleted file mode 100644
index ab3a561f3..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26da29a4bb1f899d8f34688d397b8c0c85e9f4db4b3be972e46fadaf89f458f8
-size 1294099
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 422cbed34..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6355850549604499181
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_normal.png
deleted file mode 100644
index c0c555542..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9e4826ef9701d1cec08b14e2bb19b2fdaa9d62994b4fb457d124b9dbf9e788f
-size 6859659
diff --git a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_normal.png.chmeta
deleted file mode 100644
index d410339e2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_burnt_firewood_udthdasiw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 5333494532024687389
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_basecolor.png
deleted file mode 100644
index 518b77800..000000000
--- a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f62f4d4e63a2e23bfc4570045f3d81f0841373f8a25a5451a02f8a66142bcf09
-size 8318402
diff --git a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_basecolor.png.chmeta
deleted file mode 100644
index cc80e260d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7577024752357850551
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_metallicroughness.png
deleted file mode 100644
index 961a09bad..000000000
--- a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df3e8073322bd4ea7ac8ee65c8fb997040ea42468c380434c5c6517e844f2466
-size 1830281
diff --git a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_metallicroughness.png.chmeta
deleted file mode 100644
index 6d20ed80a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9942961286547409095
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_normal.png b/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_normal.png
deleted file mode 100644
index 4c8239f1e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54a5943df6b7704dd4c9a15978afb88f8ac947c380184b55e7f37dc4545f1b2e
-size 9495398
diff --git a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_normal.png.chmeta
deleted file mode 100644
index 32449c933..000000000
--- a/game/chaineddecos/assets/models_backup/mi_castle_wall_sctv3_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16718013967533925207
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png
deleted file mode 100644
index a582ba752..000000000
--- a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62757de77ad625410cda612e3033ae00c9c029c062368659b627dada54f48462
-size 3518668
diff --git a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png.chmeta
deleted file mode 100644
index b9a2fb9ab..000000000
--- a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13969981887167924601
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png
deleted file mode 100644
index 95d1b5462..000000000
--- a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71d646a26ad27464fe93f8c3661cbfdebee00f0b67a206fa3726bf9ed5cfa474
-size 964752
diff --git a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 1bbb0f929..000000000
--- a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9523496794060801121
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_normal.png
deleted file mode 100644
index 65099c452..000000000
--- a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9113bba34235e9fa819e3093cdb7814375ff4078711f7fe697d394cd237dd1aa
-size 6184936
diff --git a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_normal.png.chmeta
deleted file mode 100644
index 6a501f841..000000000
--- a/game/chaineddecos/assets/models_backup/mi_decorative_hardcover_book_vdkvag3_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13881499403566762313
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_basecolor.png
deleted file mode 100644
index 32543d6c6..000000000
--- a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbd5352fb7296d1120bbe19397fe436727d7e6e9520e211303519c9fdafed524
-size 4388240
diff --git a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_basecolor.png.chmeta
deleted file mode 100644
index ff149305f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13963467369409457379
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_metallicroughness.png
deleted file mode 100644
index 9675815b1..000000000
--- a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daf4b1d1e95e7041d85715efd7883b71cfcaa67329befd484179d91368c70d2e
-size 2224438
diff --git a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_metallicroughness.png.chmeta
deleted file mode 100644
index b3906b5ce..000000000
--- a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7030168770275284781
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_normal.png
deleted file mode 100644
index b158f3427..000000000
--- a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cba78bad6e1ea3a909ff4e777521090b771c2f949316862614c8748b23ae9b1f
-size 5071084
diff --git a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_normal.png.chmeta
deleted file mode 100644
index 46b513cea..000000000
--- a/game/chaineddecos/assets/models_backup/mi_green_book_vdkvbb2_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1890515047916908973
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png
deleted file mode 100644
index 44c519ddd..000000000
--- a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f24f4596a464a473031b788ced693267a89f374fd98756eda616eafc36162c1f
-size 4188592
diff --git a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png.chmeta
deleted file mode 100644
index 8ee5c13e7..000000000
--- a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1292397647758245362
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png
deleted file mode 100644
index 7206eaa6f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5236ea39bd1f242a59ec367fd7f12ca14f4729642e2c62e009a73c56f340f809
-size 839040
diff --git a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 23ea72ac3..000000000
--- a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12832219061228057271
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png
deleted file mode 100644
index ad439f99f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8fb9f1e0938c3adbf1966d76d028ce9cdd73f06e4af002a347677d47796ae38
-size 9997580
diff --git a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png.chmeta
deleted file mode 100644
index 722bdde35..000000000
--- a/game/chaineddecos/assets/models_backup/mi_grilled_turkey_leg_wd5lcfcaa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10144088406914186661
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png
deleted file mode 100644
index 3685c1aad..000000000
--- a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6885bc73ffde0c9770c2f3087e94fea9c4e7798c413ba4f649cf8881fec347a
-size 3672468
diff --git a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png.chmeta
deleted file mode 100644
index 6d80edd7d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14026650683047449408
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png
deleted file mode 100644
index 0ccc6f6a6..000000000
--- a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:645aca4ced76f7800d7c6b2822f431a0318813ddc49c9c49f1cd806105f6d23e
-size 2227355
diff --git a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 8189fc9d2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6852489383820512523
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_normal.png
deleted file mode 100644
index 0ee925da5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:780eb2288ba9171af30558c56868aea578c1eb0dfdac56f425720efdca15b9e3
-size 7097428
diff --git a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_normal.png.chmeta
deleted file mode 100644
index 9764a6f7e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_leather_wooden_chest_vigiaeoga_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1533864205423687105
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png
deleted file mode 100644
index b8e6cb43e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:690411d8f82c200c6b2fea54384b0aa0622448df3278f1595295500b1d3f3abf
-size 4500997
diff --git a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png.chmeta
deleted file mode 100644
index 50ff916c7..000000000
--- a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7269523350283513737
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png
deleted file mode 100644
index 7676739f8..000000000
--- a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ba5ed27c3999ed9bdbbd9839bd57e4cb8e01abaa921c2639fda17c8d0d5decc
-size 1626775
diff --git a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 4f2ae51ef..000000000
--- a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1143358982194462351
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_normal.png
deleted file mode 100644
index 0879f2e5a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4797d9af0703a9c99234e7635f238e1fe6ffc7410be75aca42313cbf373aa48c
-size 8795323
diff --git a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_normal.png.chmeta
deleted file mode 100644
index b6a21187d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_modular_iron_fence_xdiiajjdw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6114652254899478811
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png
deleted file mode 100644
index 8caf2da66..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b00bc4e62cde340d8d5bfba710406d353f50ec9063c03dd8d91950f4275b087
-size 9057907
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png.chmeta
deleted file mode 100644
index 7362e9a0c..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14111831235631024562
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png
deleted file mode 100644
index 87ce0a6d5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d3ecd9dd31396b46e07b3a4c06c461a15684480d28b74963ab2a5f497127fd8
-size 3529751
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index f70e8d136..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12682368881774843985
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png
deleted file mode 100644
index 57c94b880..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04b759ad9d54fa5c207e77e0e61277e38bfbfc7502b4a5ce7dc9d0292a8eb92d
-size 11068045
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png.chmeta
deleted file mode 100644
index 6b55726f5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1484584720809164139
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png
deleted file mode 100644
index 06aa71b07..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b4d78e3c2b424083f362117e3b0e7a778f5277a26fb5107ce3c31f8b7aaa950
-size 3163128
diff --git a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png.chmeta
deleted file mode 100644
index efb1e0b1a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_mossy_roof_tiles_ul0kdffbw_2k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 11873905049597990894
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_basecolor.png
deleted file mode 100644
index ad425d944..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3801ea467071e3360db2816a1bdb94cc3ac9b219431f1848792611d1b6ee3859
-size 5599058
diff --git a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_basecolor.png.chmeta
deleted file mode 100644
index 2b3f42cdf..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6910320492645910085
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_metallicroughness.png
deleted file mode 100644
index 3065b14a2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71e9accf0c05f1d3e920475a2984a8249ac52b74218b120db19e0fa43d565be8
-size 2118227
diff --git a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_metallicroughness.png.chmeta
deleted file mode 100644
index ff3dc9217..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9248906560417657291
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_normal.png
deleted file mode 100644
index 5987ca1bb..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be8bedaf38b029315d78b95b4ffed86447912866da719355f5dac70d5eb706ab
-size 7929852
diff --git a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_normal.png.chmeta
deleted file mode 100644
index 8c8210d18..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_book_wldodjd_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4958106345790237738
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_basecolor.png
deleted file mode 100644
index c0b9d01ca..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19af2e9ea1bd8c0b5f081038912e85dd8d8d0f3a029365d603b9741815039e40
-size 5638195
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_basecolor.png.chmeta
deleted file mode 100644
index bfaff6bce..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13357244731926414609
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_metallicroughness.png
deleted file mode 100644
index 04b34b94b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a0ae15df7088e025b2c7257ab975c700a85372683515ba8f13cf8c1a8d45345
-size 2868378
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 15bf06bc3..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13015190764768928074
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_normal.png
deleted file mode 100644
index d0a5e0138..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95c9722b825779f59ef00de8eed6126aa06a16f7779d78b1ee6fc42bb217e497
-size 9492493
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_normal.png.chmeta
deleted file mode 100644
index cabafea78..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vishcehdb_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10574782070803471164
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_basecolor.png
deleted file mode 100644
index 29e0506b6..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9687c0a981b2c6c21ce42f0b632a7ffeea1dc4c02fe86ad1581a0627737156
-size 5443854
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_basecolor.png.chmeta
deleted file mode 100644
index 389b6c8ef..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1780640350890330045
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_metallicroughness.png
deleted file mode 100644
index d1397aa71..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61c949736e9caa4542b36798e039fe3ac5611b2bc1d6d9ff7ba761a26a4bc358
-size 740338
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 476fcbaf0..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10215068734414013343
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_normal.png
deleted file mode 100644
index 0b8e21ad1..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9d9e7efab2f7e13f3b46b9e890c2e001b1ba3c5a259371ee043aa5292db1672
-size 10210103
diff --git a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_normal.png.chmeta
deleted file mode 100644
index faa0b5396..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_cushion_vizmci3va_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12804304700181175413
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png
deleted file mode 100644
index 4d596bf22..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab41a1b17a99132b36675e7b57f573e632bc782e20382b7b6fb8480bb8a87954
-size 3136953
diff --git a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png.chmeta
deleted file mode 100644
index acfd6bc7a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4467715386992070476
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png
deleted file mode 100644
index ca87bee37..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16c76d6406cf3a08130b4ad1f9f38acda4726fc5efd86d678e318f34d376fd16
-size 724493
diff --git a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 0b1cc2f1e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10965541526370061131
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_normal.png
deleted file mode 100644
index 88fc2182b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:539d308b2857e20d73a5c091d101390f6bbe753b1793b0855dbf7bdada9013d5
-size 8695804
diff --git a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_normal.png.chmeta
deleted file mode 100644
index 27d38ec6f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_metal_pot_ufljdc2fa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7315732788980380463
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png
deleted file mode 100644
index 2fd118839..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40d65e18065fc075adb6104a2c6908892cc291213182d8cfa6703c59ca299fe2
-size 5796360
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png.chmeta
deleted file mode 100644
index 1576df287..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1837732280868633652
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png
deleted file mode 100644
index ac4707d0c..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0372255b6e6ca0791a5552d7e557f8e65143f012449920c1815bebcc854dceb
-size 1461105
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 3425f2a22..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7947611018134436822
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_normal.png
deleted file mode 100644
index 5267a2966..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b608fe9c38dd623535e280c37eb7da9540d2613eab133f33192574aacbbb3a0e
-size 8757471
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_normal.png.chmeta
deleted file mode 100644
index 7873bf07b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bench_uchpfjefa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12498170369811088228
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png
deleted file mode 100644
index 092bcd039..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:141a0e21c6c4a055c13b5417d1536aa29ec130f31c7b91e7d39c4278a28e2698
-size 4653923
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png.chmeta
deleted file mode 100644
index 7a31336dd..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8547920953938771715
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png
deleted file mode 100644
index a9efe98e4..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8e4195e09abc76a89a552b73fdc424e306f1a457eefaf3e655440d2122e449a
-size 1249680
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 0a4a2075d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12378886082106116647
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_normal.png
deleted file mode 100644
index dd666b85f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34ea8032d3bd9f221eda26e4cd20f97f10bac8d462ee5f1b23f37086c291907e
-size 8071958
diff --git a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_normal.png.chmeta
deleted file mode 100644
index c5c130fa4..000000000
--- a/game/chaineddecos/assets/models_backup/mi_old_wooden_bucket_ubupeirfa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6851976678579032524
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png
deleted file mode 100644
index f980bd403..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ae2f4f7d60c9b4750e2abca3ac557d4007970f799072a8563ef984a7f67ad79
-size 7277390
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png.chmeta
deleted file mode 100644
index c1323ec23..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17112620121573647710
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png
deleted file mode 100644
index b722661ed..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7adfff080cfc7b0c209f9ef7e42c0008e05a60acac65390e2f5f4f44186206cd
-size 2600118
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png.chmeta
deleted file mode 100644
index 34021ab8f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9718684035441773609
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_normal.png b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_normal.png
deleted file mode 100644
index c11d5c3fd..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e4d6434aebffcae64dac6956b5985dc6cbf648c2c6be1ca28b1cb236564df3c
-size 9843984
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_normal.png.chmeta
deleted file mode 100644
index 715ebdc61..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2769448390985880553
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png
deleted file mode 100644
index 32d036586..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fe56684e8f4e7a003143e96e973759ae7731594d7b05c040b053b5727fceeac
-size 3433969
diff --git a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png.chmeta
deleted file mode 100644
index 85630b932..000000000
--- a/game/chaineddecos/assets/models_backup/mi_patterned_brick_floor_uidoadeew_4k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6329451289722306220
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_basecolor.png
deleted file mode 100644
index 6d92bd265..000000000
--- a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca757f5b2320b7f032b233a464bd3911815a9dab4c3d59cc886e0a4d8b36e1aa
-size 5664157
diff --git a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_basecolor.png.chmeta
deleted file mode 100644
index abc378e06..000000000
--- a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13205331915746216335
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_metallicroughness.png
deleted file mode 100644
index 1829d6f2a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed7734759ae3f7ebb3bd74cc64f91608fdae9a293af992dfcbb6ff0dea8e608d
-size 631254
diff --git a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 7cd54db0d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4062538266523079645
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_normal.png
deleted file mode 100644
index e8fd460a1..000000000
--- a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aece5689e097c9c6a03a4b799bd48cef0a02dc5a674b435297bc27324e674d52
-size 8774408
diff --git a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_normal.png.chmeta
deleted file mode 100644
index 83442ee46..000000000
--- a/game/chaineddecos/assets/models_backup/mi_rusty_teapot_wdktcew_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8321850580208152918
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png
deleted file mode 100644
index a49dd59f2..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7528420e8dcf01766ab8e0959e447b071620c09e991691f34e660ed98fe1f81d
-size 6440460
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png.chmeta
deleted file mode 100644
index 87b435989..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17582815100539881041
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png
deleted file mode 100644
index 9921217ba..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45a983c276e78352ffd026f085a556a51e9ce5b06891421643fcb6aa7e9d413f
-size 1473285
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png.chmeta
deleted file mode 100644
index b7a4b9c45..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3590655522094963110
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_normal.png b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_normal.png
deleted file mode 100644
index 25c927ef4..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95b9cbe00f10a07c692e9c190d284e83358b72b35ff363f0285cf0c622fa10aa
-size 8450103
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_normal.png.chmeta
deleted file mode 100644
index adee9477c..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15149679065866618764
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png
deleted file mode 100644
index 386464f84..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e6cecefd8fece13cd0ebac4bcc645edee332d9459e3d8406ce0a825c8cdde9b
-size 982853
diff --git a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png.chmeta
deleted file mode 100644
index b7b6ec442..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stained_wooden_ceiling_vjogaco_4k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7878744344143820223
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_basecolor.png
deleted file mode 100644
index 27201a3ad..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66f68c4b79f320f09a5dbfdedb7b90a86ab0849318d3f8f7f5deb4e81ed200f7
-size 8210313
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_basecolor.png.chmeta
deleted file mode 100644
index daf2a7989..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17719284696713226949
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_metallicroughness.png
deleted file mode 100644
index 0dec124a7..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f31335263973040c1fcccd11c39bf534025cec065a08d3d09a1256b41b229c4
-size 2346603
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_metallicroughness.png.chmeta
deleted file mode 100644
index 94752e454..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4994058841805216765
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_normal.png b/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_normal.png
deleted file mode 100644
index 994bdd1b3..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b1efa6918a31a1021da1fd7a8ebb0736da17e91ed46d79bfdadb93266175b44
-size 8048673
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_normal.png.chmeta
deleted file mode 100644
index 3669b6b2a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_pillar_selvf_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17242970635042908449
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_basecolor.png
deleted file mode 100644
index 7f1e3333f..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7d9ebf25f9216b8245ce86069cb3569dbd8b3e94cebea5db5c46f4686168196
-size 7644490
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_basecolor.png.chmeta
deleted file mode 100644
index 8849934c0..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1456018306286917988
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png
deleted file mode 100644
index cc8e277bd..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f541960c8351da1aba7ea848cbf71eef5bbab4effafcea64348ba700760c838
-size 2614475
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png.chmeta
deleted file mode 100644
index 348d6a6cc..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7525450269260433071
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_normal.png b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_normal.png
deleted file mode 100644
index 522c58b3b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bf92c80c77fb97016d1890d7b275777c7f2d3dfc1573f626ba0570fff42f6a8
-size 10864797
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_normal.png.chmeta
deleted file mode 100644
index 3b12835bc..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 14952513181232360777
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_occlusion.png b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_occlusion.png
deleted file mode 100644
index 1e14a33d1..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_occlusion.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7d4a1338f476004555a32b8a14a6fcb732ea52fbb7f4ac5634e8ddf009c1e96
-size 3670092
diff --git a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_occlusion.png.chmeta b/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_occlusion.png.chmeta
deleted file mode 100644
index 5b7860f66..000000000
--- a/game/chaineddecos/assets/models_backup/mi_stone_wall_uk3lfbyfw_4k_occlusion.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 16766488758454790490
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_basecolor.png
deleted file mode 100644
index 8c71137c5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6664f94a452289af048a23b90107ce027eb021005c0fb4fe6fec070ccd89e3dc
-size 6875859
diff --git a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_basecolor.png.chmeta
deleted file mode 100644
index 0afc352a4..000000000
--- a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2106860811660563562
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png
deleted file mode 100644
index fe850e318..000000000
--- a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08b5921998fcd727e4769c2f9353ef10bd6b5695339b97293d4a9fdf859cd0ac
-size 1262360
diff --git a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png.chmeta
deleted file mode 100644
index dfae48c6c..000000000
--- a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10762286433810630416
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_normal.png b/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_normal.png
deleted file mode 100644
index 763f6cfb6..000000000
--- a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af745baf875a2ab22087f6b6b67b42a69f3800b0cc8ce0c8cde57001d3734501
-size 8497782
diff --git a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_normal.png.chmeta
deleted file mode 100644
index 33fd8d34d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_traditional_lantern_xccpecydw_4k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 8462263190634042223
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png
deleted file mode 100644
index d0f0812f6..000000000
--- a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f19317f24d81ffbd148c93eb6299dde8aeaef333b025c60bb65853384adb5e2
-size 6401968
diff --git a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png.chmeta
deleted file mode 100644
index f9e92ab86..000000000
--- a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12944454088988022990
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png
deleted file mode 100644
index 0d1485ee9..000000000
--- a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4a3e0630896798c944ad08c30514465c983dff6214e6237d6234dd50728dea6
-size 3826451
diff --git a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 70c9120b0..000000000
--- a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 1133293960086880899
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_normal.png
deleted file mode 100644
index d0ab81a7d..000000000
--- a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc659f4dfe25d00b3b7beaf1d70660f363e1c37f9509db52e2848e1d90117ad3
-size 8371853
diff --git a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_normal.png.chmeta
deleted file mode 100644
index 9864ed074..000000000
--- a/game/chaineddecos/assets/models_backup/mi_war_hammer_axe_uh1pbcufa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 2140963091350270795
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png
deleted file mode 100644
index 1320fb429..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bbf6b1e46d6d5464cbd1f1ba9869f8ddbc6a68afec019a7456726c63e0608ca
-size 5502544
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png.chmeta
deleted file mode 100644
index ad99d0b48..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7398952159539014143
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png
deleted file mode 100644
index c446384fa..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c3a72764d971471dc09e61e6232a412454fe902d83c76067e80ac31b5c5aa777
-size 1404615
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 025c960d9..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17761701916036865504
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_normal.png
deleted file mode 100644
index 64e4d693b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da54270a167c71b50993cca9b5f1b122363316e3c546a4252dc70bee8f7a08b3
-size 7633052
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_normal.png.chmeta
deleted file mode 100644
index af5b81c7e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_barrel_udlmcdhqx_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 4067054663608928820
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png
deleted file mode 100644
index d07f9a8a0..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea3b5cbdc8c2fe97ca78643abeb99c0ea3e66ddf1ab69746f4d6e73491593551
-size 5508721
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png.chmeta
deleted file mode 100644
index cab358443..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 17036813804964448503
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png
deleted file mode 100644
index 967822def..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b497a0a11ed979ba7841d6462f645a9795248c767b574e9f89f6fb8bf63ae247
-size 3317969
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png.chmeta
deleted file mode 100644
index 8b364b40b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15671148339255941964
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_normal.png
deleted file mode 100644
index 7b2e502ec..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b523ba0342d1d4d4fe22f85958c82675e61b5cd6a25acdcc10613c5f5403c619
-size 9427237
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_normal.png.chmeta
deleted file mode 100644
index fe4d546d7..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_caddy_ukwteiiaw_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 12447702735639385685
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_basecolor.png
deleted file mode 100644
index b3d2c20b3..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:538c8ae2be44354eacd42bcd7f6b919d5ec89d2d10c3ae93a00f79029d68a52b
-size 5207588
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_basecolor.png.chmeta
deleted file mode 100644
index b854f33c5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 13262597323563812700
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png
deleted file mode 100644
index 07a9edab3..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b87ea743296b9b645f88135102beff125ea01825354b5b48723f73326c6995e
-size 1602156
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png.chmeta
deleted file mode 100644
index c84cf4dbe..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15126418984089290473
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_normal.png
deleted file mode 100644
index 77d86648a..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aadc2c67c868868e995918aa9f3d7a102aa061f54d3541df8c04eb5f5794ab3
-size 9221823
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_normal.png.chmeta
deleted file mode 100644
index 96d402b2b..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_stool_ucspai0fa_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7176426208209317776
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_basecolor.png b/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_basecolor.png
deleted file mode 100644
index 2cbd13eca..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_basecolor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:237aa71c9c5b0ea43fcf28de7a6ba85a62c190beb03305739c896ac2fdaad038
-size 4623521
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_basecolor.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_basecolor.png.chmeta
deleted file mode 100644
index d66eb7fe5..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_basecolor.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 15119256348999428325
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png b/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png
deleted file mode 100644
index 02a53b11e..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2b597e2a0fe86df8b49253c8d916fb09384baae0530baf444b8b3bc0537acd7
-size 1721272
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png.chmeta
deleted file mode 100644
index d066152a6..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_metallicroughness.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7085600164168620642
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_normal.png b/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_normal.png
deleted file mode 100644
index c263a9087..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f4823c2a318551307c6d68181054a26240f3c6fd0d307222f5d73c0caf85881
-size 8248589
diff --git a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_normal.png.chmeta b/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_normal.png.chmeta
deleted file mode 100644
index ab816c6f7..000000000
--- a/game/chaineddecos/assets/models_backup/mi_wooden_wheel_ugljehkga_2k_normal.png.chmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 10599521737320745339
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis.glb b/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis.glb
deleted file mode 100644
index ab125ea1e..000000000
--- a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9193e32d2f60063f92898ec40b807d604d86e586c1be151f7ca42ee6a4a5c261
-size 1549320
diff --git a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis.zip b/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis.zip
deleted file mode 100644
index 6a62943ee..000000000
--- a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c223906029417928a83f142c6998f9f1a4e9c65ec518c2fcbcccbbb350fd16c
-size 527170
diff --git a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/license.txt b/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/license.txt
deleted file mode 100644
index 4cb6b416f..000000000
--- a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Mystery Skulls Ghost Lewis
-* source:	https://sketchfab.com/3d-models/mystery-skulls-ghost-lewis-7e85c836f5ae4db7b45d027d7853334f
-* author:	Juhani Partanen (https://sketchfab.com/jochanan)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Mystery Skulls Ghost Lewis" (https://sketchfab.com/3d-models/mystery-skulls-ghost-lewis-7e85c836f5ae4db7b45d027d7853334f) by Juhani Partanen (https://sketchfab.com/jochanan) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/scene.bin b/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/scene.bin
deleted file mode 100644
index 44162e123..000000000
--- a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:801a4280fa7b190cd8479b25107c3175ecead5602ecc0dd3650d034e36a5b955
-size 1470016
diff --git a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/scene.gltf b/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/scene.gltf
deleted file mode 100644
index 3a07d4672..000000000
--- a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:723fb811d13c0b7e0949433adc36df160e0545b83dfd89ce1013ba5a9bcee094
-size 141818
diff --git a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png b/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png
deleted file mode 100644
index 72cbf4d76..000000000
--- a/game/chaineddecos/assets/models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81b39aee854258a66c91a590832ea5baaa8ae8eb6289df006282a563b5833e15
-size 115
diff --git a/game/chaineddecos/assets/models_backup/pillar/pillar.glb b/game/chaineddecos/assets/models_backup/pillar/pillar.glb
deleted file mode 100644
index 56f0f65b0..000000000
--- a/game/chaineddecos/assets/models_backup/pillar/pillar.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d2be9e8c8806a4e12310e54e65bf558a46ab469c18d3f4aa2a80b374f9bbdf0
-size 3031720
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter.zip b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter.zip
deleted file mode 100644
index a8ae1ef0a..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e03e43632b6422d77907bf77d26e642dd4cab7c0acdd5e74f30093571e0108d
-size 14208223
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/license.txt b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/license.txt
deleted file mode 100644
index 76c6d63ce..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/license.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Model Information:
-* title:	Animated civilian Helicopter
-* source:	https://sketchfab.com/3d-models/animated-civilian-helicopter-f25c041a8d004eb092e4aa41d1dc33f4
-* author:	assetfactory (https://sketchfab.com/assetfactory)
-
-Model License:
-* license type:	SKETCHFAB Standard (https://sketchfab.com/licenses)
-* requirements:	Under basic restrictions, use worldwide, on all types of media, commercially or not, and in all types of derivative works
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/scene.bin b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/scene.bin
deleted file mode 100644
index c7c38fb95..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21596faaf83b786dbcdf6541c202eff35809fd032ef987eba19cf066b7df05bb
-size 1402324
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/scene.gltf
deleted file mode 100644
index c050b4466..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56b51fb292b8ee431594584b9fbd8c57027ce430a73c88011298bbd3d688d250
-size 55463
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg
deleted file mode 100644
index 2ecc1d7c2..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png
deleted file mode 100644
index 8bc389968..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c056a61d592a71624ab34643bba057b07fa65f5010a123e6548dda382528c34b
-size 1492214
diff --git a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png b/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png
deleted file mode 100644
index 61999ebb1..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca16d33837aba1509aa1a29a7b69f8815cd94318aa29060c83a2369f81a1c94d
-size 11083757
diff --git a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88.zip b/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88.zip
deleted file mode 100644
index 80660d9d2..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c951f60f45e80870fdb95ca4fe9de1d49d194e8a46298ba848e822361026f6a1
-size 1330488
diff --git a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/license.txt b/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/license.txt
deleted file mode 100644
index 837f4be6f..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	DAE Stylized Plane: comet 88
-* source:	https://sketchfab.com/3d-models/dae-stylized-plane-comet-88-0bbb9ca9a92c451f920c3ca6ee4806cb
-* author:	vervoortward (https://sketchfab.com/vervoortward)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "DAE Stylized Plane: comet 88" (https://sketchfab.com/3d-models/dae-stylized-plane-comet-88-0bbb9ca9a92c451f920c3ca6ee4806cb) by vervoortward (https://sketchfab.com/vervoortward) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/scene.bin b/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/scene.bin
deleted file mode 100644
index c7bc188da..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:452378866cca2a94bf9172e9c8060c5d30e3afbf2707d77b61a875d641c18d45
-size 2833744
diff --git a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/scene.gltf
deleted file mode 100644
index 8e4feee14..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a66f901bd9f31976ce5f40e4eec10c47e1f6d46cfb5aa9ee3d31b56b58cdeb59
-size 135052
diff --git a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/textures/final_plane_tex_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/textures/final_plane_tex_baseColor.jpeg
deleted file mode 100644
index 337f8bd09..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/textures/final_plane_tex_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/textures/light1_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/textures/light1_baseColor.png
deleted file mode 100644
index e0a51d522..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/dae_stylized_plane_comet_88/textures/light1_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c66f73fa01797aaac3623eea28367e8152b09b67b7151b1a5dcd2f6fad93c0a
-size 1513
diff --git a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated.glb b/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated.glb
deleted file mode 100644
index 346a2ca60..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a255a0b3ad897ffe7e53eb0dbbf29f04658039e142d900ab6fad831a275b2e8f
-size 78685384
diff --git a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated.zip b/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated.zip
deleted file mode 100644
index dcc2a332f..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d3b4d327b146cd3b6e3b9f50caae54513effc67c458b11289f3a1107e2b389d
-size 16570644
diff --git a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/license.txt b/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/license.txt
deleted file mode 100644
index 9aff67ec6..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Ferris Wheel-Animated
-* source:	https://sketchfab.com/3d-models/ferris-wheel-animated-ca88dead074344bf9e74f446467e3aa3
-* author:	minamahmoodi (https://sketchfab.com/minamahmoodi)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Ferris Wheel-Animated" (https://sketchfab.com/3d-models/ferris-wheel-animated-ca88dead074344bf9e74f446467e3aa3) by minamahmoodi (https://sketchfab.com/minamahmoodi) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/scene.bin b/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/scene.bin
deleted file mode 100644
index 043d18578..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7dbc85832f188fb719090c45a3cde440e179e756389febe85940ac6e0b1690c
-size 78000512
diff --git a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/scene.gltf
deleted file mode 100644
index 08da0a846..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/ferris_wheel-animated/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5593ecf9cbd91b561462b374c414ddf4b8798580a61f76a683632984fbdbd83a
-size 1193377
diff --git a/game/chaineddecos/assets/models_backup/pilot/lighthouse.glb b/game/chaineddecos/assets/models_backup/pilot/lighthouse.glb
deleted file mode 100644
index 517261d65..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/lighthouse.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a1b047cd6fa25c898fa9e5777fda1abd790855d42844c4132a690d96bef0aac
-size 4000444
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home.zip b/game/chaineddecos/assets/models_backup/pilot/mobile_home.zip
deleted file mode 100644
index 1d420c0ef..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a1b4db9eb5b42f2d393ded5ec89545b4c47433d63b3971f1ad2b392a3f78408
-size 100122213
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/license.txt b/game/chaineddecos/assets/models_backup/pilot/mobile_home/license.txt
deleted file mode 100644
index 74b09b079..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/license.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Model Information:
-* title:	Mobile Home
-* source:	https://sketchfab.com/3d-models/mobile-home-5240b1dbc29c4ea28be7f91b3638951a
-* author:	Conrad Justin (https://sketchfab.com/ConradJustin)
-
-Model License:
-* license type:	SKETCHFAB Standard (https://sketchfab.com/licenses)
-* requirements:	Under basic restrictions, use worldwide, on all types of media, commercially or not, and in all types of derivative works
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/scene.bin b/game/chaineddecos/assets/models_backup/pilot/mobile_home/scene.bin
deleted file mode 100644
index b2159e9aa..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:886d14f2e4e6293dc3007267e40bc284d2099e5b66b2493c5529af50028d9ca4
-size 31595432
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/mobile_home/scene.gltf
deleted file mode 100644
index c4783a4d9..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59645a15038f8cf486d46a4083299431ace49b6c8c0173a1c06a69a3508a0dbd
-size 51280
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/flame_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/flame_baseColor.png
deleted file mode 100644
index b358187a2..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/flame_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bbfd2ea0f14757539e399b5c68bbe770dd5c699759fd4bbe95f1c2018bcd17a
-size 15554
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/flame_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/flame_emissive.jpeg
deleted file mode 100644
index 61485665a..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/flame_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/foliage_baked_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/foliage_baked_baseColor.png
deleted file mode 100644
index cd76aaeaf..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/foliage_baked_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cddb5ec93add10081af7247f1113c00b9e665a7e3e27738c06449f9b8c7538c4
-size 24734924
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/house_baked_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/house_baked_baseColor.jpeg
deleted file mode 100644
index b9b119f6e..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/house_baked_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/house_baked_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/house_baked_emissive.jpeg
deleted file mode 100644
index 66c605f78..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/house_baked_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/pipes_moving_baked_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/pipes_moving_baked_baseColor.jpeg
deleted file mode 100644
index 5b143ffd2..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/pipes_moving_baked_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_calm_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_calm_baseColor.png
deleted file mode 100644
index 8c3e21605..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_calm_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb934859d3ffa0058dc73a5894187f92d289831769a0dfc974335ac17b4e1c15
-size 21892104
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_calm_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_calm_emissive.jpeg
deleted file mode 100644
index 7fc1ff396..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_calm_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_unstable_baked_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_unstable_baked_baseColor.jpeg
deleted file mode 100644
index 3352983b9..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_unstable_baked_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_unstable_baked_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_unstable_baked_emissive.jpeg
deleted file mode 100644
index c2bbc20d2..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/platform_unstable_baked_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_middle_baked_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_middle_baked_baseColor.png
deleted file mode 100644
index d26a4a683..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_middle_baked_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:091f476791e45cd0e974e7ba8cfc989009dd7bf53100b082a4282bf4036dafe9
-size 18316240
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_right_baked_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_right_baked_baseColor.jpeg
deleted file mode 100644
index ccc42fa34..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_right_baked_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_top_baked_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_top_baked_baseColor.jpeg
deleted file mode 100644
index 0794c764b..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/rock_top_baked_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/stones_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/stones_baseColor.jpeg
deleted file mode 100644
index 7fb464e4d..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/mobile_home/textures/stones_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_0.png
deleted file mode 100644
index 5c4d94eea..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40bd85bd960b01913a7d517a72a3e537d55119d7921c1d079ced73923289440c
-size 752198
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_1.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_1.png
deleted file mode 100644
index b2f7c3a5e..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b200546117df6c7f5c61a344499b6e8986484d62d0ffa5ea853a558473ea87f
-size 148671
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_2.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_2.png
deleted file mode 100644
index 4b899a56b..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8e5a6a38611978f05dc188a6d9a1f56856bdfd9dd6da3e9b2574220ac586821
-size 1023484
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_3.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_3.png
deleted file mode 100644
index 6d74e7340..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0989ee51e90fbdf528878e7eae1510828caf7d4c45806426a96d174484db9b39
-size 8254
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_4.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_4.png
deleted file mode 100644
index 4489c9610..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:303e0084a3e1f4b12664449964a4f360b91587d4fd00e7689232c3c500dc3cf9
-size 896236
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_6.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_6.png
deleted file mode 100644
index fbcdf157a..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_6.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7276ffb139b574f07dd19747060a7a7ae99194d5fc84228ff2aa127755718c0f
-size 6274
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_7.png b/game/chaineddecos/assets/models_backup/pilot/textures/embedded_7.png
deleted file mode 100644
index 843a9bc0e..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/embedded_7.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dce904448e4dd6cee7d4cab4ad08ff2a70c8e6773e4711f61cd430e6d92acc68
-size 4977
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/lighthouse_texture.png b/game/chaineddecos/assets/models_backup/pilot/textures/lighthouse_texture.png
deleted file mode 100644
index 5c4d94eea..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/lighthouse_texture.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40bd85bd960b01913a7d517a72a3e537d55119d7921c1d079ced73923289440c
-size 752198
diff --git a/game/chaineddecos/assets/models_backup/pilot/textures/wizard_tower_animated_texture.png b/game/chaineddecos/assets/models_backup/pilot/textures/wizard_tower_animated_texture.png
deleted file mode 100644
index 14ba472d4..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/textures/wizard_tower_animated_texture.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f5a47f6e650a2973107be048a43e4e378169bc6f6f26e5219e46040b1dbed30
-size 171
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated.zip b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated.zip
deleted file mode 100644
index 2d57debf5..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95867e7f06fb9934eb44ce07d32acffdec49751d1147a3904d5088e7c45f16ab
-size 43775443
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/license.txt b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/license.txt
deleted file mode 100644
index 41972ed7b..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/license.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Model Information:
-* title:	The Last Stronghold (animated)
-* source:	https://sketchfab.com/3d-models/the-last-stronghold-animated-6b4ac951cefb43a791b2bd084b53a201
-* author:	Conrad Justin (https://sketchfab.com/ConradJustin)
-
-Model License:
-* license type:	SKETCHFAB Standard (https://sketchfab.com/licenses)
-* requirements:	Under basic restrictions, use worldwide, on all types of media, commercially or not, and in all types of derivative works
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/scene.bin b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/scene.bin
deleted file mode 100644
index 601967cd7..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8257718ca8193a0e88aa5bd1bf8aac34637d583a2215abfb82cad9a4d52926be
-size 18188188
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/scene.gltf
deleted file mode 100644
index e83a41fbe..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07a2577f09add13a73f767b6ea9d9afcb2aed161044c9fa251d4ebfda5e2802b
-size 294418
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_A_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_A_emissive.jpeg
deleted file mode 100644
index 4ddd0c0ff..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_A_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_B_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_B_emissive.jpeg
deleted file mode 100644
index 9f895b58a..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_B_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_C_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_C_emissive.jpeg
deleted file mode 100644
index cc3847f1e..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_C_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_E_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_E_emissive.jpeg
deleted file mode 100644
index e5f09560f..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_E_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_SOMT_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_SOMT_emissive.jpeg
deleted file mode 100644
index 23524b88e..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_SOMT_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_alfa_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_alfa_emissive.jpeg
deleted file mode 100644
index 3e5c77169..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_alfa_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_gate_low_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_gate_low_emissive.jpeg
deleted file mode 100644
index a1bdfae8a..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_gate_low_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_gate_top_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_gate_top_emissive.jpeg
deleted file mode 100644
index 31bb09713..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_gate_top_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_rope_emissive.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_rope_emissive.jpeg
deleted file mode 100644
index 3e831ce74..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/final_rope_emissive.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/sky_sketchfab_baseColor.jpeg b/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/sky_sketchfab_baseColor.jpeg
deleted file mode 100644
index ea5715c24..000000000
Binary files a/game/chaineddecos/assets/models_backup/pilot/the_last_stronghold_animated/textures/sky_sketchfab_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated.glb b/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated.glb
deleted file mode 100644
index 0da36f074..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b415d98a7b707378d2be8bd38b3c932c12faba0198f0f1a7a1eb19cdb1dbbac2
-size 2474624
diff --git a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated.zip b/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated.zip
deleted file mode 100644
index 9454bc2ea..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:814ec31cc41c442df1ff46e9cf7db7a26876bba4ff86dacf1902f03cdf3cda0a
-size 863321
diff --git a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/license.txt b/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/license.txt
deleted file mode 100644
index c92cdfcfe..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Tree Mill Animated
-* source:	https://sketchfab.com/3d-models/tree-mill-animated-8ed62842bd4b4757ad5d0130e40f34b2
-* author:	enesaras (https://sketchfab.com/boss97fb)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Tree Mill Animated" (https://sketchfab.com/3d-models/tree-mill-animated-8ed62842bd4b4757ad5d0130e40f34b2) by enesaras (https://sketchfab.com/boss97fb) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/scene.bin b/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/scene.bin
deleted file mode 100644
index fe22383c1..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4cd9fbbfbbaf175a74480c95930abc6b964367b3ded0bd44eefd05e06e56e7c
-size 2441720
diff --git a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/scene.gltf
deleted file mode 100644
index f0aa9fe10..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/tree_mill_animated/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a5d765e7456056b319cfd200edc94670631bf32fd4ee839e8280fb6ab0e8c16
-size 59335
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated.glb b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated.glb
deleted file mode 100644
index c872a9541..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae12a30063b84c38eb94fcf684e21260a5884558e421f418db4113a2bf4d44a2
-size 1210248
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated.zip b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated.zip
deleted file mode 100644
index 13b460f27..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f901346792b59648026790c3b1411be243564603946131864bfe5617a60d485
-size 584942
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/license.txt b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/license.txt
deleted file mode 100644
index 403a4e3c7..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Wizard Tower Animated
-* source:	https://sketchfab.com/3d-models/wizard-tower-animated-cc777c6f112840bea2d4a2c612916906
-* author:	VitSh (https://sketchfab.com/VitSh)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Wizard Tower Animated" (https://sketchfab.com/3d-models/wizard-tower-animated-cc777c6f112840bea2d4a2c612916906) by VitSh (https://sketchfab.com/VitSh) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/scene.bin b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/scene.bin
deleted file mode 100644
index adecf056d..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:507cf3dfc7cd3c84af1b473e6d674fbd0078f41618b673f2d3ce61e7e836f87a
-size 931568
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/scene.gltf b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/scene.gltf
deleted file mode 100644
index f835e3a7e..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19859407b48f677e4c236c760a1dd3ec8a542ac1d90adca274342ff709e6e611
-size 231891
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/textures/Material.015_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/textures/Material.015_baseColor.png
deleted file mode 100644
index b2f7c3a5e..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/textures/Material.015_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b200546117df6c7f5c61a344499b6e8986484d62d0ffa5ea853a558473ea87f
-size 148671
diff --git a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/textures/color_baseColor.png b/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/textures/color_baseColor.png
deleted file mode 100644
index 14ba472d4..000000000
--- a/game/chaineddecos/assets/models_backup/pilot/wizard_tower_animated/textures/color_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f5a47f6e650a2973107be048a43e4e378169bc6f6f26e5219e46040b1dbed30
-size 171
diff --git a/game/chaineddecos/assets/models_backup/plane.glb b/game/chaineddecos/assets/models_backup/plane.glb
deleted file mode 100644
index 35319f11a..000000000
--- a/game/chaineddecos/assets/models_backup/plane.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebec0dfae7c445b82fe11fb6dc79007d337c33029de7d5c94d94433d4b912f71
-size 2100
diff --git a/game/chaineddecos/assets/models_backup/plane.glb.chmeta b/game/chaineddecos/assets/models_backup/plane.glb.chmeta
deleted file mode 100644
index aa463fcb8..000000000
--- a/game/chaineddecos/assets/models_backup/plane.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 10870346537860049974
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/plane.obj.chmeta b/game/chaineddecos/assets/models_backup/plane.obj.chmeta
deleted file mode 100644
index 0775ee2b6..000000000
--- a/game/chaineddecos/assets/models_backup/plane.obj.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 12318460540060644072
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/plane_big.glb b/game/chaineddecos/assets/models_backup/plane_big.glb
deleted file mode 100644
index 5916cad5c..000000000
--- a/game/chaineddecos/assets/models_backup/plane_big.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46b3b548a84dbe28c1975550b9beef9f75d85bdeda31430549b577398f7d2e9a
-size 2104
diff --git a/game/chaineddecos/assets/models_backup/plane_big.glb.chmeta b/game/chaineddecos/assets/models_backup/plane_big.glb.chmeta
deleted file mode 100644
index b42a2a82f..000000000
--- a/game/chaineddecos/assets/models_backup/plane_big.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 11829362842338505238
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/plane_big2.glb b/game/chaineddecos/assets/models_backup/plane_big2.glb
deleted file mode 100644
index 531a52d3b..000000000
--- a/game/chaineddecos/assets/models_backup/plane_big2.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39d33582352075e2822cff3c23c60d16e8cbc7b49222b9aef17ed386c484d21e
-size 2104
diff --git a/game/chaineddecos/assets/models_backup/plane_big2.glb.chmeta b/game/chaineddecos/assets/models_backup/plane_big2.glb.chmeta
deleted file mode 100644
index d9d31b6a2..000000000
--- a/game/chaineddecos/assets/models_backup/plane_big2.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 11267868222620597996
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/player.glb b/game/chaineddecos/assets/models_backup/player.glb
deleted file mode 100644
index 248a3a80a..000000000
--- a/game/chaineddecos/assets/models_backup/player.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f577a6df1554644de8347db59a0f11fb4c32b6c5d9fa2658164c56e34cee3930
-size 69756
diff --git a/game/chaineddecos/assets/models_backup/player.glb.chmeta b/game/chaineddecos/assets/models_backup/player.glb.chmeta
deleted file mode 100644
index 4f092da48..000000000
--- a/game/chaineddecos/assets/models_backup/player.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 3907622828511767264
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/player_anim.glb b/game/chaineddecos/assets/models_backup/player_anim.glb
deleted file mode 100644
index 9a376d49e..000000000
--- a/game/chaineddecos/assets/models_backup/player_anim.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:348581339bd87d9252c0fb56bfe81472df1214a29eb2536a92d4a4333e8db3ac
-size 326824
diff --git a/game/chaineddecos/assets/models_backup/player_anim.glb.chmeta b/game/chaineddecos/assets/models_backup/player_anim.glb.chmeta
deleted file mode 100644
index 1e1afc237..000000000
--- a/game/chaineddecos/assets/models_backup/player_anim.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 9870880767783103989
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/player_low.glb b/game/chaineddecos/assets/models_backup/player_low.glb
deleted file mode 100644
index 0e330ed17..000000000
--- a/game/chaineddecos/assets/models_backup/player_low.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d8a0a8d6675c18fb6f846a12e31db2d6918df8ea278500053726d1d024e11b6
-size 143740
diff --git a/game/chaineddecos/assets/models_backup/player_low.glb.chmeta b/game/chaineddecos/assets/models_backup/player_low.glb.chmeta
deleted file mode 100644
index fd3eabee8..000000000
--- a/game/chaineddecos/assets/models_backup/player_low.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 10498140929447303227
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_0.png
deleted file mode 100644
index e147ca53a..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b15eb0d9c2a495f1ecc3a6b46ba3c4e5df37a72b651bea016c6a16512913838e
-size 437354
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_1.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_1.png
deleted file mode 100644
index 46d721439..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:099ea3b2118d71ea7c868b6cf913ad77ac355edf2b18e1b2e24a7d8ee52f7138
-size 241
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_2.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_2.png
deleted file mode 100644
index dcbbb4007..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:478089f413f5ddf50040e788bc264cd1598acf4d21d5507af20ea5e4e152a370
-size 1060971
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_4.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_4.png
deleted file mode 100644
index 4b7ba83ac..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c56b447dc190e103bdbcca7b03e7fc22459903eb60a1454e06e1b952cc9d526
-size 2886409
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_5.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_5.png
deleted file mode 100644
index da185011a..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_5.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe4956d29261f369b746be8abf23560770c9e5c872797bc842ef56dce5e7569d
-size 4140462
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_7.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_7.png
deleted file mode 100644
index 2638dec9d..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_7.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d03c0ae645ae805467de8719f328e985c710196138eb0c227830692756d67f2
-size 1634253
diff --git a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_8.png b/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_8.png
deleted file mode 100644
index 2b70d6672..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/textures/embedded_8.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ebeabd749bad2a8eaa9c321309f381e494d3a8290d4434006365780ab0bc662
-size 970898
diff --git a/game/chaineddecos/assets/models_backup/player_woman/walk_cycles-s.glb b/game/chaineddecos/assets/models_backup/player_woman/walk_cycles-s.glb
deleted file mode 100644
index 9f2cdfe0b..000000000
--- a/game/chaineddecos/assets/models_backup/player_woman/walk_cycles-s.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e322ac1bb832452bbd82805412d6affacea102f3f3d368265c0b7df911191d41
-size 26536840
diff --git a/game/chaineddecos/assets/models_backup/railway_stone_bridge.glb b/game/chaineddecos/assets/models_backup/railway_stone_bridge.glb
deleted file mode 100644
index a7527abd3..000000000
--- a/game/chaineddecos/assets/models_backup/railway_stone_bridge.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62f031dc9e838b2413a765d35c6761aefe8a6b20c64c82afe846722b16209440
-size 61789244
diff --git a/game/chaineddecos/assets/models_backup/rung/copyright.txt b/game/chaineddecos/assets/models_backup/rung/copyright.txt
deleted file mode 100644
index 30c336872..000000000
--- a/game/chaineddecos/assets/models_backup/rung/copyright.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Neu Rungholt medieval village Minecraft map
-(stylized recreation of the real city, http://en.wikipedia.org/wiki/Rungholt)
-entitled "Alone in the dark" by "kescha"
-http://www.planetminecraft.com/project/neu-rungholt/
-"Fell[sic] free to use the map or parts of it for you own projects. "
-
-
-6,704,264 faces
-12,308,528 vertices 
-after loading and welding colocated vertices
-
-------------------
-Converted to OBJ by Morgan McGuire using Mineways (http://mineways.com)
diff --git a/game/chaineddecos/assets/models_backup/rung/house-Alpha.png b/game/chaineddecos/assets/models_backup/rung/house-Alpha.png
deleted file mode 100644
index 7f945e3ca..000000000
--- a/game/chaineddecos/assets/models_backup/rung/house-Alpha.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e99a0bba875a53a36bfa244c998e992ae6f1926efd6aad1b3029be3d1b768fcd
-size 5566
diff --git a/game/chaineddecos/assets/models_backup/rung/house-RGB.png b/game/chaineddecos/assets/models_backup/rung/house-RGB.png
deleted file mode 100644
index d86d6dcce..000000000
--- a/game/chaineddecos/assets/models_backup/rung/house-RGB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bda61da0088eaab786f266d0b544010b3336009f143d6febb463ba49babc1610
-size 101281
diff --git a/game/chaineddecos/assets/models_backup/rung/house-RGBA.png b/game/chaineddecos/assets/models_backup/rung/house-RGBA.png
deleted file mode 100644
index 922899652..000000000
--- a/game/chaineddecos/assets/models_backup/rung/house-RGBA.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df7e7f10937cdb62ea899a0ddb06efdd495a296ada4d758a5a18a0d145f1f644
-size 119787
diff --git a/game/chaineddecos/assets/models_backup/rung/house.jpg b/game/chaineddecos/assets/models_backup/rung/house.jpg
deleted file mode 100644
index 8c765c37a..000000000
--- a/game/chaineddecos/assets/models_backup/rung/house.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32f2e98f377028b1357ec370530883b44031a8a85d44d5062989b2358c84d3d1
-size 191037
diff --git a/game/chaineddecos/assets/models_backup/rung/house.mtl b/game/chaineddecos/assets/models_backup/rung/house.mtl
deleted file mode 100644
index caefb0899..000000000
--- a/game/chaineddecos/assets/models_backup/rung/house.mtl
+++ /dev/null
@@ -1,454 +0,0 @@
-Wavefront OBJ material file
-# Contains 40 materials
-
-newmtl Stone
-Ns 0
-Ka 0.0941176 0.0941176 0.0941176
-Kd 0.470588 0.470588 0.470588
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Grass
-Ns 0
-Ka 0.0941176 0.140392 0.0603922
-Kd 0.470588 0.701961 0.301961
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Dirt
-Ns 0
-Ka 0.109804 0.0776471 0.0533333
-Kd 0.54902 0.388235 0.266667
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Cobblestone
-Ns 0
-Ka 0.101961 0.101961 0.101961
-Kd 0.509804 0.509804 0.509804
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Plank
-Ns 0
-Ka 0.124706 0.101176 0.0627451
-Kd 0.623529 0.505882 0.313726
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sand
-Ns 0
-Ka 0.175686 0.169412 0.130196
-Kd 0.878431 0.847059 0.65098
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Gravel
-Ns 0
-Ka 0.104314 0.0964706 0.0964706
-Kd 0.521569 0.482353 0.482353
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Ore
-Ns 0
-Ka 0.147451 0.12 0.100392
-Kd 0.737255 0.6 0.501961
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Coal_Ore
-Ns 0
-Ka 0.0407843 0.0407843 0.0407843
-Kd 0.203922 0.203922 0.203922
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Log
-Ns 0
-Ka 0.138824 0.112941 0.0705882
-Kd 0.694118 0.564706 0.352941
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Leaves
-Ns 0
-Ka 0.0447059 0.134118 0.0305882
-Kd 0.223529 0.670588 0.152941
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sandstone
-Ns 0
-Ka 0.175686 0.169412 0.130196
-Kd 0.878431 0.847059 0.65098
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Bed
-Ns 0
-Ka 0.2 0.04 0.04
-Kd 1 0.2 0.2
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Tall_Grass
-Ns 0
-Ka 0.0815686 0.127843 0.0478431
-Kd 0.407843 0.639216 0.239216
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Dandelion
-Ns 0
-Ka 0.199216 0.199216 0.00156863
-Kd 0.996078 0.996078 0.00784314
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Rose
-Ns 0
-Ka 0.2 0.0117647 0.0117647
-Kd 1 0.0588235 0.0588235
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Block
-Ns 0
-Ka 0.186667 0.186667 0.186667
-Kd 0.933333 0.933333 0.933333
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Double_Slab
-Ns 0
-Ka 0.130196 0.130196 0.130196
-Kd 0.65098 0.65098 0.65098
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Slab
-Ns 0
-Ka 0.129412 0.129412 0.129412
-Kd 0.647059 0.647059 0.647059
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Bookshelf
-Ns 0
-Ka 0.094902 0.0705882 0.0447059
-Kd 0.47451 0.352941 0.223529
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Torch
-Ns 0
-Ka 0.197647 0.197647 0
-Kd 0.988235 0.988235 0
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Stairs
-Ns 0
-Ka 0.123922 0.100392 0.0619608
-Kd 0.619608 0.501961 0.309804
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Chest
-Ns 0
-Ka 0.12549 0.0870588 0.027451
-Kd 0.627451 0.435294 0.137255
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Door
-Ns 0
-Ka 0.0988235 0.0729412 0.0352941
-Kd 0.494118 0.364706 0.176471
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Ladder
-Ns 0
-Ka 0.133333 0.105098 0.0635294
-Kd 0.666667 0.52549 0.317647
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Cobblestone_Stairs
-Ns 0
-Ka 0.101176 0.101176 0.101176
-Kd 0.505882 0.505882 0.505882
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wall_Sign
-Ns 0
-Ka 0.130196 0.108235 0.054902
-Kd 0.65098 0.541176 0.27451
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Lever
-Ns 0
-Ka 0.108235 0.0831373 0.0478431
-Kd 0.541176 0.415686 0.239216
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Door
-Ns 0
-Ka 0.139608 0.139608 0.139608
-Kd 0.698039 0.698039 0.698039
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Plate
-Ns 0
-Ka 0.123137 0.0996078 0.0611765
-Kd 0.615686 0.498039 0.305882
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Redstone_Torch_(on)
-Ns 0
-Ka 0.198431 0 0
-Kd 0.992157 0 0
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Button
-Ns 0
-Ka 0.134902 0.134902 0.134902
-Kd 0.67451 0.67451 0.67451
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Fence
-Ns 0
-Ka 0.124706 0.101176 0.0611765
-Kd 0.623529 0.505882 0.305882
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Glowstone
-Ns 0
-Ka 0.195294 0.166275 0.122353
-Kd 0.976471 0.831373 0.611765
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Brick
-Ns 0
-Ka 0.094902 0.094902 0.094902
-Kd 0.47451 0.47451 0.47451
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Bars
-Ns 0
-Ka 0.127843 0.128627 0.128627
-Kd 0.639216 0.643137 0.643137
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Glass_Pane
-Ns 0
-Ka 0.150588 0.192941 0.199216
-Kd 0.752941 0.964706 0.996078
-Ks 0 0 0
-map_Ka house-RGBA.png
-map_Kd house-RGBA.png
-map_d house-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Brick_Stairs
-Ns 0
-Ka 0.094902 0.094902 0.094902
-Kd 0.47451 0.47451 0.47451
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl White_Wool
-Ns 0
-Ka 0.173333 0.173333 0.173333
-Kd 0.866667 0.866667 0.866667
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Red_Wool
-Ns 0
-Ka 0.127843 0.0345098 0.0313726
-Kd 0.639216 0.172549 0.156863
-Ks 0 0 0
-map_Ka house-RGB.png
-map_Kd house-RGB.png
-illum 2
-# d 1
-# Tr 1
-
diff --git a/game/chaineddecos/assets/models_backup/rung/rungholt-Alpha.png b/game/chaineddecos/assets/models_backup/rung/rungholt-Alpha.png
deleted file mode 100644
index 8c570b34f..000000000
--- a/game/chaineddecos/assets/models_backup/rung/rungholt-Alpha.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c63f62d9c80ecc6599e341dd137aef6f64425ae4a963da8b919987b8487d7340
-size 29509
diff --git a/game/chaineddecos/assets/models_backup/rung/rungholt-RGB.png b/game/chaineddecos/assets/models_backup/rung/rungholt-RGB.png
deleted file mode 100644
index 630902b49..000000000
--- a/game/chaineddecos/assets/models_backup/rung/rungholt-RGB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d55e53bdaeadd1abc45a6f058757a181b5e5144df9b0ed69b847adce023c513f
-size 203078
diff --git a/game/chaineddecos/assets/models_backup/rung/rungholt-RGBA.png b/game/chaineddecos/assets/models_backup/rung/rungholt-RGBA.png
deleted file mode 100644
index 5ceeb5862..000000000
--- a/game/chaineddecos/assets/models_backup/rung/rungholt-RGBA.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae2c4caea3eddadca62d32b25a9059454b9cb0408fd747771e708157be609f00
-size 219033
diff --git a/game/chaineddecos/assets/models_backup/rung/rungholt.jpg b/game/chaineddecos/assets/models_backup/rung/rungholt.jpg
deleted file mode 100644
index e89c86318..000000000
--- a/game/chaineddecos/assets/models_backup/rung/rungholt.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:817d745f3a7a110d3de16a2713fd0c1ed06330a0db415e33054833ef7b8859b7
-size 497895
diff --git a/game/chaineddecos/assets/models_backup/rung/rungholt.mtl b/game/chaineddecos/assets/models_backup/rung/rungholt.mtl
deleted file mode 100644
index f855339d0..000000000
--- a/game/chaineddecos/assets/models_backup/rung/rungholt.mtl
+++ /dev/null
@@ -1,953 +0,0 @@
-Wavefront OBJ material file
-# Contains 84 materials
-
-newmtl Stone
-Ns 0
-Ka 0.0941176 0.0941176 0.0941176
-Kd 0.470588 0.470588 0.470588
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Grass
-Ns 0
-Ka 0.0941176 0.140392 0.0603922
-Kd 0.470588 0.701961 0.301961
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Dirt
-Ns 0
-Ka 0.109804 0.0776471 0.0533333
-Kd 0.54902 0.388235 0.266667
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Cobblestone
-Ns 0
-Ka 0.101961 0.101961 0.101961
-Kd 0.509804 0.509804 0.509804
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Plank
-Ns 0
-Ka 0.124706 0.101176 0.0627451
-Kd 0.623529 0.505882 0.313726
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sapling
-Ns 0
-Ka 0.0964706 0.120784 0.0321569
-Kd 0.482353 0.603922 0.160784
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stationary_Water
-Ns 0
-Ka 0.0321569 0.0729412 0.199216
-Kd 0.160784 0.364706 0.996078
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 4
-# d 0.535
-# Tr 0.535
-Tf 0.91398 0.804882 0.467098
-
-newmtl Stationary_Lava
-Ns 0
-Ka 0.192157 0.0854902 0
-Kd 0.960784 0.427451 0
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sand
-Ns 0
-Ka 0.175686 0.169412 0.130196
-Kd 0.878431 0.847059 0.65098
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Gravel
-Ns 0
-Ka 0.104314 0.0964706 0.0964706
-Kd 0.521569 0.482353 0.482353
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Ore
-Ns 0
-Ka 0.147451 0.12 0.100392
-Kd 0.737255 0.6 0.501961
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Coal_Ore
-Ns 0
-Ka 0.0407843 0.0407843 0.0407843
-Kd 0.203922 0.203922 0.203922
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Log
-Ns 0
-Ka 0.138824 0.112941 0.0705882
-Kd 0.694118 0.564706 0.352941
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Leaves
-Ns 0
-Ka 0.0447059 0.134118 0.0305882
-Kd 0.223529 0.670588 0.152941
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Glass
-Ns 0
-Ka 0.150588 0.192941 0.199216
-Kd 0.752941 0.964706 0.996078
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Dispenser
-Ns 0
-Ka 0.0870588 0.0870588 0.0870588
-Kd 0.435294 0.435294 0.435294
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sandstone
-Ns 0
-Ka 0.175686 0.169412 0.130196
-Kd 0.878431 0.847059 0.65098
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Bed
-Ns 0
-Ka 0.2 0.04 0.04
-Kd 1 0.2 0.2
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Tall_Grass
-Ns 0
-Ka 0.0815686 0.127843 0.0478431
-Kd 0.407843 0.639216 0.239216
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Piston
-Ns 0
-Ka 0.116863 0.0933333 0.0588235
-Kd 0.584314 0.466667 0.294118
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Piston_Head
-Ns 0
-Ka 0.116863 0.0933333 0.0588235
-Kd 0.584314 0.466667 0.294118
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Dandelion
-Ns 0
-Ka 0.199216 0.199216 0.00156863
-Kd 0.996078 0.996078 0.00784314
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Rose
-Ns 0
-Ka 0.2 0.0117647 0.0117647
-Kd 1 0.0588235 0.0588235
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Brown_Mushroom
-Ns 0
-Ka 0.151373 0.113725 0.0886275
-Kd 0.756863 0.568627 0.443137
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Red_Mushroom
-Ns 0
-Ka 0.197647 0.0721569 0.0729412
-Kd 0.988235 0.360784 0.364706
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Gold_Block
-Ns 0
-Ka 0.199216 0.193725 0.0611765
-Kd 0.996078 0.968627 0.305882
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Block
-Ns 0
-Ka 0.186667 0.186667 0.186667
-Kd 0.933333 0.933333 0.933333
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Double_Slab
-Ns 0
-Ka 0.130196 0.130196 0.130196
-Kd 0.65098 0.65098 0.65098
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Slab
-Ns 0
-Ka 0.129412 0.129412 0.129412
-Kd 0.647059 0.647059 0.647059
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Brick
-Ns 0
-Ka 0.12549 0.100392 0.0964706
-Kd 0.627451 0.501961 0.482353
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Bookshelf
-Ns 0
-Ka 0.094902 0.0705882 0.0447059
-Kd 0.47451 0.352941 0.223529
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Moss_Stone
-Ns 0
-Ka 0.0768627 0.0886275 0.0768627
-Kd 0.384314 0.443137 0.384314
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Obsidian
-Ns 0
-Ka 0.0211765 0.0180392 0.0321569
-Kd 0.105882 0.0901961 0.160784
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Torch
-Ns 0
-Ka 0.197647 0.197647 0
-Kd 0.988235 0.988235 0
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Fire
-Ns 0
-Ka 0.197647 0.126275 0
-Kd 0.988235 0.631373 0
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Monster_Spawner
-Ns 0
-Ka 0.0290196 0.0517647 0.0658824
-Kd 0.145098 0.258824 0.329412
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Stairs
-Ns 0
-Ka 0.123922 0.100392 0.0619608
-Kd 0.619608 0.501961 0.309804
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Chest
-Ns 0
-Ka 0.12549 0.0870588 0.027451
-Kd 0.627451 0.435294 0.137255
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Redstone_Wire
-Ns 0
-Ka 0.167843 0 0
-Kd 0.839216 0 0
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Crafting_Table
-Ns 0
-Ka 0.101961 0.0658824 0.0392157
-Kd 0.509804 0.329412 0.196078
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Crops
-Ns 0
-Ka 0.092549 0.08 0.0164706
-Kd 0.462745 0.4 0.0823529
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Farmland
-Ns 0
-Ka 0.0501961 0.0266667 0.00862745
-Kd 0.25098 0.133333 0.0431373
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Furnace
-Ns 0
-Ka 0.092549 0.092549 0.0933333
-Kd 0.462745 0.462745 0.466667
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sign_Post
-Ns 0
-Ka 0.124706 0.101176 0.0619608
-Kd 0.623529 0.505882 0.309804
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Door
-Ns 0
-Ka 0.0988235 0.0729412 0.0352941
-Kd 0.494118 0.364706 0.176471
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Ladder
-Ns 0
-Ka 0.133333 0.105098 0.0635294
-Kd 0.666667 0.52549 0.317647
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Rail
-Ns 0
-Ka 0.0815686 0.0815686 0.0815686
-Kd 0.407843 0.407843 0.407843
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Cobblestone_Stairs
-Ns 0
-Ka 0.101176 0.101176 0.101176
-Kd 0.505882 0.505882 0.505882
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wall_Sign
-Ns 0
-Ka 0.130196 0.108235 0.054902
-Kd 0.65098 0.541176 0.27451
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Lever
-Ns 0
-Ka 0.108235 0.0831373 0.0478431
-Kd 0.541176 0.415686 0.239216
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Plate
-Ns 0
-Ka 0.128627 0.128627 0.128627
-Kd 0.643137 0.643137 0.643137
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Door
-Ns 0
-Ka 0.139608 0.139608 0.139608
-Kd 0.698039 0.698039 0.698039
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Wooden_Plate
-Ns 0
-Ka 0.123137 0.0996078 0.0611765
-Kd 0.615686 0.498039 0.305882
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Redstone_Torch_(off)
-Ns 0
-Ka 0.067451 0 0
-Kd 0.337255 0 0
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Redstone_Torch_(on)
-Ns 0
-Ka 0.198431 0 0
-Kd 0.992157 0 0
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Button
-Ns 0
-Ka 0.134902 0.134902 0.134902
-Kd 0.67451 0.67451 0.67451
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Clay
-Ns 0
-Ka 0.127059 0.13098 0.141176
-Kd 0.635294 0.654902 0.705882
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Sugar_Cane
-Ns 0
-Ka 0.0894118 0.116078 0.0611765
-Kd 0.447059 0.580392 0.305882
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Fence
-Ns 0
-Ka 0.124706 0.101176 0.0611765
-Kd 0.623529 0.505882 0.305882
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Netherrack
-Ns 0
-Ka 0.0894118 0.0454902 0.0439216
-Kd 0.447059 0.227451 0.219608
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Glowstone
-Ns 0
-Ka 0.195294 0.166275 0.122353
-Kd 0.976471 0.831373 0.611765
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Jack-O-Lantern
-Ns 0
-Ka 0.182745 0.141176 0.0172549
-Kd 0.913725 0.705882 0.0862745
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Cake
-Ns 0
-Ka 0.2 0.198431 0.198431
-Kd 1 0.992157 0.992157
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Repeater_(on)
-Ns 0
-Ka 0.186667 0.0666667 0.0666667
-Kd 0.933333 0.333333 0.333333
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Trapdoor
-Ns 0
-Ka 0.106667 0.08 0.0407843
-Kd 0.533333 0.4 0.203922
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Brick
-Ns 0
-Ka 0.094902 0.094902 0.094902
-Kd 0.47451 0.47451 0.47451
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Iron_Bars
-Ns 0
-Ka 0.127843 0.128627 0.128627
-Kd 0.639216 0.643137 0.643137
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Glass_Pane
-Ns 0
-Ka 0.150588 0.192941 0.199216
-Kd 0.752941 0.964706 0.996078
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Vines
-Ns 0
-Ka 0.0235294 0.0596078 0.00784314
-Kd 0.117647 0.298039 0.0392157
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Fence_Gate
-Ns 0
-Ka 0.131765 0.105882 0.0658824
-Kd 0.658824 0.529412 0.329412
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Brick_Stairs
-Ns 0
-Ka 0.12549 0.100392 0.0964706
-Kd 0.627451 0.501961 0.482353
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Stone_Brick_Stairs
-Ns 0
-Ka 0.094902 0.094902 0.094902
-Kd 0.47451 0.47451 0.47451
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Lily_Pad
-Ns 0
-Ka 0.00941176 0.0745098 0.0156863
-Kd 0.0470588 0.372549 0.0784314
-Ks 0 0 0
-map_Ka rungholt-RGBA.png
-map_Kd rungholt-RGBA.png
-map_d rungholt-Alpha.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Enchantment_Table
-Ns 0
-Ka 0.130196 0.0878431 0.0203922
-Kd 0.65098 0.439216 0.101961
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl White_Wool
-Ns 0
-Ka 0.173333 0.173333 0.173333
-Kd 0.866667 0.866667 0.866667
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Orange_Wool
-Ns 0
-Ka 0.183529 0.100392 0.0431373
-Kd 0.917647 0.501961 0.215686
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Light_Blue_Wool
-Ns 0
-Ka 0.08 0.107451 0.16549
-Kd 0.4 0.537255 0.827451
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Gray_Wool
-Ns 0
-Ka 0.052549 0.052549 0.052549
-Kd 0.262745 0.262745 0.262745
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Light_Gray_Wool
-Ns 0
-Ka 0.123137 0.128627 0.128627
-Kd 0.615686 0.643137 0.643137
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Cyan_Wool
-Ns 0
-Ka 0.0305882 0.0909804 0.116078
-Kd 0.152941 0.454902 0.580392
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Brown_Wool
-Ns 0
-Ka 0.067451 0.04 0.0211765
-Kd 0.337255 0.2 0.105882
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Green_Wool
-Ns 0
-Ka 0.0431373 0.0603922 0.0188235
-Kd 0.215686 0.301961 0.0941176
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Red_Wool
-Ns 0
-Ka 0.127843 0.0345098 0.0313726
-Kd 0.639216 0.172549 0.156863
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
-newmtl Black_Wool
-Ns 0
-Ka 0.0211765 0.0180392 0.0180392
-Kd 0.105882 0.0901961 0.0901961
-Ks 0 0 0
-map_Ka rungholt-RGB.png
-map_Kd rungholt-RGB.png
-illum 2
-# d 1
-# Tr 1
-
diff --git a/game/chaineddecos/assets/models_backup/rungholt.zip b/game/chaineddecos/assets/models_backup/rungholt.zip
deleted file mode 100644
index 0e17ce0c9..000000000
--- a/game/chaineddecos/assets/models_backup/rungholt.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd927901828e19e042e02448f3814e18592c9c076b39bff226bb8dc7a5ad6f4a
-size 49767647
diff --git a/game/chaineddecos/assets/models_backup/scene.bin b/game/chaineddecos/assets/models_backup/scene.bin
deleted file mode 100644
index a717757ad..000000000
--- a/game/chaineddecos/assets/models_backup/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f219b0dc5ee8aec51debb4a1b4babee055576650073afaba8f4327f1019e18e8
-size 183776
diff --git a/game/chaineddecos/assets/models_backup/scene.gltf b/game/chaineddecos/assets/models_backup/scene.gltf
deleted file mode 100644
index c9cf44c19..000000000
--- a/game/chaineddecos/assets/models_backup/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce22a0f150f598dfa00bdb647d870a82a5716860ee060c397ff6d5f377d9f3be
-size 25495
diff --git a/game/chaineddecos/assets/models_backup/scene.gltf.chmeta b/game/chaineddecos/assets/models_backup/scene.gltf.chmeta
deleted file mode 100644
index 92b9c6e19..000000000
--- a/game/chaineddecos/assets/models_backup/scene.gltf.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 4099266720684198389
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/scene.json b/game/chaineddecos/assets/models_backup/scene.json
deleted file mode 100644
index 0d9b5434d..000000000
--- a/game/chaineddecos/assets/models_backup/scene.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "metadata": {
-        "author": "",
-        "description": "",
-        "difficulty": 0.0,
-        "displayName": "",
-        "endPosition": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 0.0
-        },
-        "groundColor": {
-            "a": 0,
-            "b": 0,
-            "g": 0,
-            "r": 0
-        },
-        "name": "",
-        "sceneType": 0,
-        "skyColor": {
-            "a": 0,
-            "b": 0,
-            "g": 0,
-            "r": 0
-        },
-        "startPosition": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 0.0
-        },
-        "version": ""
-    },
-    "objects": [
-        {
-            "color": {
-                "a": 255,
-                "b": 80,
-                "g": 80,
-                "r": 80
-            },
-            "height": 1.0,
-            "isObstacle": false,
-            "isPlatform": false,
-            "name": "Ground",
-            "position": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 0.0
-            },
-            "radius": 0.5,
-            "rotation": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 0.0
-            },
-            "scale": {
-                "x": 1.0,
-                "y": 1.0,
-                "z": 1.0
-            },
-            "size": {
-                "height": 100.0,
-                "width": 100.0
-            },
-            "type": 3
-        },
-        {
-            "color": {
-                "a": 255,
-                "b": 255,
-                "g": 255,
-                "r": 255
-            },
-            "height": 1.0,
-            "isObstacle": false,
-            "isPlatform": false,
-            "name": "Default Cube",
-            "position": {
-                "x": 0.0,
-                "y": 0.5,
-                "z": 0.0
-            },
-            "radius": 0.5,
-            "rotation": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 0.0
-            },
-            "scale": {
-                "x": 1.0,
-                "y": 1.0,
-                "z": 1.0
-            },
-            "size": {
-                "height": 1.0,
-                "width": 1.0
-            },
-            "type": 0
-        }
-    ],
-    "uiElements": []
-}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/scene.json.chscene b/game/chaineddecos/assets/models_backup/scene.json.chscene
deleted file mode 100644
index ea70dc1c6..000000000
Binary files a/game/chaineddecos/assets/models_backup/scene.json.chscene and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/section_of_walls.glb b/game/chaineddecos/assets/models_backup/section_of_walls.glb
deleted file mode 100644
index 648351a08..000000000
--- a/game/chaineddecos/assets/models_backup/section_of_walls.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b554661d546e9efacb50c20a5dfc66ca807869382e1a1eb865de025071f57a9f
-size 5308
diff --git a/game/chaineddecos/assets/models_backup/section_of_walls.glb.chmeta b/game/chaineddecos/assets/models_backup/section_of_walls.glb.chmeta
deleted file mode 100644
index a9ddd8ca7..000000000
--- a/game/chaineddecos/assets/models_backup/section_of_walls.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 4339801244026219033
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/section_of_walls_begin.glb b/game/chaineddecos/assets/models_backup/section_of_walls_begin.glb
deleted file mode 100644
index 4cbe60e98..000000000
--- a/game/chaineddecos/assets/models_backup/section_of_walls_begin.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:505109a3fc3b633488bd07de1fefdf757f1e17ac5bd6193b1c5de5903b2701c5
-size 6836
diff --git a/game/chaineddecos/assets/models_backup/section_of_walls_begin.glb.chmeta b/game/chaineddecos/assets/models_backup/section_of_walls_begin.glb.chmeta
deleted file mode 100644
index 3d72a7e0d..000000000
--- a/game/chaineddecos/assets/models_backup/section_of_walls_begin.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 7801362058126487098
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/skeleton/license.txt b/game/chaineddecos/assets/models_backup/skeleton/license.txt
deleted file mode 100644
index 2526a0060..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Skeleton (Animated)
-* source:	https://sketchfab.com/3d-models/skeleton-animated-bd1de4a8153a44fe93e728ca8e06701b
-* author:	One_Boy (https://sketchfab.com/one_boy)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Skeleton (Animated)" (https://sketchfab.com/3d-models/skeleton-animated-bd1de4a8153a44fe93e728ca8e06701b) by One_Boy (https://sketchfab.com/one_boy) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/skeleton/scene.bin b/game/chaineddecos/assets/models_backup/skeleton/scene.bin
deleted file mode 100644
index ab6b3a373..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:deacbbdbec219cd2b88858a36e0959c4f658d6881f47e2524b163e0eca7482e4
-size 4426068
diff --git a/game/chaineddecos/assets/models_backup/skeleton/scene.gltf b/game/chaineddecos/assets/models_backup/skeleton/scene.gltf
deleted file mode 100644
index c3dd9ad4c..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88a1714ff6b198afdf1fd034a968f60d48b6ad14e720f9c12b2f78632b47cf58
-size 271473
diff --git a/game/chaineddecos/assets/models_backup/skeleton/source/625a809678574856b07560fbe66f5035.zip b/game/chaineddecos/assets/models_backup/skeleton/source/625a809678574856b07560fbe66f5035.zip
deleted file mode 100644
index efb705af5..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/source/625a809678574856b07560fbe66f5035.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:869ed25c114a3f2512167ea3ac25036ade48936c3ebaf93d6df3eafb98609e68
-size 49097492
diff --git a/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_Shield_MAT_baseColor.png b/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_Shield_MAT_baseColor.png
deleted file mode 100644
index 1a7dca5f3..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_Shield_MAT_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9687ad2fbf7e0052097b7330d02e01010da5ac178ceda8b703b12c95bab6563f
-size 219451
diff --git a/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_Sword_MAT_baseColor.png b/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_Sword_MAT_baseColor.png
deleted file mode 100644
index 386d425c0..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_Sword_MAT_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b2703db25cd477ba29237ce65fc9625d0b838fab5575acd82ab25cabea7e3b5
-size 166697
diff --git a/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_skeleton_MAT1_baseColor.png b/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_skeleton_MAT1_baseColor.png
deleted file mode 100644
index 826970141..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton/textures/Fight_Rework_skeleton_MAT1_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93dbf938ff37c08800e5a3f37c3ebc7c815126122aaebe8d884f4ca6ee064928
-size 2799402
diff --git a/game/chaineddecos/assets/models_backup/skeleton_animated.glb b/game/chaineddecos/assets/models_backup/skeleton_animated.glb
deleted file mode 100644
index feb4d10ff..000000000
--- a/game/chaineddecos/assets/models_backup/skeleton_animated.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faf754bd2564a13cb6ec0e0a00c6e0bada3d2f048817bff5378924dfdb7a5fb8
-size 7761988
diff --git a/game/chaineddecos/assets/models_backup/snowman 1.png b/game/chaineddecos/assets/models_backup/snowman 1.png
deleted file mode 100644
index 84a6cc6a0..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 1.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c0583079b0c798af1dba879c93fab67096b89abb547bafd3e64d283abd32961
-size 312924
diff --git a/game/chaineddecos/assets/models_backup/snowman 1.png.chmeta b/game/chaineddecos/assets/models_backup/snowman 1.png.chmeta
deleted file mode 100644
index f33edd11d..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 1.png.chmeta	
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 9054054805598287213
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/snowman 2.png b/game/chaineddecos/assets/models_backup/snowman 2.png
deleted file mode 100644
index c497e881f..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 2.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce937e84af860cee7714e315a362874142e236e810134f9992b63ebc739be0cc
-size 367526
diff --git a/game/chaineddecos/assets/models_backup/snowman 2.png.chmeta b/game/chaineddecos/assets/models_backup/snowman 2.png.chmeta
deleted file mode 100644
index 5b84b5214..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 2.png.chmeta	
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 6143546238449644009
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/snowman 3.png b/game/chaineddecos/assets/models_backup/snowman 3.png
deleted file mode 100644
index 7457acb4b..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 3.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64048fbe9fbedb66a6c65cd7b12e5a9a254d0bb85681806808aa3307c8b1cd88
-size 372188
diff --git a/game/chaineddecos/assets/models_backup/snowman 3.png.chmeta b/game/chaineddecos/assets/models_backup/snowman 3.png.chmeta
deleted file mode 100644
index 2afa436ec..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 3.png.chmeta	
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 3803111987749408311
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/snowman 4.png b/game/chaineddecos/assets/models_backup/snowman 4.png
deleted file mode 100644
index 5b3f2e998..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 4.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3e37bf768bea4e1c5a192cc199cf3ba0bfe3487030d62207849eed7704073d6
-size 417945
diff --git a/game/chaineddecos/assets/models_backup/snowman 4.png.chmeta b/game/chaineddecos/assets/models_backup/snowman 4.png.chmeta
deleted file mode 100644
index bc478eacd..000000000
--- a/game/chaineddecos/assets/models_backup/snowman 4.png.chmeta	
+++ /dev/null
@@ -1,5 +0,0 @@
-Asset: 7668012533655706409
-Type: 2
-FilterMode: 1
-WrapMode: 0
-GenerateMipmaps: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/snowman.fbx b/game/chaineddecos/assets/models_backup/snowman.fbx
deleted file mode 100644
index d7fb3d0eb..000000000
--- a/game/chaineddecos/assets/models_backup/snowman.fbx
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95c341fd176edf13e0f360fd66520e3bce8e51ed56e7da9b69cbdaff2ccf8d46
-size 662000
diff --git a/game/chaineddecos/assets/models_backup/snowman.fbx.chmeta b/game/chaineddecos/assets/models_backup/snowman.fbx.chmeta
deleted file mode 100644
index 65ec52023..000000000
--- a/game/chaineddecos/assets/models_backup/snowman.fbx.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 7332202917873038279
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/snowman.ma b/game/chaineddecos/assets/models_backup/snowman.ma
deleted file mode 100644
index bc7296ea1..000000000
--- a/game/chaineddecos/assets/models_backup/snowman.ma
+++ /dev/null
@@ -1,18220 +0,0 @@
-//Maya ASCII 2019 scene
-//Name: snowman.ma
-//Last modified: Thu, Dec 03, 2020 04:42:16 PM
-//Codeset: 1252
-requires maya "2019";
-requires -nodeType "displayPoints" "Type" "2.0a";
-requires "stereoCamera" "10.0";
-requires -nodeType "aiOptions" -nodeType "aiAOVDriver" -nodeType "aiAOVFilter" -nodeType "aiAreaLight"
-		 -nodeType "aiStandardSurface" -nodeType "aiPhysicalSky" "mtoa" "3.2.2";
-currentUnit -l centimeter -a degree -t film;
-fileInfo "exportedFrom" "E:/3D Class/Snow Man/Snow man/scenes/snow man.0016.ma";
-fileInfo "application" "maya";
-fileInfo "product" "Maya 2019";
-fileInfo "version" "2019";
-fileInfo "cutIdentifier" "201907021615-48e59968a3";
-fileInfo "osv" "Microsoft Windows 10 Technical Preview  (Build 19041)\n";
-createNode transform -s -n "persp";
-	rename -uid "F5F33A51-4C02-C90F-BE06-09B3DB9F86C2";
-	setAttr ".v" no;
-	setAttr ".t" -type "double3" -1.4412116299480004 3.8470716532095994 -11.95887128589222 ;
-	setAttr ".r" -type "double3" -6.9383527293764766 -538.19999999974175 0 ;
-createNode camera -s -n "perspShape" -p "persp";
-	rename -uid "991A2AA7-410A-2168-A25D-34834F0C0DF1";
-	setAttr -k off ".v" no;
-	setAttr ".fl" 34.999999999999993;
-	setAttr ".coi" 12.665050992442387;
-	setAttr ".imn" -type "string" "persp";
-	setAttr ".den" -type "string" "persp_depth";
-	setAttr ".man" -type "string" "persp_mask";
-	setAttr ".hc" -type "string" "viewSet -p %camera";
-	setAttr ".ai_translator" -type "string" "perspective";
-createNode transform -s -n "top";
-	rename -uid "366D4A27-4939-0BEB-45E9-C79B335845DD";
-	setAttr ".v" no;
-	setAttr ".t" -type "double3" 0 1000.1 0 ;
-	setAttr ".r" -type "double3" -90 0 0 ;
-createNode camera -s -n "topShape" -p "top";
-	rename -uid "0EA3DE43-41C9-65FE-1DD6-E29C0C591422";
-	setAttr -k off ".v" no;
-	setAttr ".rnd" no;
-	setAttr ".coi" 1000.1;
-	setAttr ".ow" 11.634330767097119;
-	setAttr ".imn" -type "string" "top";
-	setAttr ".den" -type "string" "top_depth";
-	setAttr ".man" -type "string" "top_mask";
-	setAttr ".hc" -type "string" "viewSet -t %camera";
-	setAttr ".o" yes;
-	setAttr ".ai_translator" -type "string" "orthographic";
-createNode transform -s -n "front";
-	rename -uid "A422DD69-4B11-0364-332B-0A92728E64DC";
-	setAttr ".v" no;
-	setAttr ".t" -type "double3" -1.1070939727146603 4.4928020513525109 1000.1 ;
-createNode camera -s -n "frontShape" -p "front";
-	rename -uid "2A7CA4DA-463E-61E7-C3E7-2688D4E5C2AD";
-	setAttr -k off ".v" no;
-	setAttr ".rnd" no;
-	setAttr ".coi" 1000.1;
-	setAttr ".ow" 12.426518628265397;
-	setAttr ".imn" -type "string" "front";
-	setAttr ".den" -type "string" "front_depth";
-	setAttr ".man" -type "string" "front_mask";
-	setAttr ".hc" -type "string" "viewSet -f %camera";
-	setAttr ".o" yes;
-	setAttr ".ai_translator" -type "string" "orthographic";
-createNode transform -s -n "side";
-	rename -uid "081BDC49-4167-BC8C-0AEA-07ADC9AA0035";
-	setAttr ".v" no;
-	setAttr ".t" -type "double3" 1000.1 2.8219677109952799 0.65356841319816228 ;
-	setAttr ".r" -type "double3" 0 90 0 ;
-createNode camera -s -n "sideShape" -p "side";
-	rename -uid "C83BE064-449D-52CE-CC1B-14865605F4FD";
-	setAttr -k off ".v" no;
-	setAttr ".rnd" no;
-	setAttr ".coi" 1000.1;
-	setAttr ".ow" 13.030503365456338;
-	setAttr ".imn" -type "string" "side";
-	setAttr ".den" -type "string" "side_depth";
-	setAttr ".man" -type "string" "side_mask";
-	setAttr ".hc" -type "string" "viewSet -s %camera";
-	setAttr ".o" yes;
-	setAttr ".ai_translator" -type "string" "orthographic";
-createNode transform -n "camera1";
-	rename -uid "3EED56C2-4E01-E26B-78A7-A989778A333A";
-	setAttr ".t" -type "double3" -7.2135117208238206 0.12788140540477455 -13.226859879156239 ;
-	setAttr ".r" -type "double3" 10.79999999999462 209.19999999999288 0 ;
-createNode camera -n "cameraShape1" -p "camera1";
-	rename -uid "D56823D1-4217-B29B-05A8-5C9C76E4CAA1";
-	setAttr -k off ".v";
-	setAttr ".rnd" no;
-	setAttr ".cap" -type "double2" 1.41732 0.94488 ;
-	setAttr ".ff" 0;
-	setAttr ".coi" 12.457743218774699;
-	setAttr ".ow" 30;
-	setAttr ".imn" -type "string" "camera1";
-	setAttr ".den" -type "string" "camera1_depth";
-	setAttr ".man" -type "string" "camera1_mask";
-	setAttr ".ai_translator" -type "string" "perspective";
-createNode transform -n "pSphere1";
-	rename -uid "6336A7B3-4F5C-184A-DFB7-C3998BCAEAF6";
-	setAttr ".t" -type "double3" -1.5997026926555624 1.1591477347925618 1.3816172260514392 ;
-createNode mesh -n "pSphereShape1" -p "pSphere1";
-	rename -uid "B63A1C26-44CE-D022-8212-489570EBD100";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".pv" -type "double2" 0.32500001788139343 0.72500002384185791 ;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr -s 2 ".clst";
-	setAttr ".clst[0].clsn" -type "string" "SculptFreezeColorTemp";
-	setAttr ".clst[1].clsn" -type "string" "SculptMaskColorTemp";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".pt";
-	setAttr ".pt[0:165]" -type "float3"  0.00084502995 -0.00019562244 -0.00054632872 
-		0.00093087554 -0.00019180775 -0.0010364652 0.0010398179 -0.00012481213 -0.0014386922 
-		0.0011414662 5.543232e-05 -0.0017482042 0.0012131685 0.0003734827 -0.0019715577 0.0012399629 
-		0.00077533722 -0.0020963848 0.0012109578 0.0011435747 -0.0020293593 0.0011285841 
-		0.0013538599 -0.0016498268 0.0010299236 0.0014027357 -0.00093374401 0.00098456442 
-		0.0013965368 -7.4942363e-10 0.0010299236 0.0014027357 0.00093374401 0.0011285841 
-		0.0013538599 0.0016498119 0.0012109429 0.0011435747 0.0020293593 0.0012399703 0.00077533722 
-		0.0020963848 0.0012131666 0.0003734827 0.0019715577 0.0011414662 5.543232e-05 0.0017481893 
-		0.0010398179 -0.00012481213 0.0014386922 0.00093087554 -0.00019180775 0.0010364652 
-		0.00084502995 -0.00019562244 0.00054632872 0.00081284344 -0.00018835068 -1.7462298e-10 
-		0.0014459491 -0.00033509731 -0.0014711618 0.0018846691 -0.00042068958 -0.0027693808 
-		0.0022652745 -0.00041377544 -0.0036427975 0.0025073886 -6.4015388e-05 -0.0041696727 
-		0.0027102209 0.00093781948 -0.0046859086 0.0030046999 0.0026644468 -0.0054399073 
-		0.0032209456 0.0042725801 -0.006011188 0.0029890835 0.0047732592 -0.005407989 0.0024065077 
-		0.0042271614 -0.0032482743 0.0020782948 0.0037475824 2.401066e-10 0.0023923814 0.0042448044 
-		0.0032620132 0.0029587448 0.0048084259 0.0054302514 0.0032071769 0.0042865276 0.0060182214 
-		0.003004685 0.0026644468 0.0054399073 0.0027102176 0.00093781948 0.004685849 0.0025073886 
-		-6.4015388e-05 0.0041697025 0.0022652447 -0.00041377544 0.0036427975 0.0018846691 
-		-0.00042068958 0.0027693808 0.0014459491 -0.00033509731 0.0014711618 0.0012518167 
-		-0.0002900362 -2.3283064e-10 0.0023083687 -0.00051760674 -0.0028313845 0.003311336 
-		-0.00059318542 -0.005356431 0.0041273534 -0.00050866604 -0.0070819259 0.0042746216 
-		-5.209446e-05 -0.0076653361 0.0033853056 0.0018050671 -0.0071040988 0.0026569217 
-		0.0055510998 -0.0072314739 0.0034003854 0.0087419748 -0.0085558295 0.0044956803 0.0088450909 
-		-0.0090610087 0.0040037036 0.0070008039 -0.0061379671 0.0031463504 0.005643487 0.00011397569 
-		0.0037331581 0.0074585676 0.0065122396 0.0039967299 0.0095388889 0.0094456971 0.0029459894 
-		0.009236455 0.0087289214 0.0025184155 0.0056707859 0.007258594 0.0033852994 0.0018050671 
-		0.0071040988 0.0042746216 -5.209446e-05 0.0076653361 0.0041273534 -0.00050866604 
-		0.0070819259 0.003311336 -0.00059318542 0.0053564012 0.0023083687 -0.00051760674 
-		0.0028313845 0.00180161 -0.00041747093 -2.910383e-09 0.0033335686 -0.00066316128 
-		-0.0045504868 0.005199492 -0.00060105324 -0.0089222491 0.0065797865 -0.00011444092 
-		-0.012133181 0.0059010983 0.00075471401 -0.012161613 0.0010205104 0.0022249222 -0.0073370934 
-		-0.0038832426 0.0066511631 -0.0031239986 -0.0023180544 0.011590958 -0.0048094988 
-		0.0033074021 0.012465835 -0.0089562535 0.0049980283 0.0084162951 -0.0076266527 0.0036411285 
-		0.0054496527 0.00056484272 0.0044035316 0.0099109411 0.0089571774 0.0019513369 0.014684796 
-		0.0099726617 -0.0038350821 0.01320672 0.0050373673 -0.0045609474 0.0071614981 0.0030944943 
-		0.0010087562 0.0022317171 0.0073366165 0.0059011281 0.00075471401 0.012161613 0.0065797865 
-		-0.00011444092 0.012133181 0.005199492 -0.00060105324 0.0089222491 0.0033335686 -0.00066316128 
-		0.0045504868 0.0024470091 -0.00056707859 -3.4924597e-09 0.0044543147 -0.00071102381 
-		-0.0065417588 0.007371068 -0.00025165081 -0.013349116 0.0089899302 0.0012392402 -0.018216014 
-		0.0063812435 0.0029342771 -0.016781092 -0.0047901268 0.0022760034 -0.005148232 -0.015801728 
-		0.0038567185 0.0064153075 -0.012383521 0.012318611 0.0042344928 0.00078505278 0.018289328 
-		-0.0061155558 0.0063641667 0.011248589 -0.0076229274 0.0048274994 0.0048196912 0.0012505626 
-		0.0059630871 0.013836443 0.01029852 -0.0010545254 0.022056162 0.0075495243 -0.015109658 
-		0.015084028 -0.0045152903 -0.017230302 0.0047245026 -0.0067951679 -0.0048654694 0.0023077726 
-		0.0051304698 0.0063812733 0.0029342771 0.016781032 0.0089899302 0.0012392402 0.018215954 
-		0.007371068 -0.00025165081 0.013349116 0.0044543147 -0.00071102381 0.0065417588 0.0031487346 
-		-0.00072723627 -2.7907276e-09 0.0055143833 -0.00058078766 -0.0085831583 0.009277463 
-		0.0007519722 -0.017944932 0.0097357631 0.0043784976 -0.023224831 0.0042778552 0.007907033 
-		-0.019194603 -0.012020131 0.0042770505 -0.0017354488 -0.02682966 0.0019346476 0.016367197 
-		-0.021291018 0.012854159 0.014402151 -0.00019216537 0.028177381 -0.0024057627 0.011230111 
-		0.02074486 -0.007877022 0.011193395 0.011298597 0.0018656604 0.011760473 0.023443639 
-		0.011559367 -0.0013494492 0.031512916 0.0035063028 -0.024463177 0.015603423 -0.015802205 
-		-0.028836459 0.002789557 -0.017338514 -0.012142729 0.0043158531 0.0016895533 0.004277885 
-		0.007907033 0.019194722 0.0097357035 0.0043784976 0.023224771 0.0092775226 0.0007519722 
-		0.017944872 0.0055143833 -0.00058078766 0.0085831583 0.00378263 -0.00083369017 -2.8230716e-09 
-		0.0062812567 -0.00017887354 -0.010319591 0.010015011 0.0027617812 -0.021379292 0.0064595342 
-		0.0097318292 -0.023943543 -0.0020967722 0.016664803 -0.016385078 -0.018602602 0.011982143 
-		0.0022976398 -0.03539294 0.008436799 0.025469303 -0.027677178 0.018502116 0.025713563 
-		0.0037825108 0.034027457 0.00040793419 0.024912834 0.03516227 -0.011933893 0.02855289 
-		0.032791734 0.0023690055 0.026251197 0.037651718 0.015965968 0.00342381 0.035791934 
-		-0.00019168854 -0.03048557 0.019752324 -0.028181851 -0.037505686 0.0087755919 -0.026931643 
-		-0.018707907 0.012011707 -0.0023499727 -0.0020992756 0.016667366 0.016384602 0.0064595342 
-		0.0097317696 0.023943424 0.010015011 0.0027617812 0.021379292 0.0062812567 -0.00017887354 
-		0.010319591 0.0042722225 -0.00083231926 -1.8735591e-09 0.0065009594 0.00057780743 
-		-0.011331916 0.0084571838 0.0056297779 -0.022083044 -0.0027942061 0.015420228 -0.018082619 
-		-0.014250576 0.026567221 -0.0064222813 -0.024593862 0.026031673 0.0068594217 -0.041790456 
-		0.022909433 0.034694791 -0.030370235 0.02662164 0.038395524 0.016153455 0.025321364 
-		-0.0010867715 0.049155951 0.036650121 -0.022842795 0.056473494 0.055238068 0.0022123673 
-		0.05182755 0.035095006 0.02647078 0.016697288 0.024701357 0.00019586086 -0.032593966 
-		0.025962651 -0.041431785 -0.043327451 0.022965252 -0.036146641 -0.024717422 0.028177828 
-		-0.0068545341 -0.014455795 0.026937604 0.0064384937 -0.0027965903 0.015437871 0.018081784 
-		0.0084571838 0.0056297481 0.022083044 0.0065009594 0.00057780743 0.011331946 0.0045368671 
-		-0.00067901611 -2.8448994e-09 0.006021142 0.0020426959 -0.011197716 0.0038746595 
-		0.0085728467 -0.019065797 -0.017028093 0.01919578 -0.0062853098 -0.031084031 0.033871859 
-		0.0089113712 -0.030461026 0.043086141 0.010895491 -0.046030164 0.040971413 0.04615283;
-	setAttr ".pt[166:331]" -0.030464053 0.030096263 0.055359125 0.035018206 0.00020551682 
-		-0.0056715608 0.078770518 0.017988607 -0.038949937 0.087315202 0.059152484 0.001143685 
-		0.081659913 0.016188204 0.042142302 0.036950111 0.00025498867 0.0046790838 -0.031903148 
-		0.030752286 -0.058923244 -0.045258373 0.043814212 -0.047206998 -0.030726688 0.051481202 
-		-0.011402369 -0.033225834 0.037058473 -0.0090765953 -0.017329931 0.021533027 0.0058537722 
-		0.0035756826 0.010753393 0.018850982 0.0057880878 0.0029630512 0.011451989 0.0045151711 
-		-0.00033532083 1.7148372e-07 0.0047539473 0.0039286921 -0.0094872117 -0.0028108358 
-		0.011325744 -0.012815714 -0.030677199 0.022575535 0.0073390007 -0.048411816 0.038221478 
-		0.026465178 -0.040434375 0.057476658 0.021582127 -0.053739786 0.057443161 0.06605792 
-		-0.033914268 0.027358517 0.078410625 0.048588395 -0.021443671 -0.0028181672 0.10431373 
-		0.0030132984 -0.050594568 0.12281847 0.053500246 0.0015471609 0.10977888 0.0092860656 
-		0.055889428 0.053545713 -0.0097453371 -9.2744827e-05 -0.034570336 0.038923234 -0.085709453 
-		-0.050992757 0.065101959 -0.068738103 -0.041090865 0.067227632 -0.023828745 -0.05280593 
-		0.045537509 -0.028414726 -0.032067895 0.035032865 -0.011150956 -0.0060111284 0.023748824 
-		0.010730743 0.0020850897 0.011239538 0.012084633 0.0039464235 0.00085998944 0.00057841279 
-		0.0030114651 0.0047792494 -0.0065285563 -0.0097292662 0.013838232 -0.0047633648 -0.039983511 
-		0.025442153 0.019771814 -0.061808527 0.041125447 0.043518543 -0.055903785 0.067433298 
-		0.042655706 -0.066940427 0.066610277 0.091058135 -0.044821501 0.024730474 0.10486984 
-		0.049141169 -0.028112307 0.011816025 0.12242782 -0.0038949698 -0.049574852 0.16248143 
-		0.052432537 0.0049465061 0.13097727 0.0056572706 0.058196276 0.056696415 -0.010630772 
-		-0.017296135 -0.046339571 0.0413073 -0.11726618 -0.06700632 0.074002504 -0.09769392 
-		-0.056104112 0.069656283 -0.044499755 -0.063725114 0.047981769 -0.048578262 -0.040897965 
-		0.041733801 -0.028042912 -0.017373562 0.028822884 0.001544416 -0.0033558607 0.013570517 
-		0.013281792 0.0024231672 0.0026532263 0.00299385 0.00058162212 0.0052031279 -0.0029847622 
-		-0.01716578 0.01448831 0.0046400428 -0.046916366 0.024477005 0.031466484 -0.070074946 
-		0.044087619 0.058487654 -0.070394665 0.074357122 0.064568877 -0.083659112 0.066902786 
-		0.11668003 -0.05770731 0.023281366 0.12763089 0.039823055 -0.019256949 0.036641359 
-		0.13168859 -0.00017300248 -0.030632287 0.18660069 0.051851064 0.00807737 0.1383363 
-		0.00047835708 0.041814804 0.046595335 -0.015038282 -0.038052082 -0.06095171 0.027932197 
-		-0.13754421 -0.090040237 0.065833122 -0.1247679 -0.069928229 0.065842122 -0.063273907 
-		-0.065375745 0.042893648 -0.063959837 -0.044429481 0.029453069 -0.039030552 -0.025530934 
-		0.017558068 -0.0039337873 -0.0060187578 0.0064920783 0.012112111 0.0012565851 0.0022580028 
-		0.0047809267 -0.0040113926 0.0044756532 0.0013415217 -0.026819289 0.010678411 0.015554488 
-		-0.055118203 0.019340754 0.043460071 -0.075590104 0.045908451 0.070800424 -0.082063608 
-		0.071903586 0.085534215 -0.093070507 0.056884766 0.13050222 -0.058658957 0.016728401 
-		0.13115066 0.031364441 -0.0062237978 0.060750902 0.12947094 0.014980972 -0.0034483969 
-		0.18500996 0.046684444 0.0079032546 0.13204885 0.0066036582 0.015041798 0.034250498 
-		-0.015038908 -0.055935621 -0.065768361 0.0070337057 -0.13570261 -0.10463968 0.048650205 
-		-0.13667846 -0.081721291 0.062951744 -0.082864404 -0.065617889 0.037659347 -0.07371664 
-		-0.048500657 0.011053681 -0.045732319 -0.03189379 0.0039817095 -0.010438502 -0.008377552 
-		0.00042539835 0.0069811344 0.0007609129 0.0013785958 0.0049746027 -0.010432243 0.0010236502 
-		0.006810993 -0.034591258 0.0035983324 0.024809957 -0.059235394 0.012405515 0.051626742 
-		-0.077800453 0.039507926 0.078489661 -0.085385785 0.057657301 0.096861959 -0.087860823 
-		0.039146602 0.12529314 -0.052860498 0.0028077364 0.1220836 0.024095416 -0.0093303323 
-		0.074545383 0.11471879 0.010368347 0.018098891 0.16211766 0.022600055 0.0063096238 
-		0.11576426 0.0029401183 -0.0080784261 0.022712946 -0.021576822 -0.069191277 -0.063251674 
-		-0.013255179 -0.12256497 -0.098648846 0.030468345 -0.12802488 -0.085509278 0.054166555 
-		-0.095808506 -0.06887728 0.031465113 -0.078701615 -0.050525486 -0.0015872121 -0.049790442 
-		-0.03485316 -0.0060282946 -0.02040875 -0.013404965 -0.0036799908 0.0002732873 -0.00080525875 
-		-3.8146973e-06 0.0044200164 -0.015137374 -0.0047003031 0.011358887 -0.036768734 -0.0049523115 
-		0.029684186 -0.057177007 0.0017941594 0.053738594 -0.072728425 0.022730052 0.077556729 
-		-0.077162869 0.035075128 0.093350887 -0.072501987 0.017044961 0.1082716 -0.04315424 
-		-0.015624225 0.10462129 0.017308295 -0.028282762 0.0728634 0.090037525 -0.017071605 
-		0.028177112 0.12530994 -0.011253238 0.0047664298 0.089677632 -0.0230878 -0.020530403 
-		0.012825787 -0.038668454 -0.070267498 -0.052475572 -0.027184367 -0.10504091 -0.078008592 
-		0.012473404 -0.10890067 -0.077236496 0.034812391 -0.09338063 -0.068868637 0.019075215 
-		-0.077094853 -0.050120115 -0.007309258 -0.052768171 -0.033536553 -0.012755692 -0.028085291 
-		-0.016457915 -0.0087674856 -0.0057265759 -0.0038995147 -0.0031993985 0.003751986 
-		-0.015437067 -0.011408567 0.013085559 -0.032979429 -0.014329076 0.029649317 -0.04852277 
-		-0.011749268 0.049120724 -0.058508128 -0.00016856194 0.067040443 -0.059353646 0.0062152147 
-		0.078486502 -0.050369978 -0.0082559586 0.083874226 -0.027384996 -0.033671856 0.078481674 
-		0.013363421 -0.04730165 0.056800365 0.059523761 -0.044999838 0.026365608 0.080608368 
-		-0.042069554 0.0035768494 0.058056355 -0.048765421 -0.02139537 0.0086936951 -0.053014636 
-		-0.05619356 -0.032751352 -0.038265586 -0.079785287 -0.052025676 -0.0094592571 -0.084194958 
-		-0.059362866 0.0061568022 -0.07852006 -0.057554752 -0.00081658363 -0.067166388 -0.044405431 
-		-0.014599562 -0.050107419 -0.029164255 -0.018173456 -0.02958703 -0.014902174 -0.014070392 
-		-0.0090032667 -0.0061357617 -0.0092437267 0.0032123174 -0.011479855 -0.019552112 
-		0.011591241 -0.022771955 -0.023192525 0.02438277 -0.032547235 -0.024561405 0.038148582 
-		-0.037362128 -0.022274494 0.049690247 -0.036068626 -0.022929668 0.056733489 -0.027439117 
-		-0.032983661 0.057903111 -0.011141717 -0.048156738 0.051878899 0.011342347 -0.058845043 
-		0.038106412 0.033222973 -0.061921 0.019684166 0.042210877 -0.062441707 0.0020888965 
-		0.031104684 -0.064210892 -0.016640633 0.0077545643 -0.06165576 -0.037458599;
-	setAttr ".pt[332:381]" -0.013885051 -0.04981637 -0.052403271 -0.028096914 
-		-0.033335447 -0.058101535 -0.036085516 -0.022978425 -0.056742966 -0.036829934 -0.022465706 
-		-0.049857974 -0.030173749 -0.025571585 -0.038681298 -0.019601673 -0.025227666 -0.023915172 
-		-0.0096899867 -0.021453261 -0.0087360889 -0.005589664 -0.018266082 0.0020615086 -0.0063017905 
-		-0.030114889 0.0082004815 -0.010815918 -0.032733917 0.016360357 -0.015012324 -0.035705209 
-		0.024469852 -0.016942106 -0.038679361 0.031204045 -0.015401972 -0.042864919 0.035087109 
-		-0.0098747015 -0.049380541 0.035131782 -0.0011659563 -0.057080269 0.030999362 0.0088878274 
-		-0.063320637 0.022847071 0.017268002 -0.066643834 0.012089714 0.020183176 -0.067841887 
-		0.00060790323 0.016229302 -0.067407608 -0.011090145 0.0074629784 -0.064238548 -0.022340551 
-		-0.0021068752 -0.057603002 -0.030909479 -0.010130793 -0.04952693 -0.035131544 -0.015416419 
-		-0.04289937 -0.035082281 -0.01671499 -0.038793206 -0.031195194 -0.014119476 -0.036131024 
-		-0.02435568 -0.0094567239 -0.033510447 -0.015846014 -0.0052883327 -0.030799508 -0.007190153 
-		-0.0039912164 -0.029350281 0.00061803195 -0.0021542609 -0.042759776 0.0043290332 
-		-0.0028833002 -0.044205546 0.0084291399 -0.0035081059 -0.046397924 0.01202932 -0.0034587681 
-		-0.049122453 0.014772847 -0.0023899316 -0.052286983 0.016206518 -0.0002373904 -0.055695057 
-		0.015963018 0.002673775 -0.058968306 0.013942763 0.0056582987 -0.06166625 0.010315537 
-		0.0079063624 -0.063402176 0.0054814517 0.0087113529 -0.064018011 3.7923084e-05 0.0078263432 
-		-0.063452959 -0.0054075196 0.005559966 -0.061732531 -0.010248631 0.0026108325 -0.059016705 
-		-0.013904348 -0.00025180727 -0.055716872 -0.015947342 -0.0023993109 -0.052306294 
-		-0.016193032 -0.0034647286 -0.049142241 -0.01476042 -0.0034600496 -0.046431541 -0.012001052 
-		-0.0027983189 -0.044260621 -0.0083745122 -0.0020741224 -0.042804718 -0.004269585 
-		-0.0018058866 -0.042272091 3.163264e-05 0.00058305141 0.00010478497 -3.6425263e-10 
-		0.0018546294 -0.054852247 8.6716127e-06;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere2";
-	rename -uid "EAD55407-4186-60C9-D216-B6B3B947CFEC";
-	setAttr ".t" -type "double3" -1.5997026926555624 2.9873533707938078 1.3816172260514392 ;
-	setAttr ".s" -type "double3" 0.56374108463068329 0.56374108463068329 0.56374108463068329 ;
-createNode transform -n "transform11" -p "pSphere2";
-	rename -uid "C92A5126-4B20-5550-E5A7-F09A5A701F79";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape2" -p "transform11";
-	rename -uid "13DEAB1A-4F0C-FF11-DCDA-E0983BB53ED0";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr -s 2 ".clst";
-	setAttr ".clst[0].clsn" -type "string" "SculptFreezeColorTemp";
-	setAttr ".clst[1].clsn" -type "string" "SculptMaskColorTemp";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".pt";
-	setAttr ".pt[0:165]" -type "float3"  0.0020650923 0.00443995 0.0042472705 
-		0.002423048 0.0052530766 0.0086566657 0.0030240119 0.0065674782 0.01306659 0.0038819239 
-		0.0082907677 0.017022192 0.0049868352 0.010241628 0.019824669 0.0062785782 0.012171388 
-		0.020697325 0.0076431111 0.013879299 0.019051969 0.0088974833 0.015214682 0.014726467 
-		0.0097977221 0.016058326 0.0080548339 0.010129064 0.016338825 2.0495648e-08 0.0097977221 
-		0.016058326 -0.0080547668 0.0088974833 0.015214682 -0.014726423 0.0076431036 0.013879299 
-		-0.019051939 0.0062785633 0.012171388 -0.020697251 0.0049868328 0.010241628 -0.019824624 
-		0.0038819239 0.0082907677 -0.017022133 0.003023982 0.0065674782 -0.013066575 0.002423048 
-		0.0052530766 -0.0086566284 0.0020650923 0.00443995 -0.0042472333 0.0019448847 0.0041648149 
-		1.5621197e-08 0.0001219213 0.0024477243 0.0058591962 0.00064945221 0.0039333105 0.012952939 
-		0.0017772615 0.0065226555 0.021833152 0.0035810471 0.010106444 0.031606555 0.0061256955 
-		0.014112473 0.040234804 0.0093781501 0.018137932 0.045230031 0.013272107 0.021900177 
-		0.044127017 0.017358512 0.02508533 0.035558999 0.020575345 0.027320623 0.020035684 
-		0.021797895 0.02817452 4.3685318e-08 0.020575345 0.027320623 -0.020035602 0.017358541 
-		0.02508533 -0.035558924 0.013272107 0.021900177 -0.044126928 0.0093781352 0.018137932 
-		-0.045229971 0.0061256909 0.014112473 -0.040234745 0.0035810471 0.010106444 -0.031606495 
-		0.0017772615 0.0065226555 -0.021833092 0.00064945221 0.0039331913 -0.012952924 0.0001219213 
-		0.0024477243 -0.0058591664 -5.9604645e-08 0.0019692183 1.1862113e-08 -0.0028247833 
-		0.0014181137 0.0062307864 -0.0024146438 0.0033394098 0.014770895 -0.00058335066 0.0069195032 
-		0.027717143 0.0028942674 0.011948228 0.044445097 0.0075920178 0.017283797 0.061786473 
-		0.013680473 0.022744536 0.074276924 0.021716624 0.028840661 0.075586408 0.031195521 
-		0.035477996 0.062490433 0.039384007 0.041008234 0.035844177 0.042737246 0.043164134 
-		5.1303616e-08 0.039384007 0.041008234 -0.035844088 0.031195492 0.035477996 -0.062490314 
-		0.021716595 0.028840661 -0.075586379 0.013680458 0.022744536 -0.074276865 0.0075920131 
-		0.017283797 -0.061786413 0.0028942674 0.011948228 -0.044445038 -0.00058335066 0.0069195032 
-		-0.027717173 -0.0024145842 0.0033394098 -0.014770895 -0.0028248429 0.0014181137 -0.0062307715 
-		-0.0027531385 0.00079202652 8.9656567e-09 -0.0079180598 0.00038290024 0.0068919063 
-		-0.0084085464 0.0016026497 0.015982062 -0.0055107176 0.0053924322 0.032069504 0.00084269047 
-		0.010994673 0.056984365 0.0090180589 0.015590191 0.087537408 0.019191995 0.018870473 
-		0.11095971 0.032926291 0.025823951 0.11436403 0.050265193 0.038141251 0.094705135 
-		0.066633344 0.050413609 0.054461151 0.073824286 0.055423737 4.8848122e-08 0.066633284 
-		0.050413609 -0.054461122 0.050265253 0.038141251 -0.094705075 0.032926261 0.025823951 
-		-0.11436403 0.019191965 0.018870473 -0.11095965 0.0090180561 0.015590191 -0.087537348 
-		0.00084266067 0.010994673 -0.056984305 -0.0055106878 0.0053924322 -0.032069504 -0.0084084868 
-		0.0016026497 -0.015982091 -0.0079180598 0.00038290024 -0.0068918765 -0.0070714951 
-		0.00019192696 5.4963749e-09 -0.01577884 -0.0024200082 0.0087990165 -0.018191814 -0.0035232306 
-		0.01831913 -0.014344692 -0.00062978268 0.036773741 -0.0043527782 0.0044041872 0.071482718 
-		0.0089388099 0.0051522255 0.11889344 0.025001109 0.00080919266 0.1531871 0.04626441 
-		0.0048404336 0.15680391 0.072727799 0.023548722 0.12847888 0.098878384 0.046283126 
-		0.073128983 0.11120743 0.055849016 6.6904327e-08 0.098878384 0.046283185 -0.073128939 
-		0.072727859 0.023548663 -0.1284788 0.04626441 0.0048404336 -0.15680379 0.025001138 
-		0.00080919266 -0.15318704 0.0089388154 0.0051522255 -0.11889338 -0.0043527782 0.0044041872 
-		-0.071482658 -0.014344633 -0.00062978268 -0.036773741 -0.018191755 -0.0035231113 
-		-0.01831913 -0.01577878 -0.0024200082 -0.0087989867 -0.013311028 -0.001093328 7.9982669e-09 
-		-0.025666356 -0.0088818073 0.012161911 -0.03048265 -0.014968097 0.022614598 -0.027484298 
-		-0.014347434 0.043308437 -0.014351308 -0.0097547174 0.088597476 0.0055545871 -0.01460588 
-		0.15148085 0.030050218 -0.030873299 0.19184726 0.060674548 -0.034844756 0.19493639 
-		0.096838832 -0.012093186 0.15877599 0.13074869 0.023734868 0.08851245 0.14705074 
-		0.039996088 6.7878673e-08 0.13074869 0.023734927 -0.088512331 0.096838892 -0.012093246 
-		-0.15877604 0.060674548 -0.034844756 -0.19493634 0.030050218 -0.030873299 -0.19184732 
-		0.0055545918 -0.014605939 -0.15148073 -0.014351338 -0.0097546577 -0.088597655 -0.027484238 
-		-0.014347434 -0.043308377 -0.03048259 -0.014968097 -0.022614539 -0.025666356 -0.0088818073 
-		-0.012161881 -0.02115798 -0.0050119758 8.6008072e-09 -0.035480738 -0.02183038 0.016534626 
-		-0.043209016 -0.037112951 0.028656244 -0.043929815 -0.03981638 0.052050233 -0.031012356 
-		-0.033376276 0.10781753 -0.0038820757 -0.041964531 0.1801796 0.032132983 -0.071024239 
-		0.22109008 0.07444489 -0.086508214 0.22317088 0.12051612 -0.064931989 0.18195069 
-		0.15831089 -0.016957104 0.098443061 0.17515874 0.0075189471 5.109996e-08 0.15831077 
-		-0.016957045 -0.098442942 0.12051618 -0.064931929 -0.18195075 0.07444489 -0.086508095 
-		-0.22317082 0.032133013 -0.071024239 -0.22108996 -0.0038820682 -0.041964471 -0.18017972 
-		-0.031012297 -0.033376336 -0.10781741 -0.043929815 -0.03981632 -0.052050233 -0.043208957 
-		-0.037112892 -0.028656244 -0.035480738 -0.02183038 -0.016534597 -0.029343486 -0.013366401 
-		8.4984695e-09 -0.043528318 -0.043721288 0.021267653 -0.055343866 -0.072399169 0.036220551 
-		-0.063533068 -0.079184145 0.063634992 -0.056117773 -0.067267448 0.12935925 -0.022709163 
-		-0.074513048 0.20450735 0.027695328 -0.11392316 0.24105895 0.084865808 -0.14223579 
-		0.24052799 0.14090711 -0.12652221 0.19641787 0.17983961 -0.071537882 0.10258877 0.19424653 
-		-0.039850622 3.8788812e-08 0.17983961 -0.071537763 -0.10258859 0.14090711 -0.12652221 
-		-0.19641805 0.084865808 -0.14223585 -0.24052805 0.027695388 -0.11392316 -0.24105895 
-		-0.022709182 -0.074513048 -0.20450735 -0.056117803 -0.067267507 -0.12935936 -0.063533068 
-		-0.079184145 -0.063634992 -0.055343866 -0.07239911 -0.036220551 -0.043528318 -0.043721318 
-		-0.021267623 -0.036136866 -0.027675569 9.0807077e-09 -0.049232721 -0.073840559 0.025910765 
-		-0.066471696 -0.11527711 0.044377625 -0.086065769 -0.12714148 0.077622533 -0.088674396 
-		-0.1092611 0.15221679 -0.05145549 -0.1094659 0.22460055 0.01319918 -0.15645763 0.25371337;
-	setAttr ".pt[166:331]" 0.08789748 -0.19596007 0.24799091 0.15415204 -0.18784633 
-		0.20117557 0.19355643 -0.13325977 0.1012817 0.20452702 -0.0983769 3.0777251e-08 0.19355631 
-		-0.13325983 -0.10128155 0.15415233 -0.18784627 -0.20117557 0.087897539 -0.19596013 
-		-0.24799091 0.01319924 -0.15645775 -0.25371337 -0.05145549 -0.10946593 -0.22460055 
-		-0.088674396 -0.1092611 -0.15221679 -0.086065829 -0.12714148 -0.077622533 -0.066471815 
-		-0.1152772 -0.044377685 -0.049232721 -0.073840588 -0.025910735 -0.040273547 -0.048582882 
-		1.0477379e-08 -0.052193642 -0.10655448 0.029527068 -0.075991631 -0.15526289 0.051392198 
-		-0.10936564 -0.17311908 0.09089601 -0.12167537 -0.15281293 0.17021525 -0.084110782 
-		-0.14410953 0.23595905 -0.011885256 -0.19721748 0.25947642 0.079035223 -0.24392989 
-		0.24652863 0.15673697 -0.24231543 0.19507915 0.19769132 -0.19497195 0.0945189 0.20608389 
-		-0.16284014 3.8419522e-08 0.19769132 -0.19497196 -0.094518811 0.15673691 -0.24231541 
-		-0.19507909 0.079017818 -0.24392995 -0.24653965 -0.011885285 -0.19721755 -0.25947642 
-		-0.084110834 -0.14410965 -0.23595917 -0.12167543 -0.15281302 -0.17021549 -0.10912776 
-		-0.17315702 -0.091044664 -0.075991631 -0.15526295 -0.051392317 -0.052193642 -0.10655457 
-		-0.029527068 -0.041199327 -0.074246123 1.537046e-08 -0.052255154 -0.13513325 0.031007946 
-		-0.083703876 -0.18598872 0.055214047 -0.17572594 -0.18968566 0.070554852 -0.14728305 
-		-0.19056499 0.17593038 -0.11346328 -0.17687401 0.23368943 -0.031630963 -0.22452547 
-		0.24862099 0.085823715 -0.2691347 0.21888769 0.14666075 -0.28659278 0.17827725 0.19116199 
-		-0.25060374 0.082648337 0.1986804 -0.22689119 2.5210639e-08 0.19116199 -0.25060377 
-		-0.082648337 0.14665729 -0.28659281 -0.17827934 0.057260096 -0.28401023 -0.23624176 
-		-0.042373121 -0.23328377 -0.2550087 -0.11346325 -0.17687419 -0.23368943 -0.14722902 
-		-0.19060634 -0.17596281 -0.12821692 -0.21014939 -0.099603534 -0.08286798 -0.18637109 
-		-0.055724919 -0.052255273 -0.13513334 -0.031007916 -0.039242387 -0.10032576 5.5953255e-09 
-		-0.050166845 -0.1562345 0.030122459 -0.11562854 -0.19308612 0.038937211 -0.28946406 
-		-0.21371752 0.0069675446 -0.1636242 -0.21657854 0.16638267 -0.13597456 -0.20490056 
-		0.21666729 -0.014875621 -0.2544134 0.20140886 0.21236348 -0.27804834 0.10054344 0.13104022 
-		-0.31512761 0.14795315 0.17256463 -0.29541308 0.066692859 0.18040478 -0.2819463 1.9790605e-08 
-		0.17256474 -0.29541314 -0.066692799 0.12434208 -0.31949866 -0.15198249 0.02753675 
-		-0.31344879 -0.21545464 -0.071407527 -0.26057851 -0.23677373 -0.13597454 -0.20490071 
-		-0.21666729 -0.16232461 -0.21791837 -0.16714394 -0.13933611 -0.23536329 -0.1006096 
-		-0.086410999 -0.20801689 -0.056687057 -0.050166845 -0.15623456 -0.030122459 -0.03582108 
-		-0.1221419 1.133958e-08 -0.048667192 -0.17063802 0.027676523 -0.13343233 -0.2055648 
-		0.027175188 -0.27498284 -0.21076247 0.01284492 -0.1683798 -0.23299277 0.14735913 
-		-0.1505428 -0.22511664 0.18677557 -0.023146123 -0.27469149 0.15872324 0.2264722 -0.27735457 
-		0.039750576 0.12496835 -0.32366139 0.099047482 0.14089048 -0.32457793 0.049341232 
-		0.14903283 -0.31863335 2.6542693e-08 0.1408906 -0.32457796 -0.049341202 0.09240514 
-		-0.33927351 -0.11863405 -0.0033096075 -0.33029956 -0.18168592 -0.095054179 -0.2776953 
-		-0.20390493 -0.15054277 -0.22511673 -0.18677568 -0.16804153 -0.23325589 -0.14756107 
-		-0.14160073 -0.24813959 -0.094914794 -0.086983681 -0.22098169 -0.054567695 -0.048667192 
-		-0.17063814 -0.027676553 -0.034326553 -0.1388557 1.3845352e-08 -0.05168438 -0.18113256 
-		0.024846762 -0.10128045 -0.22965753 0.044917762 -0.16513944 -0.25307178 0.0705024 
-		-0.16773796 -0.24104851 0.12495255 -0.15806384 -0.24012583 0.15206003 -0.080138236 
-		-0.28894043 0.15697193 0.083972096 -0.30342489 0.070780218 0.073226929 -0.34174013 
-		0.075797737 0.098293662 -0.33892611 0.034718245 0.10644269 -0.33682451 2.5493151e-08 
-		0.098293662 -0.33892614 -0.034718156 0.054416835 -0.34604111 -0.085453153 -0.031120956 
-		-0.33506063 -0.13915449 -0.11167276 -0.28727055 -0.16187197 -0.15806381 -0.24012589 
-		-0.15205979 -0.16773804 -0.24104875 -0.12495261 -0.13910478 -0.25124472 -0.085893512 
-		-0.087891102 -0.22680777 -0.050604403 -0.051684499 -0.18113267 -0.024846762 -0.038439631 
-		-0.15318292 1.5214027e-08 -0.062381268 -0.19175375 0.0225164 -0.097189784 -0.23301315 
-		0.045543492 -0.13792321 -0.25120109 0.075994492 -0.16418207 -0.24787182 0.10443336 
-		-0.15893602 -0.25561577 0.12119359 -0.12027007 -0.29529077 0.12244743 -0.040925026 
-		-0.33759367 0.094445705 0.019626915 -0.35311645 0.058468044 0.049864888 -0.34787327 
-		0.024854332 0.057459235 -0.34834999 3.3683136e-08 0.049864888 -0.34787321 -0.024854273 
-		0.014123499 -0.34742266 -0.060055792 -0.054278255 -0.33362526 -0.10025644 -0.12067199 
-		-0.29487509 -0.12256336 -0.15893602 -0.25561589 -0.12119347 -0.16418208 -0.24787176 
-		-0.1044333 -0.13720509 -0.25045824 -0.076201737 -0.093778491 -0.22948378 -0.046527803 
-		-0.062381387 -0.19175386 -0.022516459 -0.051021338 -0.17001331 1.2822056e-08 -0.082366288 
-		-0.2086494 0.020571128 -0.10661173 -0.23527789 0.042004466 -0.13809457 -0.25202513 
-		0.065130532 -0.15805858 -0.25759411 0.084665775 -0.15344304 -0.27243668 0.093979836 
-		-0.12297678 -0.30362481 0.089907765 -0.071775556 -0.33506185 0.069925845 -0.02407819 
-		-0.35130662 0.04220289 0.0012918711 -0.35763806 0.018324569 0.007760942 -0.36056203 
-		3.2738171e-08 0.0012919307 -0.357638 -0.018324479 -0.025018394 -0.35033387 -0.042474061 
-		-0.073223442 -0.33356386 -0.070343554 -0.12297672 -0.30362493 -0.089907706 -0.15344301 
-		-0.27243668 -0.093979836 -0.15805855 -0.25759411 -0.084665716 -0.13809457 -0.25202531 
-		-0.065130472 -0.10661179 -0.23527825 -0.042004406 -0.082366288 -0.20864958 -0.020571098 
-		-0.073613465 -0.19440913 1.4016393e-08 -0.10870209 -0.23494625 0.017542109 -0.12319493 
-		-0.24927938 0.034797639 -0.14059168 -0.26151955 0.050722629 -0.15024114 -0.27243483 
-		0.062632978 -0.14437428 -0.28989702 0.066865563 -0.12239595 -0.31404871 0.061433017 
-		-0.090276986 -0.33733821 0.047236234 -0.060496271 -0.35425216 0.029417515 -0.042990506 
-		-0.36434799 0.013228759 -0.037906826 -0.36800313 3.0082447e-08 -0.042990446 -0.36434799 
-		-0.013228714 -0.06049633 -0.35425204 -0.029417485;
-	setAttr ".pt[332:381]" -0.090276957 -0.33733839 -0.047236174 -0.1223959 -0.31404895 
-		-0.061432838 -0.14437422 -0.28989714 -0.066865444 -0.15024108 -0.27243483 -0.062632918 
-		-0.14059168 -0.26151943 -0.050722599 -0.12319499 -0.24927962 -0.034797579 -0.10870215 
-		-0.23494625 -0.017542064 -0.10331255 -0.22803056 1.3308636e-08 -0.13125104 -0.26574373 
-		0.012405962 -0.1365028 -0.27230239 0.023960769 -0.1417564 -0.2810365 0.033414841 
-		-0.14276846 -0.29223228 0.039477229 -0.13655075 -0.30679178 0.040818274 -0.12319313 
-		-0.32374287 0.036971599 -0.10613313 -0.34017694 0.028936684 -0.090607762 -0.35327238 
-		0.018919632 -0.080581456 -0.36165422 0.0090003163 -0.07725963 -0.36460465 2.9846433e-08 
-		-0.080581486 -0.36165434 -0.0090002567 -0.090607762 -0.3532725 -0.018919587 -0.1061331 
-		-0.34017694 -0.028936565 -0.12319311 -0.32374299 -0.036971509 -0.13655069 -0.30679178 
-		-0.040818185 -0.1427684 -0.29223251 -0.03947717 -0.14175639 -0.2810365 -0.033414751 
-		-0.13650279 -0.27230251 -0.02396071 -0.13125101 -0.26574373 -0.012405895 -0.12913853 
-		-0.26312602 1.8276381e-08 -0.13985215 -0.29628229 0.0061249919 -0.13989347 -0.29953671 
-		0.011615455 -0.13918017 -0.30477154 0.015856609 -0.13692617 -0.31172752 0.018345743 
-		-0.13272969 -0.3199569 0.018817499 -0.1268993 -0.3287034 0.017289072 -0.12043741 
-		-0.33694422 0.014101058 -0.11466265 -0.34363163 0.0098134279 -0.11072257 -0.34800315 
-		0.00499928 -0.1093325 -0.34952486 2.6680937e-08 -0.11072257 -0.34800327 -0.0049992427 
-		-0.11466263 -0.34363174 -0.0098133609 -0.12043744 -0.33694422 -0.014100954 -0.12689932 
-		-0.32870352 -0.017288998 -0.13272969 -0.31995678 -0.018817395 -0.13692614 -0.31172752 
-		-0.018345699 -0.13918015 -0.30477154 -0.015856534 -0.1398935 -0.29953659 -0.011615403 
-		-0.13985217 -0.29628217 -0.0061249435 -0.13975254 -0.29516757 2.1612777e-08 0.0045383545 
-		0.0086221695 2.6309749e-08 -0.13190131 -0.32501638 3.0300157e-08;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.20959426 -1.39142644 -0.068101302 0.17829153 -1.39142644 -0.12953638
-		 0.12953638 -1.39142644 -0.17829151 0.068101294 -1.39142644 -0.20959423 0 -1.39142644 -0.22038041
-		 -0.068101294 -1.39142644 -0.20959422 -0.12953635 -1.39142644 -0.17829148 -0.17829147 -1.39142644 -0.12953633
-		 -0.20959419 -1.39142644 -0.068101272 -0.22038037 -1.39142644 0 -0.20959419 -1.39142644 0.068101272
-		 -0.17829145 -1.39142644 0.12953632 -0.12953632 -1.39142644 0.17829144 -0.068101272 -1.39142644 0.20959416
-		 -6.5678449e-09 -1.39142644 0.22038034 0.068101257 -1.39142644 0.20959415 0.12953629 -1.39142644 0.17829143
-		 0.17829141 -1.39142644 0.1295363 0.20959413 -1.39142644 0.068101265 0.22038031 -1.39142644 0
-		 0.4140276 -1.33982062 -0.13452572 0.35219291 -1.33982062 -0.2558831 0.2558831 -1.33982062 -0.35219288
-		 0.1345257 -1.33982062 -0.41402754 0 -1.33982062 -0.4353343 -0.1345257 -1.33982062 -0.41402751
-		 -0.25588307 -1.33982062 -0.35219282 -0.35219279 -1.33982062 -0.25588304 -0.41402742 -1.33982062 -0.13452566
-		 -0.43533418 -1.33982062 0 -0.41402742 -1.33982062 0.13452566 -0.35219276 -1.33982062 0.25588301
-		 -0.25588301 -1.33982062 0.35219273 -0.13452566 -1.33982062 0.41402739 -1.2973967e-08 -1.33982062 0.43533415
-		 0.13452563 -1.33982062 0.41402736 0.25588295 -1.33982062 0.3521927 0.35219267 -1.33982062 0.25588298
-		 0.41402733 -1.33982062 0.13452564 0.43533409 -1.33982062 0 0.60826617 -1.25522387 -0.19763766
-		 0.51742214 -1.25522387 -0.37592915 0.37592915 -1.25522387 -0.51742208 0.19763763 -1.25522387 -0.60826612
-		 0 -1.25522387 -0.63956881 -0.19763763 -1.25522387 -0.60826606 -0.37592909 -1.25522387 -0.51742196
-		 -0.51742196 -1.25522387 -0.37592906 -0.60826594 -1.25522387 -0.19763759 -0.63956869 -1.25522387 0
-		 -0.60826594 -1.25522387 0.19763759 -0.5174219 -1.25522387 0.375929 -0.375929 -1.25522387 0.5174219
-		 -0.19763759 -1.25522387 0.60826588 -1.9060627e-08 -1.25522387 0.63956857 0.19763753 -1.25522387 0.60826588
-		 0.37592894 -1.25522387 0.51742184 0.51742178 -1.25522387 0.37592897 0.60826582 -1.25522387 0.19763754
-		 0.63956851 -1.25522387 0 0.78752726 -1.13971949 -0.2558831 0.66991073 -1.13971949 -0.48671857
-		 0.48671857 -1.13971949 -0.66991067 0.25588307 -1.13971949 -0.78752714 0 -1.13971949 -0.82805502
-		 -0.25588307 -1.13971949 -0.78752708 -0.48671848 -1.13971949 -0.66991049 -0.66991043 -1.13971949 -0.48671842
-		 -0.78752697 -1.13971949 -0.25588301 -0.82805479 -1.13971949 0 -0.78752697 -1.13971949 0.25588301
-		 -0.66991043 -1.13971949 0.48671839 -0.48671839 -1.13971949 0.66991037 -0.25588301 -1.13971949 0.78752685
-		 -2.467795e-08 -1.13971949 0.82805473 0.25588292 -1.13971949 0.78752679 0.48671827 -1.13971949 0.66991031
-		 0.66991025 -1.13971949 0.48671833 0.78752673 -1.13971949 0.25588295 0.82805461 -1.13971949 0
-		 0.94739676 -0.99615127 -0.30782786 0.80590385 -0.99615127 -0.58552337 0.58552337 -0.99615127 -0.80590379
-		 0.30782783 -0.99615127 -0.94739664 0 -0.99615127 -0.99615175 -0.30782783 -0.99615127 -0.94739658
-		 -0.58552325 -0.99615127 -0.80590361 -0.80590355 -0.99615127 -0.58552319 -0.9473964 -0.99615127 -0.30782774
-		 -0.99615151 -0.99615127 0 -0.9473964 -0.99615127 0.30782774 -0.80590349 -0.99615127 0.58552313
-		 -0.58552313 -0.99615127 0.80590343 -0.30782774 -0.99615127 0.94739628 -2.9687621e-08 -0.99615127 0.99615139
-		 0.30782765 -0.99615127 0.94739622 0.58552301 -0.99615127 0.80590338 0.80590332 -0.99615127 0.58552307
-		 0.94739616 -0.99615127 0.30782768 0.99615127 -0.99615127 0 1.08393836 -0.82805461 -0.35219291
-		 0.92205304 -0.82805461 -0.66991073 0.66991073 -0.82805461 -0.92205298 0.35219288 -0.82805461 -1.083938241
-		 0 -0.82805461 -1.13972008 -0.35219288 -0.82805461 -1.083938122 -0.66991055 -0.82805461 -0.9220528
-		 -0.92205274 -0.82805461 -0.66991049 -1.083937883 -0.82805461 -0.35219276 -1.13971972 -0.82805461 0
-		 -1.083937883 -0.82805461 0.35219276 -0.92205262 -0.82805461 0.66991043 -0.66991043 -0.82805461 0.92205256
-		 -0.35219276 -0.82805461 1.083937764 -3.3966288e-08 -0.82805461 1.13971961 0.35219267 -0.82805461 1.083937764
-		 0.66991031 -0.82805461 0.9220525 0.92205244 -0.82805461 0.66991037 1.083937645 -0.82805461 0.3521927
-		 1.13971949 -0.82805461 0 1.1937896 -0.63956851 -0.38788575 1.015498161 -0.63956851 -0.73780251
-		 0.73780251 -0.63956851 -1.015498042 0.38788572 -0.63956851 -1.19378948 0 -0.63956851 -1.25522447
-		 -0.38788572 -0.63956851 -1.19378936 -0.73780239 -0.63956851 -1.015497804 -1.015497804 -0.63956851 -0.73780227
-		 -1.19378912 -0.63956851 -0.3878856 -1.25522423 -0.63956851 0 -1.19378912 -0.63956851 0.3878856
-		 -1.015497684 -0.63956851 0.73780221 -0.73780221 -0.63956851 1.015497565 -0.3878856 -0.63956851 1.19378901
-		 -3.7408586e-08 -0.63956851 1.25522399 0.38788548 -0.63956851 1.19378901 0.73780209 -0.63956851 1.015497565
-		 1.015497446 -0.63956851 0.73780215 1.19378889 -0.63956851 0.38788551 1.25522387 -0.63956851 0
-		 1.27424598 -0.43533406 -0.4140276 1.08393836 -0.43533406 -0.78752726 0.78752726 -0.43533406 -1.08393836
-		 0.41402754 -0.43533406 -1.27424586 0 -0.43533406 -1.33982122 -0.41402754 -0.43533406 -1.27424574
-		 -0.78752708 -0.43533406 -1.083938122 -1.083938003 -0.43533406 -0.78752702 -1.2742455 -0.43533406 -0.41402742
-		 -1.33982098 -0.43533406 0 -1.2742455 -0.43533406 0.41402742 -1.083937883 -0.43533406 0.78752697
-		 -0.78752697 -0.43533406 1.083937883 -0.41402742 -0.43533406 1.27424538 -3.9929766e-08 -0.43533406 1.33982074
-		 0.4140273 -0.43533406 1.27424526 0.78752679 -0.43533406 1.083937764 1.083937645 -0.43533406 0.78752685
-		 1.27424514 -0.43533406 0.41402736 1.33982062 -0.43533406 0 1.32332599 -0.22038016 -0.42997468
-		 1.12568843 -0.22038016 -0.81786042 0.81786042 -0.22038016 -1.12568831 0.42997465 -0.22038016 -1.32332587
-		 0 -0.22038016 -1.39142716 -0.42997465 -0.22038016 -1.32332575;
-	setAttr ".vt[166:331]" -0.81786025 -0.22038016 -1.12568808 -1.12568796 -0.22038016 -0.81786019
-		 -1.32332551 -0.22038016 -0.42997453 -1.3914268 -0.22038016 0 -1.32332551 -0.22038016 0.42997453
-		 -1.12568796 -0.22038016 0.81786013 -0.81786013 -0.22038016 1.12568784 -0.42997453 -0.22038016 1.3233254
-		 -4.1467739e-08 -0.22038016 1.39142656 0.42997438 -0.22038016 1.32332528 0.81785995 -0.22038016 1.12568772
-		 1.1256876 -0.22038016 0.81786001 1.32332528 -0.22038016 0.42997444 1.39142644 -0.22038016 0
-		 1.33982146 0 -0.43533435 1.1397202 0 -0.82805514 0.82805514 0 -1.13972008 0.4353343 0 -1.33982122
-		 0 0 -1.4087714 -0.4353343 0 -1.3398211 -0.82805496 0 -1.13971984 -1.13971972 0 -0.82805485
-		 -1.33982086 0 -0.43533418 -1.40877104 0 0 -1.33982086 0 0.43533418 -1.13971972 0 0.82805479
-		 -0.82805479 0 1.13971961 -0.43533418 0 1.33982074 -4.1984638e-08 0 1.4087708 0.43533406 0 1.33982062
-		 0.82805461 0 1.13971949 1.13971949 0 0.82805473 1.33982062 0 0.43533409 1.40877068 0 0
-		 1.32332599 0.22038016 -0.42997468 1.12568843 0.22038016 -0.81786042 0.81786042 0.22038016 -1.12568831
-		 0.42997465 0.22038016 -1.32332587 0 0.22038016 -1.39142716 -0.42997465 0.22038016 -1.32332575
-		 -0.81786025 0.22038016 -1.12568808 -1.12568796 0.22038016 -0.81786019 -1.32332551 0.22038016 -0.42997453
-		 -1.3914268 0.22038016 0 -1.32332551 0.22038016 0.42997453 -1.12568796 0.22038016 0.81786013
-		 -0.81786013 0.22038016 1.12568784 -0.42997453 0.22038016 1.3233254 -4.1467739e-08 0.22038016 1.39142656
-		 0.42997438 0.22038016 1.32332528 0.81785995 0.22038016 1.12568772 1.1256876 0.22038016 0.81786001
-		 1.32332528 0.22038016 0.42997444 1.39142644 0.22038016 0 1.27424598 0.43533406 -0.4140276
-		 1.08393836 0.43533406 -0.78752726 0.78752726 0.43533406 -1.08393836 0.41402754 0.43533406 -1.27424586
-		 0 0.43533406 -1.33982122 -0.41402754 0.43533406 -1.27424574 -0.78752708 0.43533406 -1.083938122
-		 -1.083938003 0.43533406 -0.78752702 -1.2742455 0.43533406 -0.41402742 -1.33982098 0.43533406 0
-		 -1.2742455 0.43533406 0.41402742 -1.083937883 0.43533406 0.78752697 -0.78752697 0.43533406 1.083937883
-		 -0.41402742 0.43533406 1.27424538 -3.9929766e-08 0.43533406 1.33982074 0.4140273 0.43533406 1.27424526
-		 0.78752679 0.43533406 1.083937764 1.083937645 0.43533406 0.78752685 1.27424514 0.43533406 0.41402736
-		 1.33982062 0.43533406 0 1.1937896 0.63956851 -0.38788575 1.015498161 0.63956851 -0.73780251
-		 0.73780251 0.63956851 -1.015498042 0.38788572 0.63956851 -1.19378948 0 0.63956851 -1.25522447
-		 -0.38788572 0.63956851 -1.19378936 -0.73780239 0.63956851 -1.015497804 -1.015497804 0.63956851 -0.73780227
-		 -1.19378912 0.63956851 -0.3878856 -1.25522423 0.63956851 0 -1.19378912 0.63956851 0.3878856
-		 -1.015497684 0.63956851 0.73780221 -0.73780221 0.63956851 1.015497565 -0.3878856 0.63956851 1.19378901
-		 -3.7408586e-08 0.63956851 1.25522399 0.38788548 0.63956851 1.19378901 0.73780209 0.63956851 1.015497565
-		 1.015497446 0.63956851 0.73780215 1.19378889 0.63956851 0.38788551 1.25522387 0.63956851 0
-		 1.08393836 0.82805461 -0.35219291 0.92205304 0.82805461 -0.66991073 0.66991073 0.82805461 -0.92205298
-		 0.35219288 0.82805461 -1.083938241 0 0.82805461 -1.13972008 -0.35219288 0.82805461 -1.083938122
-		 -0.66991055 0.82805461 -0.9220528 -0.92205274 0.82805461 -0.66991049 -1.083937883 0.82805461 -0.35219276
-		 -1.13971972 0.82805461 0 -1.083937883 0.82805461 0.35219276 -0.92205262 0.82805461 0.66991043
-		 -0.66991043 0.82805461 0.92205256 -0.35219276 0.82805461 1.083937764 -3.3966288e-08 0.82805461 1.13971961
-		 0.35219267 0.82805461 1.083937764 0.66991031 0.82805461 0.9220525 0.92205244 0.82805461 0.66991037
-		 1.083937645 0.82805461 0.3521927 1.13971949 0.82805461 0 0.94739676 0.99615127 -0.30782786
-		 0.80590385 0.99615127 -0.58552337 0.58552337 0.99615127 -0.80590379 0.30782783 0.99615127 -0.94739664
-		 0 0.99615127 -0.99615175 -0.30782783 0.99615127 -0.94739658 -0.58552325 0.99615127 -0.80590361
-		 -0.80590355 0.99615127 -0.58552319 -0.9473964 0.99615127 -0.30782774 -0.99615151 0.99615127 0
-		 -0.9473964 0.99615127 0.30782774 -0.80590349 0.99615127 0.58552313 -0.58552313 0.99615127 0.80590343
-		 -0.30782774 0.99615127 0.94739628 -2.9687621e-08 0.99615127 0.99615139 0.30782765 0.99615127 0.94739622
-		 0.58552301 0.99615127 0.80590338 0.80590332 0.99615127 0.58552307 0.94739616 0.99615127 0.30782768
-		 0.99615127 0.99615127 0 0.78752726 1.13971949 -0.2558831 0.66991073 1.13971949 -0.48671857
-		 0.48671857 1.13971949 -0.66991067 0.25588307 1.13971949 -0.78752714 0 1.13971949 -0.82805502
-		 -0.25588307 1.13971949 -0.78752708 -0.48671848 1.13971949 -0.66991049 -0.66991043 1.13971949 -0.48671842
-		 -0.78752697 1.13971949 -0.25588301 -0.82805479 1.13971949 0 -0.78752697 1.13971949 0.25588301
-		 -0.66991043 1.13971949 0.48671839 -0.48671839 1.13971949 0.66991037 -0.25588301 1.13971949 0.78752685
-		 -2.467795e-08 1.13971949 0.82805473 0.25588292 1.13971949 0.78752679 0.48671827 1.13971949 0.66991031
-		 0.66991025 1.13971949 0.48671833 0.78752673 1.13971949 0.25588295 0.82805461 1.13971949 0
-		 0.60826617 1.25522387 -0.19763766 0.51742214 1.25522387 -0.37592915 0.37592915 1.25522387 -0.51742208
-		 0.19763763 1.25522387 -0.60826612 0 1.25522387 -0.63956881 -0.19763763 1.25522387 -0.60826606
-		 -0.37592909 1.25522387 -0.51742196 -0.51742196 1.25522387 -0.37592906 -0.60826594 1.25522387 -0.19763759
-		 -0.63956869 1.25522387 0 -0.60826594 1.25522387 0.19763759 -0.5174219 1.25522387 0.375929;
-	setAttr ".vt[332:381]" -0.375929 1.25522387 0.5174219 -0.19763759 1.25522387 0.60826588
-		 -1.9060627e-08 1.25522387 0.63956857 0.19763753 1.25522387 0.60826588 0.37592894 1.25522387 0.51742184
-		 0.51742178 1.25522387 0.37592897 0.60826582 1.25522387 0.19763754 0.63956851 1.25522387 0
-		 0.4140276 1.33982062 -0.13452572 0.35219291 1.33982062 -0.2558831 0.2558831 1.33982062 -0.35219288
-		 0.1345257 1.33982062 -0.41402754 0 1.33982062 -0.4353343 -0.1345257 1.33982062 -0.41402751
-		 -0.25588307 1.33982062 -0.35219282 -0.35219279 1.33982062 -0.25588304 -0.41402742 1.33982062 -0.13452566
-		 -0.43533418 1.33982062 0 -0.41402742 1.33982062 0.13452566 -0.35219276 1.33982062 0.25588301
-		 -0.25588301 1.33982062 0.35219273 -0.13452566 1.33982062 0.41402739 -1.2973967e-08 1.33982062 0.43533415
-		 0.13452563 1.33982062 0.41402736 0.25588295 1.33982062 0.3521927 0.35219267 1.33982062 0.25588298
-		 0.41402733 1.33982062 0.13452564 0.43533409 1.33982062 0 0.20959426 1.39142644 -0.068101302
-		 0.17829153 1.39142644 -0.12953638 0.12953638 1.39142644 -0.17829151 0.068101294 1.39142644 -0.20959423
-		 0 1.39142644 -0.22038041 -0.068101294 1.39142644 -0.20959422 -0.12953635 1.39142644 -0.17829148
-		 -0.17829147 1.39142644 -0.12953633 -0.20959419 1.39142644 -0.068101272 -0.22038037 1.39142644 0
-		 -0.20959419 1.39142644 0.068101272 -0.17829145 1.39142644 0.12953632 -0.12953632 1.39142644 0.17829144
-		 -0.068101272 1.39142644 0.20959416 -6.5678449e-09 1.39142644 0.22038034 0.068101257 1.39142644 0.20959415
-		 0.12953629 1.39142644 0.17829143 0.17829141 1.39142644 0.1295363 0.20959413 1.39142644 0.068101265
-		 0.22038031 1.39142644 0 0 -1.40877068 0 0 1.40877068 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere3";
-	rename -uid "A59C2A60-4FC4-7123-C4B9-0CA0348BF3A6";
-	setAttr ".t" -type "double3" -1.5561414847111918 2.1353352534941612 0.44924015353732749 ;
-	setAttr ".r" -type "double3" 33.659744533704234 0 0 ;
-	setAttr ".s" -type "double3" 0.64627208158235794 0.64627208158235794 0.48287904263204279 ;
-createNode transform -n "transform15" -p "pSphere3";
-	rename -uid "07C499B6-49F6-9F08-F206-BAA4B797FD4C";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape3" -p "transform15";
-	rename -uid "7F7DAF30-4197-52CC-CA06-18BCF18F966E";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere4";
-	rename -uid "DDC4A45D-45FB-1738-DE30-27B7558B9A2B";
-	setAttr ".t" -type "double3" -1.5561414847111918 1.7878112409517524 0.18590874370565458 ;
-	setAttr ".r" -type "double3" 20.247190059396477 0 0 ;
-	setAttr ".s" -type "double3" 0.64627208158235794 0.64627208158235794 0.48287904263204279 ;
-createNode transform -n "transform14" -p "pSphere4";
-	rename -uid "923830A7-47AC-C294-3598-2B91314AFE1B";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape4" -p "transform14";
-	rename -uid "41BA6EA8-48CD-FBFC-6061-498559003289";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.029600544 -0.19650814 -0.009617799 0.025179727 -0.19650814 -0.018294141
-		 0.018294141 -0.19650814 -0.025179725 0.009617798 -0.19650814 -0.02960054 0 -0.19650814 -0.031123849
-		 -0.009617798 -0.19650814 -0.029600538 -0.018294137 -0.19650814 -0.02517972 -0.025179718 -0.19650814 -0.018294135
-		 -0.029600533 -0.19650814 -0.0096177952 -0.031123841 -0.19650814 0 -0.029600533 -0.19650814 0.0096177952
-		 -0.025179716 -0.19650814 0.018294133 -0.018294133 -0.19650814 0.025179714 -0.0096177952 -0.19650814 0.029600529
-		 -9.2756253e-10 -0.19650814 0.031123837 0.0096177924 -0.19650814 0.029600527 0.01829413 -0.19650814 0.025179712
-		 0.02517971 -0.19650814 0.018294131 0.029600525 -0.19650814 0.0096177934 0.031123834 -0.19650814 0
-		 0.058472224 -0.18921997 -0.018998776 0.049739443 -0.18921997 -0.036137819 0.036137819 -0.18921997 -0.049739443
-		 0.018998774 -0.18921997 -0.058472216 0 -0.18921997 -0.061481323 -0.018998774 -0.18921997 -0.058472212
-		 -0.036137812 -0.18921997 -0.049739432 -0.049739428 -0.18921997 -0.036137808 -0.058472201 -0.18921997 -0.018998768
-		 -0.061481308 -0.18921997 0 -0.058472201 -0.18921997 0.018998768 -0.049739424 -0.18921997 0.036137804
-		 -0.036137804 -0.18921997 0.04973942 -0.018998768 -0.18921997 0.058472194 -1.8322853e-09 -0.18921997 0.061481301
-		 0.018998763 -0.18921997 0.05847219 0.036137797 -0.18921997 0.049739417 0.049739413 -0.18921997 0.036137801
-		 0.058472186 -0.18921997 0.018998764 0.061481293 -0.18921997 0 0.085904121 -0.17727256 -0.027911939
-		 0.073074408 -0.17727256 -0.053091664 0.053091664 -0.17727256 -0.073074408 0.027911937 -0.17727256 -0.085904106
-		 0 -0.17727256 -0.090324923 -0.027911937 -0.17727256 -0.085904106 -0.053091653 -0.17727256 -0.073074393
-		 -0.073074386 -0.17727256 -0.053091645 -0.085904092 -0.17727256 -0.027911929 -0.090324901 -0.17727256 0
-		 -0.085904092 -0.17727256 0.027911929 -0.073074378 -0.17727256 0.053091642 -0.053091642 -0.17727256 0.073074371
-		 -0.027911929 -0.17727256 0.085904077 -2.6918912e-09 -0.17727256 0.090324886 0.02791192 -0.17727256 0.085904069
-		 0.05309163 -0.17727256 0.073074371 0.073074363 -0.17727256 0.053091638 0.085904069 -0.17727256 0.027911924
-		 0.090324879 -0.17727256 0 0.11122077 -0.16096011 -0.036137819 0.094610043 -0.16096011 -0.068738215
-		 0.068738215 -0.16096011 -0.094610035 0.036137816 -0.16096011 -0.11122076 0 -0.16096011 -0.11694442
-		 -0.036137816 -0.16096011 -0.11122075 -0.0687382 -0.16096011 -0.094610013 -0.094610006 -0.16096011 -0.068738192
-		 -0.11122073 -0.16096011 -0.036137804 -0.1169444 -0.16096011 0 -0.11122073 -0.16096011 0.036137804
-		 -0.094609998 -0.16096011 0.068738185 -0.068738185 -0.16096011 0.094609991 -0.036137804 -0.16096011 0.11122072
-		 -3.4852137e-09 -0.16096011 0.11694438 0.036137793 -0.16096011 0.11122071 0.06873817 -0.16096011 0.094609983
-		 0.094609983 -0.16096011 0.068738177 0.1112207 -0.16096011 0.036137797 0.11694437 -0.16096011 0
-		 0.13379879 -0.14068429 -0.043473862 0.11381606 -0.14068429 -0.082692198 0.082692198 -0.14068429 -0.11381605
-		 0.043473858 -0.14068429 -0.13379878 0 -0.14068429 -0.14068437 -0.043473858 -0.14068429 -0.13379878
-		 -0.082692184 -0.14068429 -0.11381602 -0.11381602 -0.14068429 -0.082692176 -0.13379875 -0.14068429 -0.043473847
-		 -0.14068432 -0.14068429 0 -0.13379875 -0.14068429 0.043473847 -0.11381601 -0.14068429 0.082692169
-		 -0.082692169 -0.14068429 0.113816 -0.043473847 -0.14068429 0.13379873 -4.1927186e-09 -0.14068429 0.14068431
-		 0.043473832 -0.14068429 0.13379872 0.082692154 -0.14068429 0.11381599 0.11381599 -0.14068429 0.082692161
-		 0.13379872 -0.14068429 0.04347384 0.14068429 -0.14068429 0 0.15308227 -0.11694437 -0.049739439
-		 0.13021955 -0.11694437 -0.094610035 0.094610035 -0.11694437 -0.13021953 0.049739435 -0.11694437 -0.15308224
-		 0 -0.11694437 -0.16096018 -0.049739435 -0.11694437 -0.15308224 -0.094610013 -0.11694437 -0.13021952
-		 -0.1302195 -0.11694437 -0.094610006 -0.15308221 -0.11694437 -0.04973942 -0.16096015 -0.11694437 0
-		 -0.15308221 -0.11694437 0.04973942 -0.13021949 -0.11694437 0.094609998 -0.094609998 -0.11694437 0.13021949
-		 -0.04973942 -0.11694437 0.15308218 -4.796985e-09 -0.11694437 0.16096012 0.049739406 -0.11694437 0.15308218
-		 0.094609976 -0.11694437 0.13021947 0.13021946 -0.11694437 0.094609983 0.15308216 -0.11694437 0.049739409
-		 0.16096011 -0.11694437 0 0.16859633 -0.090324879 -0.054780267 0.14341661 -0.090324879 -0.10419825
-		 0.10419825 -0.090324879 -0.1434166 0.05478026 -0.090324879 -0.16859631 0 -0.090324879 -0.17727265
-		 -0.05478026 -0.090324879 -0.1685963 -0.10419824 -0.090324879 -0.14341657 -0.14341655 -0.090324879 -0.10419822
-		 -0.16859627 -0.090324879 -0.054780245 -0.1772726 -0.090324879 0 -0.16859627 -0.090324879 0.054780245
-		 -0.14341654 -0.090324879 0.10419822 -0.10419822 -0.090324879 0.14341654 -0.054780245 -0.090324879 0.16859625
-		 -5.2831339e-09 -0.090324879 0.17727257 0.05478023 -0.090324879 0.16859624 0.1041982 -0.090324879 0.14341652
-		 0.14341651 -0.090324879 0.1041982 0.16859622 -0.090324879 0.054780234 0.17727256 -0.090324879 0
-		 0.179959 -0.061481286 -0.05847222 0.15308227 -0.061481286 -0.11122077 0.11122077 -0.061481286 -0.15308227
-		 0.058472216 -0.061481286 -0.17995898 0 -0.061481286 -0.18922006 -0.058472216 -0.061481286 -0.17995897
-		 -0.11122075 -0.061481286 -0.15308222 -0.15308222 -0.061481286 -0.11122074 -0.17995892 -0.061481286 -0.058472198
-		 -0.18922001 -0.061481286 0 -0.17995892 -0.061481286 0.058472198 -0.15308221 -0.061481286 0.11122072
-		 -0.11122072 -0.061481286 0.15308219 -0.058472198 -0.061481286 0.17995891 -5.6391944e-09 -0.061481286 0.18922
-		 0.058472183 -0.061481286 0.17995889 0.1112207 -0.061481286 0.15308218 0.15308218 -0.061481286 0.11122072
-		 0.17995888 -0.061481286 0.058472186 0.18921997 -0.061481286 0 0.18689047 -0.031123813 -0.060724393
-		 0.15897854 -0.031123813 -0.11550465 0.11550465 -0.031123813 -0.15897852 0.060724385 -0.031123813 -0.18689044
-		 0 -0.031123813 -0.19650823 -0.060724385 -0.031123813 -0.18689044;
-	setAttr ".vt[166:331]" -0.11550463 -0.031123813 -0.15897848 -0.15897848 -0.031123813 -0.11550462
-		 -0.18689039 -0.031123813 -0.060724366 -0.19650818 -0.031123813 0 -0.18689039 -0.031123813 0.060724366
-		 -0.15897846 -0.031123813 0.11550461 -0.11550461 -0.031123813 0.15897845 -0.060724366 -0.031123813 0.18689038
-		 -5.8563989e-09 -0.031123813 0.19650817 0.060724352 -0.031123813 0.18689036 0.11550459 -0.031123813 0.15897843
-		 0.15897843 -0.031123813 0.11550459 0.18689035 -0.031123813 0.060724355 0.19650814 -0.031123813 0
-		 0.18922009 0 -0.061481327 0.16096021 0 -0.11694443 0.11694443 0 -0.16096021 0.061481323 0 -0.18922006
-		 0 0 -0.19895773 -0.061481323 0 -0.18922004 -0.11694441 0 -0.16096017 -0.16096015 0 -0.1169444
-		 -0.18922001 0 -0.061481304 -0.19895768 0 0 -0.18922001 0 0.061481304 -0.16096015 0 0.11694439
-		 -0.11694439 0 0.16096014 -0.061481304 0 0.18921998 -5.9293996e-09 0 0.19895767 0.061481286 0 0.18921997
-		 0.11694437 0 0.16096012 0.16096011 0 0.11694437 0.18921997 0 0.061481293 0.19895764 0 0
-		 0.18689047 0.031123813 -0.060724393 0.15897854 0.031123813 -0.11550465 0.11550465 0.031123813 -0.15897852
-		 0.060724385 0.031123813 -0.18689044 0 0.031123813 -0.19650823 -0.060724385 0.031123813 -0.18689044
-		 -0.11550463 0.031123813 -0.15897848 -0.15897848 0.031123813 -0.11550462 -0.18689039 0.031123813 -0.060724366
-		 -0.19650818 0.031123813 0 -0.18689039 0.031123813 0.060724366 -0.15897846 0.031123813 0.11550461
-		 -0.11550461 0.031123813 0.15897845 -0.060724366 0.031123813 0.18689038 -5.8563989e-09 0.031123813 0.19650817
-		 0.060724352 0.031123813 0.18689036 0.11550459 0.031123813 0.15897843 0.15897843 0.031123813 0.11550459
-		 0.18689035 0.031123813 0.060724355 0.19650814 0.031123813 0 0.179959 0.061481286 -0.05847222
-		 0.15308227 0.061481286 -0.11122077 0.11122077 0.061481286 -0.15308227 0.058472216 0.061481286 -0.17995898
-		 0 0.061481286 -0.18922006 -0.058472216 0.061481286 -0.17995897 -0.11122075 0.061481286 -0.15308222
-		 -0.15308222 0.061481286 -0.11122074 -0.17995892 0.061481286 -0.058472198 -0.18922001 0.061481286 0
-		 -0.17995892 0.061481286 0.058472198 -0.15308221 0.061481286 0.11122072 -0.11122072 0.061481286 0.15308219
-		 -0.058472198 0.061481286 0.17995891 -5.6391944e-09 0.061481286 0.18922 0.058472183 0.061481286 0.17995889
-		 0.1112207 0.061481286 0.15308218 0.15308218 0.061481286 0.11122072 0.17995888 0.061481286 0.058472186
-		 0.18921997 0.061481286 0 0.16859633 0.090324879 -0.054780267 0.14341661 0.090324879 -0.10419825
-		 0.10419825 0.090324879 -0.1434166 0.05478026 0.090324879 -0.16859631 0 0.090324879 -0.17727265
-		 -0.05478026 0.090324879 -0.1685963 -0.10419824 0.090324879 -0.14341657 -0.14341655 0.090324879 -0.10419822
-		 -0.16859627 0.090324879 -0.054780245 -0.1772726 0.090324879 0 -0.16859627 0.090324879 0.054780245
-		 -0.14341654 0.090324879 0.10419822 -0.10419822 0.090324879 0.14341654 -0.054780245 0.090324879 0.16859625
-		 -5.2831339e-09 0.090324879 0.17727257 0.05478023 0.090324879 0.16859624 0.1041982 0.090324879 0.14341652
-		 0.14341651 0.090324879 0.1041982 0.16859622 0.090324879 0.054780234 0.17727256 0.090324879 0
-		 0.15308227 0.11694437 -0.049739439 0.13021955 0.11694437 -0.094610035 0.094610035 0.11694437 -0.13021953
-		 0.049739435 0.11694437 -0.15308224 0 0.11694437 -0.16096018 -0.049739435 0.11694437 -0.15308224
-		 -0.094610013 0.11694437 -0.13021952 -0.1302195 0.11694437 -0.094610006 -0.15308221 0.11694437 -0.04973942
-		 -0.16096015 0.11694437 0 -0.15308221 0.11694437 0.04973942 -0.13021949 0.11694437 0.094609998
-		 -0.094609998 0.11694437 0.13021949 -0.04973942 0.11694437 0.15308218 -4.796985e-09 0.11694437 0.16096012
-		 0.049739406 0.11694437 0.15308218 0.094609976 0.11694437 0.13021947 0.13021946 0.11694437 0.094609983
-		 0.15308216 0.11694437 0.049739409 0.16096011 0.11694437 0 0.13379879 0.14068429 -0.043473862
-		 0.11381606 0.14068429 -0.082692198 0.082692198 0.14068429 -0.11381605 0.043473858 0.14068429 -0.13379878
-		 0 0.14068429 -0.14068437 -0.043473858 0.14068429 -0.13379878 -0.082692184 0.14068429 -0.11381602
-		 -0.11381602 0.14068429 -0.082692176 -0.13379875 0.14068429 -0.043473847 -0.14068432 0.14068429 0
-		 -0.13379875 0.14068429 0.043473847 -0.11381601 0.14068429 0.082692169 -0.082692169 0.14068429 0.113816
-		 -0.043473847 0.14068429 0.13379873 -4.1927186e-09 0.14068429 0.14068431 0.043473832 0.14068429 0.13379872
-		 0.082692154 0.14068429 0.11381599 0.11381599 0.14068429 0.082692161 0.13379872 0.14068429 0.04347384
-		 0.14068429 0.14068429 0 0.11122077 0.16096011 -0.036137819 0.094610043 0.16096011 -0.068738215
-		 0.068738215 0.16096011 -0.094610035 0.036137816 0.16096011 -0.11122076 0 0.16096011 -0.11694442
-		 -0.036137816 0.16096011 -0.11122075 -0.0687382 0.16096011 -0.094610013 -0.094610006 0.16096011 -0.068738192
-		 -0.11122073 0.16096011 -0.036137804 -0.1169444 0.16096011 0 -0.11122073 0.16096011 0.036137804
-		 -0.094609998 0.16096011 0.068738185 -0.068738185 0.16096011 0.094609991 -0.036137804 0.16096011 0.11122072
-		 -3.4852137e-09 0.16096011 0.11694438 0.036137793 0.16096011 0.11122071 0.06873817 0.16096011 0.094609983
-		 0.094609983 0.16096011 0.068738177 0.1112207 0.16096011 0.036137797 0.11694437 0.16096011 0
-		 0.085904121 0.17727256 -0.027911939 0.073074408 0.17727256 -0.053091664 0.053091664 0.17727256 -0.073074408
-		 0.027911937 0.17727256 -0.085904106 0 0.17727256 -0.090324923 -0.027911937 0.17727256 -0.085904106
-		 -0.053091653 0.17727256 -0.073074393 -0.073074386 0.17727256 -0.053091645 -0.085904092 0.17727256 -0.027911929
-		 -0.090324901 0.17727256 0 -0.085904092 0.17727256 0.027911929 -0.073074378 0.17727256 0.053091642;
-	setAttr ".vt[332:381]" -0.053091642 0.17727256 0.073074371 -0.027911929 0.17727256 0.085904077
-		 -2.6918912e-09 0.17727256 0.090324886 0.02791192 0.17727256 0.085904069 0.05309163 0.17727256 0.073074371
-		 0.073074363 0.17727256 0.053091638 0.085904069 0.17727256 0.027911924 0.090324879 0.17727256 0
-		 0.058472224 0.18921997 -0.018998776 0.049739443 0.18921997 -0.036137819 0.036137819 0.18921997 -0.049739443
-		 0.018998774 0.18921997 -0.058472216 0 0.18921997 -0.061481323 -0.018998774 0.18921997 -0.058472212
-		 -0.036137812 0.18921997 -0.049739432 -0.049739428 0.18921997 -0.036137808 -0.058472201 0.18921997 -0.018998768
-		 -0.061481308 0.18921997 0 -0.058472201 0.18921997 0.018998768 -0.049739424 0.18921997 0.036137804
-		 -0.036137804 0.18921997 0.04973942 -0.018998768 0.18921997 0.058472194 -1.8322853e-09 0.18921997 0.061481301
-		 0.018998763 0.18921997 0.05847219 0.036137797 0.18921997 0.049739417 0.049739413 0.18921997 0.036137801
-		 0.058472186 0.18921997 0.018998764 0.061481293 0.18921997 0 0.029600544 0.19650814 -0.009617799
-		 0.025179727 0.19650814 -0.018294141 0.018294141 0.19650814 -0.025179725 0.009617798 0.19650814 -0.02960054
-		 0 0.19650814 -0.031123849 -0.009617798 0.19650814 -0.029600538 -0.018294137 0.19650814 -0.02517972
-		 -0.025179718 0.19650814 -0.018294135 -0.029600533 0.19650814 -0.0096177952 -0.031123841 0.19650814 0
-		 -0.029600533 0.19650814 0.0096177952 -0.025179716 0.19650814 0.018294133 -0.018294133 0.19650814 0.025179714
-		 -0.0096177952 0.19650814 0.029600529 -9.2756253e-10 0.19650814 0.031123837 0.0096177924 0.19650814 0.029600527
-		 0.01829413 0.19650814 0.025179712 0.02517971 0.19650814 0.018294131 0.029600525 0.19650814 0.0096177934
-		 0.031123834 0.19650814 0 0 -0.19895764 0 0 0.19895764 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere5";
-	rename -uid "87D90348-4A5C-6E51-0836-DAB056054F33";
-	setAttr ".t" -type "double3" -1.5561414847111918 1.3897739919627621 0.021963139216962357 ;
-	setAttr ".r" -type "double3" 12.730094076911284 0 0 ;
-	setAttr ".s" -type "double3" 0.64627208158235794 0.64627208158235794 0.48287904263204279 ;
-createNode transform -n "transform13" -p "pSphere5";
-	rename -uid "042FEC30-4D5A-2BEC-A7B7-76AEFB073072";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape5" -p "transform13";
-	rename -uid "066324C2-4B42-DA29-D11E-829FF5326562";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.029600544 -0.19650814 -0.009617799 0.025179727 -0.19650814 -0.018294141
-		 0.018294141 -0.19650814 -0.025179725 0.009617798 -0.19650814 -0.02960054 0 -0.19650814 -0.031123849
-		 -0.009617798 -0.19650814 -0.029600538 -0.018294137 -0.19650814 -0.02517972 -0.025179718 -0.19650814 -0.018294135
-		 -0.029600533 -0.19650814 -0.0096177952 -0.031123841 -0.19650814 0 -0.029600533 -0.19650814 0.0096177952
-		 -0.025179716 -0.19650814 0.018294133 -0.018294133 -0.19650814 0.025179714 -0.0096177952 -0.19650814 0.029600529
-		 -9.2756253e-10 -0.19650814 0.031123837 0.0096177924 -0.19650814 0.029600527 0.01829413 -0.19650814 0.025179712
-		 0.02517971 -0.19650814 0.018294131 0.029600525 -0.19650814 0.0096177934 0.031123834 -0.19650814 0
-		 0.058472224 -0.18921997 -0.018998776 0.049739443 -0.18921997 -0.036137819 0.036137819 -0.18921997 -0.049739443
-		 0.018998774 -0.18921997 -0.058472216 0 -0.18921997 -0.061481323 -0.018998774 -0.18921997 -0.058472212
-		 -0.036137812 -0.18921997 -0.049739432 -0.049739428 -0.18921997 -0.036137808 -0.058472201 -0.18921997 -0.018998768
-		 -0.061481308 -0.18921997 0 -0.058472201 -0.18921997 0.018998768 -0.049739424 -0.18921997 0.036137804
-		 -0.036137804 -0.18921997 0.04973942 -0.018998768 -0.18921997 0.058472194 -1.8322853e-09 -0.18921997 0.061481301
-		 0.018998763 -0.18921997 0.05847219 0.036137797 -0.18921997 0.049739417 0.049739413 -0.18921997 0.036137801
-		 0.058472186 -0.18921997 0.018998764 0.061481293 -0.18921997 0 0.085904121 -0.17727256 -0.027911939
-		 0.073074408 -0.17727256 -0.053091664 0.053091664 -0.17727256 -0.073074408 0.027911937 -0.17727256 -0.085904106
-		 0 -0.17727256 -0.090324923 -0.027911937 -0.17727256 -0.085904106 -0.053091653 -0.17727256 -0.073074393
-		 -0.073074386 -0.17727256 -0.053091645 -0.085904092 -0.17727256 -0.027911929 -0.090324901 -0.17727256 0
-		 -0.085904092 -0.17727256 0.027911929 -0.073074378 -0.17727256 0.053091642 -0.053091642 -0.17727256 0.073074371
-		 -0.027911929 -0.17727256 0.085904077 -2.6918912e-09 -0.17727256 0.090324886 0.02791192 -0.17727256 0.085904069
-		 0.05309163 -0.17727256 0.073074371 0.073074363 -0.17727256 0.053091638 0.085904069 -0.17727256 0.027911924
-		 0.090324879 -0.17727256 0 0.11122077 -0.16096011 -0.036137819 0.094610043 -0.16096011 -0.068738215
-		 0.068738215 -0.16096011 -0.094610035 0.036137816 -0.16096011 -0.11122076 0 -0.16096011 -0.11694442
-		 -0.036137816 -0.16096011 -0.11122075 -0.0687382 -0.16096011 -0.094610013 -0.094610006 -0.16096011 -0.068738192
-		 -0.11122073 -0.16096011 -0.036137804 -0.1169444 -0.16096011 0 -0.11122073 -0.16096011 0.036137804
-		 -0.094609998 -0.16096011 0.068738185 -0.068738185 -0.16096011 0.094609991 -0.036137804 -0.16096011 0.11122072
-		 -3.4852137e-09 -0.16096011 0.11694438 0.036137793 -0.16096011 0.11122071 0.06873817 -0.16096011 0.094609983
-		 0.094609983 -0.16096011 0.068738177 0.1112207 -0.16096011 0.036137797 0.11694437 -0.16096011 0
-		 0.13379879 -0.14068429 -0.043473862 0.11381606 -0.14068429 -0.082692198 0.082692198 -0.14068429 -0.11381605
-		 0.043473858 -0.14068429 -0.13379878 0 -0.14068429 -0.14068437 -0.043473858 -0.14068429 -0.13379878
-		 -0.082692184 -0.14068429 -0.11381602 -0.11381602 -0.14068429 -0.082692176 -0.13379875 -0.14068429 -0.043473847
-		 -0.14068432 -0.14068429 0 -0.13379875 -0.14068429 0.043473847 -0.11381601 -0.14068429 0.082692169
-		 -0.082692169 -0.14068429 0.113816 -0.043473847 -0.14068429 0.13379873 -4.1927186e-09 -0.14068429 0.14068431
-		 0.043473832 -0.14068429 0.13379872 0.082692154 -0.14068429 0.11381599 0.11381599 -0.14068429 0.082692161
-		 0.13379872 -0.14068429 0.04347384 0.14068429 -0.14068429 0 0.15308227 -0.11694437 -0.049739439
-		 0.13021955 -0.11694437 -0.094610035 0.094610035 -0.11694437 -0.13021953 0.049739435 -0.11694437 -0.15308224
-		 0 -0.11694437 -0.16096018 -0.049739435 -0.11694437 -0.15308224 -0.094610013 -0.11694437 -0.13021952
-		 -0.1302195 -0.11694437 -0.094610006 -0.15308221 -0.11694437 -0.04973942 -0.16096015 -0.11694437 0
-		 -0.15308221 -0.11694437 0.04973942 -0.13021949 -0.11694437 0.094609998 -0.094609998 -0.11694437 0.13021949
-		 -0.04973942 -0.11694437 0.15308218 -4.796985e-09 -0.11694437 0.16096012 0.049739406 -0.11694437 0.15308218
-		 0.094609976 -0.11694437 0.13021947 0.13021946 -0.11694437 0.094609983 0.15308216 -0.11694437 0.049739409
-		 0.16096011 -0.11694437 0 0.16859633 -0.090324879 -0.054780267 0.14341661 -0.090324879 -0.10419825
-		 0.10419825 -0.090324879 -0.1434166 0.05478026 -0.090324879 -0.16859631 0 -0.090324879 -0.17727265
-		 -0.05478026 -0.090324879 -0.1685963 -0.10419824 -0.090324879 -0.14341657 -0.14341655 -0.090324879 -0.10419822
-		 -0.16859627 -0.090324879 -0.054780245 -0.1772726 -0.090324879 0 -0.16859627 -0.090324879 0.054780245
-		 -0.14341654 -0.090324879 0.10419822 -0.10419822 -0.090324879 0.14341654 -0.054780245 -0.090324879 0.16859625
-		 -5.2831339e-09 -0.090324879 0.17727257 0.05478023 -0.090324879 0.16859624 0.1041982 -0.090324879 0.14341652
-		 0.14341651 -0.090324879 0.1041982 0.16859622 -0.090324879 0.054780234 0.17727256 -0.090324879 0
-		 0.179959 -0.061481286 -0.05847222 0.15308227 -0.061481286 -0.11122077 0.11122077 -0.061481286 -0.15308227
-		 0.058472216 -0.061481286 -0.17995898 0 -0.061481286 -0.18922006 -0.058472216 -0.061481286 -0.17995897
-		 -0.11122075 -0.061481286 -0.15308222 -0.15308222 -0.061481286 -0.11122074 -0.17995892 -0.061481286 -0.058472198
-		 -0.18922001 -0.061481286 0 -0.17995892 -0.061481286 0.058472198 -0.15308221 -0.061481286 0.11122072
-		 -0.11122072 -0.061481286 0.15308219 -0.058472198 -0.061481286 0.17995891 -5.6391944e-09 -0.061481286 0.18922
-		 0.058472183 -0.061481286 0.17995889 0.1112207 -0.061481286 0.15308218 0.15308218 -0.061481286 0.11122072
-		 0.17995888 -0.061481286 0.058472186 0.18921997 -0.061481286 0 0.18689047 -0.031123813 -0.060724393
-		 0.15897854 -0.031123813 -0.11550465 0.11550465 -0.031123813 -0.15897852 0.060724385 -0.031123813 -0.18689044
-		 0 -0.031123813 -0.19650823 -0.060724385 -0.031123813 -0.18689044;
-	setAttr ".vt[166:331]" -0.11550463 -0.031123813 -0.15897848 -0.15897848 -0.031123813 -0.11550462
-		 -0.18689039 -0.031123813 -0.060724366 -0.19650818 -0.031123813 0 -0.18689039 -0.031123813 0.060724366
-		 -0.15897846 -0.031123813 0.11550461 -0.11550461 -0.031123813 0.15897845 -0.060724366 -0.031123813 0.18689038
-		 -5.8563989e-09 -0.031123813 0.19650817 0.060724352 -0.031123813 0.18689036 0.11550459 -0.031123813 0.15897843
-		 0.15897843 -0.031123813 0.11550459 0.18689035 -0.031123813 0.060724355 0.19650814 -0.031123813 0
-		 0.18922009 0 -0.061481327 0.16096021 0 -0.11694443 0.11694443 0 -0.16096021 0.061481323 0 -0.18922006
-		 0 0 -0.19895773 -0.061481323 0 -0.18922004 -0.11694441 0 -0.16096017 -0.16096015 0 -0.1169444
-		 -0.18922001 0 -0.061481304 -0.19895768 0 0 -0.18922001 0 0.061481304 -0.16096015 0 0.11694439
-		 -0.11694439 0 0.16096014 -0.061481304 0 0.18921998 -5.9293996e-09 0 0.19895767 0.061481286 0 0.18921997
-		 0.11694437 0 0.16096012 0.16096011 0 0.11694437 0.18921997 0 0.061481293 0.19895764 0 0
-		 0.18689047 0.031123813 -0.060724393 0.15897854 0.031123813 -0.11550465 0.11550465 0.031123813 -0.15897852
-		 0.060724385 0.031123813 -0.18689044 0 0.031123813 -0.19650823 -0.060724385 0.031123813 -0.18689044
-		 -0.11550463 0.031123813 -0.15897848 -0.15897848 0.031123813 -0.11550462 -0.18689039 0.031123813 -0.060724366
-		 -0.19650818 0.031123813 0 -0.18689039 0.031123813 0.060724366 -0.15897846 0.031123813 0.11550461
-		 -0.11550461 0.031123813 0.15897845 -0.060724366 0.031123813 0.18689038 -5.8563989e-09 0.031123813 0.19650817
-		 0.060724352 0.031123813 0.18689036 0.11550459 0.031123813 0.15897843 0.15897843 0.031123813 0.11550459
-		 0.18689035 0.031123813 0.060724355 0.19650814 0.031123813 0 0.179959 0.061481286 -0.05847222
-		 0.15308227 0.061481286 -0.11122077 0.11122077 0.061481286 -0.15308227 0.058472216 0.061481286 -0.17995898
-		 0 0.061481286 -0.18922006 -0.058472216 0.061481286 -0.17995897 -0.11122075 0.061481286 -0.15308222
-		 -0.15308222 0.061481286 -0.11122074 -0.17995892 0.061481286 -0.058472198 -0.18922001 0.061481286 0
-		 -0.17995892 0.061481286 0.058472198 -0.15308221 0.061481286 0.11122072 -0.11122072 0.061481286 0.15308219
-		 -0.058472198 0.061481286 0.17995891 -5.6391944e-09 0.061481286 0.18922 0.058472183 0.061481286 0.17995889
-		 0.1112207 0.061481286 0.15308218 0.15308218 0.061481286 0.11122072 0.17995888 0.061481286 0.058472186
-		 0.18921997 0.061481286 0 0.16859633 0.090324879 -0.054780267 0.14341661 0.090324879 -0.10419825
-		 0.10419825 0.090324879 -0.1434166 0.05478026 0.090324879 -0.16859631 0 0.090324879 -0.17727265
-		 -0.05478026 0.090324879 -0.1685963 -0.10419824 0.090324879 -0.14341657 -0.14341655 0.090324879 -0.10419822
-		 -0.16859627 0.090324879 -0.054780245 -0.1772726 0.090324879 0 -0.16859627 0.090324879 0.054780245
-		 -0.14341654 0.090324879 0.10419822 -0.10419822 0.090324879 0.14341654 -0.054780245 0.090324879 0.16859625
-		 -5.2831339e-09 0.090324879 0.17727257 0.05478023 0.090324879 0.16859624 0.1041982 0.090324879 0.14341652
-		 0.14341651 0.090324879 0.1041982 0.16859622 0.090324879 0.054780234 0.17727256 0.090324879 0
-		 0.15308227 0.11694437 -0.049739439 0.13021955 0.11694437 -0.094610035 0.094610035 0.11694437 -0.13021953
-		 0.049739435 0.11694437 -0.15308224 0 0.11694437 -0.16096018 -0.049739435 0.11694437 -0.15308224
-		 -0.094610013 0.11694437 -0.13021952 -0.1302195 0.11694437 -0.094610006 -0.15308221 0.11694437 -0.04973942
-		 -0.16096015 0.11694437 0 -0.15308221 0.11694437 0.04973942 -0.13021949 0.11694437 0.094609998
-		 -0.094609998 0.11694437 0.13021949 -0.04973942 0.11694437 0.15308218 -4.796985e-09 0.11694437 0.16096012
-		 0.049739406 0.11694437 0.15308218 0.094609976 0.11694437 0.13021947 0.13021946 0.11694437 0.094609983
-		 0.15308216 0.11694437 0.049739409 0.16096011 0.11694437 0 0.13379879 0.14068429 -0.043473862
-		 0.11381606 0.14068429 -0.082692198 0.082692198 0.14068429 -0.11381605 0.043473858 0.14068429 -0.13379878
-		 0 0.14068429 -0.14068437 -0.043473858 0.14068429 -0.13379878 -0.082692184 0.14068429 -0.11381602
-		 -0.11381602 0.14068429 -0.082692176 -0.13379875 0.14068429 -0.043473847 -0.14068432 0.14068429 0
-		 -0.13379875 0.14068429 0.043473847 -0.11381601 0.14068429 0.082692169 -0.082692169 0.14068429 0.113816
-		 -0.043473847 0.14068429 0.13379873 -4.1927186e-09 0.14068429 0.14068431 0.043473832 0.14068429 0.13379872
-		 0.082692154 0.14068429 0.11381599 0.11381599 0.14068429 0.082692161 0.13379872 0.14068429 0.04347384
-		 0.14068429 0.14068429 0 0.11122077 0.16096011 -0.036137819 0.094610043 0.16096011 -0.068738215
-		 0.068738215 0.16096011 -0.094610035 0.036137816 0.16096011 -0.11122076 0 0.16096011 -0.11694442
-		 -0.036137816 0.16096011 -0.11122075 -0.0687382 0.16096011 -0.094610013 -0.094610006 0.16096011 -0.068738192
-		 -0.11122073 0.16096011 -0.036137804 -0.1169444 0.16096011 0 -0.11122073 0.16096011 0.036137804
-		 -0.094609998 0.16096011 0.068738185 -0.068738185 0.16096011 0.094609991 -0.036137804 0.16096011 0.11122072
-		 -3.4852137e-09 0.16096011 0.11694438 0.036137793 0.16096011 0.11122071 0.06873817 0.16096011 0.094609983
-		 0.094609983 0.16096011 0.068738177 0.1112207 0.16096011 0.036137797 0.11694437 0.16096011 0
-		 0.085904121 0.17727256 -0.027911939 0.073074408 0.17727256 -0.053091664 0.053091664 0.17727256 -0.073074408
-		 0.027911937 0.17727256 -0.085904106 0 0.17727256 -0.090324923 -0.027911937 0.17727256 -0.085904106
-		 -0.053091653 0.17727256 -0.073074393 -0.073074386 0.17727256 -0.053091645 -0.085904092 0.17727256 -0.027911929
-		 -0.090324901 0.17727256 0 -0.085904092 0.17727256 0.027911929 -0.073074378 0.17727256 0.053091642;
-	setAttr ".vt[332:381]" -0.053091642 0.17727256 0.073074371 -0.027911929 0.17727256 0.085904077
-		 -2.6918912e-09 0.17727256 0.090324886 0.02791192 0.17727256 0.085904069 0.05309163 0.17727256 0.073074371
-		 0.073074363 0.17727256 0.053091638 0.085904069 0.17727256 0.027911924 0.090324879 0.17727256 0
-		 0.058472224 0.18921997 -0.018998776 0.049739443 0.18921997 -0.036137819 0.036137819 0.18921997 -0.049739443
-		 0.018998774 0.18921997 -0.058472216 0 0.18921997 -0.061481323 -0.018998774 0.18921997 -0.058472212
-		 -0.036137812 0.18921997 -0.049739432 -0.049739428 0.18921997 -0.036137808 -0.058472201 0.18921997 -0.018998768
-		 -0.061481308 0.18921997 0 -0.058472201 0.18921997 0.018998768 -0.049739424 0.18921997 0.036137804
-		 -0.036137804 0.18921997 0.04973942 -0.018998768 0.18921997 0.058472194 -1.8322853e-09 0.18921997 0.061481301
-		 0.018998763 0.18921997 0.05847219 0.036137797 0.18921997 0.049739417 0.049739413 0.18921997 0.036137801
-		 0.058472186 0.18921997 0.018998764 0.061481293 0.18921997 0 0.029600544 0.19650814 -0.009617799
-		 0.025179727 0.19650814 -0.018294141 0.018294141 0.19650814 -0.025179725 0.009617798 0.19650814 -0.02960054
-		 0 0.19650814 -0.031123849 -0.009617798 0.19650814 -0.029600538 -0.018294137 0.19650814 -0.02517972
-		 -0.025179718 0.19650814 -0.018294135 -0.029600533 0.19650814 -0.0096177952 -0.031123841 0.19650814 0
-		 -0.029600533 0.19650814 0.0096177952 -0.025179716 0.19650814 0.018294133 -0.018294133 0.19650814 0.025179714
-		 -0.0096177952 0.19650814 0.029600529 -9.2756253e-10 0.19650814 0.031123837 0.0096177924 0.19650814 0.029600527
-		 0.01829413 0.19650814 0.025179712 0.02517971 0.19650814 0.018294131 0.029600525 0.19650814 0.0096177934
-		 0.031123834 0.19650814 0 0 -0.19895764 0 0 0.19895764 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere7";
-	rename -uid "3BEAF6C6-4342-5407-2A0D-D486CCDBDF17";
-	setAttr ".t" -type "double3" -1.9609342663227012 3.1506369295413861 0.88852640071140243 ;
-	setAttr ".r" -type "double3" 10.654615211149865 37.841085465194404 1.0030049290423182 ;
-	setAttr ".s" -type "double3" 0.37789492252366208 0.39965854129851819 0.11720320226928101 ;
-createNode transform -n "transform9" -p "pSphere7";
-	rename -uid "50202C35-4245-15D3-D5B2-01BB8D331F38";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape7" -p "transform9";
-	rename -uid "FA5E6017-4B07-DDDC-FA89-0B8098765570";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.029600544 -0.19650814 -0.009617799 0.025179727 -0.19650814 -0.018294141
-		 0.018294141 -0.19650814 -0.025179725 0.009617798 -0.19650814 -0.02960054 0 -0.19650814 -0.031123849
-		 -0.009617798 -0.19650814 -0.029600538 -0.018294137 -0.19650814 -0.02517972 -0.025179718 -0.19650814 -0.018294135
-		 -0.029600533 -0.19650814 -0.0096177952 -0.031123841 -0.19650814 0 -0.029600533 -0.19650814 0.0096177952
-		 -0.025179716 -0.19650814 0.018294133 -0.018294133 -0.19650814 0.025179714 -0.0096177952 -0.19650814 0.029600529
-		 -9.2756253e-10 -0.19650814 0.031123837 0.0096177924 -0.19650814 0.029600527 0.01829413 -0.19650814 0.025179712
-		 0.02517971 -0.19650814 0.018294131 0.029600525 -0.19650814 0.0096177934 0.031123834 -0.19650814 0
-		 0.058472224 -0.18921997 -0.018998776 0.049739443 -0.18921997 -0.036137819 0.036137819 -0.18921997 -0.049739443
-		 0.018998774 -0.18921997 -0.058472216 0 -0.18921997 -0.061481323 -0.018998774 -0.18921997 -0.058472212
-		 -0.036137812 -0.18921997 -0.049739432 -0.049739428 -0.18921997 -0.036137808 -0.058472201 -0.18921997 -0.018998768
-		 -0.061481308 -0.18921997 0 -0.058472201 -0.18921997 0.018998768 -0.049739424 -0.18921997 0.036137804
-		 -0.036137804 -0.18921997 0.04973942 -0.018998768 -0.18921997 0.058472194 -1.8322853e-09 -0.18921997 0.061481301
-		 0.018998763 -0.18921997 0.05847219 0.036137797 -0.18921997 0.049739417 0.049739413 -0.18921997 0.036137801
-		 0.058472186 -0.18921997 0.018998764 0.061481293 -0.18921997 0 0.085904121 -0.17727256 -0.027911939
-		 0.073074408 -0.17727256 -0.053091664 0.053091664 -0.17727256 -0.073074408 0.027911937 -0.17727256 -0.085904106
-		 0 -0.17727256 -0.090324923 -0.027911937 -0.17727256 -0.085904106 -0.053091653 -0.17727256 -0.073074393
-		 -0.073074386 -0.17727256 -0.053091645 -0.085904092 -0.17727256 -0.027911929 -0.090324901 -0.17727256 0
-		 -0.085904092 -0.17727256 0.027911929 -0.073074378 -0.17727256 0.053091642 -0.053091642 -0.17727256 0.073074371
-		 -0.027911929 -0.17727256 0.085904077 -2.6918912e-09 -0.17727256 0.090324886 0.02791192 -0.17727256 0.085904069
-		 0.05309163 -0.17727256 0.073074371 0.073074363 -0.17727256 0.053091638 0.085904069 -0.17727256 0.027911924
-		 0.090324879 -0.17727256 0 0.11122077 -0.16096011 -0.036137819 0.094610043 -0.16096011 -0.068738215
-		 0.068738215 -0.16096011 -0.094610035 0.036137816 -0.16096011 -0.11122076 0 -0.16096011 -0.11694442
-		 -0.036137816 -0.16096011 -0.11122075 -0.0687382 -0.16096011 -0.094610013 -0.094610006 -0.16096011 -0.068738192
-		 -0.11122073 -0.16096011 -0.036137804 -0.1169444 -0.16096011 0 -0.11122073 -0.16096011 0.036137804
-		 -0.094609998 -0.16096011 0.068738185 -0.068738185 -0.16096011 0.094609991 -0.036137804 -0.16096011 0.11122072
-		 -3.4852137e-09 -0.16096011 0.11694438 0.036137793 -0.16096011 0.11122071 0.06873817 -0.16096011 0.094609983
-		 0.094609983 -0.16096011 0.068738177 0.1112207 -0.16096011 0.036137797 0.11694437 -0.16096011 0
-		 0.13379879 -0.14068429 -0.043473862 0.11381606 -0.14068429 -0.082692198 0.082692198 -0.14068429 -0.11381605
-		 0.043473858 -0.14068429 -0.13379878 0 -0.14068429 -0.14068437 -0.043473858 -0.14068429 -0.13379878
-		 -0.082692184 -0.14068429 -0.11381602 -0.11381602 -0.14068429 -0.082692176 -0.13379875 -0.14068429 -0.043473847
-		 -0.14068432 -0.14068429 0 -0.13379875 -0.14068429 0.043473847 -0.11381601 -0.14068429 0.082692169
-		 -0.082692169 -0.14068429 0.113816 -0.043473847 -0.14068429 0.13379873 -4.1927186e-09 -0.14068429 0.14068431
-		 0.043473832 -0.14068429 0.13379872 0.082692154 -0.14068429 0.11381599 0.11381599 -0.14068429 0.082692161
-		 0.13379872 -0.14068429 0.04347384 0.14068429 -0.14068429 0 0.15308227 -0.11694437 -0.049739439
-		 0.13021955 -0.11694437 -0.094610035 0.094610035 -0.11694437 -0.13021953 0.049739435 -0.11694437 -0.15308224
-		 0 -0.11694437 -0.16096018 -0.049739435 -0.11694437 -0.15308224 -0.094610013 -0.11694437 -0.13021952
-		 -0.1302195 -0.11694437 -0.094610006 -0.15308221 -0.11694437 -0.04973942 -0.16096015 -0.11694437 0
-		 -0.15308221 -0.11694437 0.04973942 -0.13021949 -0.11694437 0.094609998 -0.094609998 -0.11694437 0.13021949
-		 -0.04973942 -0.11694437 0.15308218 -4.796985e-09 -0.11694437 0.16096012 0.049739406 -0.11694437 0.15308218
-		 0.094609976 -0.11694437 0.13021947 0.13021946 -0.11694437 0.094609983 0.15308216 -0.11694437 0.049739409
-		 0.16096011 -0.11694437 0 0.16859633 -0.090324879 -0.054780267 0.14341661 -0.090324879 -0.10419825
-		 0.10419825 -0.090324879 -0.1434166 0.05478026 -0.090324879 -0.16859631 0 -0.090324879 -0.17727265
-		 -0.05478026 -0.090324879 -0.1685963 -0.10419824 -0.090324879 -0.14341657 -0.14341655 -0.090324879 -0.10419822
-		 -0.16859627 -0.090324879 -0.054780245 -0.1772726 -0.090324879 0 -0.16859627 -0.090324879 0.054780245
-		 -0.14341654 -0.090324879 0.10419822 -0.10419822 -0.090324879 0.14341654 -0.054780245 -0.090324879 0.16859625
-		 -5.2831339e-09 -0.090324879 0.17727257 0.05478023 -0.090324879 0.16859624 0.1041982 -0.090324879 0.14341652
-		 0.14341651 -0.090324879 0.1041982 0.16859622 -0.090324879 0.054780234 0.17727256 -0.090324879 0
-		 0.179959 -0.061481286 -0.05847222 0.15308227 -0.061481286 -0.11122077 0.11122077 -0.061481286 -0.15308227
-		 0.058472216 -0.061481286 -0.17995898 0 -0.061481286 -0.18922006 -0.058472216 -0.061481286 -0.17995897
-		 -0.11122075 -0.061481286 -0.15308222 -0.15308222 -0.061481286 -0.11122074 -0.17995892 -0.061481286 -0.058472198
-		 -0.18922001 -0.061481286 0 -0.17995892 -0.061481286 0.058472198 -0.15308221 -0.061481286 0.11122072
-		 -0.11122072 -0.061481286 0.15308219 -0.058472198 -0.061481286 0.17995891 -5.6391944e-09 -0.061481286 0.18922
-		 0.058472183 -0.061481286 0.17995889 0.1112207 -0.061481286 0.15308218 0.15308218 -0.061481286 0.11122072
-		 0.17995888 -0.061481286 0.058472186 0.18921997 -0.061481286 0 0.18689047 -0.031123813 -0.060724393
-		 0.15897854 -0.031123813 -0.11550465 0.11550465 -0.031123813 -0.15897852 0.060724385 -0.031123813 -0.18689044
-		 0 -0.031123813 -0.19650823 -0.060724385 -0.031123813 -0.18689044;
-	setAttr ".vt[166:331]" -0.11550463 -0.031123813 -0.15897848 -0.15897848 -0.031123813 -0.11550462
-		 -0.18689039 -0.031123813 -0.060724366 -0.19650818 -0.031123813 0 -0.18689039 -0.031123813 0.060724366
-		 -0.15897846 -0.031123813 0.11550461 -0.11550461 -0.031123813 0.15897845 -0.060724366 -0.031123813 0.18689038
-		 -5.8563989e-09 -0.031123813 0.19650817 0.060724352 -0.031123813 0.18689036 0.11550459 -0.031123813 0.15897843
-		 0.15897843 -0.031123813 0.11550459 0.18689035 -0.031123813 0.060724355 0.19650814 -0.031123813 0
-		 0.18922009 0 -0.061481327 0.16096021 0 -0.11694443 0.11694443 0 -0.16096021 0.061481323 0 -0.18922006
-		 0 0 -0.19895773 -0.061481323 0 -0.18922004 -0.11694441 0 -0.16096017 -0.16096015 0 -0.1169444
-		 -0.18922001 0 -0.061481304 -0.19895768 0 0 -0.18922001 0 0.061481304 -0.16096015 0 0.11694439
-		 -0.11694439 0 0.16096014 -0.061481304 0 0.18921998 -5.9293996e-09 0 0.19895767 0.061481286 0 0.18921997
-		 0.11694437 0 0.16096012 0.16096011 0 0.11694437 0.18921997 0 0.061481293 0.19895764 0 0
-		 0.18689047 0.031123813 -0.060724393 0.15897854 0.031123813 -0.11550465 0.11550465 0.031123813 -0.15897852
-		 0.060724385 0.031123813 -0.18689044 0 0.031123813 -0.19650823 -0.060724385 0.031123813 -0.18689044
-		 -0.11550463 0.031123813 -0.15897848 -0.15897848 0.031123813 -0.11550462 -0.18689039 0.031123813 -0.060724366
-		 -0.19650818 0.031123813 0 -0.18689039 0.031123813 0.060724366 -0.15897846 0.031123813 0.11550461
-		 -0.11550461 0.031123813 0.15897845 -0.060724366 0.031123813 0.18689038 -5.8563989e-09 0.031123813 0.19650817
-		 0.060724352 0.031123813 0.18689036 0.11550459 0.031123813 0.15897843 0.15897843 0.031123813 0.11550459
-		 0.18689035 0.031123813 0.060724355 0.19650814 0.031123813 0 0.179959 0.061481286 -0.05847222
-		 0.15308227 0.061481286 -0.11122077 0.11122077 0.061481286 -0.15308227 0.058472216 0.061481286 -0.17995898
-		 0 0.061481286 -0.18922006 -0.058472216 0.061481286 -0.17995897 -0.11122075 0.061481286 -0.15308222
-		 -0.15308222 0.061481286 -0.11122074 -0.17995892 0.061481286 -0.058472198 -0.18922001 0.061481286 0
-		 -0.17995892 0.061481286 0.058472198 -0.15308221 0.061481286 0.11122072 -0.11122072 0.061481286 0.15308219
-		 -0.058472198 0.061481286 0.17995891 -5.6391944e-09 0.061481286 0.18922 0.058472183 0.061481286 0.17995889
-		 0.1112207 0.061481286 0.15308218 0.15308218 0.061481286 0.11122072 0.17995888 0.061481286 0.058472186
-		 0.18921997 0.061481286 0 0.16859633 0.090324879 -0.054780267 0.14341661 0.090324879 -0.10419825
-		 0.10419825 0.090324879 -0.1434166 0.05478026 0.090324879 -0.16859631 0 0.090324879 -0.17727265
-		 -0.05478026 0.090324879 -0.1685963 -0.10419824 0.090324879 -0.14341657 -0.14341655 0.090324879 -0.10419822
-		 -0.16859627 0.090324879 -0.054780245 -0.1772726 0.090324879 0 -0.16859627 0.090324879 0.054780245
-		 -0.14341654 0.090324879 0.10419822 -0.10419822 0.090324879 0.14341654 -0.054780245 0.090324879 0.16859625
-		 -5.2831339e-09 0.090324879 0.17727257 0.05478023 0.090324879 0.16859624 0.1041982 0.090324879 0.14341652
-		 0.14341651 0.090324879 0.1041982 0.16859622 0.090324879 0.054780234 0.17727256 0.090324879 0
-		 0.15308227 0.11694437 -0.049739439 0.13021955 0.11694437 -0.094610035 0.094610035 0.11694437 -0.13021953
-		 0.049739435 0.11694437 -0.15308224 0 0.11694437 -0.16096018 -0.049739435 0.11694437 -0.15308224
-		 -0.094610013 0.11694437 -0.13021952 -0.1302195 0.11694437 -0.094610006 -0.15308221 0.11694437 -0.04973942
-		 -0.16096015 0.11694437 0 -0.15308221 0.11694437 0.04973942 -0.13021949 0.11694437 0.094609998
-		 -0.094609998 0.11694437 0.13021949 -0.04973942 0.11694437 0.15308218 -4.796985e-09 0.11694437 0.16096012
-		 0.049739406 0.11694437 0.15308218 0.094609976 0.11694437 0.13021947 0.13021946 0.11694437 0.094609983
-		 0.15308216 0.11694437 0.049739409 0.16096011 0.11694437 0 0.13379879 0.14068429 -0.043473862
-		 0.11381606 0.14068429 -0.082692198 0.082692198 0.14068429 -0.11381605 0.043473858 0.14068429 -0.13379878
-		 0 0.14068429 -0.14068437 -0.043473858 0.14068429 -0.13379878 -0.082692184 0.14068429 -0.11381602
-		 -0.11381602 0.14068429 -0.082692176 -0.13379875 0.14068429 -0.043473847 -0.14068432 0.14068429 0
-		 -0.13379875 0.14068429 0.043473847 -0.11381601 0.14068429 0.082692169 -0.082692169 0.14068429 0.113816
-		 -0.043473847 0.14068429 0.13379873 -4.1927186e-09 0.14068429 0.14068431 0.043473832 0.14068429 0.13379872
-		 0.082692154 0.14068429 0.11381599 0.11381599 0.14068429 0.082692161 0.13379872 0.14068429 0.04347384
-		 0.14068429 0.14068429 0 0.11122077 0.16096011 -0.036137819 0.094610043 0.16096011 -0.068738215
-		 0.068738215 0.16096011 -0.094610035 0.036137816 0.16096011 -0.11122076 0 0.16096011 -0.11694442
-		 -0.036137816 0.16096011 -0.11122075 -0.0687382 0.16096011 -0.094610013 -0.094610006 0.16096011 -0.068738192
-		 -0.11122073 0.16096011 -0.036137804 -0.1169444 0.16096011 0 -0.11122073 0.16096011 0.036137804
-		 -0.094609998 0.16096011 0.068738185 -0.068738185 0.16096011 0.094609991 -0.036137804 0.16096011 0.11122072
-		 -3.4852137e-09 0.16096011 0.11694438 0.036137793 0.16096011 0.11122071 0.06873817 0.16096011 0.094609983
-		 0.094609983 0.16096011 0.068738177 0.1112207 0.16096011 0.036137797 0.11694437 0.16096011 0
-		 0.085904121 0.17727256 -0.027911939 0.073074408 0.17727256 -0.053091664 0.053091664 0.17727256 -0.073074408
-		 0.027911937 0.17727256 -0.085904106 0 0.17727256 -0.090324923 -0.027911937 0.17727256 -0.085904106
-		 -0.053091653 0.17727256 -0.073074393 -0.073074386 0.17727256 -0.053091645 -0.085904092 0.17727256 -0.027911929
-		 -0.090324901 0.17727256 0 -0.085904092 0.17727256 0.027911929 -0.073074378 0.17727256 0.053091642;
-	setAttr ".vt[332:381]" -0.053091642 0.17727256 0.073074371 -0.027911929 0.17727256 0.085904077
-		 -2.6918912e-09 0.17727256 0.090324886 0.02791192 0.17727256 0.085904069 0.05309163 0.17727256 0.073074371
-		 0.073074363 0.17727256 0.053091638 0.085904069 0.17727256 0.027911924 0.090324879 0.17727256 0
-		 0.058472224 0.18921997 -0.018998776 0.049739443 0.18921997 -0.036137819 0.036137819 0.18921997 -0.049739443
-		 0.018998774 0.18921997 -0.058472216 0 0.18921997 -0.061481323 -0.018998774 0.18921997 -0.058472212
-		 -0.036137812 0.18921997 -0.049739432 -0.049739428 0.18921997 -0.036137808 -0.058472201 0.18921997 -0.018998768
-		 -0.061481308 0.18921997 0 -0.058472201 0.18921997 0.018998768 -0.049739424 0.18921997 0.036137804
-		 -0.036137804 0.18921997 0.04973942 -0.018998768 0.18921997 0.058472194 -1.8322853e-09 0.18921997 0.061481301
-		 0.018998763 0.18921997 0.05847219 0.036137797 0.18921997 0.049739417 0.049739413 0.18921997 0.036137801
-		 0.058472186 0.18921997 0.018998764 0.061481293 0.18921997 0 0.029600544 0.19650814 -0.009617799
-		 0.025179727 0.19650814 -0.018294141 0.018294141 0.19650814 -0.025179725 0.009617798 0.19650814 -0.02960054
-		 0 0.19650814 -0.031123849 -0.009617798 0.19650814 -0.029600538 -0.018294137 0.19650814 -0.02517972
-		 -0.025179718 0.19650814 -0.018294135 -0.029600533 0.19650814 -0.0096177952 -0.031123841 0.19650814 0
-		 -0.029600533 0.19650814 0.0096177952 -0.025179716 0.19650814 0.018294133 -0.018294133 0.19650814 0.025179714
-		 -0.0096177952 0.19650814 0.029600529 -9.2756253e-10 0.19650814 0.031123837 0.0096177924 0.19650814 0.029600527
-		 0.01829413 0.19650814 0.025179712 0.02517971 0.19650814 0.018294131 0.029600525 0.19650814 0.0096177934
-		 0.031123834 0.19650814 0 0 -0.19895764 0 0 0.19895764 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pCylinder1";
-	rename -uid "EB15F226-4DD3-D716-57FD-19A29ADF0CC5";
-	setAttr ".t" -type "double3" 0.058487594274699406 2.1686895105287971 1.3943256118490017 ;
-	setAttr ".r" -type "double3" -2.4389120900307786e-15 12.022577259767049 -72.071368855114514 ;
-	setAttr ".s" -type "double3" -0.248 0.42120859649370429 0.24752488323401525 ;
-createNode transform -n "transform27" -p "pCylinder1";
-	rename -uid "ABD88DC1-45A5-3F4E-ECA0-9593F13D680C";
-	setAttr ".v" no;
-createNode mesh -n "pCylinderShape1" -p "transform27";
-	rename -uid "C9DFAEB4-4E12-2153-26EF-42B6805E681E";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".pv" -type "double2" 0.55624982714653015 0.57307109236717224 ;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 10 ".pt[428:437]" -type "float3"  -0.12716162 -0.022322532 
-		0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599 
-		-0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 
-		-0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 
-		0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere8";
-	rename -uid "6B4700F4-43EB-FF37-5816-5091BD7A6D28";
-	setAttr ".t" -type "double3" -1.1742866346412115 3.1506369295413861 0.88452845466009999 ;
-	setAttr ".r" -type "double3" 10.654615211149865 -37.841 1.0030049290423182 ;
-	setAttr ".s" -type "double3" 0.37789492252366208 0.39965854129851819 0.11720320226928101 ;
-createNode transform -n "transform10" -p "pSphere8";
-	rename -uid "8B7DF42E-401D-E382-BE78-248A8A5B293B";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape8" -p "transform10";
-	rename -uid "14C7AE4F-49C4-E9F7-2730-398CFB4988D3";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.029600544 -0.19650814 -0.009617799 0.025179727 -0.19650814 -0.018294141
-		 0.018294141 -0.19650814 -0.025179725 0.009617798 -0.19650814 -0.02960054 0 -0.19650814 -0.031123849
-		 -0.009617798 -0.19650814 -0.029600538 -0.018294137 -0.19650814 -0.02517972 -0.025179718 -0.19650814 -0.018294135
-		 -0.029600533 -0.19650814 -0.0096177952 -0.031123841 -0.19650814 0 -0.029600533 -0.19650814 0.0096177952
-		 -0.025179716 -0.19650814 0.018294133 -0.018294133 -0.19650814 0.025179714 -0.0096177952 -0.19650814 0.029600529
-		 -9.2756253e-10 -0.19650814 0.031123837 0.0096177924 -0.19650814 0.029600527 0.01829413 -0.19650814 0.025179712
-		 0.02517971 -0.19650814 0.018294131 0.029600525 -0.19650814 0.0096177934 0.031123834 -0.19650814 0
-		 0.058472224 -0.18921997 -0.018998776 0.049739443 -0.18921997 -0.036137819 0.036137819 -0.18921997 -0.049739443
-		 0.018998774 -0.18921997 -0.058472216 0 -0.18921997 -0.061481323 -0.018998774 -0.18921997 -0.058472212
-		 -0.036137812 -0.18921997 -0.049739432 -0.049739428 -0.18921997 -0.036137808 -0.058472201 -0.18921997 -0.018998768
-		 -0.061481308 -0.18921997 0 -0.058472201 -0.18921997 0.018998768 -0.049739424 -0.18921997 0.036137804
-		 -0.036137804 -0.18921997 0.04973942 -0.018998768 -0.18921997 0.058472194 -1.8322853e-09 -0.18921997 0.061481301
-		 0.018998763 -0.18921997 0.05847219 0.036137797 -0.18921997 0.049739417 0.049739413 -0.18921997 0.036137801
-		 0.058472186 -0.18921997 0.018998764 0.061481293 -0.18921997 0 0.085904121 -0.17727256 -0.027911939
-		 0.073074408 -0.17727256 -0.053091664 0.053091664 -0.17727256 -0.073074408 0.027911937 -0.17727256 -0.085904106
-		 0 -0.17727256 -0.090324923 -0.027911937 -0.17727256 -0.085904106 -0.053091653 -0.17727256 -0.073074393
-		 -0.073074386 -0.17727256 -0.053091645 -0.085904092 -0.17727256 -0.027911929 -0.090324901 -0.17727256 0
-		 -0.085904092 -0.17727256 0.027911929 -0.073074378 -0.17727256 0.053091642 -0.053091642 -0.17727256 0.073074371
-		 -0.027911929 -0.17727256 0.085904077 -2.6918912e-09 -0.17727256 0.090324886 0.02791192 -0.17727256 0.085904069
-		 0.05309163 -0.17727256 0.073074371 0.073074363 -0.17727256 0.053091638 0.085904069 -0.17727256 0.027911924
-		 0.090324879 -0.17727256 0 0.11122077 -0.16096011 -0.036137819 0.094610043 -0.16096011 -0.068738215
-		 0.068738215 -0.16096011 -0.094610035 0.036137816 -0.16096011 -0.11122076 0 -0.16096011 -0.11694442
-		 -0.036137816 -0.16096011 -0.11122075 -0.0687382 -0.16096011 -0.094610013 -0.094610006 -0.16096011 -0.068738192
-		 -0.11122073 -0.16096011 -0.036137804 -0.1169444 -0.16096011 0 -0.11122073 -0.16096011 0.036137804
-		 -0.094609998 -0.16096011 0.068738185 -0.068738185 -0.16096011 0.094609991 -0.036137804 -0.16096011 0.11122072
-		 -3.4852137e-09 -0.16096011 0.11694438 0.036137793 -0.16096011 0.11122071 0.06873817 -0.16096011 0.094609983
-		 0.094609983 -0.16096011 0.068738177 0.1112207 -0.16096011 0.036137797 0.11694437 -0.16096011 0
-		 0.13379879 -0.14068429 -0.043473862 0.11381606 -0.14068429 -0.082692198 0.082692198 -0.14068429 -0.11381605
-		 0.043473858 -0.14068429 -0.13379878 0 -0.14068429 -0.14068437 -0.043473858 -0.14068429 -0.13379878
-		 -0.082692184 -0.14068429 -0.11381602 -0.11381602 -0.14068429 -0.082692176 -0.13379875 -0.14068429 -0.043473847
-		 -0.14068432 -0.14068429 0 -0.13379875 -0.14068429 0.043473847 -0.11381601 -0.14068429 0.082692169
-		 -0.082692169 -0.14068429 0.113816 -0.043473847 -0.14068429 0.13379873 -4.1927186e-09 -0.14068429 0.14068431
-		 0.043473832 -0.14068429 0.13379872 0.082692154 -0.14068429 0.11381599 0.11381599 -0.14068429 0.082692161
-		 0.13379872 -0.14068429 0.04347384 0.14068429 -0.14068429 0 0.15308227 -0.11694437 -0.049739439
-		 0.13021955 -0.11694437 -0.094610035 0.094610035 -0.11694437 -0.13021953 0.049739435 -0.11694437 -0.15308224
-		 0 -0.11694437 -0.16096018 -0.049739435 -0.11694437 -0.15308224 -0.094610013 -0.11694437 -0.13021952
-		 -0.1302195 -0.11694437 -0.094610006 -0.15308221 -0.11694437 -0.04973942 -0.16096015 -0.11694437 0
-		 -0.15308221 -0.11694437 0.04973942 -0.13021949 -0.11694437 0.094609998 -0.094609998 -0.11694437 0.13021949
-		 -0.04973942 -0.11694437 0.15308218 -4.796985e-09 -0.11694437 0.16096012 0.049739406 -0.11694437 0.15308218
-		 0.094609976 -0.11694437 0.13021947 0.13021946 -0.11694437 0.094609983 0.15308216 -0.11694437 0.049739409
-		 0.16096011 -0.11694437 0 0.16859633 -0.090324879 -0.054780267 0.14341661 -0.090324879 -0.10419825
-		 0.10419825 -0.090324879 -0.1434166 0.05478026 -0.090324879 -0.16859631 0 -0.090324879 -0.17727265
-		 -0.05478026 -0.090324879 -0.1685963 -0.10419824 -0.090324879 -0.14341657 -0.14341655 -0.090324879 -0.10419822
-		 -0.16859627 -0.090324879 -0.054780245 -0.1772726 -0.090324879 0 -0.16859627 -0.090324879 0.054780245
-		 -0.14341654 -0.090324879 0.10419822 -0.10419822 -0.090324879 0.14341654 -0.054780245 -0.090324879 0.16859625
-		 -5.2831339e-09 -0.090324879 0.17727257 0.05478023 -0.090324879 0.16859624 0.1041982 -0.090324879 0.14341652
-		 0.14341651 -0.090324879 0.1041982 0.16859622 -0.090324879 0.054780234 0.17727256 -0.090324879 0
-		 0.179959 -0.061481286 -0.05847222 0.15308227 -0.061481286 -0.11122077 0.11122077 -0.061481286 -0.15308227
-		 0.058472216 -0.061481286 -0.17995898 0 -0.061481286 -0.18922006 -0.058472216 -0.061481286 -0.17995897
-		 -0.11122075 -0.061481286 -0.15308222 -0.15308222 -0.061481286 -0.11122074 -0.17995892 -0.061481286 -0.058472198
-		 -0.18922001 -0.061481286 0 -0.17995892 -0.061481286 0.058472198 -0.15308221 -0.061481286 0.11122072
-		 -0.11122072 -0.061481286 0.15308219 -0.058472198 -0.061481286 0.17995891 -5.6391944e-09 -0.061481286 0.18922
-		 0.058472183 -0.061481286 0.17995889 0.1112207 -0.061481286 0.15308218 0.15308218 -0.061481286 0.11122072
-		 0.17995888 -0.061481286 0.058472186 0.18921997 -0.061481286 0 0.18689047 -0.031123813 -0.060724393
-		 0.15897854 -0.031123813 -0.11550465 0.11550465 -0.031123813 -0.15897852 0.060724385 -0.031123813 -0.18689044
-		 0 -0.031123813 -0.19650823 -0.060724385 -0.031123813 -0.18689044;
-	setAttr ".vt[166:331]" -0.11550463 -0.031123813 -0.15897848 -0.15897848 -0.031123813 -0.11550462
-		 -0.18689039 -0.031123813 -0.060724366 -0.19650818 -0.031123813 0 -0.18689039 -0.031123813 0.060724366
-		 -0.15897846 -0.031123813 0.11550461 -0.11550461 -0.031123813 0.15897845 -0.060724366 -0.031123813 0.18689038
-		 -5.8563989e-09 -0.031123813 0.19650817 0.060724352 -0.031123813 0.18689036 0.11550459 -0.031123813 0.15897843
-		 0.15897843 -0.031123813 0.11550459 0.18689035 -0.031123813 0.060724355 0.19650814 -0.031123813 0
-		 0.18922009 0 -0.061481327 0.16096021 0 -0.11694443 0.11694443 0 -0.16096021 0.061481323 0 -0.18922006
-		 0 0 -0.19895773 -0.061481323 0 -0.18922004 -0.11694441 0 -0.16096017 -0.16096015 0 -0.1169444
-		 -0.18922001 0 -0.061481304 -0.19895768 0 0 -0.18922001 0 0.061481304 -0.16096015 0 0.11694439
-		 -0.11694439 0 0.16096014 -0.061481304 0 0.18921998 -5.9293996e-09 0 0.19895767 0.061481286 0 0.18921997
-		 0.11694437 0 0.16096012 0.16096011 0 0.11694437 0.18921997 0 0.061481293 0.19895764 0 0
-		 0.18689047 0.031123813 -0.060724393 0.15897854 0.031123813 -0.11550465 0.11550465 0.031123813 -0.15897852
-		 0.060724385 0.031123813 -0.18689044 0 0.031123813 -0.19650823 -0.060724385 0.031123813 -0.18689044
-		 -0.11550463 0.031123813 -0.15897848 -0.15897848 0.031123813 -0.11550462 -0.18689039 0.031123813 -0.060724366
-		 -0.19650818 0.031123813 0 -0.18689039 0.031123813 0.060724366 -0.15897846 0.031123813 0.11550461
-		 -0.11550461 0.031123813 0.15897845 -0.060724366 0.031123813 0.18689038 -5.8563989e-09 0.031123813 0.19650817
-		 0.060724352 0.031123813 0.18689036 0.11550459 0.031123813 0.15897843 0.15897843 0.031123813 0.11550459
-		 0.18689035 0.031123813 0.060724355 0.19650814 0.031123813 0 0.179959 0.061481286 -0.05847222
-		 0.15308227 0.061481286 -0.11122077 0.11122077 0.061481286 -0.15308227 0.058472216 0.061481286 -0.17995898
-		 0 0.061481286 -0.18922006 -0.058472216 0.061481286 -0.17995897 -0.11122075 0.061481286 -0.15308222
-		 -0.15308222 0.061481286 -0.11122074 -0.17995892 0.061481286 -0.058472198 -0.18922001 0.061481286 0
-		 -0.17995892 0.061481286 0.058472198 -0.15308221 0.061481286 0.11122072 -0.11122072 0.061481286 0.15308219
-		 -0.058472198 0.061481286 0.17995891 -5.6391944e-09 0.061481286 0.18922 0.058472183 0.061481286 0.17995889
-		 0.1112207 0.061481286 0.15308218 0.15308218 0.061481286 0.11122072 0.17995888 0.061481286 0.058472186
-		 0.18921997 0.061481286 0 0.16859633 0.090324879 -0.054780267 0.14341661 0.090324879 -0.10419825
-		 0.10419825 0.090324879 -0.1434166 0.05478026 0.090324879 -0.16859631 0 0.090324879 -0.17727265
-		 -0.05478026 0.090324879 -0.1685963 -0.10419824 0.090324879 -0.14341657 -0.14341655 0.090324879 -0.10419822
-		 -0.16859627 0.090324879 -0.054780245 -0.1772726 0.090324879 0 -0.16859627 0.090324879 0.054780245
-		 -0.14341654 0.090324879 0.10419822 -0.10419822 0.090324879 0.14341654 -0.054780245 0.090324879 0.16859625
-		 -5.2831339e-09 0.090324879 0.17727257 0.05478023 0.090324879 0.16859624 0.1041982 0.090324879 0.14341652
-		 0.14341651 0.090324879 0.1041982 0.16859622 0.090324879 0.054780234 0.17727256 0.090324879 0
-		 0.15308227 0.11694437 -0.049739439 0.13021955 0.11694437 -0.094610035 0.094610035 0.11694437 -0.13021953
-		 0.049739435 0.11694437 -0.15308224 0 0.11694437 -0.16096018 -0.049739435 0.11694437 -0.15308224
-		 -0.094610013 0.11694437 -0.13021952 -0.1302195 0.11694437 -0.094610006 -0.15308221 0.11694437 -0.04973942
-		 -0.16096015 0.11694437 0 -0.15308221 0.11694437 0.04973942 -0.13021949 0.11694437 0.094609998
-		 -0.094609998 0.11694437 0.13021949 -0.04973942 0.11694437 0.15308218 -4.796985e-09 0.11694437 0.16096012
-		 0.049739406 0.11694437 0.15308218 0.094609976 0.11694437 0.13021947 0.13021946 0.11694437 0.094609983
-		 0.15308216 0.11694437 0.049739409 0.16096011 0.11694437 0 0.13379879 0.14068429 -0.043473862
-		 0.11381606 0.14068429 -0.082692198 0.082692198 0.14068429 -0.11381605 0.043473858 0.14068429 -0.13379878
-		 0 0.14068429 -0.14068437 -0.043473858 0.14068429 -0.13379878 -0.082692184 0.14068429 -0.11381602
-		 -0.11381602 0.14068429 -0.082692176 -0.13379875 0.14068429 -0.043473847 -0.14068432 0.14068429 0
-		 -0.13379875 0.14068429 0.043473847 -0.11381601 0.14068429 0.082692169 -0.082692169 0.14068429 0.113816
-		 -0.043473847 0.14068429 0.13379873 -4.1927186e-09 0.14068429 0.14068431 0.043473832 0.14068429 0.13379872
-		 0.082692154 0.14068429 0.11381599 0.11381599 0.14068429 0.082692161 0.13379872 0.14068429 0.04347384
-		 0.14068429 0.14068429 0 0.11122077 0.16096011 -0.036137819 0.094610043 0.16096011 -0.068738215
-		 0.068738215 0.16096011 -0.094610035 0.036137816 0.16096011 -0.11122076 0 0.16096011 -0.11694442
-		 -0.036137816 0.16096011 -0.11122075 -0.0687382 0.16096011 -0.094610013 -0.094610006 0.16096011 -0.068738192
-		 -0.11122073 0.16096011 -0.036137804 -0.1169444 0.16096011 0 -0.11122073 0.16096011 0.036137804
-		 -0.094609998 0.16096011 0.068738185 -0.068738185 0.16096011 0.094609991 -0.036137804 0.16096011 0.11122072
-		 -3.4852137e-09 0.16096011 0.11694438 0.036137793 0.16096011 0.11122071 0.06873817 0.16096011 0.094609983
-		 0.094609983 0.16096011 0.068738177 0.1112207 0.16096011 0.036137797 0.11694437 0.16096011 0
-		 0.085904121 0.17727256 -0.027911939 0.073074408 0.17727256 -0.053091664 0.053091664 0.17727256 -0.073074408
-		 0.027911937 0.17727256 -0.085904106 0 0.17727256 -0.090324923 -0.027911937 0.17727256 -0.085904106
-		 -0.053091653 0.17727256 -0.073074393 -0.073074386 0.17727256 -0.053091645 -0.085904092 0.17727256 -0.027911929
-		 -0.090324901 0.17727256 0 -0.085904092 0.17727256 0.027911929 -0.073074378 0.17727256 0.053091642;
-	setAttr ".vt[332:381]" -0.053091642 0.17727256 0.073074371 -0.027911929 0.17727256 0.085904077
-		 -2.6918912e-09 0.17727256 0.090324886 0.02791192 0.17727256 0.085904069 0.05309163 0.17727256 0.073074371
-		 0.073074363 0.17727256 0.053091638 0.085904069 0.17727256 0.027911924 0.090324879 0.17727256 0
-		 0.058472224 0.18921997 -0.018998776 0.049739443 0.18921997 -0.036137819 0.036137819 0.18921997 -0.049739443
-		 0.018998774 0.18921997 -0.058472216 0 0.18921997 -0.061481323 -0.018998774 0.18921997 -0.058472212
-		 -0.036137812 0.18921997 -0.049739432 -0.049739428 0.18921997 -0.036137808 -0.058472201 0.18921997 -0.018998768
-		 -0.061481308 0.18921997 0 -0.058472201 0.18921997 0.018998768 -0.049739424 0.18921997 0.036137804
-		 -0.036137804 0.18921997 0.04973942 -0.018998768 0.18921997 0.058472194 -1.8322853e-09 0.18921997 0.061481301
-		 0.018998763 0.18921997 0.05847219 0.036137797 0.18921997 0.049739417 0.049739413 0.18921997 0.036137801
-		 0.058472186 0.18921997 0.018998764 0.061481293 0.18921997 0 0.029600544 0.19650814 -0.009617799
-		 0.025179727 0.19650814 -0.018294141 0.018294141 0.19650814 -0.025179725 0.009617798 0.19650814 -0.02960054
-		 0 0.19650814 -0.031123849 -0.009617798 0.19650814 -0.029600538 -0.018294137 0.19650814 -0.02517972
-		 -0.025179718 0.19650814 -0.018294135 -0.029600533 0.19650814 -0.0096177952 -0.031123841 0.19650814 0
-		 -0.029600533 0.19650814 0.0096177952 -0.025179716 0.19650814 0.018294133 -0.018294133 0.19650814 0.025179714
-		 -0.0096177952 0.19650814 0.029600529 -9.2756253e-10 0.19650814 0.031123837 0.0096177924 0.19650814 0.029600527
-		 0.01829413 0.19650814 0.025179712 0.02517971 0.19650814 0.018294131 0.029600525 0.19650814 0.0096177934
-		 0.031123834 0.19650814 0 0 -0.19895764 0 0 0.19895764 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pCylinder2";
-	rename -uid "60283465-48FC-DB44-490F-A9BAB885C0B5";
-	setAttr ".t" -type "double3" -3.1532343453577951 2.2075000192530632 1.3943256118490017 ;
-	setAttr ".r" -type "double3" 0 0 74.320133685454664 ;
-	setAttr ".s" -type "double3" 0.24752488323401525 0.42120859649370429 0.24752488323401525 ;
-createNode transform -n "transform26" -p "pCylinder2";
-	rename -uid "FFD860B6-487F-EB7A-A460-00A9898D0024";
-	setAttr ".v" no;
-createNode mesh -n "pCylinderShape2" -p "transform26";
-	rename -uid "AF061300-483E-F24C-167E-1482DED429DE";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:455]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".pv" -type "double2" 0.55624982714653015 0.57307109236717224 ;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 499 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0.64860266 0.10796607 0.62640899
-		 0.064408496 0.59184152 0.029841021 0.54828393 0.0076473355 0.5 -7.4505806e-08 0.45171607
-		 0.0076473504 0.40815851 0.029841051 0.37359107 0.064408526 0.3513974 0.1079661 0.34374997
-		 0.15625 0.3513974 0.2045339 0.37359107 0.24809146 0.40815854 0.28265893 0.4517161
-		 0.3048526 0.5 0.3125 0.54828387 0.3048526 0.59184146 0.28265893 0.62640893 0.24809146
-		 0.6486026 0.2045339 0.65625 0.15625 0.375 0.3125 0.38749999 0.3125 0.39999998 0.3125
-		 0.41249996 0.3125 0.42499995 0.3125 0.43749994 0.3125 0.44999993 0.3125 0.46249992
-		 0.3125 0.4749999 0.3125 0.48749989 0.3125 0.49999988 0.3125 0.51249987 0.3125 0.52499986
-		 0.3125 0.53749985 0.3125 0.54999983 0.3125 0.56249982 0.3125 0.57499981 0.3125 0.5874998
-		 0.3125 0.59999979 0.3125 0.61249977 0.3125 0.62499976 0.3125 0.375 0.68843985 0.38749999
-		 0.68843985 0.39999998 0.68843985 0.41249996 0.68843985 0.42499995 0.68843985 0.43749994
-		 0.68843985 0.44999993 0.68843985 0.46249992 0.68843985 0.4749999 0.68843985 0.48749989
-		 0.68843985 0.49999988 0.68843985 0.51249987 0.68843985 0.52499986 0.68843985 0.53749985
-		 0.68843985 0.54999983 0.68843985 0.56249982 0.68843985 0.57499981 0.68843985 0.5874998
-		 0.68843985 0.59999979 0.68843985 0.61249977 0.68843985 0.62499976 0.68843985 0.64860266
-		 0.79546607 0.62640899 0.75190848 0.59184152 0.71734101 0.54828393 0.69514734 0.5
-		 0.68749994 0.45171607 0.69514734 0.40815851 0.71734107 0.37359107 0.75190854 0.3513974
-		 0.79546607 0.34374997 0.84375 0.3513974 0.89203393 0.37359107 0.93559146 0.40815854
-		 0.97015893 0.4517161 0.9923526 0.5 1 0.54828387 0.9923526 0.59184146 0.97015893 0.62640893
-		 0.93559146 0.6486026 0.89203393 0.65625 0.84375 0.5 0.15000001 0.5 0.83749998 0.41249996
-		 0.44719118 0.39999998 0.44719118 0.38749999 0.44719118 0.62499976 0.44719118 0.375
-		 0.44719118 0.61249983 0.44719118 0.59999979 0.44719118 0.5874998 0.44719118 0.57499981
-		 0.44719118 0.56249988 0.44719118 0.54999983 0.44719118 0.53749985 0.44719118 0.52499986
-		 0.44719118 0.51249993 0.44719118 0.49999988 0.44719118 0.48749989 0.44719118 0.4749999
-		 0.44719118 0.46249995 0.44719118 0.44999993 0.44719118 0.43749994 0.44719118 0.42499995
-		 0.44719118 0.41249996 0.5016129 0.39999998 0.5016129 0.38749999 0.5016129 0.62499976
-		 0.5016129 0.375 0.5016129 0.61249983 0.5016129 0.59999979 0.5016129 0.5874998 0.5016129
-		 0.57499981 0.5016129 0.56249988 0.5016129 0.54999983 0.5016129 0.53749985 0.5016129
-		 0.52499986 0.5016129 0.51249993 0.5016129 0.49999988 0.5016129 0.48749989 0.5016129
-		 0.4749999 0.5016129 0.46249992 0.5016129 0.44999993 0.5016129 0.43749994 0.5016129
-		 0.42499995 0.5016129 0.41249996 0.54838634 0.39999998 0.54838634 0.38749999 0.54838634
-		 0.62499976 0.54838634 0.375 0.54838634 0.61249983 0.54838634 0.59999979 0.54838634
-		 0.5874998 0.54838634 0.57499981 0.54838634 0.56249988 0.54838634 0.54999983 0.54838634
-		 0.53749985 0.54838634 0.52499986 0.54838634 0.51249993 0.54838634 0.49999988 0.54838634
-		 0.48749989 0.54838634 0.4749999 0.54838634 0.46249992 0.54838634 0.44999993 0.54838634
-		 0.43749994 0.54838634 0.42499995 0.54838634 0.41249996 0.58717245 0.39999998 0.58717245
-		 0.38749999 0.58717245 0.62499976 0.58717245 0.375 0.58717245 0.61249983 0.58717245
-		 0.59999979 0.58717245 0.5874998 0.58717245 0.57499981 0.58717245 0.56249988 0.58717245
-		 0.54999983 0.58717245 0.53749985 0.58717245 0.52499986 0.58717245 0.51249993 0.58717245
-		 0.49999988 0.58717245 0.48749989 0.58717245 0.4749999 0.58717245 0.46249992 0.58717245
-		 0.44999993 0.58717245 0.43749994 0.58717245 0.42499995 0.58717245 0.41249996 0.64687693
-		 0.39999998 0.64687693 0.38749999 0.64687693 0.62499976 0.64687693 0.375 0.64687693
-		 0.61249983 0.64687693 0.59999979 0.64687693 0.5874998 0.64687693 0.57499981 0.64687693
-		 0.56249988 0.64687693 0.54999983 0.64687693 0.53749985 0.64687693 0.52499986 0.64687693
-		 0.51249987 0.64687693 0.49999988 0.64687693 0.48749989 0.64687693 0.4749999 0.64687693
-		 0.46249992 0.64687693 0.44999993 0.64687693 0.43749994 0.64687693 0.42499995 0.64687693
-		 0.39999998 0.67569643 0.38749999 0.67569643 0.62499976 0.67569643 0.375 0.67569643
-		 0.61249977 0.67569643 0.59999979 0.67569643 0.5874998 0.67569643 0.57499981 0.67569643
-		 0.56249982 0.67569643 0.54999983 0.67569643 0.53749985 0.67569643 0.52499986 0.67569643
-		 0.51249987 0.67569643 0.49999988 0.67569643 0.48749989 0.67569643 0.4749999 0.67569643
-		 0.46249992 0.67569643 0.44999993 0.67569643 0.43749994 0.67569643 0.42499995 0.67569643
-		 0.41249996 0.67569643 0.41249996 0.67472219 0.39999998 0.67472219 0.38749999 0.67472219
-		 0.62499976 0.67472219 0.375 0.67472219 0.61249977 0.67472219 0.59999979 0.67472219
-		 0.5874998 0.67472219 0.57499981 0.67472219 0.56249982 0.67472219 0.54999983 0.67472219
-		 0.53749985 0.67472219 0.52499986 0.67472219 0.51249987 0.67472219 0.49999988 0.67472219
-		 0.48749989 0.67472219 0.4749999 0.67472219 0.46249992 0.67472219 0.44999993 0.67472219
-		 0.43749994 0.67472219 0.42499995 0.67472219 0.42499995 0.67367357 0.41249996 0.67367357
-		 0.39999998 0.67367357 0.38749999 0.67367357 0.62499976 0.67367357 0.375 0.67367357
-		 0.61249977 0.67367357 0.59999979 0.67367357 0.5874998 0.67367357 0.57499981 0.67367357
-		 0.56249982 0.67367357 0.54999983 0.67367357 0.53749985 0.67367357 0.52499986 0.67367357
-		 0.51249987 0.67367357 0.49999988 0.67367357 0.48749989 0.67367357 0.4749999 0.67367357
-		 0.46249992 0.67367357;
-	setAttr ".uvst[0].uvsp[250:498]" 0.44999993 0.67367357 0.43749994 0.67367357
-		 0.38749999 0.67472219 0.38749999 0.67569643 0.375 0.67569643 0.62499976 0.67569643
-		 0.61249977 0.67569643 0.61249977 0.67472219 0.375 0.67367357 0.38749999 0.67367357
-		 0.61249977 0.67367357 0.62499976 0.67367357 0.42499995 0.64074463 0.41249996 0.64074463
-		 0.39999998 0.64074463 0.38749999 0.64074463 0.62499976 0.64074463 0.375 0.64074463
-		 0.61249983 0.64074463 0.59999979 0.64074463 0.5874998 0.64074463 0.57499981 0.64074463
-		 0.56249988 0.64074463 0.54999983 0.64074463 0.53749985 0.64074463 0.52499986 0.64074463
-		 0.51249987 0.64074463 0.49999988 0.64074463 0.48749989 0.64074463 0.4749999 0.64074463
-		 0.46249992 0.64074463 0.44999993 0.64074463 0.43749994 0.64074463 0.43749994 0.64006925
-		 0.42499995 0.64006925 0.41249996 0.64006925 0.39999998 0.64006925 0.38749999 0.64006925
-		 0.62499976 0.64006925 0.375 0.64006925 0.61249983 0.64006925 0.59999979 0.64006925
-		 0.5874998 0.64006925 0.57499981 0.64006925 0.56249988 0.64006925 0.54999983 0.64006925
-		 0.53749985 0.64006925 0.52499986 0.64006925 0.51249987 0.64006925 0.49999988 0.64006925
-		 0.48749989 0.64006925 0.4749999 0.64006925 0.46249992 0.64006925 0.44999993 0.64006925
-		 0.43749994 0.63916838 0.42499995 0.63916838 0.41249996 0.63916838 0.39999998 0.63916838
-		 0.38749999 0.63916838 0.62499976 0.63916838 0.375 0.63916838 0.61249983 0.63916838
-		 0.59999979 0.63916838 0.5874998 0.63916838 0.57499981 0.63916838 0.56249988 0.63916838
-		 0.54999983 0.63916838 0.53749985 0.63916838 0.52499986 0.63916838 0.51249987 0.63916838
-		 0.49999988 0.63916838 0.48749989 0.63916838 0.4749999 0.63916838 0.46249992 0.63916838
-		 0.44999993 0.63916838 0.43749994 0.64074463 0.42499995 0.64074463 0.42499995 0.64006925
-		 0.44999993 0.64006925 0.44999993 0.64074463 0.42499995 0.63916838 0.43749994 0.63916838
-		 0.44999993 0.63916838 0.43749994 0.61417967 0.42499995 0.61417967 0.41249996 0.61417967
-		 0.39999998 0.61417967 0.38749999 0.61417967 0.62499976 0.61417967 0.375 0.61417967
-		 0.61249983 0.61417967 0.59999979 0.61417967 0.5874998 0.61417967 0.57499981 0.61417967
-		 0.56249988 0.61417967 0.54999983 0.61417967 0.53749985 0.61417967 0.52499986 0.61417967
-		 0.51249993 0.61417967 0.49999988 0.61417967 0.48749989 0.61417967 0.4749999 0.61417967
-		 0.46249992 0.61417967 0.44999993 0.61417967 0.42499995 0.61219186 0.41249996 0.61219186
-		 0.39999998 0.61219186 0.38749999 0.61219186 0.62499976 0.61219186 0.375 0.61219186
-		 0.61249983 0.61219186 0.59999979 0.61219186 0.5874998 0.61219186 0.57499981 0.61219186
-		 0.56249988 0.61219186 0.54999983 0.61219186 0.53749985 0.61219186 0.52499986 0.61219186
-		 0.51249993 0.61219186 0.49999988 0.61219186 0.48749989 0.61219186 0.4749999 0.61219186
-		 0.46249992 0.61219186 0.44999993 0.61219186 0.43749994 0.61219186 0.42499995 0.609972
-		 0.41249996 0.609972 0.39999998 0.609972 0.38749999 0.609972 0.62499976 0.609972 0.375
-		 0.609972 0.61249983 0.609972 0.59999979 0.609972 0.5874998 0.609972 0.57499981 0.609972
-		 0.56249988 0.609972 0.54999983 0.609972 0.53749985 0.609972 0.52499986 0.609972 0.51249993
-		 0.609972 0.49999988 0.609972 0.48749989 0.609972 0.4749999 0.609972 0.46249992 0.609972
-		 0.44999993 0.609972 0.43749994 0.609972 0.41249996 0.61219186 0.41249996 0.61417967
-		 0.39999998 0.61417967 0.38749999 0.61417967 0.375 0.61417967 0.375 0.61219186 0.39999998
-		 0.609972 0.41249996 0.609972 0.38749999 0.609972 0.375 0.609972 0.54999983 0.57621372
-		 0.53749985 0.57621372 0.52499986 0.57621372 0.51249993 0.57621372 0.49999988 0.57621372
-		 0.48749989 0.57621372 0.4749999 0.57621372 0.46249992 0.57621372 0.44999993 0.57621372
-		 0.43749994 0.57621372 0.42499995 0.57621372 0.41249996 0.57621372 0.39999998 0.57621372
-		 0.38749999 0.57621372 0.62499976 0.57621372 0.375 0.57621372 0.61249983 0.57621372
-		 0.59999979 0.57621372 0.5874998 0.57621372 0.57499981 0.57621372 0.56249988 0.57621372
-		 0.56249988 0.57287121 0.54999983 0.57287121 0.53749985 0.57287121 0.52499986 0.57287121
-		 0.51249993 0.57287121 0.49999988 0.57287121 0.48749989 0.57287121 0.4749999 0.57287121
-		 0.46249992 0.57287121 0.44999993 0.57287121 0.43749994 0.57287121 0.42499995 0.57287121
-		 0.41249996 0.57287121 0.39999998 0.57287121 0.38749999 0.57287121 0.62499976 0.57287121
-		 0.375 0.57287121 0.61249983 0.57287121 0.59999979 0.57287121 0.5874998 0.57287121
-		 0.57499981 0.57287121 0.54999983 0.56992847 0.53749985 0.56992847 0.52499986 0.56992847
-		 0.51249993 0.56992847 0.49999988 0.56992847 0.48749989 0.56992847 0.4749999 0.56992847
-		 0.46249992 0.56992847 0.44999993 0.56992847 0.43749994 0.56992847 0.42499995 0.56992847
-		 0.41249996 0.56992847 0.39999998 0.56992847 0.38749999 0.56992847 0.62499976 0.56992847
-		 0.375 0.56992847 0.61249983 0.56992847 0.59999979 0.56992847 0.5874998 0.56992847
-		 0.57499981 0.56992847 0.56249988 0.56992847 0.56249988 0.57621372 0.54999983 0.57621372
-		 0.53749985 0.57621372 0.53749985 0.57287121 0.57499981 0.57287121 0.57499981 0.57621372
-		 0.53749985 0.56992847 0.54999983 0.56992847 0.56249988 0.56992847 0.57499981 0.56992847
-		 0.57499981 0.57287121 0.57499981 0.56992847 0.56249988 0.56992847 0.54999983 0.56992847
-		 0.53749985 0.56992847 0.53749985 0.57287121 0.53749985 0.57621372 0.54999983 0.57621372
-		 0.56249988 0.57621372 0.57499981 0.57621372 0.57499981 0.56992847 0.56249988 0.56992847
-		 0.54999983 0.56992847 0.53749985 0.56992847 0.53749985 0.57287121 0.53749985 0.57621372
-		 0.54999983 0.57621372 0.56249988 0.57621372 0.57499981 0.57621372 0.57499981 0.57287121;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 10 ".pt[428:437]" -type "float3"  -0.12716162 -0.022322532 
-		0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599 
-		-0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 
-		-0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 
-		0.17428599 -0.12716162 -0.022322532 0.17428599 -0.12716162 -0.022322532 0.17428599;
-	setAttr -s 438 ".vt";
-	setAttr ".vt[0:165]"  0.15040064 -2.53432465 -0.048865318 0.12793589 -2.53432465 -0.092950344
-		 0.092950344 -2.53432655 -0.12794018 0.048863411 -2.53432465 -0.15039873 -2.3841858e-06 -2.53432798 -0.15814257
-		 -0.048870564 -2.53432512 -0.15039873 -0.092955112 -2.53432465 -0.12794018 -0.12794161 -2.53432608 -0.092950344
-		 -0.15040588 -2.53432465 -0.048865318 -0.15814638 -2.53432465 3.8146973e-06 -0.15040588 -2.53432465 0.048868656
-		 -0.12794161 -2.53432608 0.092957497 -0.092955112 -2.53432465 0.12794352 -0.048870564 -2.53432512 0.15040588
-		 -2.3841858e-06 -2.53432798 0.15814352 0.048863411 -2.53432465 0.15040588 0.092950344 -2.53432655 0.12794352
-		 0.12793589 -2.53432465 0.092957497 0.15040064 -2.53432465 0.048868656 0.15813971 -2.53432512 3.8146973e-06
-		 0.66919899 2.37882423 -0.0050873756 0.6668601 2.3788166 -0.0096802711 0.66321468 2.37881756 -0.013326168
-		 0.65861845 2.37882328 -0.015668869 0.65353203 2.37882328 -0.016471386 0.64843941 2.3788166 -0.015668869
-		 0.64384174 2.37882328 -0.013326168 0.64019775 2.37882328 -0.0096802711 0.63785839 2.37882328 -0.0050873756
-		 0.6370554 2.3788166 3.8146973e-06 0.63785839 2.37882328 0.005095005 0.64019775 2.37882328 0.0096879005
-		 0.64384174 2.37882328 0.013333321 0.64843941 2.3788166 0.015672207 0.65353203 2.37882328 0.016479015
-		 0.65861845 2.37882328 0.015672684 0.66321468 2.37881756 0.013333321 0.6668601 2.3788166 0.0096879005
-		 0.66919899 2.37882423 0.005095005 0.67000341 2.37882328 3.8146973e-06 -2.3841858e-06 -2.53432798 3.8146973e-06
-		 0.65353203 2.37882328 3.8146973e-06 -0.03982687 -0.73184586 -0.11435938 -0.0063033104 -0.73184538 -0.097277164
-		 0.020297527 -0.73184586 -0.070678234 0.037376881 -0.73184681 -0.037157536 0.043261051 -0.73184586 3.8146973e-06
-		 0.037376881 -0.73184681 0.037158489 0.020297527 -0.73184586 0.070679188 -0.0063033104 -0.73184538 0.097284794
-		 -0.03982687 -0.73184586 0.11436272 -0.07697916 -0.73184586 0.12024498 -0.11414099 -0.73184538 0.11436272
-		 -0.14766169 -0.73184633 0.097284794 -0.17426348 -0.73184681 0.070679188 -0.19134188 -0.73184633 0.037158489
-		 -0.197227 -0.73184586 3.8146973e-06 -0.19134188 -0.73184633 -0.037157536 -0.17426348 -0.73184681 -0.070678234
-		 -0.14766169 -0.73184633 -0.097277164 -0.11414099 -0.73184538 -0.11435938 -0.07697916 -0.73184586 -0.12024117
-		 -0.3707757 -0.055368423 -0.09979248 -0.34152699 -0.055361748 -0.084889889 -0.31830835 -0.055368423 -0.061674118
-		 -0.30340624 -0.055366516 -0.032422066 -0.29827356 -0.055361748 3.8146973e-06 -0.30340624 -0.055366516 0.032429218
-		 -0.31830835 -0.055368423 0.061677933 -0.34152699 -0.055361748 0.084893227 -0.3707757 -0.055368423 0.09980011
-		 -0.40320253 -0.055368423 0.10493612 -0.43562555 -0.05536747 0.09980011 -0.46488333 -0.055360794 0.084893227
-		 -0.48809767 -0.055363655 0.061677933 -0.50300169 -0.055361748 0.032429218 -0.50813675 -0.055362701 3.8146973e-06
-		 -0.50300169 -0.055361748 -0.032422066 -0.48809767 -0.055363655 -0.061674118 -0.46488333 -0.055360794 -0.084889889
-		 -0.43562555 -0.05536747 -0.09979248 -0.40320253 -0.055368423 -0.10492849 -0.091418266 0.62502098 -0.087275982
-		 -0.065834522 0.62502193 -0.074243546 -0.045529366 0.62502193 -0.053938389 -0.032494068 0.62502003 -0.028355122
-		 -0.028000355 0.62502193 3.8146973e-06 -0.032494068 0.62502003 0.028362751 -0.045529366 0.62502193 0.053946018
-		 -0.065834522 0.62502193 0.074246407 -0.091418266 0.62502098 0.087283611 -0.11977625 0.62502289 0.09177494
-		 -0.14813471 0.62502289 0.087283611 -0.17371845 0.62502193 0.074246407 -0.19401836 0.62502193 0.053946018
-		 -0.20705271 0.62501526 0.028362751 -0.21154594 0.62501812 3.8146973e-06 -0.20705271 0.62501526 -0.028355122
-		 -0.19401836 0.62502193 -0.053938389 -0.17371845 0.62502193 -0.074243546 -0.14813566 0.62502289 -0.087275982
-		 -0.11977625 0.62502289 -0.091771603 -0.28489113 1.11458492 -0.076897621 -0.26235008 1.11459064 -0.065413952
-		 -0.24445677 1.11458683 -0.047523975 -0.23297787 1.11458969 -0.024982929 -0.22901869 1.11458778 3.8146973e-06
-		 -0.23297787 1.11458969 0.024990559 -0.24445677 1.11458683 0.047531605 -0.26235008 1.11459064 0.065421104
-		 -0.28489113 1.11458492 0.076904774 -0.30987453 1.11458492 0.080862045 -0.33486128 1.11458302 0.076904774
-		 -0.3574028 1.11458302 0.065421104 -0.37529469 1.11459064 0.047531605 -0.38678074 1.11458874 0.024990559
-		 -0.39073896 1.11458778 3.8146973e-06 -0.38678074 1.11458874 -0.024982929 -0.37529469 1.11459064 -0.047523975
-		 -0.3574028 1.11458302 -0.065413952 -0.33486128 1.11458302 -0.076897621 -0.30987453 1.11458492 -0.080854893
-		 0.057119846 1.98051643 -0.060920715 0.074979782 1.98051453 -0.051823616 0.089151382 1.98051548 -0.037650108
-		 0.09825325 1.98050785 -0.019791603 0.10138845 1.98051167 3.8146973e-06 0.09825325 1.98050785 0.019799232
-		 0.089151382 1.98051548 0.037657261 0.074979782 1.98051453 0.051831245 0.057119846 1.98051643 0.060927868
-		 0.037327766 1.9805088 0.064063072 0.017534256 1.98050785 0.060927868 -0.00032424927 1.98050785 0.051831245
-		 -0.014502525 1.98051453 0.037657261 -0.023599625 1.98051548 0.019799232 -0.026730061 1.98051167 3.8146973e-06
-		 -0.023599625 1.98051548 -0.019791603 -0.014502525 1.98051453 -0.037650108 -0.00032424927 1.98050785 -0.051823616
-		 0.017534256 1.98050785 -0.060920715 0.037327766 1.9805088 -0.064055443 0.48286009 2.25669765 -0.025129795
-		 0.48918819 2.25600147 -0.017735004 0.49259615 2.25487232 -0.0031514168 0.48828936 2.24919701 0.0076422691
-		 0.49414158 2.25669956 0.0096030235 0.48972845 2.2566967 0.01826334 0.48286009 2.25669765 0.025136948
-		 0.47419977 2.25669193 0.029548168 0.46459913 2.2566967 0.031068325 0.45499849 2.25669956 0.029547691
-		 0.44634008 2.25669289 0.025136948 0.43946218 2.2566967 0.01826334 0.43505287 2.25669765 0.0096030235
-		 0.4335351 2.25669479 3.8146973e-06 0.43505287 2.25669765 -0.009595871 0.43946218 2.2566967 -0.018256187
-		 0.44634008 2.25669289 -0.025129795 0.45499849 2.25669956 -0.029544353 0.46459913 2.2566967 -0.031061172
-		 0.47419977 2.25669193 -0.029544353 0.46009779 2.24735832 -0.030605316 0.46907091 2.24735546 -0.026031971
-		 0.48006058 2.25192451 -0.027573109 0.47878027 2.24231434 0.0083227158;
-	setAttr ".vt[166:331]" 0.48076153 2.24735737 0.0099458694 0.47618866 2.24736309 0.018918991
-		 0.46907091 2.24735546 0.026035786 0.46009779 2.24735832 0.0306077 0.45015669 2.24735832 0.032183647
-		 0.44021225 2.24735641 0.0306077 0.4312396 2.24735641 0.026035786 0.424119 2.24735832 0.018918991
-		 0.41955137 2.24735641 0.0099458694 0.41797209 2.24736309 3.8146973e-06 0.41955137 2.24735641 -0.0099439621
-		 0.424119 2.24735832 -0.018911839 0.4312396 2.24735641 -0.026031971 0.44021225 2.24735641 -0.030605316
-		 0.45015669 2.24735832 -0.032176495 0.43460703 2.23730659 -0.033377171 0.44491911 2.23731136 -0.031743526
-		 0.45422983 2.23730755 -0.027003288 0.47055387 2.24504089 -0.026898384 0.46624327 2.23937702 -0.016104698
-		 0.46965361 2.23824406 -0.001516819 0.46635628 2.23730659 0.010318756 0.46161413 2.2373085 0.019624233
-		 0.45422983 2.23730755 0.027010918 0.44491911 2.23731136 0.031750679 0.43460703 2.23730659 0.033384323
-		 0.42429113 2.23731041 0.031750679 0.41498804 2.23730659 0.027010918 0.40760183 2.23730659 0.019624233
-		 0.40286112 2.23730659 0.010318756 0.40122366 2.23731232 3.8146973e-06 0.40286112 2.23730659 -0.010311604
-		 0.40760183 2.23730659 -0.019620895 0.41498804 2.23730659 -0.027003288 0.42429113 2.23731041 -0.031743526
-		 0.66571331 2.28088856 -0.012073517 0.66551542 2.27980804 -0.0096373558 0.66907597 2.28181934 -0.01073122
-		 0.67033148 2.28155994 -0.0087413788 0.66524315 2.27868271 -0.0071754456 0.66874218 2.28026295 -0.007267952
-		 0.66221333 2.27930927 -0.011981487 0.66062641 2.27800941 -0.01050806 0.66188192 2.27775002 -0.0085177422
-		 -0.0036458969 1.88932419 -0.06547451 0.021992207 1.89157581 -0.062561512 0.040333748 1.89157581 -0.053219318
-		 0.054889202 1.89157295 -0.038664341 0.064232826 1.89157391 -0.020324707 0.067448616 1.89157486 3.8146973e-06
-		 0.064232826 1.89157391 0.020332336 0.054889202 1.89157295 0.038671494 0.040333748 1.89157581 0.053226948
-		 0.021992207 1.89157581 0.062568665 0.0016617775 1.89157295 0.065788746 -0.018660069 1.89156818 0.062568665
-		 -0.037002087 1.891572 0.053226948 -0.051558018 1.89157104 0.038671494 -0.060898781 1.89157581 0.020332336
-		 -0.064119339 1.89156914 3.8146973e-06 -0.060898781 1.89157581 -0.020324707 -0.051558018 1.89157104 -0.038664341
-		 -0.035962105 1.89200974 -0.054641247 -0.018715858 1.89479828 -0.05978632 0.00043010712 1.87878513 -0.06837368
-		 0.018123627 1.88177967 -0.06274271 0.03651762 1.88177776 -0.053373337 0.051112652 1.88178062 -0.038775921
-		 0.060486317 1.88177586 -0.020383358 0.063711166 1.88177967 3.8146973e-06 0.060486317 1.88177586 0.020390987
-		 0.051112652 1.88178062 0.038783073 0.03651762 1.88177776 0.053380489 0.018123627 1.88177967 0.062749863
-		 -0.002263546 1.88177681 0.065978527 -0.022648335 1.8817749 0.062749863 -0.041042805 1.88177681 0.053380489
-		 -0.055637836 1.8817749 0.038783073 -0.065011024 1.88178062 0.020390987 -0.068235397 1.88177395 3.8146973e-06
-		 -0.065011024 1.88178062 -0.020383358 -0.055637836 1.8817749 -0.038775921 -0.04528141 1.88258648 -0.05305624
-		 -0.026136398 1.86657524 -0.061646461 -0.0088877678 1.86936092 -0.06678915 0.012965679 1.86871147 -0.062983513
-		 0.03142786 1.86871147 -0.053580761 0.046079159 1.86871529 -0.038924694 0.055486679 1.86870956 -0.020462036
-		 0.058725834 1.86871433 3.8146973e-06 0.055486679 1.86870956 0.020469666 0.046079159 1.86871529 0.038931847
-		 0.03142786 1.86871147 0.053583145 0.012965679 1.86871147 0.062990665 -0.0075035095 1.86871433 0.066231728
-		 -0.027964115 1.86870766 0.062990665 -0.046430588 1.86871052 0.053583145 -0.061080933 1.86871243 0.038931847
-		 -0.070487499 1.86870956 0.020469666 -0.073730469 1.86871433 3.8146973e-06 -0.070487499 1.86870956 -0.020462036
-		 -0.061080933 1.86871243 -0.038924694 -0.041211605 1.87205315 -0.055957794 0.28307152 1.93442345 -0.76216364
-		 0.28684139 1.93400097 -0.76990891 0.28367567 1.93664551 -0.76131773 0.28616858 1.93574429 -0.76700592
-		 0.27928209 1.93462944 -0.75459146 0.2808218 1.93618965 -0.75617599 0.28244877 1.93198109 -0.76318026
-		 0.28530121 1.9324398 -0.76832438 0.27995682 1.93288422 -0.75749159 -0.17450619 1.50517464 -0.068975925
-		 -0.15354013 1.50662708 -0.073548794 -0.1272006 1.50435257 -0.070727825 -0.10344124 1.50698566 -0.048078537
-		 -0.084397793 1.49791336 -0.025799751 -0.077342987 1.4805994 -0.01240015 -0.079561234 1.50628948 3.8146973e-06
-		 -0.083147049 1.50628948 0.022642136 -0.093548298 1.50629044 0.043064594 -0.10975742 1.50628948 0.059271812
-		 -0.13018131 1.50628567 0.069675922 -0.15281963 1.50628948 0.073262691 -0.17545748 1.50628662 0.069675922
-		 -0.19588184 1.50628853 0.059271812 -0.21209097 1.50629044 0.043064594 -0.22249508 1.50628757 0.022642136
-		 -0.22608042 1.50628757 3.8146973e-06 -0.22249508 1.50628757 -0.022634506 -0.21209097 1.50629044 -0.043057442
-		 -0.19317102 1.50802231 -0.060502052 -0.16504526 1.47777271 -0.074086666 -0.14659643 1.4910183 -0.085092068
-		 -0.084970951 1.46165848 -0.012994766 -0.090560913 1.47745705 3.8146973e-06 -0.094174862 1.47745991 0.02281332
-		 -0.10465813 1.47745895 0.043393612 -0.12099266 1.47745895 0.059725761 -0.14156818 1.47745609 0.070209503
-		 -0.16437864 1.47745991 0.073822498 -0.18718719 1.47745609 0.070209503 -0.20776844 1.47745705 0.059725761
-		 -0.22410202 1.47745991 0.043393612 -0.23458815 1.477458 0.02281332 -0.23820162 1.47745705 3.8146973e-06
-		 -0.23458815 1.477458 -0.022807598 -0.22410202 1.47745991 -0.043386459 -0.20525885 1.47906303 -0.060863972
-		 -0.18630934 1.47642803 -0.069559097 -0.17789745 1.44554901 -0.074687481 -0.15422297 1.47207832 -0.085688114
-		 -0.14716673 1.45476437 -0.072287083 -0.12812424 1.44569206 -0.050009727 -0.10436678 1.4483242 -0.027359962
-		 -0.10284662 1.44526482 3.8146973e-06 -0.10649061 1.44526386 0.023006439 -0.11706209 1.44526482 0.043758869
-		 -0.13353252 1.44526482 0.060229301 -0.15428543 1.44526386 0.070803642 -0.17728758 1.44526005 0.074447155
-		 -0.20029259 1.44526196 0.070803642 -0.22104549 1.44526196 0.060229301 -0.23751545 1.445261 0.043758869
-		 -0.24808788 1.44526386 0.023006439 -0.25173092 1.44526386 3.8146973e-06;
-	setAttr ".vt[332:437]" -0.24808788 1.44526386 -0.023000717 -0.23751545 1.445261 -0.043755054
-		 -0.21875525 1.44672298 -0.061267376 -0.19948769 1.44432259 -0.070210457 0.64728642 1.61785889 -0.65112686
-		 0.65798092 1.6132555 -0.64679241 0.65731812 1.62219429 -0.64871216 0.66960669 1.62304974 -0.64490366
-		 0.66840601 1.61305332 -0.64338541 0.67945623 1.62010193 -0.6411581 0.67916155 1.60831547 -0.63900661
-		 0.68310642 1.6144743 -0.63890553 0.64334202 1.61170292 -0.65122795 0.64699078 1.60607719 -0.6489749
-		 0.6568408 1.60312748 -0.64522886 0.66912842 1.60398102 -0.64142084 -0.25408268 0.9723177 0.079685509
-		 -0.285151 0.9563818 0.085908234 -0.30550432 0.97626209 0.067914963 -0.32407475 0.97626686 0.049343109
-		 -0.33599997 0.97626305 0.025942802 -0.34010887 0.97626305 3.8146973e-06 -0.33599997 0.97626305 -0.025936127
-		 -0.32407475 0.97626686 -0.04933691 -0.30550432 0.97626209 -0.067908764 -0.28210258 0.97626305 -0.07983017
-		 -0.25616264 0.976264 -0.083939075 -0.23022747 0.976264 -0.07983017 -0.20682669 0.97626591 -0.067908764
-		 -0.18825197 0.97626495 -0.04933691 -0.17633247 0.97626495 -0.025936127 -0.17222309 0.97626495 3.8146973e-06
-		 -0.17633247 0.97626495 0.025942802 -0.18825197 0.97626495 0.049343109 -0.17769575 0.96154118 0.068653405
-		 -0.21303797 0.97428799 0.073094666 -0.29437876 0.9325695 0.089385331 -0.28967476 0.93407249 0.068675339
-		 -0.30845451 0.93407631 0.049896538 -0.32051229 0.93407249 0.026233196 -0.3246665 0.93407345 3.8146973e-06
-		 -0.32051229 0.93407249 -0.026226521 -0.30845451 0.93407631 -0.049889088 -0.28967476 0.93407249 -0.068669319
-		 -0.26601171 0.93407249 -0.080724239 -0.23978138 0.9340744 -0.084880352 -0.21355438 0.9340744 -0.080724239
-		 -0.18988991 0.93407631 -0.068669319 -0.17110825 0.93407536 -0.049889088 -0.15905523 0.93407631 -0.026226521
-		 -0.15489912 0.93407536 3.8146973e-06 -0.15905523 0.93407631 0.026233196 -0.17110825 0.93407536 0.049896717
-		 -0.16155672 0.93894482 0.068058014 -0.2428956 0.89722729 0.084348202 -0.2782383 0.9099741 0.088789284
-		 -0.27573729 0.89692879 0.069345295 -0.29470015 0.89693165 0.050383389 -0.30687475 0.89692879 0.026489735
-		 -0.31107187 0.89692974 3.8146973e-06 -0.30687475 0.89692879 -0.026482105 -0.29470015 0.89693165 -0.050375938
-		 -0.27573729 0.89692879 -0.069339275 -0.25184393 0.89692974 -0.081512451 -0.22535849 0.89693069 -0.085708141
-		 -0.1988759 0.89692974 -0.081512451 -0.17497969 0.89693069 -0.069339275 -0.15601587 0.89693165 -0.050375938
-		 -0.14384413 0.8969326 -0.026482105 -0.13964796 0.89693165 3.8146973e-06 -0.14384413 0.8969326 0.026489735
-		 -0.15601587 0.89693165 0.050383568 -0.17078352 0.91513252 0.071535587 -0.20185232 0.89919662 0.077757359
-		 1.26705229 1.19715214 0.71286464 1.25510836 1.19709778 0.71372658 1.26642287 1.1993469 0.7123794
-		 1.25192463 1.1992352 0.71343666 1.23769248 1.19698274 0.71499252 1.24095058 1.19833231 0.71443444
-		 1.28460741 1.1973443 0.71157098 1.2789073 1.19862449 0.71166676 1.25587809 1.1949805 0.71418411
-		 1.24339271 1.19570255 0.71489674 1.2813493 1.19599485 0.71212918 1.27037525 1.19509184 0.71312684
-		 0.15580271 0.99565041 0.20927636 0.14788572 0.97676748 0.21211328 0.12122668 0.96413052 0.21718863
-		 0.086008951 0.962569 0.22256511 0.055682272 0.97267693 0.226188 0.041832894 0.99059474 0.22667427
-		 0.049750611 1.0094776154 0.22383775 0.076409295 1.022114515 0.21876162 0.11162838 1.023676991 0.21338512
-		 0.14195448 1.013568878 0.20976211 0.58219802 1.060769439 0.40370572 0.56154901 1.052628517 0.40721861
-		 0.53427088 1.051622748 0.41094005 0.51078051 1.058134317 0.41344786 0.50005364 1.069676995 0.41378447
-		 0.50618589 1.081841588 0.41182101 0.52683467 1.089982271 0.40830758 0.5541141 1.090988874 0.40458608
-		 0.57760376 1.084477186 0.40207827 0.58832985 1.072934031 0.40174192;
-	setAttr -s 892 ".ed";
-	setAttr ".ed[0:165]"  0 1 0 1 2 0 2 3 0 3 4 0 4 5 0 5 6 0 6 7 0 7 8 0 8 9 0
-		 9 10 0 10 11 0 11 12 0 12 13 0 13 14 0 14 15 0 15 16 0 16 17 0 17 18 0 18 19 0 19 0 0
-		 20 21 0 21 22 0 22 23 0 23 24 0 24 25 0 25 26 0 26 27 0 27 28 0 28 29 0 29 30 0 30 31 0
-		 31 32 0 32 33 0 33 34 0 34 35 0 35 36 0 36 37 0 37 38 0 38 39 0 39 20 0 0 45 1 1 44 1
-		 2 43 1 3 42 1 4 61 1 5 60 1 6 59 1 7 58 1 8 57 1 9 56 1 10 55 1 11 54 1 12 53 1 13 52 1
-		 14 51 1 15 50 1 16 49 1 17 48 1 18 47 1 19 46 1 40 0 1 40 1 1 40 2 1 40 3 1 40 4 1
-		 40 5 1 40 6 1 40 7 1 40 8 1 40 9 1 40 10 1 40 11 1 40 12 1 40 13 1 40 14 1 40 15 1
-		 40 16 1 40 17 1 40 18 1 40 19 1 20 41 1 21 41 1 22 41 1 23 41 1 24 41 1 25 41 1 26 41 1
-		 27 41 1 28 41 1 29 41 1 30 41 1 31 41 1 32 41 1 33 41 1 34 41 1 35 41 1 36 41 1 37 41 1
-		 38 41 1 39 41 1 42 62 1 43 63 1 42 43 1 44 64 1 43 44 1 45 65 1 44 45 1 46 66 1 45 46 1
-		 47 67 1 46 47 1 48 68 1 47 48 1 49 69 1 48 49 1 50 70 1 49 50 1 51 71 1 50 51 1 52 72 1
-		 51 52 1 53 73 1 52 53 1 54 74 1 53 54 1 55 75 1 54 55 1 56 76 1 55 56 1 57 77 1 56 57 1
-		 58 78 1 57 58 1 59 79 1 58 59 1 60 80 1 59 60 1 61 81 1 60 61 1 61 42 1 62 82 1 63 83 1
-		 62 63 1 64 84 1 63 64 1 65 85 1 64 65 1 66 86 1 65 66 1 67 87 1 66 67 1 68 88 1 67 68 1
-		 69 89 1 68 69 1 70 90 1 69 70 1 71 91 1 70 71 1 72 92 1 71 72 1 73 93 1 72 73 1 74 94 1
-		 73 74 1 75 95 1;
-	setAttr ".ed[166:331]" 74 75 1 76 96 1 75 76 1 77 97 1 76 77 1 78 98 1 77 78 1
-		 79 99 1 78 79 1 80 100 1 79 80 1 81 101 1 80 81 1 81 62 1 82 397 1 83 398 1 82 83 1
-		 84 399 1 83 84 1 85 400 1 84 85 1 86 401 1 85 86 1 87 402 1 86 87 1 88 403 1 87 88 1
-		 89 404 0 88 89 1 90 405 1 89 90 1 91 386 1 90 91 1 92 387 0 91 92 1 93 388 1 92 93 1
-		 94 389 1 93 94 1 95 390 1 94 95 1 96 391 1 95 96 1 97 392 1 96 97 1 98 393 1 97 98 1
-		 99 394 1 98 99 1 100 395 1 99 100 1 101 396 1 100 101 1 101 82 1 102 317 0 103 318 1
-		 102 103 1 104 319 1 103 104 1 105 320 1 104 105 1 106 321 1 105 106 1 107 322 1 106 107 1
-		 108 323 1 107 108 1 109 324 1 108 109 1 110 325 1 109 110 1 111 326 1 110 111 1 112 327 1
-		 111 112 1 113 328 1 112 113 1 114 329 1 113 114 1 115 330 1 114 115 1 116 331 1 115 116 1
-		 117 332 1 116 117 1 118 333 1 117 118 1 119 334 1 118 119 1 120 335 1 119 120 1 121 316 1
-		 120 121 1 121 102 1 122 182 1 123 183 1 122 123 1 124 184 1 123 124 1 125 185 1 124 125 1
-		 126 186 1 125 126 1 127 187 1 126 127 1 128 188 1 127 128 1 129 189 1 128 129 1 130 190 1
-		 129 130 1 131 191 1 130 131 1 132 192 1 131 132 1 133 193 1 132 133 1 134 194 1 133 134 1
-		 135 195 1 134 135 1 136 196 1 135 136 1 137 197 1 136 137 1 138 198 1 137 138 1 139 199 1
-		 138 139 1 140 200 1 139 140 1 141 181 1 140 141 1 141 122 1 142 22 1 143 21 1 142 143 0
-		 144 20 1 143 144 0 145 39 0 144 145 0 146 38 1 145 146 0 147 37 1 146 147 1 148 36 1
-		 147 148 1 149 35 1 148 149 1 150 34 1 149 150 1 151 33 1 150 151 1 152 32 1 151 152 1
-		 153 31 1 152 153 1 154 30 1 153 154 1 155 29 1 154 155 1 156 28 1 155 156 1 157 27 1
-		 156 157 1 158 26 1;
-	setAttr ".ed[332:497]" 157 158 1 159 25 1 158 159 1 160 24 1 159 160 1 161 23 1
-		 160 161 1 161 142 1 162 161 1 163 142 1 162 163 1 164 143 0 163 164 1 165 145 0 166 146 1
-		 165 166 0 167 147 1 166 167 1 168 148 1 167 168 1 169 149 1 168 169 1 170 150 1 169 170 1
-		 171 151 1 170 171 1 172 152 1 171 172 1 173 153 1 172 173 1 174 154 1 173 174 1 175 155 1
-		 174 175 1 176 156 1 175 176 1 177 157 1 176 177 1 178 158 1 177 178 1 179 159 1 178 179 1
-		 180 160 1 179 180 1 180 162 1 181 180 1 182 162 1 181 182 1 183 163 1 182 183 1 184 164 0
-		 183 184 0 184 185 0 186 165 0 185 186 0 187 166 1 186 187 1 188 167 1 187 188 1 189 168 1
-		 188 189 1 190 169 1 189 190 1 191 170 1 190 191 1 192 171 1 191 192 1 193 172 1 192 193 1
-		 194 173 1 193 194 1 195 174 1 194 195 1 196 175 1 195 196 1 197 176 1 196 197 1 198 177 1
-		 197 198 1 199 178 1 198 199 1 200 179 1 199 200 1 200 181 1 164 201 0 201 202 1 143 203 0
-		 201 203 0 144 204 0 203 204 0 202 204 1 165 205 0 202 205 1 145 206 0 204 206 0 205 206 0
-		 184 207 0 185 208 0 207 208 0 207 201 0 208 202 1 186 209 0 208 209 0 209 205 0 210 141 1
-		 211 122 1 210 211 1 212 123 1 211 212 1 213 124 1 212 213 1 214 125 1 213 214 1 215 126 1
-		 214 215 1 216 127 1 215 216 1 217 128 1 216 217 1 218 129 1 217 218 1 219 130 1 218 219 1
-		 220 131 1 219 220 1 221 132 1 220 221 1 222 133 1 221 222 1 223 134 1 222 223 1 224 135 1
-		 223 224 1 225 136 1 224 225 1 226 137 1 225 226 1 227 138 1 226 227 1 228 139 1 227 228 1
-		 229 140 1 228 229 0 229 210 0 230 210 0 231 211 1 230 231 1 232 212 1 231 232 1 233 213 1
-		 232 233 1 234 214 1 233 234 1 235 215 1 234 235 1 236 216 1 235 236 1 237 217 1 236 237 1
-		 238 218 1 237 238 1 239 219 1 238 239 1 240 220 1 239 240 1 241 221 1;
-	setAttr ".ed[498:663]" 240 241 1 242 222 1 241 242 1 243 223 1 242 243 1 244 224 1
-		 243 244 1 245 225 1 244 245 1 246 226 1 245 246 1 247 227 1 246 247 1 248 228 0 247 248 1
-		 250 230 0 249 250 0 251 231 1 250 251 1 252 232 1 251 252 1 253 233 1 252 253 1 254 234 1
-		 253 254 1 255 235 1 254 255 1 256 236 1 255 256 1 257 237 1 256 257 1 258 238 1 257 258 1
-		 259 239 1 258 259 1 260 240 1 259 260 1 261 241 1 260 261 1 262 242 1 261 262 1 263 243 1
-		 262 263 1 264 244 1 263 264 1 265 245 1 264 265 1 266 246 1 265 266 1 267 247 1 266 267 1
-		 268 248 0 267 268 1 268 249 0 230 270 0 269 270 1 229 271 0 269 271 1 210 272 0 271 272 0
-		 270 272 0 248 273 0 273 269 1 228 274 0 273 274 0 274 271 0 249 275 0 250 276 0 275 276 0
-		 275 269 1 276 270 0 268 277 0 277 275 0 277 273 0 278 249 1 279 250 1 278 279 1 280 251 0
-		 279 280 0 281 252 1 280 281 0 282 253 1 281 282 0 283 254 0 282 283 0 284 255 1 283 284 1
-		 285 256 1 284 285 1 286 257 1 285 286 1 287 258 1 286 287 1 288 259 1 287 288 1 289 260 1
-		 288 289 1 290 261 1 289 290 1 291 262 1 290 291 1 292 263 1 291 292 1 293 264 1 292 293 1
-		 294 265 1 293 294 1 295 266 1 294 295 1 296 267 1 295 296 1 297 268 1 296 297 1 297 278 1
-		 298 279 1 299 280 0 298 299 1 300 283 0 301 284 1 300 301 1 302 285 1 301 302 1 303 286 1
-		 302 303 1 304 287 1 303 304 1 305 288 1 304 305 1 306 289 1 305 306 1 307 290 1 306 307 1
-		 308 291 1 307 308 1 309 292 1 308 309 1 310 293 1 309 310 1 311 294 1 310 311 1 312 295 1
-		 311 312 1 313 296 1 312 313 1 314 297 1 313 314 1 315 278 1 314 315 1 315 298 1 316 298 1
-		 317 299 0 316 317 0 317 318 0 318 319 0 320 300 0 319 320 0 321 301 1 320 321 1 322 302 1
-		 321 322 1 323 303 1 322 323 1 324 304 1 323 324 1 325 305 1 324 325 1;
-	setAttr ".ed[664:829]" 326 306 1 325 326 1 327 307 1 326 327 1 328 308 1 327 328 1
-		 329 309 1 328 329 1 330 310 1 329 330 1 331 311 1 330 331 1 332 312 1 331 332 1 333 313 1
-		 332 333 1 334 314 1 333 334 1 335 315 1 334 335 1 335 316 1 299 336 0 336 337 1 280 338 0
-		 336 338 0 281 339 0 338 339 0 337 339 1 337 340 1 282 341 0 339 341 0 340 341 1 300 342 0
-		 340 342 1 283 343 0 341 343 0 342 343 0 317 344 0 318 345 0 344 345 0 344 336 0 345 337 1
-		 319 346 0 345 346 0 346 340 1 320 347 0 346 347 0 347 342 0 348 111 1 349 112 0 348 349 0
-		 350 113 1 349 350 0 351 114 1 350 351 1 352 115 1 351 352 1 353 116 1 352 353 1 354 117 1
-		 353 354 1 355 118 1 354 355 1 356 119 1 355 356 1 357 120 1 356 357 1 358 121 1 357 358 1
-		 359 102 1 358 359 1 360 103 1 359 360 1 361 104 1 360 361 1 362 105 1 361 362 1 363 106 1
-		 362 363 1 364 107 1 363 364 1 365 108 1 364 365 1 366 109 0 365 366 0 367 110 1 366 367 0
-		 367 348 0 368 349 0 369 350 1 368 369 1 370 351 1 369 370 1 371 352 1 370 371 1 372 353 1
-		 371 372 1 373 354 1 372 373 1 374 355 1 373 374 1 375 356 1 374 375 1 376 357 1 375 376 1
-		 377 358 1 376 377 1 378 359 1 377 378 1 379 360 1 378 379 1 380 361 1 379 380 1 381 362 1
-		 380 381 1 382 363 1 381 382 1 383 364 1 382 383 1 384 365 1 383 384 1 385 366 0 384 385 1
-		 387 368 0 386 387 0 388 369 1 387 388 0 389 370 1 388 389 1 390 371 1 389 390 1 391 372 1
-		 390 391 1 392 373 1 391 392 1 393 374 1 392 393 1 394 375 1 393 394 1 395 376 1 394 395 1
-		 396 377 1 395 396 1 397 378 1 396 397 1 398 379 1 397 398 1 399 380 1 398 399 1 400 381 1
-		 399 400 1 401 382 1 400 401 1 402 383 1 401 402 1 403 384 1 402 403 1 404 385 0 403 404 0
-		 404 405 0 405 386 0 406 407 1 367 426 0 406 408 1 348 425 0 408 409 0;
-	setAttr ".ed[830:891]" 407 409 1 368 423 0 407 410 1 349 424 0 409 411 0 410 411 0
-		 385 418 0 412 406 1 366 427 0 412 413 0 413 408 0 386 421 0 387 422 0 414 415 0 414 407 1
-		 415 410 0 404 419 0 405 420 0 416 417 0 416 412 0 417 406 1 417 414 0 418 437 0 419 428 0
-		 418 419 1 420 429 0 419 420 1 421 430 0 420 421 1 422 431 0 421 422 1 423 432 0 422 423 1
-		 424 433 0 423 424 1 425 434 0 424 425 1 426 435 0 425 426 1 427 436 0 426 427 1 427 418 1
-		 428 416 0 429 417 0 428 429 1 430 414 0 429 430 1 431 415 0 430 431 1 432 410 0 431 432 1
-		 433 411 0 432 433 1 434 409 0 433 434 1 435 408 0 434 435 1 436 413 0 435 436 1 437 412 0
-		 436 437 1 437 428 1;
-	setAttr -s 456 -ch 1784 ".fc[0:455]" -type "polyFaces" 
-		f 4 0 41 106 -41
-		mu 0 4 20 21 86 88
-		f 4 1 42 104 -42
-		mu 0 4 21 22 85 86
-		f 4 2 43 102 -43
-		mu 0 4 22 23 84 85
-		f 4 3 44 139 -44
-		mu 0 4 23 24 104 84
-		f 4 4 45 138 -45
-		mu 0 4 24 25 103 104
-		f 4 5 46 136 -46
-		mu 0 4 25 26 102 103
-		f 4 6 47 134 -47
-		mu 0 4 26 27 101 102
-		f 4 7 48 132 -48
-		mu 0 4 27 28 100 101
-		f 4 8 49 130 -49
-		mu 0 4 28 29 99 100
-		f 4 9 50 128 -50
-		mu 0 4 29 30 98 99
-		f 4 10 51 126 -51
-		mu 0 4 30 31 97 98
-		f 4 11 52 124 -52
-		mu 0 4 31 32 96 97
-		f 4 12 53 122 -53
-		mu 0 4 32 33 95 96
-		f 4 13 54 120 -54
-		mu 0 4 33 34 94 95
-		f 4 14 55 118 -55
-		mu 0 4 34 35 93 94
-		f 4 15 56 116 -56
-		mu 0 4 35 36 92 93
-		f 4 16 57 114 -57
-		mu 0 4 36 37 91 92
-		f 4 17 58 112 -58
-		mu 0 4 37 38 90 91
-		f 4 18 59 110 -59
-		mu 0 4 38 39 89 90
-		f 4 19 40 108 -60
-		mu 0 4 39 40 87 89
-		f 3 -1 -61 61
-		mu 0 3 1 0 82
-		f 3 -2 -62 62
-		mu 0 3 2 1 82
-		f 3 -3 -63 63
-		mu 0 3 3 2 82
-		f 3 -4 -64 64
-		mu 0 3 4 3 82
-		f 3 -5 -65 65
-		mu 0 3 5 4 82
-		f 3 -6 -66 66
-		mu 0 3 6 5 82
-		f 3 -7 -67 67
-		mu 0 3 7 6 82
-		f 3 -8 -68 68
-		mu 0 3 8 7 82
-		f 3 -9 -69 69
-		mu 0 3 9 8 82
-		f 3 -10 -70 70
-		mu 0 3 10 9 82
-		f 3 -11 -71 71
-		mu 0 3 11 10 82
-		f 3 -12 -72 72
-		mu 0 3 12 11 82
-		f 3 -13 -73 73
-		mu 0 3 13 12 82
-		f 3 -14 -74 74
-		mu 0 3 14 13 82
-		f 3 -15 -75 75
-		mu 0 3 15 14 82
-		f 3 -16 -76 76
-		mu 0 3 16 15 82
-		f 3 -17 -77 77
-		mu 0 3 17 16 82
-		f 3 -18 -78 78
-		mu 0 3 18 17 82
-		f 3 -19 -79 79
-		mu 0 3 19 18 82
-		f 3 -20 -80 60
-		mu 0 3 0 19 82
-		f 3 20 81 -81
-		mu 0 3 80 79 83
-		f 3 21 82 -82
-		mu 0 3 79 78 83
-		f 3 22 83 -83
-		mu 0 3 78 77 83
-		f 3 23 84 -84
-		mu 0 3 77 76 83
-		f 3 24 85 -85
-		mu 0 3 76 75 83
-		f 3 25 86 -86
-		mu 0 3 75 74 83
-		f 3 26 87 -87
-		mu 0 3 74 73 83
-		f 3 27 88 -88
-		mu 0 3 73 72 83
-		f 3 28 89 -89
-		mu 0 3 72 71 83
-		f 3 29 90 -90
-		mu 0 3 71 70 83
-		f 3 30 91 -91
-		mu 0 3 70 69 83
-		f 3 31 92 -92
-		mu 0 3 69 68 83
-		f 3 32 93 -93
-		mu 0 3 68 67 83
-		f 3 33 94 -94
-		mu 0 3 67 66 83
-		f 3 34 95 -95
-		mu 0 3 66 65 83
-		f 3 35 96 -96
-		mu 0 3 65 64 83
-		f 3 36 97 -97
-		mu 0 3 64 63 83
-		f 3 37 98 -98
-		mu 0 3 63 62 83
-		f 3 38 99 -99
-		mu 0 3 62 81 83
-		f 3 39 80 -100
-		mu 0 3 81 80 83
-		f 4 -103 100 142 -102
-		mu 0 4 85 84 105 106
-		f 4 -105 101 144 -104
-		mu 0 4 86 85 106 107
-		f 4 -107 103 146 -106
-		mu 0 4 88 86 107 109
-		f 4 -109 105 148 -108
-		mu 0 4 89 87 108 110
-		f 4 -111 107 150 -110
-		mu 0 4 90 89 110 111
-		f 4 -113 109 152 -112
-		mu 0 4 91 90 111 112
-		f 4 -115 111 154 -114
-		mu 0 4 92 91 112 113
-		f 4 -117 113 156 -116
-		mu 0 4 93 92 113 114
-		f 4 -119 115 158 -118
-		mu 0 4 94 93 114 115
-		f 4 -121 117 160 -120
-		mu 0 4 95 94 115 116
-		f 4 -123 119 162 -122
-		mu 0 4 96 95 116 117
-		f 4 -125 121 164 -124
-		mu 0 4 97 96 117 118
-		f 4 -127 123 166 -126
-		mu 0 4 98 97 118 119
-		f 4 -129 125 168 -128
-		mu 0 4 99 98 119 120
-		f 4 -131 127 170 -130
-		mu 0 4 100 99 120 121
-		f 4 -133 129 172 -132
-		mu 0 4 101 100 121 122
-		f 4 -135 131 174 -134
-		mu 0 4 102 101 122 123
-		f 4 -137 133 176 -136
-		mu 0 4 103 102 123 124
-		f 4 -139 135 178 -138
-		mu 0 4 104 103 124 125
-		f 4 -140 137 179 -101
-		mu 0 4 84 104 125 105
-		f 4 -143 140 182 -142
-		mu 0 4 106 105 126 127
-		f 4 -145 141 184 -144
-		mu 0 4 107 106 127 128
-		f 4 -147 143 186 -146
-		mu 0 4 109 107 128 130
-		f 4 -149 145 188 -148
-		mu 0 4 110 108 129 131
-		f 4 -151 147 190 -150
-		mu 0 4 111 110 131 132
-		f 4 -153 149 192 -152
-		mu 0 4 112 111 132 133
-		f 4 -155 151 194 -154
-		mu 0 4 113 112 133 134
-		f 4 -157 153 196 -156
-		mu 0 4 114 113 134 135
-		f 4 -159 155 198 -158
-		mu 0 4 115 114 135 136
-		f 4 -161 157 200 -160
-		mu 0 4 116 115 136 137
-		f 4 -163 159 202 -162
-		mu 0 4 117 116 137 138
-		f 4 -165 161 204 -164
-		mu 0 4 118 117 138 139
-		f 4 -167 163 206 -166
-		mu 0 4 119 118 139 140
-		f 4 -169 165 208 -168
-		mu 0 4 120 119 140 141
-		f 4 -171 167 210 -170
-		mu 0 4 121 120 141 142
-		f 4 -173 169 212 -172
-		mu 0 4 122 121 142 143
-		f 4 -175 171 214 -174
-		mu 0 4 123 122 143 144
-		f 4 -177 173 216 -176
-		mu 0 4 124 123 144 145
-		f 4 -179 175 218 -178
-		mu 0 4 125 124 145 146
-		f 4 -180 177 219 -141
-		mu 0 4 105 125 146 126
-		f 4 -183 180 810 -182
-		mu 0 4 127 126 459 460
-		f 4 -185 181 812 -184
-		mu 0 4 128 127 460 461
-		f 4 -187 183 814 -186
-		mu 0 4 130 128 461 463
-		f 4 -189 185 816 -188
-		mu 0 4 131 129 462 464
-		f 4 -191 187 818 -190
-		mu 0 4 132 131 464 465
-		f 4 -193 189 820 -192
-		mu 0 4 133 132 465 466
-		f 4 -195 191 822 -194
-		mu 0 4 134 133 466 467
-		f 4 -197 193 823 -196
-		mu 0 4 135 134 467 468
-		f 4 -199 195 824 -198
-		mu 0 4 136 135 468 448
-		f 4 -201 197 788 -200
-		mu 0 4 137 136 448 449
-		f 4 -203 199 790 -202
-		mu 0 4 138 137 449 450
-		f 4 -205 201 792 -204
-		mu 0 4 139 138 450 451
-		f 4 -207 203 794 -206
-		mu 0 4 140 139 451 452
-		f 4 -209 205 796 -208
-		mu 0 4 141 140 452 453
-		f 4 -211 207 798 -210
-		mu 0 4 142 141 453 454
-		f 4 -213 209 800 -212
-		mu 0 4 143 142 454 455
-		f 4 -215 211 802 -214
-		mu 0 4 144 143 455 456
-		f 4 -217 213 804 -216
-		mu 0 4 145 144 456 457
-		f 4 -219 215 806 -218
-		mu 0 4 146 145 457 458
-		f 4 -220 217 808 -181
-		mu 0 4 126 146 458 459
-		f 4 -223 220 650 -222
-		mu 0 4 148 147 376 377
-		f 4 -225 221 651 -224
-		mu 0 4 149 148 377 378
-		f 4 -227 223 653 -226
-		mu 0 4 151 149 378 380
-		f 4 -229 225 655 -228
-		mu 0 4 152 150 379 381
-		f 4 -231 227 657 -230
-		mu 0 4 153 152 381 382
-		f 4 -233 229 659 -232
-		mu 0 4 154 153 382 383
-		f 4 -235 231 661 -234
-		mu 0 4 155 154 383 384
-		f 4 -237 233 663 -236
-		mu 0 4 156 155 384 385
-		f 4 -239 235 665 -238
-		mu 0 4 157 156 385 386
-		f 4 -241 237 667 -240
-		mu 0 4 158 157 386 387
-		f 4 -243 239 669 -242
-		mu 0 4 159 158 387 388
-		f 4 -245 241 671 -244
-		mu 0 4 160 159 388 389
-		f 4 -247 243 673 -246
-		mu 0 4 161 160 389 390
-		f 4 -249 245 675 -248
-		mu 0 4 162 161 390 391
-		f 4 -251 247 677 -250
-		mu 0 4 163 162 391 392
-		f 4 -253 249 679 -252
-		mu 0 4 164 163 392 393
-		f 4 -255 251 681 -254
-		mu 0 4 165 164 393 394
-		f 4 -257 253 683 -256
-		mu 0 4 166 165 394 395
-		f 4 -259 255 684 -258
-		mu 0 4 167 166 395 375
-		f 4 -260 257 649 -221
-		mu 0 4 147 167 375 376
-		f 4 -263 260 381 -262
-		mu 0 4 169 168 232 233
-		f 4 -265 261 383 -264
-		mu 0 4 170 169 233 234
-		f 4 -267 263 384 -266
-		mu 0 4 172 170 234 236
-		f 4 -269 265 386 -268
-		mu 0 4 173 171 235 237
-		f 4 -271 267 388 -270
-		mu 0 4 174 173 237 238
-		f 4 -273 269 390 -272
-		mu 0 4 175 174 238 239
-		f 4 -275 271 392 -274
-		mu 0 4 176 175 239 240
-		f 4 -277 273 394 -276
-		mu 0 4 177 176 240 241
-		f 4 -279 275 396 -278
-		mu 0 4 178 177 241 242
-		f 4 -281 277 398 -280
-		mu 0 4 179 178 242 243
-		f 4 -283 279 400 -282
-		mu 0 4 180 179 243 244
-		f 4 -285 281 402 -284
-		mu 0 4 181 180 244 245
-		f 4 -287 283 404 -286
-		mu 0 4 182 181 245 246
-		f 4 -289 285 406 -288
-		mu 0 4 183 182 246 247
-		f 4 -291 287 408 -290
-		mu 0 4 184 183 247 248
-		f 4 -293 289 410 -292
-		mu 0 4 185 184 248 249
-		f 4 -295 291 412 -294
-		mu 0 4 186 185 249 250
-		f 4 -297 293 414 -296
-		mu 0 4 187 186 250 251
-		f 4 -299 295 415 -298
-		mu 0 4 188 187 251 231
-		f 4 -300 297 379 -261
-		mu 0 4 168 188 231 232
-		f 4 -303 300 -22 -302
-		mu 0 4 190 189 43 42
-		f 4 -305 301 -21 -304
-		mu 0 4 192 190 42 41
-		f 4 -307 303 -40 -306
-		mu 0 4 193 191 61 60
-		f 4 -309 305 -39 -308
-		mu 0 4 194 193 60 59
-		f 4 -311 307 -38 -310
-		mu 0 4 195 194 59 58
-		f 4 -313 309 -37 -312
-		mu 0 4 196 195 58 57
-		f 4 -315 311 -36 -314
-		mu 0 4 197 196 57 56
-		f 4 -317 313 -35 -316
-		mu 0 4 198 197 56 55
-		f 4 -319 315 -34 -318
-		mu 0 4 199 198 55 54
-		f 4 -321 317 -33 -320
-		mu 0 4 200 199 54 53
-		f 4 -323 319 -32 -322
-		mu 0 4 201 200 53 52
-		f 4 -325 321 -31 -324
-		mu 0 4 202 201 52 51
-		f 4 -327 323 -30 -326
-		mu 0 4 203 202 51 50
-		f 4 -329 325 -29 -328
-		mu 0 4 204 203 50 49
-		f 4 -331 327 -28 -330
-		mu 0 4 205 204 49 48
-		f 4 -333 329 -27 -332
-		mu 0 4 206 205 48 47
-		f 4 -335 331 -26 -334
-		mu 0 4 207 206 47 46
-		f 4 -337 333 -25 -336
-		mu 0 4 208 207 46 45
-		f 4 -339 335 -24 -338
-		mu 0 4 209 208 45 44
-		f 4 -340 337 -23 -301
-		mu 0 4 189 209 44 43
-		f 4 -343 340 339 -342
-		mu 0 4 211 210 209 189
-		f 4 -345 341 302 -344
-		mu 0 4 212 211 189 190
-		f 4 -418 419 421 -423
-		mu 0 4 214 252 253 254
-		f 4 -425 422 426 -428
-		mu 0 4 257 213 255 256
-		f 4 -348 345 308 -347
-		mu 0 4 216 215 193 194
-		f 4 -350 346 310 -349
-		mu 0 4 217 216 194 195
-		f 4 -352 348 312 -351
-		mu 0 4 218 217 195 196
-		f 4 -354 350 314 -353
-		mu 0 4 219 218 196 197
-		f 4 -356 352 316 -355
-		mu 0 4 220 219 197 198
-		f 4 -358 354 318 -357
-		mu 0 4 221 220 198 199
-		f 4 -360 356 320 -359
-		mu 0 4 222 221 199 200
-		f 4 -362 358 322 -361
-		mu 0 4 223 222 200 201
-		f 4 -364 360 324 -363
-		mu 0 4 224 223 201 202
-		f 4 -366 362 326 -365
-		mu 0 4 225 224 202 203
-		f 4 -368 364 328 -367
-		mu 0 4 226 225 203 204
-		f 4 -370 366 330 -369
-		mu 0 4 227 226 204 205
-		f 4 -372 368 332 -371
-		mu 0 4 228 227 205 206
-		f 4 -374 370 334 -373
-		mu 0 4 229 228 206 207
-		f 4 -376 372 336 -375
-		mu 0 4 230 229 207 208
-		f 4 -377 374 338 -341
-		mu 0 4 210 230 208 209
-		f 4 -380 377 376 -379
-		mu 0 4 232 231 230 210
-		f 4 -382 378 342 -381
-		mu 0 4 233 232 210 211
-		f 4 -384 380 344 -383
-		mu 0 4 234 233 211 212
-		f 4 -431 431 417 -433
-		mu 0 4 258 259 252 214
-		f 4 -435 432 424 -436
-		mu 0 4 260 261 213 257
-		f 4 -389 385 347 -388
-		mu 0 4 238 237 215 216
-		f 4 -391 387 349 -390
-		mu 0 4 239 238 216 217
-		f 4 -393 389 351 -392
-		mu 0 4 240 239 217 218
-		f 4 -395 391 353 -394
-		mu 0 4 241 240 218 219
-		f 4 -397 393 355 -396
-		mu 0 4 242 241 219 220
-		f 4 -399 395 357 -398
-		mu 0 4 243 242 220 221
-		f 4 -401 397 359 -400
-		mu 0 4 244 243 221 222
-		f 4 -403 399 361 -402
-		mu 0 4 245 244 222 223
-		f 4 -405 401 363 -404
-		mu 0 4 246 245 223 224
-		f 4 -407 403 365 -406
-		mu 0 4 247 246 224 225
-		f 4 -409 405 367 -408
-		mu 0 4 248 247 225 226
-		f 4 -411 407 369 -410
-		mu 0 4 249 248 226 227
-		f 4 -413 409 371 -412
-		mu 0 4 250 249 227 228
-		f 4 -415 411 373 -414
-		mu 0 4 251 250 228 229
-		f 4 -416 413 375 -378
-		mu 0 4 231 251 229 230
-		f 4 343 418 -420 -417
-		mu 0 4 212 190 253 252
-		f 4 304 420 -422 -419
-		mu 0 4 190 192 254 253
-		f 4 306 425 -427 -421
-		mu 0 4 191 193 256 255
-		f 4 -346 423 427 -426
-		mu 0 4 193 215 257 256
-		f 4 -385 428 430 -430
-		mu 0 4 236 234 259 258
-		f 4 382 416 -432 -429
-		mu 0 4 234 212 252 259
-		f 4 -387 429 434 -434
-		mu 0 4 237 235 261 260
-		f 4 -386 433 435 -424
-		mu 0 4 215 237 260 257
-		f 4 -439 436 299 -438
-		mu 0 4 263 262 188 168
-		f 4 -441 437 262 -440
-		mu 0 4 264 263 168 169
-		f 4 -443 439 264 -442
-		mu 0 4 265 264 169 170
-		f 4 -445 441 266 -444
-		mu 0 4 267 265 170 172
-		f 4 -447 443 268 -446
-		mu 0 4 268 266 171 173
-		f 4 -449 445 270 -448
-		mu 0 4 269 268 173 174
-		f 4 -451 447 272 -450
-		mu 0 4 270 269 174 175
-		f 4 -453 449 274 -452
-		mu 0 4 271 270 175 176
-		f 4 -455 451 276 -454
-		mu 0 4 272 271 176 177
-		f 4 -457 453 278 -456
-		mu 0 4 273 272 177 178
-		f 4 -459 455 280 -458
-		mu 0 4 274 273 178 179
-		f 4 -461 457 282 -460
-		mu 0 4 275 274 179 180
-		f 4 -463 459 284 -462
-		mu 0 4 276 275 180 181
-		f 4 -465 461 286 -464
-		mu 0 4 277 276 181 182
-		f 4 -467 463 288 -466
-		mu 0 4 278 277 182 183
-		f 4 -469 465 290 -468
-		mu 0 4 279 278 183 184
-		f 4 -471 467 292 -470
-		mu 0 4 280 279 184 185
-		f 4 -473 469 294 -472
-		mu 0 4 281 280 185 186
-		f 4 -475 471 296 -474
-		mu 0 4 282 281 186 187
-		f 4 -476 473 298 -437
-		mu 0 4 262 282 187 188
-		f 4 -554 555 557 -559
-		mu 0 4 327 283 325 326
-		f 4 -479 476 438 -478
-		mu 0 4 285 284 262 263
-		f 4 -481 477 440 -480
-		mu 0 4 286 285 263 264
-		f 4 -483 479 442 -482
-		mu 0 4 287 286 264 265
-		f 4 -485 481 444 -484
-		mu 0 4 289 287 265 267
-		f 4 -487 483 446 -486
-		mu 0 4 290 288 266 268
-		f 4 -489 485 448 -488
-		mu 0 4 291 290 268 269
-		f 4 -491 487 450 -490
-		mu 0 4 292 291 269 270
-		f 4 -493 489 452 -492
-		mu 0 4 293 292 270 271
-		f 4 -495 491 454 -494
-		mu 0 4 294 293 271 272
-		f 4 -497 493 456 -496
-		mu 0 4 295 294 272 273
-		f 4 -499 495 458 -498
-		mu 0 4 296 295 273 274
-		f 4 -501 497 460 -500
-		mu 0 4 297 296 274 275
-		f 4 -503 499 462 -502
-		mu 0 4 298 297 275 276
-		f 4 -505 501 464 -504
-		mu 0 4 299 298 276 277
-		f 4 -507 503 466 -506
-		mu 0 4 300 299 277 278
-		f 4 -509 505 468 -508
-		mu 0 4 301 300 278 279
-		f 4 -511 507 470 -510
-		mu 0 4 302 301 279 280
-		f 4 -513 509 472 -512
-		mu 0 4 303 302 280 281
-		f 4 -561 562 563 -556
-		mu 0 4 283 328 329 325
-		f 4 -567 567 553 -569
-		mu 0 4 330 331 283 327
-		f 4 -517 513 478 -516
-		mu 0 4 306 305 284 285
-		f 4 -519 515 480 -518
-		mu 0 4 307 306 285 286
-		f 4 -521 517 482 -520
-		mu 0 4 308 307 286 287
-		f 4 -523 519 484 -522
-		mu 0 4 310 308 287 289
-		f 4 -525 521 486 -524
-		mu 0 4 311 309 288 290
-		f 4 -527 523 488 -526
-		mu 0 4 312 311 290 291
-		f 4 -529 525 490 -528
-		mu 0 4 313 312 291 292
-		f 4 -531 527 492 -530
-		mu 0 4 314 313 292 293
-		f 4 -533 529 494 -532
-		mu 0 4 315 314 293 294
-		f 4 -535 531 496 -534
-		mu 0 4 316 315 294 295
-		f 4 -537 533 498 -536
-		mu 0 4 317 316 295 296
-		f 4 -539 535 500 -538
-		mu 0 4 318 317 296 297
-		f 4 -541 537 502 -540
-		mu 0 4 319 318 297 298
-		f 4 -543 539 504 -542
-		mu 0 4 320 319 298 299
-		f 4 -545 541 506 -544
-		mu 0 4 321 320 299 300
-		f 4 -547 543 508 -546
-		mu 0 4 322 321 300 301
-		f 4 -549 545 510 -548
-		mu 0 4 323 322 301 302
-		f 4 -551 547 512 -550
-		mu 0 4 324 323 302 303
-		f 4 -571 571 560 -568
-		mu 0 4 331 332 328 283
-		f 4 475 556 -558 -555
-		mu 0 4 282 262 326 325
-		f 4 -477 552 558 -557
-		mu 0 4 262 284 327 326
-		f 4 511 561 -563 -560
-		mu 0 4 303 281 329 328
-		f 4 474 554 -564 -562
-		mu 0 4 281 282 325 329
-		f 4 -515 564 566 -566
-		mu 0 4 305 304 331 330
-		f 4 -514 565 568 -553
-		mu 0 4 284 305 330 327
-		f 4 -552 569 570 -565
-		mu 0 4 304 324 332 331
-		f 4 549 559 -572 -570
-		mu 0 4 324 303 328 332
-		f 4 -575 572 514 -574
-		mu 0 4 334 333 304 305
-		f 4 -577 573 516 -576
-		mu 0 4 335 334 305 306
-		f 4 -579 575 518 -578
-		mu 0 4 336 335 306 307
-		f 4 -581 577 520 -580
-		mu 0 4 337 336 307 308
-		f 4 -583 579 522 -582
-		mu 0 4 339 337 308 310
-		f 4 -585 581 524 -584
-		mu 0 4 340 338 309 311
-		f 4 -587 583 526 -586
-		mu 0 4 341 340 311 312
-		f 4 -589 585 528 -588
-		mu 0 4 342 341 312 313
-		f 4 -591 587 530 -590
-		mu 0 4 343 342 313 314
-		f 4 -593 589 532 -592
-		mu 0 4 344 343 314 315
-		f 4 -595 591 534 -594
-		mu 0 4 345 344 315 316
-		f 4 -597 593 536 -596
-		mu 0 4 346 345 316 317
-		f 4 -599 595 538 -598
-		mu 0 4 347 346 317 318
-		f 4 -601 597 540 -600
-		mu 0 4 348 347 318 319
-		f 4 -603 599 542 -602
-		mu 0 4 349 348 319 320
-		f 4 -605 601 544 -604
-		mu 0 4 350 349 320 321
-		f 4 -607 603 546 -606
-		mu 0 4 351 350 321 322
-		f 4 -609 605 548 -608
-		mu 0 4 352 351 322 323
-		f 4 -611 607 550 -610
-		mu 0 4 353 352 323 324
-		f 4 -612 609 551 -573
-		mu 0 4 333 353 324 304
-		f 4 -615 612 576 -614
-		mu 0 4 355 354 334 335
-		f 4 -687 688 690 -692
-		mu 0 4 356 396 397 398
-		f 4 -693 691 694 -696
-		mu 0 4 357 356 398 399
-		f 4 -698 695 699 -701
-		mu 0 4 401 357 399 400
-		f 4 -618 615 584 -617
-		mu 0 4 360 358 338 340
-		f 4 -620 616 586 -619
-		mu 0 4 361 360 340 341
-		f 4 -622 618 588 -621
-		mu 0 4 362 361 341 342
-		f 4 -624 620 590 -623
-		mu 0 4 363 362 342 343
-		f 4 -626 622 592 -625
-		mu 0 4 364 363 343 344
-		f 4 -628 624 594 -627
-		mu 0 4 365 364 344 345
-		f 4 -630 626 596 -629
-		mu 0 4 366 365 345 346
-		f 4 -632 628 598 -631
-		mu 0 4 367 366 346 347
-		f 4 -634 630 600 -633
-		mu 0 4 368 367 347 348
-		f 4 -636 632 602 -635
-		mu 0 4 369 368 348 349
-		f 4 -638 634 604 -637
-		mu 0 4 370 369 349 350
-		f 4 -640 636 606 -639
-		mu 0 4 371 370 350 351
-		f 4 -642 638 608 -641
-		mu 0 4 372 371 351 352
-		f 4 -644 640 610 -643
-		mu 0 4 373 372 352 353
-		f 4 -646 642 611 -645
-		mu 0 4 374 373 353 333
-		f 4 -647 644 574 -613
-		mu 0 4 354 374 333 334
-		f 4 -650 647 614 -649
-		mu 0 4 376 375 354 355
-		f 4 -704 704 686 -706
-		mu 0 4 402 403 396 356
-		f 4 -708 705 692 -709
-		mu 0 4 404 402 356 357
-		f 4 -711 708 697 -712
-		mu 0 4 405 404 357 401
-		f 4 -656 652 617 -655
-		mu 0 4 381 379 358 360
-		f 4 -658 654 619 -657
-		mu 0 4 382 381 360 361
-		f 4 -660 656 621 -659
-		mu 0 4 383 382 361 362
-		f 4 -662 658 623 -661
-		mu 0 4 384 383 362 363
-		f 4 -664 660 625 -663
-		mu 0 4 385 384 363 364
-		f 4 -666 662 627 -665
-		mu 0 4 386 385 364 365
-		f 4 -668 664 629 -667
-		mu 0 4 387 386 365 366
-		f 4 -670 666 631 -669
-		mu 0 4 388 387 366 367
-		f 4 -672 668 633 -671
-		mu 0 4 389 388 367 368
-		f 4 -674 670 635 -673
-		mu 0 4 390 389 368 369
-		f 4 -676 672 637 -675
-		mu 0 4 391 390 369 370
-		f 4 -678 674 639 -677
-		mu 0 4 392 391 370 371
-		f 4 -680 676 641 -679
-		mu 0 4 393 392 371 372
-		f 4 -682 678 643 -681
-		mu 0 4 394 393 372 373
-		f 4 -684 680 645 -683
-		mu 0 4 395 394 373 374
-		f 4 -685 682 646 -648
-		mu 0 4 375 395 374 354
-		f 4 613 687 -689 -686
-		mu 0 4 355 335 397 396
-		f 4 578 689 -691 -688
-		mu 0 4 335 336 398 397
-		f 4 580 693 -695 -690
-		mu 0 4 336 337 399 398
-		f 4 582 698 -700 -694
-		mu 0 4 337 339 400 399
-		f 4 -616 696 700 -699
-		mu 0 4 339 359 401 400
-		f 4 -651 701 703 -703
-		mu 0 4 377 376 403 402
-		f 4 648 685 -705 -702
-		mu 0 4 376 355 396 403
-		f 4 -652 702 707 -707
-		mu 0 4 378 377 402 404
-		f 4 -654 706 710 -710
-		mu 0 4 380 378 404 405
-		f 4 -653 709 711 -697
-		mu 0 4 359 380 405 401
-		f 4 -715 712 240 -714
-		mu 0 4 407 406 157 158
-		f 4 -717 713 242 -716
-		mu 0 4 408 407 158 159
-		f 4 -719 715 244 -718
-		mu 0 4 409 408 159 160
-		f 4 -721 717 246 -720
-		mu 0 4 410 409 160 161
-		f 4 -723 719 248 -722
-		mu 0 4 411 410 161 162
-		f 4 -725 721 250 -724
-		mu 0 4 412 411 162 163
-		f 4 -727 723 252 -726
-		mu 0 4 413 412 163 164
-		f 4 -729 725 254 -728
-		mu 0 4 414 413 164 165
-		f 4 -731 727 256 -730
-		mu 0 4 415 414 165 166
-		f 4 -733 729 258 -732
-		mu 0 4 416 415 166 167
-		f 4 -735 731 259 -734
-		mu 0 4 417 416 167 147
-		f 4 -737 733 222 -736
-		mu 0 4 418 417 147 148
-		f 4 -739 735 224 -738
-		mu 0 4 419 418 148 149
-		f 4 -741 737 226 -740
-		mu 0 4 421 419 149 151
-		f 4 -743 739 228 -742
-		mu 0 4 422 420 150 152
-		f 4 -745 741 230 -744
-		mu 0 4 423 422 152 153
-		f 4 -747 743 232 -746
-		mu 0 4 424 423 153 154
-		f 4 -749 745 234 -748
-		mu 0 4 425 424 154 155
-		f 4 -751 747 236 -750
-		mu 0 4 426 425 155 156
-		f 4 -752 749 238 -713
-		mu 0 4 406 426 156 157
-		f 4 -826 827 829 -831
-		mu 0 4 428 427 469 470
-		f 4 -833 830 834 -836
-		mu 0 4 472 428 470 471
-		f 4 -755 752 716 -754
-		mu 0 4 430 429 407 408
-		f 4 -757 753 718 -756
-		mu 0 4 431 430 408 409
-		f 4 -759 755 720 -758
-		mu 0 4 432 431 409 410
-		f 4 -761 757 722 -760
-		mu 0 4 433 432 410 411
-		f 4 -763 759 724 -762
-		mu 0 4 434 433 411 412
-		f 4 -765 761 726 -764
-		mu 0 4 435 434 412 413
-		f 4 -767 763 728 -766
-		mu 0 4 436 435 413 414
-		f 4 -769 765 730 -768
-		mu 0 4 437 436 414 415
-		f 4 -771 767 732 -770
-		mu 0 4 438 437 415 416
-		f 4 -773 769 734 -772
-		mu 0 4 439 438 416 417
-		f 4 -775 771 736 -774
-		mu 0 4 440 439 417 418
-		f 4 -777 773 738 -776
-		mu 0 4 441 440 418 419
-		f 4 -779 775 740 -778
-		mu 0 4 443 441 419 421
-		f 4 -781 777 742 -780
-		mu 0 4 444 442 420 422
-		f 4 -783 779 744 -782
-		mu 0 4 445 444 422 423
-		f 4 -785 781 746 -784
-		mu 0 4 446 445 423 424
-		f 4 -787 783 748 -786
-		mu 0 4 447 446 424 425
-		f 4 -838 839 840 -828
-		mu 0 4 427 473 474 469
-		f 4 -844 844 832 -846
-		mu 0 4 475 476 428 472
-		f 4 -791 787 754 -790
-		mu 0 4 450 449 429 430
-		f 4 -793 789 756 -792
-		mu 0 4 451 450 430 431
-		f 4 -795 791 758 -794
-		mu 0 4 452 451 431 432
-		f 4 -797 793 760 -796
-		mu 0 4 453 452 432 433
-		f 4 -799 795 762 -798
-		mu 0 4 454 453 433 434
-		f 4 -801 797 764 -800
-		mu 0 4 455 454 434 435
-		f 4 -803 799 766 -802
-		mu 0 4 456 455 435 436
-		f 4 -805 801 768 -804
-		mu 0 4 457 456 436 437
-		f 4 -807 803 770 -806
-		mu 0 4 458 457 437 438
-		f 4 -809 805 772 -808
-		mu 0 4 459 458 438 439
-		f 4 -811 807 774 -810
-		mu 0 4 460 459 439 440
-		f 4 -813 809 776 -812
-		mu 0 4 461 460 440 441
-		f 4 -815 811 778 -814
-		mu 0 4 463 461 441 443
-		f 4 -817 813 780 -816
-		mu 0 4 464 462 442 444
-		f 4 -819 815 782 -818
-		mu 0 4 465 464 444 445
-		f 4 -821 817 784 -820
-		mu 0 4 466 465 445 446
-		f 4 -823 819 786 -822
-		mu 0 4 467 466 446 447
-		f 4 -849 849 837 -851
-		mu 0 4 477 478 473 427
-		f 4 -852 850 825 -845
-		mu 0 4 476 477 427 428
-		f 4 751 828 868 -827
-		mu 0 4 426 406 486 487
-		f 4 714 833 866 -829
-		mu 0 4 406 407 485 486
-		f 4 -753 831 864 -834
-		mu 0 4 407 429 484 485
-		f 4 785 838 871 -837
-		mu 0 4 447 425 488 479
-		f 4 750 826 870 -839
-		mu 0 4 425 426 487 488
-		f 4 -789 841 860 -843
-		mu 0 4 449 448 482 483
-		f 4 -788 842 862 -832
-		mu 0 4 429 449 483 484
-		f 4 -824 846 856 -848
-		mu 0 4 468 467 480 481
-		f 4 821 836 854 -847
-		mu 0 4 467 447 479 480
-		f 4 -825 847 858 -842
-		mu 0 4 448 468 481 482
-		f 4 -855 852 891 -854
-		mu 0 4 480 479 498 489
-		f 4 -857 853 874 -856
-		mu 0 4 481 480 489 490
-		f 4 -859 855 876 -858
-		mu 0 4 482 481 490 491
-		f 4 -861 857 878 -860
-		mu 0 4 483 482 491 492
-		f 4 -863 859 880 -862
-		mu 0 4 484 483 492 493
-		f 4 -865 861 882 -864
-		mu 0 4 485 484 493 494
-		f 4 -867 863 884 -866
-		mu 0 4 486 485 494 495
-		f 4 -869 865 886 -868
-		mu 0 4 487 486 495 496
-		f 4 -871 867 888 -870
-		mu 0 4 488 487 496 497
-		f 4 -872 869 890 -853
-		mu 0 4 479 488 497 498
-		f 4 -875 872 848 -874
-		mu 0 4 490 489 478 477
-		f 4 -877 873 851 -876
-		mu 0 4 491 490 477 476
-		f 4 -879 875 843 -878
-		mu 0 4 492 491 476 475
-		f 4 -881 877 845 -880
-		mu 0 4 493 492 475 472
-		f 4 -883 879 835 -882
-		mu 0 4 494 493 472 471
-		f 4 -885 881 -835 -884
-		mu 0 4 495 494 471 470
-		f 4 -887 883 -830 -886
-		mu 0 4 496 495 470 469
-		f 4 -889 885 -841 -888
-		mu 0 4 497 496 469 474
-		f 4 -891 887 -840 -890
-		mu 0 4 498 497 474 473
-		f 4 -892 889 -850 -873
-		mu 0 4 489 498 473 478;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pCone1";
-	rename -uid "2CCADA51-4742-A0B5-46A7-8689585FDEFD";
-	setAttr ".t" -type "double3" -1.5834387186826162 3.0149445919177067 0.46799555998272879 ;
-	setAttr ".r" -type "double3" -81.438123991840612 0 0 ;
-	setAttr ".s" -type "double3" 0.29047104113601807 0.29047104113601807 0.29047104113601807 ;
-createNode transform -n "transform1" -p "pCone1";
-	rename -uid "A42572EC-4960-DB9F-4EAB-6C9075AFFE5C";
-	setAttr ".v" no;
-createNode mesh -n "pConeShape1" -p "transform1";
-	rename -uid "753B5570-492B-6FCB-78BD-38AB57A6960B";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere9";
-	rename -uid "B2AFCE3B-4EDD-9BB6-3EFC-D9BE717E9E47";
-	setAttr ".t" -type "double3" -1.5999050495996123 2.6835538662557528 0.74332181852203616 ;
-	setAttr ".r" -type "double3" -12.919999627249338 0 0 ;
-	setAttr ".s" -type "double3" 0.060515934172495803 0.060515934172495803 0.0076755687871814882 ;
-createNode transform -n "transform8" -p "pSphere9";
-	rename -uid "22984498-46A7-C134-D6F2-14806D24BD7B";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape9" -p "transform8";
-	rename -uid "E57F710C-4FE6-2446-283C-349EF2F23A40";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere10";
-	rename -uid "93262C8F-4030-56FF-0507-3E9D6296E6B5";
-	setAttr ".t" -type "double3" -1.5319853564911505 2.6904822803105453 0.73377433985514051 ;
-	setAttr ".r" -type "double3" -12.919999627249338 0 0 ;
-	setAttr ".s" -type "double3" 0.050591773168317609 0.050591773168317609 0.0078728174720657223 ;
-createNode transform -n "transform3" -p "pSphere10";
-	rename -uid "CE08AEBA-466D-CAC0-A790-A7AE7FC2E1CB";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape10" -p "transform3";
-	rename -uid "DA6D3F2D-4C54-88DB-A158-42A289C49294";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.070221849 -0.46617946 -0.022816461 0.059734274 -0.46617946 -0.043399487
-		 0.043399487 -0.46617946 -0.05973427 0.022816459 -0.46617946 -0.070221841 0 -0.46617946 -0.073835611
-		 -0.022816459 -0.46617946 -0.070221834 -0.043399479 -0.46617946 -0.059734255 -0.059734251 -0.46617946 -0.043399476
-		 -0.070221826 -0.46617946 -0.022816451 -0.073835589 -0.46617946 0 -0.070221826 -0.46617946 0.022816451
-		 -0.059734248 -0.46617946 0.043399468 -0.043399468 -0.46617946 0.059734244 -0.022816451 -0.46617946 0.070221812
-		 -2.2004716e-09 -0.46617946 0.073835582 0.022816446 -0.46617946 0.070221812 0.043399461 -0.46617946 0.05973424
-		 0.059734236 -0.46617946 0.043399464 0.070221804 -0.46617946 0.022816448 0.073835574 -0.46617946 0
-		 0.13871461 -0.44888958 -0.045071106 0.11799769 -0.44888958 -0.085730337 0.085730337 -0.44888958 -0.11799768
-		 0.045071103 -0.44888958 -0.13871458 0 -0.44888958 -0.14585315 -0.045071103 -0.44888958 -0.13871458
-		 -0.085730322 -0.44888958 -0.11799766 -0.11799765 -0.44888958 -0.085730307 -0.13871455 -0.44888958 -0.045071088
-		 -0.1458531 -0.44888958 0 -0.13871455 -0.44888958 0.045071088 -0.11799764 -0.44888958 0.085730299
-		 -0.085730299 -0.44888958 0.11799763 -0.045071088 -0.44888958 0.13871454 -4.3467603e-09 -0.44888958 0.14585309
-		 0.045071077 -0.44888958 0.13871452 0.085730284 -0.44888958 0.11799762 0.11799762 -0.44888958 0.085730292
-		 0.13871452 -0.44888958 0.04507108 0.14585307 -0.44888958 0 0.20379175 -0.42054656 -0.066215955
-		 0.17335562 -0.42054656 -0.12595022 0.12595022 -0.42054656 -0.17335561 0.066215947 -0.42054656 -0.20379172
-		 0 -0.42054656 -0.21427929 -0.066215947 -0.42054656 -0.20379171 -0.1259502 -0.42054656 -0.17335556
-		 -0.17335556 -0.42054656 -0.12595019 -0.20379168 -0.42054656 -0.066215925 -0.21427923 -0.42054656 0
-		 -0.20379168 -0.42054656 0.066215925 -0.17335555 -0.42054656 0.12595017 -0.12595017 -0.42054656 0.17335553
-		 -0.066215925 -0.42054656 0.20379165 -6.3860175e-09 -0.42054656 0.21427922 0.06621591 -0.42054656 0.20379163
-		 0.12595014 -0.42054656 0.17335552 0.1733555 -0.42054656 0.12595016 0.20379162 -0.42054656 0.06621591
-		 0.21427919 -0.42054656 0 0.26385084 -0.38184828 -0.085730329 0.22444494 -0.38184828 -0.16306879
-		 0.16306879 -0.38184828 -0.22444493 0.085730322 -0.38184828 -0.26385081 0 -0.38184828 -0.27742913
-		 -0.085730322 -0.38184828 -0.26385081 -0.16306874 -0.38184828 -0.22444487 -0.22444485 -0.38184828 -0.16306873
-		 -0.26385075 -0.38184828 -0.085730299 -0.27742907 -0.38184828 0 -0.26385075 -0.38184828 0.085730299
-		 -0.22444484 -0.38184828 0.16306871 -0.16306871 -0.38184828 0.22444482 -0.085730299 -0.38184828 0.26385072
-		 -8.2680289e-09 -0.38184828 0.27742904 0.085730277 -0.38184828 0.26385069 0.16306868 -0.38184828 0.22444481
-		 0.22444479 -0.38184828 0.1630687 0.26385069 -0.38184828 0.085730284 0.27742901 -0.38184828 0
-		 0.31741306 -0.33374763 -0.10313375 0.27000767 -0.33374763 -0.19617204 0.19617204 -0.33374763 -0.27000767
-		 0.10313374 -0.33374763 -0.31741303 0 -0.33374763 -0.33374777 -0.10313374 -0.33374763 -0.317413
-		 -0.19617201 -0.33374763 -0.27000761 -0.27000758 -0.33374763 -0.19617198 -0.31741294 -0.33374763 -0.10313371
-		 -0.33374771 -0.33374763 0 -0.31741294 -0.33374763 0.10313371 -0.27000755 -0.33374763 0.19617197
-		 -0.19617197 -0.33374763 0.27000755 -0.10313371 -0.33374763 0.31741291 -9.9464543e-09 -0.33374763 0.33374766
-		 0.10313368 -0.33374763 0.31741288 0.19617192 -0.33374763 0.27000752 0.27000749 -0.33374763 0.19617195
-		 0.31741285 -0.33374763 0.10313369 0.33374763 -0.33374763 0 0.36315954 -0.27742901 -0.11799768
-		 0.30892196 -0.27742901 -0.22444493 0.22444493 -0.27742901 -0.30892193 0.11799767 -0.27742901 -0.36315948
-		 0 -0.27742901 -0.38184845 -0.11799767 -0.27742901 -0.36315945 -0.22444487 -0.27742901 -0.30892187
-		 -0.30892184 -0.27742901 -0.22444485 -0.36315939 -0.27742901 -0.11799763 -0.38184837 -0.27742901 0
-		 -0.36315939 -0.27742901 0.11799763 -0.30892181 -0.27742901 0.22444482 -0.22444482 -0.27742901 0.30892178
-		 -0.11799763 -0.27742901 0.36315936 -1.1379965e-08 -0.27742901 0.38184834 0.1179976 -0.27742901 0.36315933
-		 0.22444478 -0.27742901 0.30892178 0.30892175 -0.27742901 0.22444481 0.3631593 -0.27742901 0.11799761
-		 0.38184828 -0.27742901 0 0.3999638 -0.21427919 -0.12995611 0.34022954 -0.21427919 -0.24719122
-		 0.24719122 -0.21427919 -0.34022951 0.1299561 -0.21427919 -0.39996377 0 -0.21427919 -0.42054677
-		 -0.1299561 -0.21427919 -0.39996374 -0.24719116 -0.21427919 -0.34022945 -0.34022942 -0.21427919 -0.24719113
-		 -0.39996365 -0.21427919 -0.12995607 -0.42054665 -0.21427919 0 -0.39996365 -0.21427919 0.12995607
-		 -0.34022939 -0.21427919 0.24719112 -0.24719112 -0.21427919 0.34022936 -0.12995607 -0.21427919 0.39996362
-		 -1.2533264e-08 -0.21427919 0.42054662 0.12995602 -0.21427919 0.39996359 0.24719106 -0.21427919 0.34022933
-		 0.34022933 -0.21427919 0.24719109 0.39996356 -0.21427919 0.12995604 0.42054656 -0.21427919 0
-		 0.42691964 -0.14585306 -0.1387146 0.36315954 -0.14585306 -0.26385084 0.26385084 -0.14585306 -0.36315951
-		 0.13871458 -0.14585306 -0.42691958 0 -0.14585306 -0.44888979 -0.13871458 -0.14585306 -0.42691955
-		 -0.26385078 -0.14585306 -0.36315945 -0.36315942 -0.14585306 -0.26385075 -0.42691949 -0.14585306 -0.13871454
-		 -0.4488897 -0.14585306 0 -0.42691949 -0.14585306 0.13871454 -0.36315939 -0.14585306 0.26385072
-		 -0.26385072 -0.14585306 0.36315936 -0.13871454 -0.14585306 0.42691943 -1.3377952e-08 -0.14585306 0.44888964
-		 0.13871451 -0.14585306 0.4269194 0.26385066 -0.14585306 0.36315933 0.3631593 -0.14585306 0.26385069
-		 0.42691937 -0.14585306 0.13871451 0.44888958 -0.14585306 0 0.44336331 -0.073835529 -0.14405747
-		 0.37714735 -0.073835529 -0.27401358 0.27401358 -0.073835529 -0.37714735 0.14405745 -0.073835529 -0.44336325
-		 0 -0.073835529 -0.46617967 -0.14405745 -0.073835529 -0.44336322;
-	setAttr ".vt[166:331]" -0.27401352 -0.073835529 -0.37714726 -0.37714723 -0.073835529 -0.27401349
-		 -0.44336313 -0.073835529 -0.14405741 -0.46617958 -0.073835529 0 -0.44336313 -0.073835529 0.14405741
-		 -0.3771472 -0.073835529 0.27401346 -0.27401346 -0.073835529 0.37714717 -0.14405741 -0.073835529 0.44336307
-		 -1.3893231e-08 -0.073835529 0.46617952 0.14405736 -0.073835529 0.44336304 0.2740134 -0.073835529 0.37714714
-		 0.37714711 -0.073835529 0.27401343 0.44336301 -0.073835529 0.14405738 0.46617946 -0.073835529 0
-		 0.44888988 0 -0.14585315 0.38184854 0 -0.27742919 0.27742919 0 -0.38184851 0.14585315 0 -0.44888982
-		 0 0 -0.47199067 -0.14585315 0 -0.44888979 -0.27742913 0 -0.38184842 -0.38184839 0 -0.2774291
-		 -0.4488897 0 -0.1458531 -0.47199056 0 0 -0.4488897 0 0.1458531 -0.38184837 0 0.27742907
-		 -0.27742907 0 0.38184834 -0.1458531 0 0.44888964 -1.4066411e-08 0 0.4719905 0.14585306 0 0.44888961
-		 0.27742901 0 0.38184831 0.38184828 0 0.27742904 0.44888958 0 0.14585307 0.47199044 0 0
-		 0.44336331 0.073835529 -0.14405747 0.37714735 0.073835529 -0.27401358 0.27401358 0.073835529 -0.37714735
-		 0.14405745 0.073835529 -0.44336325 0 0.073835529 -0.46617967 -0.14405745 0.073835529 -0.44336322
-		 -0.27401352 0.073835529 -0.37714726 -0.37714723 0.073835529 -0.27401349 -0.44336313 0.073835529 -0.14405741
-		 -0.46617958 0.073835529 0 -0.44336313 0.073835529 0.14405741 -0.3771472 0.073835529 0.27401346
-		 -0.27401346 0.073835529 0.37714717 -0.14405741 0.073835529 0.44336307 -1.3893231e-08 0.073835529 0.46617952
-		 0.14405736 0.073835529 0.44336304 0.2740134 0.073835529 0.37714714 0.37714711 0.073835529 0.27401343
-		 0.44336301 0.073835529 0.14405738 0.46617946 0.073835529 0 0.42691964 0.14585306 -0.1387146
-		 0.36315954 0.14585306 -0.26385084 0.26385084 0.14585306 -0.36315951 0.13871458 0.14585306 -0.42691958
-		 0 0.14585306 -0.44888979 -0.13871458 0.14585306 -0.42691955 -0.26385078 0.14585306 -0.36315945
-		 -0.36315942 0.14585306 -0.26385075 -0.42691949 0.14585306 -0.13871454 -0.4488897 0.14585306 0
-		 -0.42691949 0.14585306 0.13871454 -0.36315939 0.14585306 0.26385072 -0.26385072 0.14585306 0.36315936
-		 -0.13871454 0.14585306 0.42691943 -1.3377952e-08 0.14585306 0.44888964 0.13871451 0.14585306 0.4269194
-		 0.26385066 0.14585306 0.36315933 0.3631593 0.14585306 0.26385069 0.42691937 0.14585306 0.13871451
-		 0.44888958 0.14585306 0 0.3999638 0.21427919 -0.12995611 0.34022954 0.21427919 -0.24719122
-		 0.24719122 0.21427919 -0.34022951 0.1299561 0.21427919 -0.39996377 0 0.21427919 -0.42054677
-		 -0.1299561 0.21427919 -0.39996374 -0.24719116 0.21427919 -0.34022945 -0.34022942 0.21427919 -0.24719113
-		 -0.39996365 0.21427919 -0.12995607 -0.42054665 0.21427919 0 -0.39996365 0.21427919 0.12995607
-		 -0.34022939 0.21427919 0.24719112 -0.24719112 0.21427919 0.34022936 -0.12995607 0.21427919 0.39996362
-		 -1.2533264e-08 0.21427919 0.42054662 0.12995602 0.21427919 0.39996359 0.24719106 0.21427919 0.34022933
-		 0.34022933 0.21427919 0.24719109 0.39996356 0.21427919 0.12995604 0.42054656 0.21427919 0
-		 0.36315954 0.27742901 -0.11799768 0.30892196 0.27742901 -0.22444493 0.22444493 0.27742901 -0.30892193
-		 0.11799767 0.27742901 -0.36315948 0 0.27742901 -0.38184845 -0.11799767 0.27742901 -0.36315945
-		 -0.22444487 0.27742901 -0.30892187 -0.30892184 0.27742901 -0.22444485 -0.36315939 0.27742901 -0.11799763
-		 -0.38184837 0.27742901 0 -0.36315939 0.27742901 0.11799763 -0.30892181 0.27742901 0.22444482
-		 -0.22444482 0.27742901 0.30892178 -0.11799763 0.27742901 0.36315936 -1.1379965e-08 0.27742901 0.38184834
-		 0.1179976 0.27742901 0.36315933 0.22444478 0.27742901 0.30892178 0.30892175 0.27742901 0.22444481
-		 0.3631593 0.27742901 0.11799761 0.38184828 0.27742901 0 0.31741306 0.33374763 -0.10313375
-		 0.27000767 0.33374763 -0.19617204 0.19617204 0.33374763 -0.27000767 0.10313374 0.33374763 -0.31741303
-		 0 0.33374763 -0.33374777 -0.10313374 0.33374763 -0.317413 -0.19617201 0.33374763 -0.27000761
-		 -0.27000758 0.33374763 -0.19617198 -0.31741294 0.33374763 -0.10313371 -0.33374771 0.33374763 0
-		 -0.31741294 0.33374763 0.10313371 -0.27000755 0.33374763 0.19617197 -0.19617197 0.33374763 0.27000755
-		 -0.10313371 0.33374763 0.31741291 -9.9464543e-09 0.33374763 0.33374766 0.10313368 0.33374763 0.31741288
-		 0.19617192 0.33374763 0.27000752 0.27000749 0.33374763 0.19617195 0.31741285 0.33374763 0.10313369
-		 0.33374763 0.33374763 0 0.26385084 0.38184828 -0.085730329 0.22444494 0.38184828 -0.16306879
-		 0.16306879 0.38184828 -0.22444493 0.085730322 0.38184828 -0.26385081 0 0.38184828 -0.27742913
-		 -0.085730322 0.38184828 -0.26385081 -0.16306874 0.38184828 -0.22444487 -0.22444485 0.38184828 -0.16306873
-		 -0.26385075 0.38184828 -0.085730299 -0.27742907 0.38184828 0 -0.26385075 0.38184828 0.085730299
-		 -0.22444484 0.38184828 0.16306871 -0.16306871 0.38184828 0.22444482 -0.085730299 0.38184828 0.26385072
-		 -8.2680289e-09 0.38184828 0.27742904 0.085730277 0.38184828 0.26385069 0.16306868 0.38184828 0.22444481
-		 0.22444479 0.38184828 0.1630687 0.26385069 0.38184828 0.085730284 0.27742901 0.38184828 0
-		 0.20379175 0.42054656 -0.066215955 0.17335562 0.42054656 -0.12595022 0.12595022 0.42054656 -0.17335561
-		 0.066215947 0.42054656 -0.20379172 0 0.42054656 -0.21427929 -0.066215947 0.42054656 -0.20379171
-		 -0.1259502 0.42054656 -0.17335556 -0.17335556 0.42054656 -0.12595019 -0.20379168 0.42054656 -0.066215925
-		 -0.21427923 0.42054656 0 -0.20379168 0.42054656 0.066215925 -0.17335555 0.42054656 0.12595017;
-	setAttr ".vt[332:381]" -0.12595017 0.42054656 0.17335553 -0.066215925 0.42054656 0.20379165
-		 -6.3860175e-09 0.42054656 0.21427922 0.06621591 0.42054656 0.20379163 0.12595014 0.42054656 0.17335552
-		 0.1733555 0.42054656 0.12595016 0.20379162 0.42054656 0.06621591 0.21427919 0.42054656 0
-		 0.13871461 0.44888958 -0.045071106 0.11799769 0.44888958 -0.085730337 0.085730337 0.44888958 -0.11799768
-		 0.045071103 0.44888958 -0.13871458 0 0.44888958 -0.14585315 -0.045071103 0.44888958 -0.13871458
-		 -0.085730322 0.44888958 -0.11799766 -0.11799765 0.44888958 -0.085730307 -0.13871455 0.44888958 -0.045071088
-		 -0.1458531 0.44888958 0 -0.13871455 0.44888958 0.045071088 -0.11799764 0.44888958 0.085730299
-		 -0.085730299 0.44888958 0.11799763 -0.045071088 0.44888958 0.13871454 -4.3467603e-09 0.44888958 0.14585309
-		 0.045071077 0.44888958 0.13871452 0.085730284 0.44888958 0.11799762 0.11799762 0.44888958 0.085730292
-		 0.13871452 0.44888958 0.04507108 0.14585307 0.44888958 0 0.070221849 0.46617946 -0.022816461
-		 0.059734274 0.46617946 -0.043399487 0.043399487 0.46617946 -0.05973427 0.022816459 0.46617946 -0.070221841
-		 0 0.46617946 -0.073835611 -0.022816459 0.46617946 -0.070221834 -0.043399479 0.46617946 -0.059734255
-		 -0.059734251 0.46617946 -0.043399476 -0.070221826 0.46617946 -0.022816451 -0.073835589 0.46617946 0
-		 -0.070221826 0.46617946 0.022816451 -0.059734248 0.46617946 0.043399468 -0.043399468 0.46617946 0.059734244
-		 -0.022816451 0.46617946 0.070221812 -2.2004716e-09 0.46617946 0.073835582 0.022816446 0.46617946 0.070221812
-		 0.043399461 0.46617946 0.05973424 0.059734236 0.46617946 0.043399464 0.070221804 0.46617946 0.022816448
-		 0.073835574 0.46617946 0 0 -0.47199044 0 0 0.47199044 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere11";
-	rename -uid "00E2980C-48A2-E4F7-A91C-6896322EA474";
-	setAttr ".t" -type "double3" -1.6709039729271431 2.6904822803105453 0.75104030094471552 ;
-	setAttr ".r" -type "double3" -15.225455168870676 0 0 ;
-	setAttr ".s" -type "double3" 0.050591773168317609 0.050591773168317609 0.0078728174720657223 ;
-createNode transform -n "transform4" -p "pSphere11";
-	rename -uid "0460EC99-4143-3901-B83A-BE9FB8A6B986";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape11" -p "transform4";
-	rename -uid "89F521AE-4A5D-F263-CC91-73B80558CFDD";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.070221849 -0.46617946 -0.022816461 0.059734274 -0.46617946 -0.043399487
-		 0.043399487 -0.46617946 -0.05973427 0.022816459 -0.46617946 -0.070221841 0 -0.46617946 -0.073835611
-		 -0.022816459 -0.46617946 -0.070221834 -0.043399479 -0.46617946 -0.059734255 -0.059734251 -0.46617946 -0.043399476
-		 -0.070221826 -0.46617946 -0.022816451 -0.073835589 -0.46617946 0 -0.070221826 -0.46617946 0.022816451
-		 -0.059734248 -0.46617946 0.043399468 -0.043399468 -0.46617946 0.059734244 -0.022816451 -0.46617946 0.070221812
-		 -2.2004716e-09 -0.46617946 0.073835582 0.022816446 -0.46617946 0.070221812 0.043399461 -0.46617946 0.05973424
-		 0.059734236 -0.46617946 0.043399464 0.070221804 -0.46617946 0.022816448 0.073835574 -0.46617946 0
-		 0.13871461 -0.44888958 -0.045071106 0.11799769 -0.44888958 -0.085730337 0.085730337 -0.44888958 -0.11799768
-		 0.045071103 -0.44888958 -0.13871458 0 -0.44888958 -0.14585315 -0.045071103 -0.44888958 -0.13871458
-		 -0.085730322 -0.44888958 -0.11799766 -0.11799765 -0.44888958 -0.085730307 -0.13871455 -0.44888958 -0.045071088
-		 -0.1458531 -0.44888958 0 -0.13871455 -0.44888958 0.045071088 -0.11799764 -0.44888958 0.085730299
-		 -0.085730299 -0.44888958 0.11799763 -0.045071088 -0.44888958 0.13871454 -4.3467603e-09 -0.44888958 0.14585309
-		 0.045071077 -0.44888958 0.13871452 0.085730284 -0.44888958 0.11799762 0.11799762 -0.44888958 0.085730292
-		 0.13871452 -0.44888958 0.04507108 0.14585307 -0.44888958 0 0.20379175 -0.42054656 -0.066215955
-		 0.17335562 -0.42054656 -0.12595022 0.12595022 -0.42054656 -0.17335561 0.066215947 -0.42054656 -0.20379172
-		 0 -0.42054656 -0.21427929 -0.066215947 -0.42054656 -0.20379171 -0.1259502 -0.42054656 -0.17335556
-		 -0.17335556 -0.42054656 -0.12595019 -0.20379168 -0.42054656 -0.066215925 -0.21427923 -0.42054656 0
-		 -0.20379168 -0.42054656 0.066215925 -0.17335555 -0.42054656 0.12595017 -0.12595017 -0.42054656 0.17335553
-		 -0.066215925 -0.42054656 0.20379165 -6.3860175e-09 -0.42054656 0.21427922 0.06621591 -0.42054656 0.20379163
-		 0.12595014 -0.42054656 0.17335552 0.1733555 -0.42054656 0.12595016 0.20379162 -0.42054656 0.06621591
-		 0.21427919 -0.42054656 0 0.26385084 -0.38184828 -0.085730329 0.22444494 -0.38184828 -0.16306879
-		 0.16306879 -0.38184828 -0.22444493 0.085730322 -0.38184828 -0.26385081 0 -0.38184828 -0.27742913
-		 -0.085730322 -0.38184828 -0.26385081 -0.16306874 -0.38184828 -0.22444487 -0.22444485 -0.38184828 -0.16306873
-		 -0.26385075 -0.38184828 -0.085730299 -0.27742907 -0.38184828 0 -0.26385075 -0.38184828 0.085730299
-		 -0.22444484 -0.38184828 0.16306871 -0.16306871 -0.38184828 0.22444482 -0.085730299 -0.38184828 0.26385072
-		 -8.2680289e-09 -0.38184828 0.27742904 0.085730277 -0.38184828 0.26385069 0.16306868 -0.38184828 0.22444481
-		 0.22444479 -0.38184828 0.1630687 0.26385069 -0.38184828 0.085730284 0.27742901 -0.38184828 0
-		 0.31741306 -0.33374763 -0.10313375 0.27000767 -0.33374763 -0.19617204 0.19617204 -0.33374763 -0.27000767
-		 0.10313374 -0.33374763 -0.31741303 0 -0.33374763 -0.33374777 -0.10313374 -0.33374763 -0.317413
-		 -0.19617201 -0.33374763 -0.27000761 -0.27000758 -0.33374763 -0.19617198 -0.31741294 -0.33374763 -0.10313371
-		 -0.33374771 -0.33374763 0 -0.31741294 -0.33374763 0.10313371 -0.27000755 -0.33374763 0.19617197
-		 -0.19617197 -0.33374763 0.27000755 -0.10313371 -0.33374763 0.31741291 -9.9464543e-09 -0.33374763 0.33374766
-		 0.10313368 -0.33374763 0.31741288 0.19617192 -0.33374763 0.27000752 0.27000749 -0.33374763 0.19617195
-		 0.31741285 -0.33374763 0.10313369 0.33374763 -0.33374763 0 0.36315954 -0.27742901 -0.11799768
-		 0.30892196 -0.27742901 -0.22444493 0.22444493 -0.27742901 -0.30892193 0.11799767 -0.27742901 -0.36315948
-		 0 -0.27742901 -0.38184845 -0.11799767 -0.27742901 -0.36315945 -0.22444487 -0.27742901 -0.30892187
-		 -0.30892184 -0.27742901 -0.22444485 -0.36315939 -0.27742901 -0.11799763 -0.38184837 -0.27742901 0
-		 -0.36315939 -0.27742901 0.11799763 -0.30892181 -0.27742901 0.22444482 -0.22444482 -0.27742901 0.30892178
-		 -0.11799763 -0.27742901 0.36315936 -1.1379965e-08 -0.27742901 0.38184834 0.1179976 -0.27742901 0.36315933
-		 0.22444478 -0.27742901 0.30892178 0.30892175 -0.27742901 0.22444481 0.3631593 -0.27742901 0.11799761
-		 0.38184828 -0.27742901 0 0.3999638 -0.21427919 -0.12995611 0.34022954 -0.21427919 -0.24719122
-		 0.24719122 -0.21427919 -0.34022951 0.1299561 -0.21427919 -0.39996377 0 -0.21427919 -0.42054677
-		 -0.1299561 -0.21427919 -0.39996374 -0.24719116 -0.21427919 -0.34022945 -0.34022942 -0.21427919 -0.24719113
-		 -0.39996365 -0.21427919 -0.12995607 -0.42054665 -0.21427919 0 -0.39996365 -0.21427919 0.12995607
-		 -0.34022939 -0.21427919 0.24719112 -0.24719112 -0.21427919 0.34022936 -0.12995607 -0.21427919 0.39996362
-		 -1.2533264e-08 -0.21427919 0.42054662 0.12995602 -0.21427919 0.39996359 0.24719106 -0.21427919 0.34022933
-		 0.34022933 -0.21427919 0.24719109 0.39996356 -0.21427919 0.12995604 0.42054656 -0.21427919 0
-		 0.42691964 -0.14585306 -0.1387146 0.36315954 -0.14585306 -0.26385084 0.26385084 -0.14585306 -0.36315951
-		 0.13871458 -0.14585306 -0.42691958 0 -0.14585306 -0.44888979 -0.13871458 -0.14585306 -0.42691955
-		 -0.26385078 -0.14585306 -0.36315945 -0.36315942 -0.14585306 -0.26385075 -0.42691949 -0.14585306 -0.13871454
-		 -0.4488897 -0.14585306 0 -0.42691949 -0.14585306 0.13871454 -0.36315939 -0.14585306 0.26385072
-		 -0.26385072 -0.14585306 0.36315936 -0.13871454 -0.14585306 0.42691943 -1.3377952e-08 -0.14585306 0.44888964
-		 0.13871451 -0.14585306 0.4269194 0.26385066 -0.14585306 0.36315933 0.3631593 -0.14585306 0.26385069
-		 0.42691937 -0.14585306 0.13871451 0.44888958 -0.14585306 0 0.44336331 -0.073835529 -0.14405747
-		 0.37714735 -0.073835529 -0.27401358 0.27401358 -0.073835529 -0.37714735 0.14405745 -0.073835529 -0.44336325
-		 0 -0.073835529 -0.46617967 -0.14405745 -0.073835529 -0.44336322;
-	setAttr ".vt[166:331]" -0.27401352 -0.073835529 -0.37714726 -0.37714723 -0.073835529 -0.27401349
-		 -0.44336313 -0.073835529 -0.14405741 -0.46617958 -0.073835529 0 -0.44336313 -0.073835529 0.14405741
-		 -0.3771472 -0.073835529 0.27401346 -0.27401346 -0.073835529 0.37714717 -0.14405741 -0.073835529 0.44336307
-		 -1.3893231e-08 -0.073835529 0.46617952 0.14405736 -0.073835529 0.44336304 0.2740134 -0.073835529 0.37714714
-		 0.37714711 -0.073835529 0.27401343 0.44336301 -0.073835529 0.14405738 0.46617946 -0.073835529 0
-		 0.44888988 0 -0.14585315 0.38184854 0 -0.27742919 0.27742919 0 -0.38184851 0.14585315 0 -0.44888982
-		 0 0 -0.47199067 -0.14585315 0 -0.44888979 -0.27742913 0 -0.38184842 -0.38184839 0 -0.2774291
-		 -0.4488897 0 -0.1458531 -0.47199056 0 0 -0.4488897 0 0.1458531 -0.38184837 0 0.27742907
-		 -0.27742907 0 0.38184834 -0.1458531 0 0.44888964 -1.4066411e-08 0 0.4719905 0.14585306 0 0.44888961
-		 0.27742901 0 0.38184831 0.38184828 0 0.27742904 0.44888958 0 0.14585307 0.47199044 0 0
-		 0.44336331 0.073835529 -0.14405747 0.37714735 0.073835529 -0.27401358 0.27401358 0.073835529 -0.37714735
-		 0.14405745 0.073835529 -0.44336325 0 0.073835529 -0.46617967 -0.14405745 0.073835529 -0.44336322
-		 -0.27401352 0.073835529 -0.37714726 -0.37714723 0.073835529 -0.27401349 -0.44336313 0.073835529 -0.14405741
-		 -0.46617958 0.073835529 0 -0.44336313 0.073835529 0.14405741 -0.3771472 0.073835529 0.27401346
-		 -0.27401346 0.073835529 0.37714717 -0.14405741 0.073835529 0.44336307 -1.3893231e-08 0.073835529 0.46617952
-		 0.14405736 0.073835529 0.44336304 0.2740134 0.073835529 0.37714714 0.37714711 0.073835529 0.27401343
-		 0.44336301 0.073835529 0.14405738 0.46617946 0.073835529 0 0.42691964 0.14585306 -0.1387146
-		 0.36315954 0.14585306 -0.26385084 0.26385084 0.14585306 -0.36315951 0.13871458 0.14585306 -0.42691958
-		 0 0.14585306 -0.44888979 -0.13871458 0.14585306 -0.42691955 -0.26385078 0.14585306 -0.36315945
-		 -0.36315942 0.14585306 -0.26385075 -0.42691949 0.14585306 -0.13871454 -0.4488897 0.14585306 0
-		 -0.42691949 0.14585306 0.13871454 -0.36315939 0.14585306 0.26385072 -0.26385072 0.14585306 0.36315936
-		 -0.13871454 0.14585306 0.42691943 -1.3377952e-08 0.14585306 0.44888964 0.13871451 0.14585306 0.4269194
-		 0.26385066 0.14585306 0.36315933 0.3631593 0.14585306 0.26385069 0.42691937 0.14585306 0.13871451
-		 0.44888958 0.14585306 0 0.3999638 0.21427919 -0.12995611 0.34022954 0.21427919 -0.24719122
-		 0.24719122 0.21427919 -0.34022951 0.1299561 0.21427919 -0.39996377 0 0.21427919 -0.42054677
-		 -0.1299561 0.21427919 -0.39996374 -0.24719116 0.21427919 -0.34022945 -0.34022942 0.21427919 -0.24719113
-		 -0.39996365 0.21427919 -0.12995607 -0.42054665 0.21427919 0 -0.39996365 0.21427919 0.12995607
-		 -0.34022939 0.21427919 0.24719112 -0.24719112 0.21427919 0.34022936 -0.12995607 0.21427919 0.39996362
-		 -1.2533264e-08 0.21427919 0.42054662 0.12995602 0.21427919 0.39996359 0.24719106 0.21427919 0.34022933
-		 0.34022933 0.21427919 0.24719109 0.39996356 0.21427919 0.12995604 0.42054656 0.21427919 0
-		 0.36315954 0.27742901 -0.11799768 0.30892196 0.27742901 -0.22444493 0.22444493 0.27742901 -0.30892193
-		 0.11799767 0.27742901 -0.36315948 0 0.27742901 -0.38184845 -0.11799767 0.27742901 -0.36315945
-		 -0.22444487 0.27742901 -0.30892187 -0.30892184 0.27742901 -0.22444485 -0.36315939 0.27742901 -0.11799763
-		 -0.38184837 0.27742901 0 -0.36315939 0.27742901 0.11799763 -0.30892181 0.27742901 0.22444482
-		 -0.22444482 0.27742901 0.30892178 -0.11799763 0.27742901 0.36315936 -1.1379965e-08 0.27742901 0.38184834
-		 0.1179976 0.27742901 0.36315933 0.22444478 0.27742901 0.30892178 0.30892175 0.27742901 0.22444481
-		 0.3631593 0.27742901 0.11799761 0.38184828 0.27742901 0 0.31741306 0.33374763 -0.10313375
-		 0.27000767 0.33374763 -0.19617204 0.19617204 0.33374763 -0.27000767 0.10313374 0.33374763 -0.31741303
-		 0 0.33374763 -0.33374777 -0.10313374 0.33374763 -0.317413 -0.19617201 0.33374763 -0.27000761
-		 -0.27000758 0.33374763 -0.19617198 -0.31741294 0.33374763 -0.10313371 -0.33374771 0.33374763 0
-		 -0.31741294 0.33374763 0.10313371 -0.27000755 0.33374763 0.19617197 -0.19617197 0.33374763 0.27000755
-		 -0.10313371 0.33374763 0.31741291 -9.9464543e-09 0.33374763 0.33374766 0.10313368 0.33374763 0.31741288
-		 0.19617192 0.33374763 0.27000752 0.27000749 0.33374763 0.19617195 0.31741285 0.33374763 0.10313369
-		 0.33374763 0.33374763 0 0.26385084 0.38184828 -0.085730329 0.22444494 0.38184828 -0.16306879
-		 0.16306879 0.38184828 -0.22444493 0.085730322 0.38184828 -0.26385081 0 0.38184828 -0.27742913
-		 -0.085730322 0.38184828 -0.26385081 -0.16306874 0.38184828 -0.22444487 -0.22444485 0.38184828 -0.16306873
-		 -0.26385075 0.38184828 -0.085730299 -0.27742907 0.38184828 0 -0.26385075 0.38184828 0.085730299
-		 -0.22444484 0.38184828 0.16306871 -0.16306871 0.38184828 0.22444482 -0.085730299 0.38184828 0.26385072
-		 -8.2680289e-09 0.38184828 0.27742904 0.085730277 0.38184828 0.26385069 0.16306868 0.38184828 0.22444481
-		 0.22444479 0.38184828 0.1630687 0.26385069 0.38184828 0.085730284 0.27742901 0.38184828 0
-		 0.20379175 0.42054656 -0.066215955 0.17335562 0.42054656 -0.12595022 0.12595022 0.42054656 -0.17335561
-		 0.066215947 0.42054656 -0.20379172 0 0.42054656 -0.21427929 -0.066215947 0.42054656 -0.20379171
-		 -0.1259502 0.42054656 -0.17335556 -0.17335556 0.42054656 -0.12595019 -0.20379168 0.42054656 -0.066215925
-		 -0.21427923 0.42054656 0 -0.20379168 0.42054656 0.066215925 -0.17335555 0.42054656 0.12595017;
-	setAttr ".vt[332:381]" -0.12595017 0.42054656 0.17335553 -0.066215925 0.42054656 0.20379165
-		 -6.3860175e-09 0.42054656 0.21427922 0.06621591 0.42054656 0.20379163 0.12595014 0.42054656 0.17335552
-		 0.1733555 0.42054656 0.12595016 0.20379162 0.42054656 0.06621591 0.21427919 0.42054656 0
-		 0.13871461 0.44888958 -0.045071106 0.11799769 0.44888958 -0.085730337 0.085730337 0.44888958 -0.11799768
-		 0.045071103 0.44888958 -0.13871458 0 0.44888958 -0.14585315 -0.045071103 0.44888958 -0.13871458
-		 -0.085730322 0.44888958 -0.11799766 -0.11799765 0.44888958 -0.085730307 -0.13871455 0.44888958 -0.045071088
-		 -0.1458531 0.44888958 0 -0.13871455 0.44888958 0.045071088 -0.11799764 0.44888958 0.085730299
-		 -0.085730299 0.44888958 0.11799763 -0.045071088 0.44888958 0.13871454 -4.3467603e-09 0.44888958 0.14585309
-		 0.045071077 0.44888958 0.13871452 0.085730284 0.44888958 0.11799762 0.11799762 0.44888958 0.085730292
-		 0.13871452 0.44888958 0.04507108 0.14585307 0.44888958 0 0.070221849 0.46617946 -0.022816461
-		 0.059734274 0.46617946 -0.043399487 0.043399487 0.46617946 -0.05973427 0.022816459 0.46617946 -0.070221841
-		 0 0.46617946 -0.073835611 -0.022816459 0.46617946 -0.070221834 -0.043399479 0.46617946 -0.059734255
-		 -0.059734251 0.46617946 -0.043399476 -0.070221826 0.46617946 -0.022816451 -0.073835589 0.46617946 0
-		 -0.070221826 0.46617946 0.022816451 -0.059734248 0.46617946 0.043399468 -0.043399468 0.46617946 0.059734244
-		 -0.022816451 0.46617946 0.070221812 -2.2004716e-09 0.46617946 0.073835582 0.022816446 0.46617946 0.070221812
-		 0.043399461 0.46617946 0.05973424 0.059734236 0.46617946 0.043399464 0.070221804 0.46617946 0.022816448
-		 0.073835574 0.46617946 0 0 -0.47199044 0 0 0.47199044 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere12";
-	rename -uid "6B1BA3BD-4D8C-55BD-E0AB-7A9723C51DBD";
-	setAttr ".t" -type "double3" -1.742038677838994 2.7039390677492463 0.76799802444403931 ;
-	setAttr ".r" -type "double3" -13.193901184529857 11.593746411267164 -2.6974818258048527 ;
-	setAttr ".s" -type "double3" 0.050591773168317609 0.050591773168317609 0.0078728174720657223 ;
-createNode transform -n "transform5" -p "pSphere12";
-	rename -uid "93BB5EC1-4F03-9DC6-646B-DDA4442A9101";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape12" -p "transform5";
-	rename -uid "2751A086-4D32-E1C3-91CB-1C85BB2B47BE";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.070221849 -0.46617946 -0.022816461 0.059734274 -0.46617946 -0.043399487
-		 0.043399487 -0.46617946 -0.05973427 0.022816459 -0.46617946 -0.070221841 0 -0.46617946 -0.073835611
-		 -0.022816459 -0.46617946 -0.070221834 -0.043399479 -0.46617946 -0.059734255 -0.059734251 -0.46617946 -0.043399476
-		 -0.070221826 -0.46617946 -0.022816451 -0.073835589 -0.46617946 0 -0.070221826 -0.46617946 0.022816451
-		 -0.059734248 -0.46617946 0.043399468 -0.043399468 -0.46617946 0.059734244 -0.022816451 -0.46617946 0.070221812
-		 -2.2004716e-09 -0.46617946 0.073835582 0.022816446 -0.46617946 0.070221812 0.043399461 -0.46617946 0.05973424
-		 0.059734236 -0.46617946 0.043399464 0.070221804 -0.46617946 0.022816448 0.073835574 -0.46617946 0
-		 0.13871461 -0.44888958 -0.045071106 0.11799769 -0.44888958 -0.085730337 0.085730337 -0.44888958 -0.11799768
-		 0.045071103 -0.44888958 -0.13871458 0 -0.44888958 -0.14585315 -0.045071103 -0.44888958 -0.13871458
-		 -0.085730322 -0.44888958 -0.11799766 -0.11799765 -0.44888958 -0.085730307 -0.13871455 -0.44888958 -0.045071088
-		 -0.1458531 -0.44888958 0 -0.13871455 -0.44888958 0.045071088 -0.11799764 -0.44888958 0.085730299
-		 -0.085730299 -0.44888958 0.11799763 -0.045071088 -0.44888958 0.13871454 -4.3467603e-09 -0.44888958 0.14585309
-		 0.045071077 -0.44888958 0.13871452 0.085730284 -0.44888958 0.11799762 0.11799762 -0.44888958 0.085730292
-		 0.13871452 -0.44888958 0.04507108 0.14585307 -0.44888958 0 0.20379175 -0.42054656 -0.066215955
-		 0.17335562 -0.42054656 -0.12595022 0.12595022 -0.42054656 -0.17335561 0.066215947 -0.42054656 -0.20379172
-		 0 -0.42054656 -0.21427929 -0.066215947 -0.42054656 -0.20379171 -0.1259502 -0.42054656 -0.17335556
-		 -0.17335556 -0.42054656 -0.12595019 -0.20379168 -0.42054656 -0.066215925 -0.21427923 -0.42054656 0
-		 -0.20379168 -0.42054656 0.066215925 -0.17335555 -0.42054656 0.12595017 -0.12595017 -0.42054656 0.17335553
-		 -0.066215925 -0.42054656 0.20379165 -6.3860175e-09 -0.42054656 0.21427922 0.06621591 -0.42054656 0.20379163
-		 0.12595014 -0.42054656 0.17335552 0.1733555 -0.42054656 0.12595016 0.20379162 -0.42054656 0.06621591
-		 0.21427919 -0.42054656 0 0.26385084 -0.38184828 -0.085730329 0.22444494 -0.38184828 -0.16306879
-		 0.16306879 -0.38184828 -0.22444493 0.085730322 -0.38184828 -0.26385081 0 -0.38184828 -0.27742913
-		 -0.085730322 -0.38184828 -0.26385081 -0.16306874 -0.38184828 -0.22444487 -0.22444485 -0.38184828 -0.16306873
-		 -0.26385075 -0.38184828 -0.085730299 -0.27742907 -0.38184828 0 -0.26385075 -0.38184828 0.085730299
-		 -0.22444484 -0.38184828 0.16306871 -0.16306871 -0.38184828 0.22444482 -0.085730299 -0.38184828 0.26385072
-		 -8.2680289e-09 -0.38184828 0.27742904 0.085730277 -0.38184828 0.26385069 0.16306868 -0.38184828 0.22444481
-		 0.22444479 -0.38184828 0.1630687 0.26385069 -0.38184828 0.085730284 0.27742901 -0.38184828 0
-		 0.31741306 -0.33374763 -0.10313375 0.27000767 -0.33374763 -0.19617204 0.19617204 -0.33374763 -0.27000767
-		 0.10313374 -0.33374763 -0.31741303 0 -0.33374763 -0.33374777 -0.10313374 -0.33374763 -0.317413
-		 -0.19617201 -0.33374763 -0.27000761 -0.27000758 -0.33374763 -0.19617198 -0.31741294 -0.33374763 -0.10313371
-		 -0.33374771 -0.33374763 0 -0.31741294 -0.33374763 0.10313371 -0.27000755 -0.33374763 0.19617197
-		 -0.19617197 -0.33374763 0.27000755 -0.10313371 -0.33374763 0.31741291 -9.9464543e-09 -0.33374763 0.33374766
-		 0.10313368 -0.33374763 0.31741288 0.19617192 -0.33374763 0.27000752 0.27000749 -0.33374763 0.19617195
-		 0.31741285 -0.33374763 0.10313369 0.33374763 -0.33374763 0 0.36315954 -0.27742901 -0.11799768
-		 0.30892196 -0.27742901 -0.22444493 0.22444493 -0.27742901 -0.30892193 0.11799767 -0.27742901 -0.36315948
-		 0 -0.27742901 -0.38184845 -0.11799767 -0.27742901 -0.36315945 -0.22444487 -0.27742901 -0.30892187
-		 -0.30892184 -0.27742901 -0.22444485 -0.36315939 -0.27742901 -0.11799763 -0.38184837 -0.27742901 0
-		 -0.36315939 -0.27742901 0.11799763 -0.30892181 -0.27742901 0.22444482 -0.22444482 -0.27742901 0.30892178
-		 -0.11799763 -0.27742901 0.36315936 -1.1379965e-08 -0.27742901 0.38184834 0.1179976 -0.27742901 0.36315933
-		 0.22444478 -0.27742901 0.30892178 0.30892175 -0.27742901 0.22444481 0.3631593 -0.27742901 0.11799761
-		 0.38184828 -0.27742901 0 0.3999638 -0.21427919 -0.12995611 0.34022954 -0.21427919 -0.24719122
-		 0.24719122 -0.21427919 -0.34022951 0.1299561 -0.21427919 -0.39996377 0 -0.21427919 -0.42054677
-		 -0.1299561 -0.21427919 -0.39996374 -0.24719116 -0.21427919 -0.34022945 -0.34022942 -0.21427919 -0.24719113
-		 -0.39996365 -0.21427919 -0.12995607 -0.42054665 -0.21427919 0 -0.39996365 -0.21427919 0.12995607
-		 -0.34022939 -0.21427919 0.24719112 -0.24719112 -0.21427919 0.34022936 -0.12995607 -0.21427919 0.39996362
-		 -1.2533264e-08 -0.21427919 0.42054662 0.12995602 -0.21427919 0.39996359 0.24719106 -0.21427919 0.34022933
-		 0.34022933 -0.21427919 0.24719109 0.39996356 -0.21427919 0.12995604 0.42054656 -0.21427919 0
-		 0.42691964 -0.14585306 -0.1387146 0.36315954 -0.14585306 -0.26385084 0.26385084 -0.14585306 -0.36315951
-		 0.13871458 -0.14585306 -0.42691958 0 -0.14585306 -0.44888979 -0.13871458 -0.14585306 -0.42691955
-		 -0.26385078 -0.14585306 -0.36315945 -0.36315942 -0.14585306 -0.26385075 -0.42691949 -0.14585306 -0.13871454
-		 -0.4488897 -0.14585306 0 -0.42691949 -0.14585306 0.13871454 -0.36315939 -0.14585306 0.26385072
-		 -0.26385072 -0.14585306 0.36315936 -0.13871454 -0.14585306 0.42691943 -1.3377952e-08 -0.14585306 0.44888964
-		 0.13871451 -0.14585306 0.4269194 0.26385066 -0.14585306 0.36315933 0.3631593 -0.14585306 0.26385069
-		 0.42691937 -0.14585306 0.13871451 0.44888958 -0.14585306 0 0.44336331 -0.073835529 -0.14405747
-		 0.37714735 -0.073835529 -0.27401358 0.27401358 -0.073835529 -0.37714735 0.14405745 -0.073835529 -0.44336325
-		 0 -0.073835529 -0.46617967 -0.14405745 -0.073835529 -0.44336322;
-	setAttr ".vt[166:331]" -0.27401352 -0.073835529 -0.37714726 -0.37714723 -0.073835529 -0.27401349
-		 -0.44336313 -0.073835529 -0.14405741 -0.46617958 -0.073835529 0 -0.44336313 -0.073835529 0.14405741
-		 -0.3771472 -0.073835529 0.27401346 -0.27401346 -0.073835529 0.37714717 -0.14405741 -0.073835529 0.44336307
-		 -1.3893231e-08 -0.073835529 0.46617952 0.14405736 -0.073835529 0.44336304 0.2740134 -0.073835529 0.37714714
-		 0.37714711 -0.073835529 0.27401343 0.44336301 -0.073835529 0.14405738 0.46617946 -0.073835529 0
-		 0.44888988 0 -0.14585315 0.38184854 0 -0.27742919 0.27742919 0 -0.38184851 0.14585315 0 -0.44888982
-		 0 0 -0.47199067 -0.14585315 0 -0.44888979 -0.27742913 0 -0.38184842 -0.38184839 0 -0.2774291
-		 -0.4488897 0 -0.1458531 -0.47199056 0 0 -0.4488897 0 0.1458531 -0.38184837 0 0.27742907
-		 -0.27742907 0 0.38184834 -0.1458531 0 0.44888964 -1.4066411e-08 0 0.4719905 0.14585306 0 0.44888961
-		 0.27742901 0 0.38184831 0.38184828 0 0.27742904 0.44888958 0 0.14585307 0.47199044 0 0
-		 0.44336331 0.073835529 -0.14405747 0.37714735 0.073835529 -0.27401358 0.27401358 0.073835529 -0.37714735
-		 0.14405745 0.073835529 -0.44336325 0 0.073835529 -0.46617967 -0.14405745 0.073835529 -0.44336322
-		 -0.27401352 0.073835529 -0.37714726 -0.37714723 0.073835529 -0.27401349 -0.44336313 0.073835529 -0.14405741
-		 -0.46617958 0.073835529 0 -0.44336313 0.073835529 0.14405741 -0.3771472 0.073835529 0.27401346
-		 -0.27401346 0.073835529 0.37714717 -0.14405741 0.073835529 0.44336307 -1.3893231e-08 0.073835529 0.46617952
-		 0.14405736 0.073835529 0.44336304 0.2740134 0.073835529 0.37714714 0.37714711 0.073835529 0.27401343
-		 0.44336301 0.073835529 0.14405738 0.46617946 0.073835529 0 0.42691964 0.14585306 -0.1387146
-		 0.36315954 0.14585306 -0.26385084 0.26385084 0.14585306 -0.36315951 0.13871458 0.14585306 -0.42691958
-		 0 0.14585306 -0.44888979 -0.13871458 0.14585306 -0.42691955 -0.26385078 0.14585306 -0.36315945
-		 -0.36315942 0.14585306 -0.26385075 -0.42691949 0.14585306 -0.13871454 -0.4488897 0.14585306 0
-		 -0.42691949 0.14585306 0.13871454 -0.36315939 0.14585306 0.26385072 -0.26385072 0.14585306 0.36315936
-		 -0.13871454 0.14585306 0.42691943 -1.3377952e-08 0.14585306 0.44888964 0.13871451 0.14585306 0.4269194
-		 0.26385066 0.14585306 0.36315933 0.3631593 0.14585306 0.26385069 0.42691937 0.14585306 0.13871451
-		 0.44888958 0.14585306 0 0.3999638 0.21427919 -0.12995611 0.34022954 0.21427919 -0.24719122
-		 0.24719122 0.21427919 -0.34022951 0.1299561 0.21427919 -0.39996377 0 0.21427919 -0.42054677
-		 -0.1299561 0.21427919 -0.39996374 -0.24719116 0.21427919 -0.34022945 -0.34022942 0.21427919 -0.24719113
-		 -0.39996365 0.21427919 -0.12995607 -0.42054665 0.21427919 0 -0.39996365 0.21427919 0.12995607
-		 -0.34022939 0.21427919 0.24719112 -0.24719112 0.21427919 0.34022936 -0.12995607 0.21427919 0.39996362
-		 -1.2533264e-08 0.21427919 0.42054662 0.12995602 0.21427919 0.39996359 0.24719106 0.21427919 0.34022933
-		 0.34022933 0.21427919 0.24719109 0.39996356 0.21427919 0.12995604 0.42054656 0.21427919 0
-		 0.36315954 0.27742901 -0.11799768 0.30892196 0.27742901 -0.22444493 0.22444493 0.27742901 -0.30892193
-		 0.11799767 0.27742901 -0.36315948 0 0.27742901 -0.38184845 -0.11799767 0.27742901 -0.36315945
-		 -0.22444487 0.27742901 -0.30892187 -0.30892184 0.27742901 -0.22444485 -0.36315939 0.27742901 -0.11799763
-		 -0.38184837 0.27742901 0 -0.36315939 0.27742901 0.11799763 -0.30892181 0.27742901 0.22444482
-		 -0.22444482 0.27742901 0.30892178 -0.11799763 0.27742901 0.36315936 -1.1379965e-08 0.27742901 0.38184834
-		 0.1179976 0.27742901 0.36315933 0.22444478 0.27742901 0.30892178 0.30892175 0.27742901 0.22444481
-		 0.3631593 0.27742901 0.11799761 0.38184828 0.27742901 0 0.31741306 0.33374763 -0.10313375
-		 0.27000767 0.33374763 -0.19617204 0.19617204 0.33374763 -0.27000767 0.10313374 0.33374763 -0.31741303
-		 0 0.33374763 -0.33374777 -0.10313374 0.33374763 -0.317413 -0.19617201 0.33374763 -0.27000761
-		 -0.27000758 0.33374763 -0.19617198 -0.31741294 0.33374763 -0.10313371 -0.33374771 0.33374763 0
-		 -0.31741294 0.33374763 0.10313371 -0.27000755 0.33374763 0.19617197 -0.19617197 0.33374763 0.27000755
-		 -0.10313371 0.33374763 0.31741291 -9.9464543e-09 0.33374763 0.33374766 0.10313368 0.33374763 0.31741288
-		 0.19617192 0.33374763 0.27000752 0.27000749 0.33374763 0.19617195 0.31741285 0.33374763 0.10313369
-		 0.33374763 0.33374763 0 0.26385084 0.38184828 -0.085730329 0.22444494 0.38184828 -0.16306879
-		 0.16306879 0.38184828 -0.22444493 0.085730322 0.38184828 -0.26385081 0 0.38184828 -0.27742913
-		 -0.085730322 0.38184828 -0.26385081 -0.16306874 0.38184828 -0.22444487 -0.22444485 0.38184828 -0.16306873
-		 -0.26385075 0.38184828 -0.085730299 -0.27742907 0.38184828 0 -0.26385075 0.38184828 0.085730299
-		 -0.22444484 0.38184828 0.16306871 -0.16306871 0.38184828 0.22444482 -0.085730299 0.38184828 0.26385072
-		 -8.2680289e-09 0.38184828 0.27742904 0.085730277 0.38184828 0.26385069 0.16306868 0.38184828 0.22444481
-		 0.22444479 0.38184828 0.1630687 0.26385069 0.38184828 0.085730284 0.27742901 0.38184828 0
-		 0.20379175 0.42054656 -0.066215955 0.17335562 0.42054656 -0.12595022 0.12595022 0.42054656 -0.17335561
-		 0.066215947 0.42054656 -0.20379172 0 0.42054656 -0.21427929 -0.066215947 0.42054656 -0.20379171
-		 -0.1259502 0.42054656 -0.17335556 -0.17335556 0.42054656 -0.12595019 -0.20379168 0.42054656 -0.066215925
-		 -0.21427923 0.42054656 0 -0.20379168 0.42054656 0.066215925 -0.17335555 0.42054656 0.12595017;
-	setAttr ".vt[332:381]" -0.12595017 0.42054656 0.17335553 -0.066215925 0.42054656 0.20379165
-		 -6.3860175e-09 0.42054656 0.21427922 0.06621591 0.42054656 0.20379163 0.12595014 0.42054656 0.17335552
-		 0.1733555 0.42054656 0.12595016 0.20379162 0.42054656 0.06621591 0.21427919 0.42054656 0
-		 0.13871461 0.44888958 -0.045071106 0.11799769 0.44888958 -0.085730337 0.085730337 0.44888958 -0.11799768
-		 0.045071103 0.44888958 -0.13871458 0 0.44888958 -0.14585315 -0.045071103 0.44888958 -0.13871458
-		 -0.085730322 0.44888958 -0.11799766 -0.11799765 0.44888958 -0.085730307 -0.13871455 0.44888958 -0.045071088
-		 -0.1458531 0.44888958 0 -0.13871455 0.44888958 0.045071088 -0.11799764 0.44888958 0.085730299
-		 -0.085730299 0.44888958 0.11799763 -0.045071088 0.44888958 0.13871454 -4.3467603e-09 0.44888958 0.14585309
-		 0.045071077 0.44888958 0.13871452 0.085730284 0.44888958 0.11799762 0.11799762 0.44888958 0.085730292
-		 0.13871452 0.44888958 0.04507108 0.14585307 0.44888958 0 0.070221849 0.46617946 -0.022816461
-		 0.059734274 0.46617946 -0.043399487 0.043399487 0.46617946 -0.05973427 0.022816459 0.46617946 -0.070221841
-		 0 0.46617946 -0.073835611 -0.022816459 0.46617946 -0.070221834 -0.043399479 0.46617946 -0.059734255
-		 -0.059734251 0.46617946 -0.043399476 -0.070221826 0.46617946 -0.022816451 -0.073835589 0.46617946 0
-		 -0.070221826 0.46617946 0.022816451 -0.059734248 0.46617946 0.043399468 -0.043399468 0.46617946 0.059734244
-		 -0.022816451 0.46617946 0.070221812 -2.2004716e-09 0.46617946 0.073835582 0.022816446 0.46617946 0.070221812
-		 0.043399461 0.46617946 0.05973424 0.059734236 0.46617946 0.043399464 0.070221804 0.46617946 0.022816448
-		 0.073835574 0.46617946 0 0 -0.47199044 0 0 0.47199044 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere13";
-	rename -uid "2C06D4C4-4781-0605-4AFB-A0AC3EEA9592";
-	setAttr ".t" -type "double3" -1.4645389657923933 2.7039390677492463 0.73377433985514051 ;
-	setAttr ".r" -type "double3" -12.919999627249338 0 0 ;
-	setAttr ".s" -type "double3" 0.050591773168317609 0.050591773168317609 0.0078728174720657223 ;
-createNode transform -n "transform2" -p "pSphere13";
-	rename -uid "781EAC37-4C46-8DE9-1710-DFB2AA0B7ABE";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape13" -p "transform2";
-	rename -uid "7777DF95-4F13-924A-99EB-BFA56670989A";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.070221849 -0.46617946 -0.022816461 0.059734274 -0.46617946 -0.043399487
-		 0.043399487 -0.46617946 -0.05973427 0.022816459 -0.46617946 -0.070221841 0 -0.46617946 -0.073835611
-		 -0.022816459 -0.46617946 -0.070221834 -0.043399479 -0.46617946 -0.059734255 -0.059734251 -0.46617946 -0.043399476
-		 -0.070221826 -0.46617946 -0.022816451 -0.073835589 -0.46617946 0 -0.070221826 -0.46617946 0.022816451
-		 -0.059734248 -0.46617946 0.043399468 -0.043399468 -0.46617946 0.059734244 -0.022816451 -0.46617946 0.070221812
-		 -2.2004716e-09 -0.46617946 0.073835582 0.022816446 -0.46617946 0.070221812 0.043399461 -0.46617946 0.05973424
-		 0.059734236 -0.46617946 0.043399464 0.070221804 -0.46617946 0.022816448 0.073835574 -0.46617946 0
-		 0.13871461 -0.44888958 -0.045071106 0.11799769 -0.44888958 -0.085730337 0.085730337 -0.44888958 -0.11799768
-		 0.045071103 -0.44888958 -0.13871458 0 -0.44888958 -0.14585315 -0.045071103 -0.44888958 -0.13871458
-		 -0.085730322 -0.44888958 -0.11799766 -0.11799765 -0.44888958 -0.085730307 -0.13871455 -0.44888958 -0.045071088
-		 -0.1458531 -0.44888958 0 -0.13871455 -0.44888958 0.045071088 -0.11799764 -0.44888958 0.085730299
-		 -0.085730299 -0.44888958 0.11799763 -0.045071088 -0.44888958 0.13871454 -4.3467603e-09 -0.44888958 0.14585309
-		 0.045071077 -0.44888958 0.13871452 0.085730284 -0.44888958 0.11799762 0.11799762 -0.44888958 0.085730292
-		 0.13871452 -0.44888958 0.04507108 0.14585307 -0.44888958 0 0.20379175 -0.42054656 -0.066215955
-		 0.17335562 -0.42054656 -0.12595022 0.12595022 -0.42054656 -0.17335561 0.066215947 -0.42054656 -0.20379172
-		 0 -0.42054656 -0.21427929 -0.066215947 -0.42054656 -0.20379171 -0.1259502 -0.42054656 -0.17335556
-		 -0.17335556 -0.42054656 -0.12595019 -0.20379168 -0.42054656 -0.066215925 -0.21427923 -0.42054656 0
-		 -0.20379168 -0.42054656 0.066215925 -0.17335555 -0.42054656 0.12595017 -0.12595017 -0.42054656 0.17335553
-		 -0.066215925 -0.42054656 0.20379165 -6.3860175e-09 -0.42054656 0.21427922 0.06621591 -0.42054656 0.20379163
-		 0.12595014 -0.42054656 0.17335552 0.1733555 -0.42054656 0.12595016 0.20379162 -0.42054656 0.06621591
-		 0.21427919 -0.42054656 0 0.26385084 -0.38184828 -0.085730329 0.22444494 -0.38184828 -0.16306879
-		 0.16306879 -0.38184828 -0.22444493 0.085730322 -0.38184828 -0.26385081 0 -0.38184828 -0.27742913
-		 -0.085730322 -0.38184828 -0.26385081 -0.16306874 -0.38184828 -0.22444487 -0.22444485 -0.38184828 -0.16306873
-		 -0.26385075 -0.38184828 -0.085730299 -0.27742907 -0.38184828 0 -0.26385075 -0.38184828 0.085730299
-		 -0.22444484 -0.38184828 0.16306871 -0.16306871 -0.38184828 0.22444482 -0.085730299 -0.38184828 0.26385072
-		 -8.2680289e-09 -0.38184828 0.27742904 0.085730277 -0.38184828 0.26385069 0.16306868 -0.38184828 0.22444481
-		 0.22444479 -0.38184828 0.1630687 0.26385069 -0.38184828 0.085730284 0.27742901 -0.38184828 0
-		 0.31741306 -0.33374763 -0.10313375 0.27000767 -0.33374763 -0.19617204 0.19617204 -0.33374763 -0.27000767
-		 0.10313374 -0.33374763 -0.31741303 0 -0.33374763 -0.33374777 -0.10313374 -0.33374763 -0.317413
-		 -0.19617201 -0.33374763 -0.27000761 -0.27000758 -0.33374763 -0.19617198 -0.31741294 -0.33374763 -0.10313371
-		 -0.33374771 -0.33374763 0 -0.31741294 -0.33374763 0.10313371 -0.27000755 -0.33374763 0.19617197
-		 -0.19617197 -0.33374763 0.27000755 -0.10313371 -0.33374763 0.31741291 -9.9464543e-09 -0.33374763 0.33374766
-		 0.10313368 -0.33374763 0.31741288 0.19617192 -0.33374763 0.27000752 0.27000749 -0.33374763 0.19617195
-		 0.31741285 -0.33374763 0.10313369 0.33374763 -0.33374763 0 0.36315954 -0.27742901 -0.11799768
-		 0.30892196 -0.27742901 -0.22444493 0.22444493 -0.27742901 -0.30892193 0.11799767 -0.27742901 -0.36315948
-		 0 -0.27742901 -0.38184845 -0.11799767 -0.27742901 -0.36315945 -0.22444487 -0.27742901 -0.30892187
-		 -0.30892184 -0.27742901 -0.22444485 -0.36315939 -0.27742901 -0.11799763 -0.38184837 -0.27742901 0
-		 -0.36315939 -0.27742901 0.11799763 -0.30892181 -0.27742901 0.22444482 -0.22444482 -0.27742901 0.30892178
-		 -0.11799763 -0.27742901 0.36315936 -1.1379965e-08 -0.27742901 0.38184834 0.1179976 -0.27742901 0.36315933
-		 0.22444478 -0.27742901 0.30892178 0.30892175 -0.27742901 0.22444481 0.3631593 -0.27742901 0.11799761
-		 0.38184828 -0.27742901 0 0.3999638 -0.21427919 -0.12995611 0.34022954 -0.21427919 -0.24719122
-		 0.24719122 -0.21427919 -0.34022951 0.1299561 -0.21427919 -0.39996377 0 -0.21427919 -0.42054677
-		 -0.1299561 -0.21427919 -0.39996374 -0.24719116 -0.21427919 -0.34022945 -0.34022942 -0.21427919 -0.24719113
-		 -0.39996365 -0.21427919 -0.12995607 -0.42054665 -0.21427919 0 -0.39996365 -0.21427919 0.12995607
-		 -0.34022939 -0.21427919 0.24719112 -0.24719112 -0.21427919 0.34022936 -0.12995607 -0.21427919 0.39996362
-		 -1.2533264e-08 -0.21427919 0.42054662 0.12995602 -0.21427919 0.39996359 0.24719106 -0.21427919 0.34022933
-		 0.34022933 -0.21427919 0.24719109 0.39996356 -0.21427919 0.12995604 0.42054656 -0.21427919 0
-		 0.42691964 -0.14585306 -0.1387146 0.36315954 -0.14585306 -0.26385084 0.26385084 -0.14585306 -0.36315951
-		 0.13871458 -0.14585306 -0.42691958 0 -0.14585306 -0.44888979 -0.13871458 -0.14585306 -0.42691955
-		 -0.26385078 -0.14585306 -0.36315945 -0.36315942 -0.14585306 -0.26385075 -0.42691949 -0.14585306 -0.13871454
-		 -0.4488897 -0.14585306 0 -0.42691949 -0.14585306 0.13871454 -0.36315939 -0.14585306 0.26385072
-		 -0.26385072 -0.14585306 0.36315936 -0.13871454 -0.14585306 0.42691943 -1.3377952e-08 -0.14585306 0.44888964
-		 0.13871451 -0.14585306 0.4269194 0.26385066 -0.14585306 0.36315933 0.3631593 -0.14585306 0.26385069
-		 0.42691937 -0.14585306 0.13871451 0.44888958 -0.14585306 0 0.44336331 -0.073835529 -0.14405747
-		 0.37714735 -0.073835529 -0.27401358 0.27401358 -0.073835529 -0.37714735 0.14405745 -0.073835529 -0.44336325
-		 0 -0.073835529 -0.46617967 -0.14405745 -0.073835529 -0.44336322;
-	setAttr ".vt[166:331]" -0.27401352 -0.073835529 -0.37714726 -0.37714723 -0.073835529 -0.27401349
-		 -0.44336313 -0.073835529 -0.14405741 -0.46617958 -0.073835529 0 -0.44336313 -0.073835529 0.14405741
-		 -0.3771472 -0.073835529 0.27401346 -0.27401346 -0.073835529 0.37714717 -0.14405741 -0.073835529 0.44336307
-		 -1.3893231e-08 -0.073835529 0.46617952 0.14405736 -0.073835529 0.44336304 0.2740134 -0.073835529 0.37714714
-		 0.37714711 -0.073835529 0.27401343 0.44336301 -0.073835529 0.14405738 0.46617946 -0.073835529 0
-		 0.44888988 0 -0.14585315 0.38184854 0 -0.27742919 0.27742919 0 -0.38184851 0.14585315 0 -0.44888982
-		 0 0 -0.47199067 -0.14585315 0 -0.44888979 -0.27742913 0 -0.38184842 -0.38184839 0 -0.2774291
-		 -0.4488897 0 -0.1458531 -0.47199056 0 0 -0.4488897 0 0.1458531 -0.38184837 0 0.27742907
-		 -0.27742907 0 0.38184834 -0.1458531 0 0.44888964 -1.4066411e-08 0 0.4719905 0.14585306 0 0.44888961
-		 0.27742901 0 0.38184831 0.38184828 0 0.27742904 0.44888958 0 0.14585307 0.47199044 0 0
-		 0.44336331 0.073835529 -0.14405747 0.37714735 0.073835529 -0.27401358 0.27401358 0.073835529 -0.37714735
-		 0.14405745 0.073835529 -0.44336325 0 0.073835529 -0.46617967 -0.14405745 0.073835529 -0.44336322
-		 -0.27401352 0.073835529 -0.37714726 -0.37714723 0.073835529 -0.27401349 -0.44336313 0.073835529 -0.14405741
-		 -0.46617958 0.073835529 0 -0.44336313 0.073835529 0.14405741 -0.3771472 0.073835529 0.27401346
-		 -0.27401346 0.073835529 0.37714717 -0.14405741 0.073835529 0.44336307 -1.3893231e-08 0.073835529 0.46617952
-		 0.14405736 0.073835529 0.44336304 0.2740134 0.073835529 0.37714714 0.37714711 0.073835529 0.27401343
-		 0.44336301 0.073835529 0.14405738 0.46617946 0.073835529 0 0.42691964 0.14585306 -0.1387146
-		 0.36315954 0.14585306 -0.26385084 0.26385084 0.14585306 -0.36315951 0.13871458 0.14585306 -0.42691958
-		 0 0.14585306 -0.44888979 -0.13871458 0.14585306 -0.42691955 -0.26385078 0.14585306 -0.36315945
-		 -0.36315942 0.14585306 -0.26385075 -0.42691949 0.14585306 -0.13871454 -0.4488897 0.14585306 0
-		 -0.42691949 0.14585306 0.13871454 -0.36315939 0.14585306 0.26385072 -0.26385072 0.14585306 0.36315936
-		 -0.13871454 0.14585306 0.42691943 -1.3377952e-08 0.14585306 0.44888964 0.13871451 0.14585306 0.4269194
-		 0.26385066 0.14585306 0.36315933 0.3631593 0.14585306 0.26385069 0.42691937 0.14585306 0.13871451
-		 0.44888958 0.14585306 0 0.3999638 0.21427919 -0.12995611 0.34022954 0.21427919 -0.24719122
-		 0.24719122 0.21427919 -0.34022951 0.1299561 0.21427919 -0.39996377 0 0.21427919 -0.42054677
-		 -0.1299561 0.21427919 -0.39996374 -0.24719116 0.21427919 -0.34022945 -0.34022942 0.21427919 -0.24719113
-		 -0.39996365 0.21427919 -0.12995607 -0.42054665 0.21427919 0 -0.39996365 0.21427919 0.12995607
-		 -0.34022939 0.21427919 0.24719112 -0.24719112 0.21427919 0.34022936 -0.12995607 0.21427919 0.39996362
-		 -1.2533264e-08 0.21427919 0.42054662 0.12995602 0.21427919 0.39996359 0.24719106 0.21427919 0.34022933
-		 0.34022933 0.21427919 0.24719109 0.39996356 0.21427919 0.12995604 0.42054656 0.21427919 0
-		 0.36315954 0.27742901 -0.11799768 0.30892196 0.27742901 -0.22444493 0.22444493 0.27742901 -0.30892193
-		 0.11799767 0.27742901 -0.36315948 0 0.27742901 -0.38184845 -0.11799767 0.27742901 -0.36315945
-		 -0.22444487 0.27742901 -0.30892187 -0.30892184 0.27742901 -0.22444485 -0.36315939 0.27742901 -0.11799763
-		 -0.38184837 0.27742901 0 -0.36315939 0.27742901 0.11799763 -0.30892181 0.27742901 0.22444482
-		 -0.22444482 0.27742901 0.30892178 -0.11799763 0.27742901 0.36315936 -1.1379965e-08 0.27742901 0.38184834
-		 0.1179976 0.27742901 0.36315933 0.22444478 0.27742901 0.30892178 0.30892175 0.27742901 0.22444481
-		 0.3631593 0.27742901 0.11799761 0.38184828 0.27742901 0 0.31741306 0.33374763 -0.10313375
-		 0.27000767 0.33374763 -0.19617204 0.19617204 0.33374763 -0.27000767 0.10313374 0.33374763 -0.31741303
-		 0 0.33374763 -0.33374777 -0.10313374 0.33374763 -0.317413 -0.19617201 0.33374763 -0.27000761
-		 -0.27000758 0.33374763 -0.19617198 -0.31741294 0.33374763 -0.10313371 -0.33374771 0.33374763 0
-		 -0.31741294 0.33374763 0.10313371 -0.27000755 0.33374763 0.19617197 -0.19617197 0.33374763 0.27000755
-		 -0.10313371 0.33374763 0.31741291 -9.9464543e-09 0.33374763 0.33374766 0.10313368 0.33374763 0.31741288
-		 0.19617192 0.33374763 0.27000752 0.27000749 0.33374763 0.19617195 0.31741285 0.33374763 0.10313369
-		 0.33374763 0.33374763 0 0.26385084 0.38184828 -0.085730329 0.22444494 0.38184828 -0.16306879
-		 0.16306879 0.38184828 -0.22444493 0.085730322 0.38184828 -0.26385081 0 0.38184828 -0.27742913
-		 -0.085730322 0.38184828 -0.26385081 -0.16306874 0.38184828 -0.22444487 -0.22444485 0.38184828 -0.16306873
-		 -0.26385075 0.38184828 -0.085730299 -0.27742907 0.38184828 0 -0.26385075 0.38184828 0.085730299
-		 -0.22444484 0.38184828 0.16306871 -0.16306871 0.38184828 0.22444482 -0.085730299 0.38184828 0.26385072
-		 -8.2680289e-09 0.38184828 0.27742904 0.085730277 0.38184828 0.26385069 0.16306868 0.38184828 0.22444481
-		 0.22444479 0.38184828 0.1630687 0.26385069 0.38184828 0.085730284 0.27742901 0.38184828 0
-		 0.20379175 0.42054656 -0.066215955 0.17335562 0.42054656 -0.12595022 0.12595022 0.42054656 -0.17335561
-		 0.066215947 0.42054656 -0.20379172 0 0.42054656 -0.21427929 -0.066215947 0.42054656 -0.20379171
-		 -0.1259502 0.42054656 -0.17335556 -0.17335556 0.42054656 -0.12595019 -0.20379168 0.42054656 -0.066215925
-		 -0.21427923 0.42054656 0 -0.20379168 0.42054656 0.066215925 -0.17335555 0.42054656 0.12595017;
-	setAttr ".vt[332:381]" -0.12595017 0.42054656 0.17335553 -0.066215925 0.42054656 0.20379165
-		 -6.3860175e-09 0.42054656 0.21427922 0.06621591 0.42054656 0.20379163 0.12595014 0.42054656 0.17335552
-		 0.1733555 0.42054656 0.12595016 0.20379162 0.42054656 0.06621591 0.21427919 0.42054656 0
-		 0.13871461 0.44888958 -0.045071106 0.11799769 0.44888958 -0.085730337 0.085730337 0.44888958 -0.11799768
-		 0.045071103 0.44888958 -0.13871458 0 0.44888958 -0.14585315 -0.045071103 0.44888958 -0.13871458
-		 -0.085730322 0.44888958 -0.11799766 -0.11799765 0.44888958 -0.085730307 -0.13871455 0.44888958 -0.045071088
-		 -0.1458531 0.44888958 0 -0.13871455 0.44888958 0.045071088 -0.11799764 0.44888958 0.085730299
-		 -0.085730299 0.44888958 0.11799763 -0.045071088 0.44888958 0.13871454 -4.3467603e-09 0.44888958 0.14585309
-		 0.045071077 0.44888958 0.13871452 0.085730284 0.44888958 0.11799762 0.11799762 0.44888958 0.085730292
-		 0.13871452 0.44888958 0.04507108 0.14585307 0.44888958 0 0.070221849 0.46617946 -0.022816461
-		 0.059734274 0.46617946 -0.043399487 0.043399487 0.46617946 -0.05973427 0.022816459 0.46617946 -0.070221841
-		 0 0.46617946 -0.073835611 -0.022816459 0.46617946 -0.070221834 -0.043399479 0.46617946 -0.059734255
-		 -0.059734251 0.46617946 -0.043399476 -0.070221826 0.46617946 -0.022816451 -0.073835589 0.46617946 0
-		 -0.070221826 0.46617946 0.022816451 -0.059734248 0.46617946 0.043399468 -0.043399468 0.46617946 0.059734244
-		 -0.022816451 0.46617946 0.070221812 -2.2004716e-09 0.46617946 0.073835582 0.022816446 0.46617946 0.070221812
-		 0.043399461 0.46617946 0.05973424 0.059734236 0.46617946 0.043399464 0.070221804 0.46617946 0.022816448
-		 0.073835574 0.46617946 0 0 -0.47199044 0 0 0.47199044 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere14";
-	rename -uid "339F6C0A-43C1-B812-5919-7A937F6DAFBC";
-	setAttr ".t" -type "double3" -1.4051443386523927 2.7302030230839933 0.73377433985514051 ;
-	setAttr ".r" -type "double3" -9.8949950775780202 0 0 ;
-	setAttr ".s" -type "double3" 0.050591773168317609 0.050591773168317609 0.0078728174720657223 ;
-createNode transform -n "transform6" -p "pSphere14";
-	rename -uid "C41EABCA-4EAF-72FB-29C7-4E9C3A206171";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape14" -p "transform6";
-	rename -uid "6693D2E7-4F60-C78B-86B1-8A916B7E8274";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.070221849 -0.46617946 -0.022816461 0.059734274 -0.46617946 -0.043399487
-		 0.043399487 -0.46617946 -0.05973427 0.022816459 -0.46617946 -0.070221841 0 -0.46617946 -0.073835611
-		 -0.022816459 -0.46617946 -0.070221834 -0.043399479 -0.46617946 -0.059734255 -0.059734251 -0.46617946 -0.043399476
-		 -0.070221826 -0.46617946 -0.022816451 -0.073835589 -0.46617946 0 -0.070221826 -0.46617946 0.022816451
-		 -0.059734248 -0.46617946 0.043399468 -0.043399468 -0.46617946 0.059734244 -0.022816451 -0.46617946 0.070221812
-		 -2.2004716e-09 -0.46617946 0.073835582 0.022816446 -0.46617946 0.070221812 0.043399461 -0.46617946 0.05973424
-		 0.059734236 -0.46617946 0.043399464 0.070221804 -0.46617946 0.022816448 0.073835574 -0.46617946 0
-		 0.13871461 -0.44888958 -0.045071106 0.11799769 -0.44888958 -0.085730337 0.085730337 -0.44888958 -0.11799768
-		 0.045071103 -0.44888958 -0.13871458 0 -0.44888958 -0.14585315 -0.045071103 -0.44888958 -0.13871458
-		 -0.085730322 -0.44888958 -0.11799766 -0.11799765 -0.44888958 -0.085730307 -0.13871455 -0.44888958 -0.045071088
-		 -0.1458531 -0.44888958 0 -0.13871455 -0.44888958 0.045071088 -0.11799764 -0.44888958 0.085730299
-		 -0.085730299 -0.44888958 0.11799763 -0.045071088 -0.44888958 0.13871454 -4.3467603e-09 -0.44888958 0.14585309
-		 0.045071077 -0.44888958 0.13871452 0.085730284 -0.44888958 0.11799762 0.11799762 -0.44888958 0.085730292
-		 0.13871452 -0.44888958 0.04507108 0.14585307 -0.44888958 0 0.20379175 -0.42054656 -0.066215955
-		 0.17335562 -0.42054656 -0.12595022 0.12595022 -0.42054656 -0.17335561 0.066215947 -0.42054656 -0.20379172
-		 0 -0.42054656 -0.21427929 -0.066215947 -0.42054656 -0.20379171 -0.1259502 -0.42054656 -0.17335556
-		 -0.17335556 -0.42054656 -0.12595019 -0.20379168 -0.42054656 -0.066215925 -0.21427923 -0.42054656 0
-		 -0.20379168 -0.42054656 0.066215925 -0.17335555 -0.42054656 0.12595017 -0.12595017 -0.42054656 0.17335553
-		 -0.066215925 -0.42054656 0.20379165 -6.3860175e-09 -0.42054656 0.21427922 0.06621591 -0.42054656 0.20379163
-		 0.12595014 -0.42054656 0.17335552 0.1733555 -0.42054656 0.12595016 0.20379162 -0.42054656 0.06621591
-		 0.21427919 -0.42054656 0 0.26385084 -0.38184828 -0.085730329 0.22444494 -0.38184828 -0.16306879
-		 0.16306879 -0.38184828 -0.22444493 0.085730322 -0.38184828 -0.26385081 0 -0.38184828 -0.27742913
-		 -0.085730322 -0.38184828 -0.26385081 -0.16306874 -0.38184828 -0.22444487 -0.22444485 -0.38184828 -0.16306873
-		 -0.26385075 -0.38184828 -0.085730299 -0.27742907 -0.38184828 0 -0.26385075 -0.38184828 0.085730299
-		 -0.22444484 -0.38184828 0.16306871 -0.16306871 -0.38184828 0.22444482 -0.085730299 -0.38184828 0.26385072
-		 -8.2680289e-09 -0.38184828 0.27742904 0.085730277 -0.38184828 0.26385069 0.16306868 -0.38184828 0.22444481
-		 0.22444479 -0.38184828 0.1630687 0.26385069 -0.38184828 0.085730284 0.27742901 -0.38184828 0
-		 0.31741306 -0.33374763 -0.10313375 0.27000767 -0.33374763 -0.19617204 0.19617204 -0.33374763 -0.27000767
-		 0.10313374 -0.33374763 -0.31741303 0 -0.33374763 -0.33374777 -0.10313374 -0.33374763 -0.317413
-		 -0.19617201 -0.33374763 -0.27000761 -0.27000758 -0.33374763 -0.19617198 -0.31741294 -0.33374763 -0.10313371
-		 -0.33374771 -0.33374763 0 -0.31741294 -0.33374763 0.10313371 -0.27000755 -0.33374763 0.19617197
-		 -0.19617197 -0.33374763 0.27000755 -0.10313371 -0.33374763 0.31741291 -9.9464543e-09 -0.33374763 0.33374766
-		 0.10313368 -0.33374763 0.31741288 0.19617192 -0.33374763 0.27000752 0.27000749 -0.33374763 0.19617195
-		 0.31741285 -0.33374763 0.10313369 0.33374763 -0.33374763 0 0.36315954 -0.27742901 -0.11799768
-		 0.30892196 -0.27742901 -0.22444493 0.22444493 -0.27742901 -0.30892193 0.11799767 -0.27742901 -0.36315948
-		 0 -0.27742901 -0.38184845 -0.11799767 -0.27742901 -0.36315945 -0.22444487 -0.27742901 -0.30892187
-		 -0.30892184 -0.27742901 -0.22444485 -0.36315939 -0.27742901 -0.11799763 -0.38184837 -0.27742901 0
-		 -0.36315939 -0.27742901 0.11799763 -0.30892181 -0.27742901 0.22444482 -0.22444482 -0.27742901 0.30892178
-		 -0.11799763 -0.27742901 0.36315936 -1.1379965e-08 -0.27742901 0.38184834 0.1179976 -0.27742901 0.36315933
-		 0.22444478 -0.27742901 0.30892178 0.30892175 -0.27742901 0.22444481 0.3631593 -0.27742901 0.11799761
-		 0.38184828 -0.27742901 0 0.3999638 -0.21427919 -0.12995611 0.34022954 -0.21427919 -0.24719122
-		 0.24719122 -0.21427919 -0.34022951 0.1299561 -0.21427919 -0.39996377 0 -0.21427919 -0.42054677
-		 -0.1299561 -0.21427919 -0.39996374 -0.24719116 -0.21427919 -0.34022945 -0.34022942 -0.21427919 -0.24719113
-		 -0.39996365 -0.21427919 -0.12995607 -0.42054665 -0.21427919 0 -0.39996365 -0.21427919 0.12995607
-		 -0.34022939 -0.21427919 0.24719112 -0.24719112 -0.21427919 0.34022936 -0.12995607 -0.21427919 0.39996362
-		 -1.2533264e-08 -0.21427919 0.42054662 0.12995602 -0.21427919 0.39996359 0.24719106 -0.21427919 0.34022933
-		 0.34022933 -0.21427919 0.24719109 0.39996356 -0.21427919 0.12995604 0.42054656 -0.21427919 0
-		 0.42691964 -0.14585306 -0.1387146 0.36315954 -0.14585306 -0.26385084 0.26385084 -0.14585306 -0.36315951
-		 0.13871458 -0.14585306 -0.42691958 0 -0.14585306 -0.44888979 -0.13871458 -0.14585306 -0.42691955
-		 -0.26385078 -0.14585306 -0.36315945 -0.36315942 -0.14585306 -0.26385075 -0.42691949 -0.14585306 -0.13871454
-		 -0.4488897 -0.14585306 0 -0.42691949 -0.14585306 0.13871454 -0.36315939 -0.14585306 0.26385072
-		 -0.26385072 -0.14585306 0.36315936 -0.13871454 -0.14585306 0.42691943 -1.3377952e-08 -0.14585306 0.44888964
-		 0.13871451 -0.14585306 0.4269194 0.26385066 -0.14585306 0.36315933 0.3631593 -0.14585306 0.26385069
-		 0.42691937 -0.14585306 0.13871451 0.44888958 -0.14585306 0 0.44336331 -0.073835529 -0.14405747
-		 0.37714735 -0.073835529 -0.27401358 0.27401358 -0.073835529 -0.37714735 0.14405745 -0.073835529 -0.44336325
-		 0 -0.073835529 -0.46617967 -0.14405745 -0.073835529 -0.44336322;
-	setAttr ".vt[166:331]" -0.27401352 -0.073835529 -0.37714726 -0.37714723 -0.073835529 -0.27401349
-		 -0.44336313 -0.073835529 -0.14405741 -0.46617958 -0.073835529 0 -0.44336313 -0.073835529 0.14405741
-		 -0.3771472 -0.073835529 0.27401346 -0.27401346 -0.073835529 0.37714717 -0.14405741 -0.073835529 0.44336307
-		 -1.3893231e-08 -0.073835529 0.46617952 0.14405736 -0.073835529 0.44336304 0.2740134 -0.073835529 0.37714714
-		 0.37714711 -0.073835529 0.27401343 0.44336301 -0.073835529 0.14405738 0.46617946 -0.073835529 0
-		 0.44888988 0 -0.14585315 0.38184854 0 -0.27742919 0.27742919 0 -0.38184851 0.14585315 0 -0.44888982
-		 0 0 -0.47199067 -0.14585315 0 -0.44888979 -0.27742913 0 -0.38184842 -0.38184839 0 -0.2774291
-		 -0.4488897 0 -0.1458531 -0.47199056 0 0 -0.4488897 0 0.1458531 -0.38184837 0 0.27742907
-		 -0.27742907 0 0.38184834 -0.1458531 0 0.44888964 -1.4066411e-08 0 0.4719905 0.14585306 0 0.44888961
-		 0.27742901 0 0.38184831 0.38184828 0 0.27742904 0.44888958 0 0.14585307 0.47199044 0 0
-		 0.44336331 0.073835529 -0.14405747 0.37714735 0.073835529 -0.27401358 0.27401358 0.073835529 -0.37714735
-		 0.14405745 0.073835529 -0.44336325 0 0.073835529 -0.46617967 -0.14405745 0.073835529 -0.44336322
-		 -0.27401352 0.073835529 -0.37714726 -0.37714723 0.073835529 -0.27401349 -0.44336313 0.073835529 -0.14405741
-		 -0.46617958 0.073835529 0 -0.44336313 0.073835529 0.14405741 -0.3771472 0.073835529 0.27401346
-		 -0.27401346 0.073835529 0.37714717 -0.14405741 0.073835529 0.44336307 -1.3893231e-08 0.073835529 0.46617952
-		 0.14405736 0.073835529 0.44336304 0.2740134 0.073835529 0.37714714 0.37714711 0.073835529 0.27401343
-		 0.44336301 0.073835529 0.14405738 0.46617946 0.073835529 0 0.42691964 0.14585306 -0.1387146
-		 0.36315954 0.14585306 -0.26385084 0.26385084 0.14585306 -0.36315951 0.13871458 0.14585306 -0.42691958
-		 0 0.14585306 -0.44888979 -0.13871458 0.14585306 -0.42691955 -0.26385078 0.14585306 -0.36315945
-		 -0.36315942 0.14585306 -0.26385075 -0.42691949 0.14585306 -0.13871454 -0.4488897 0.14585306 0
-		 -0.42691949 0.14585306 0.13871454 -0.36315939 0.14585306 0.26385072 -0.26385072 0.14585306 0.36315936
-		 -0.13871454 0.14585306 0.42691943 -1.3377952e-08 0.14585306 0.44888964 0.13871451 0.14585306 0.4269194
-		 0.26385066 0.14585306 0.36315933 0.3631593 0.14585306 0.26385069 0.42691937 0.14585306 0.13871451
-		 0.44888958 0.14585306 0 0.3999638 0.21427919 -0.12995611 0.34022954 0.21427919 -0.24719122
-		 0.24719122 0.21427919 -0.34022951 0.1299561 0.21427919 -0.39996377 0 0.21427919 -0.42054677
-		 -0.1299561 0.21427919 -0.39996374 -0.24719116 0.21427919 -0.34022945 -0.34022942 0.21427919 -0.24719113
-		 -0.39996365 0.21427919 -0.12995607 -0.42054665 0.21427919 0 -0.39996365 0.21427919 0.12995607
-		 -0.34022939 0.21427919 0.24719112 -0.24719112 0.21427919 0.34022936 -0.12995607 0.21427919 0.39996362
-		 -1.2533264e-08 0.21427919 0.42054662 0.12995602 0.21427919 0.39996359 0.24719106 0.21427919 0.34022933
-		 0.34022933 0.21427919 0.24719109 0.39996356 0.21427919 0.12995604 0.42054656 0.21427919 0
-		 0.36315954 0.27742901 -0.11799768 0.30892196 0.27742901 -0.22444493 0.22444493 0.27742901 -0.30892193
-		 0.11799767 0.27742901 -0.36315948 0 0.27742901 -0.38184845 -0.11799767 0.27742901 -0.36315945
-		 -0.22444487 0.27742901 -0.30892187 -0.30892184 0.27742901 -0.22444485 -0.36315939 0.27742901 -0.11799763
-		 -0.38184837 0.27742901 0 -0.36315939 0.27742901 0.11799763 -0.30892181 0.27742901 0.22444482
-		 -0.22444482 0.27742901 0.30892178 -0.11799763 0.27742901 0.36315936 -1.1379965e-08 0.27742901 0.38184834
-		 0.1179976 0.27742901 0.36315933 0.22444478 0.27742901 0.30892178 0.30892175 0.27742901 0.22444481
-		 0.3631593 0.27742901 0.11799761 0.38184828 0.27742901 0 0.31741306 0.33374763 -0.10313375
-		 0.27000767 0.33374763 -0.19617204 0.19617204 0.33374763 -0.27000767 0.10313374 0.33374763 -0.31741303
-		 0 0.33374763 -0.33374777 -0.10313374 0.33374763 -0.317413 -0.19617201 0.33374763 -0.27000761
-		 -0.27000758 0.33374763 -0.19617198 -0.31741294 0.33374763 -0.10313371 -0.33374771 0.33374763 0
-		 -0.31741294 0.33374763 0.10313371 -0.27000755 0.33374763 0.19617197 -0.19617197 0.33374763 0.27000755
-		 -0.10313371 0.33374763 0.31741291 -9.9464543e-09 0.33374763 0.33374766 0.10313368 0.33374763 0.31741288
-		 0.19617192 0.33374763 0.27000752 0.27000749 0.33374763 0.19617195 0.31741285 0.33374763 0.10313369
-		 0.33374763 0.33374763 0 0.26385084 0.38184828 -0.085730329 0.22444494 0.38184828 -0.16306879
-		 0.16306879 0.38184828 -0.22444493 0.085730322 0.38184828 -0.26385081 0 0.38184828 -0.27742913
-		 -0.085730322 0.38184828 -0.26385081 -0.16306874 0.38184828 -0.22444487 -0.22444485 0.38184828 -0.16306873
-		 -0.26385075 0.38184828 -0.085730299 -0.27742907 0.38184828 0 -0.26385075 0.38184828 0.085730299
-		 -0.22444484 0.38184828 0.16306871 -0.16306871 0.38184828 0.22444482 -0.085730299 0.38184828 0.26385072
-		 -8.2680289e-09 0.38184828 0.27742904 0.085730277 0.38184828 0.26385069 0.16306868 0.38184828 0.22444481
-		 0.22444479 0.38184828 0.1630687 0.26385069 0.38184828 0.085730284 0.27742901 0.38184828 0
-		 0.20379175 0.42054656 -0.066215955 0.17335562 0.42054656 -0.12595022 0.12595022 0.42054656 -0.17335561
-		 0.066215947 0.42054656 -0.20379172 0 0.42054656 -0.21427929 -0.066215947 0.42054656 -0.20379171
-		 -0.1259502 0.42054656 -0.17335556 -0.17335556 0.42054656 -0.12595019 -0.20379168 0.42054656 -0.066215925
-		 -0.21427923 0.42054656 0 -0.20379168 0.42054656 0.066215925 -0.17335555 0.42054656 0.12595017;
-	setAttr ".vt[332:381]" -0.12595017 0.42054656 0.17335553 -0.066215925 0.42054656 0.20379165
-		 -6.3860175e-09 0.42054656 0.21427922 0.06621591 0.42054656 0.20379163 0.12595014 0.42054656 0.17335552
-		 0.1733555 0.42054656 0.12595016 0.20379162 0.42054656 0.06621591 0.21427919 0.42054656 0
-		 0.13871461 0.44888958 -0.045071106 0.11799769 0.44888958 -0.085730337 0.085730337 0.44888958 -0.11799768
-		 0.045071103 0.44888958 -0.13871458 0 0.44888958 -0.14585315 -0.045071103 0.44888958 -0.13871458
-		 -0.085730322 0.44888958 -0.11799766 -0.11799765 0.44888958 -0.085730307 -0.13871455 0.44888958 -0.045071088
-		 -0.1458531 0.44888958 0 -0.13871455 0.44888958 0.045071088 -0.11799764 0.44888958 0.085730299
-		 -0.085730299 0.44888958 0.11799763 -0.045071088 0.44888958 0.13871454 -4.3467603e-09 0.44888958 0.14585309
-		 0.045071077 0.44888958 0.13871452 0.085730284 0.44888958 0.11799762 0.11799762 0.44888958 0.085730292
-		 0.13871452 0.44888958 0.04507108 0.14585307 0.44888958 0 0.070221849 0.46617946 -0.022816461
-		 0.059734274 0.46617946 -0.043399487 0.043399487 0.46617946 -0.05973427 0.022816459 0.46617946 -0.070221841
-		 0 0.46617946 -0.073835611 -0.022816459 0.46617946 -0.070221834 -0.043399479 0.46617946 -0.059734255
-		 -0.059734251 0.46617946 -0.043399476 -0.070221826 0.46617946 -0.022816451 -0.073835589 0.46617946 0
-		 -0.070221826 0.46617946 0.022816451 -0.059734248 0.46617946 0.043399468 -0.043399468 0.46617946 0.059734244
-		 -0.022816451 0.46617946 0.070221812 -2.2004716e-09 0.46617946 0.073835582 0.022816446 0.46617946 0.070221812
-		 0.043399461 0.46617946 0.05973424 0.059734236 0.46617946 0.043399464 0.070221804 0.46617946 0.022816448
-		 0.073835574 0.46617946 0 0 -0.47199044 0 0 0.47199044 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere15";
-	rename -uid "24AA6A24-48FA-A7F0-7866-DB8CFDE832AF";
-	setAttr ".t" -type "double3" -1.800764626637855 2.7302030230839933 0.78148246910714725 ;
-	setAttr ".r" -type "double3" -13.46887141202898 16.268997245650056 -3.8385908328643228 ;
-	setAttr ".s" -type "double3" 0.050591773168317609 0.050591773168317609 0.0078728174720657223 ;
-createNode transform -n "transform7" -p "pSphere15";
-	rename -uid "12C48727-49D8-BCDE-A24B-F2B640F75216";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape15" -p "transform7";
-	rename -uid "70F7C4D4-4BD4-0B6E-469E-06A8A89ECE07";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr ".iog[0].og[0].gcl" -type "componentList" 1 "f[0:399]";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr -s 439 ".uvst[0].uvsp";
-	setAttr ".uvst[0].uvsp[0:249]" -type "float2" 0 0.050000001 0.050000001 0.050000001
-		 0.1 0.050000001 0.15000001 0.050000001 0.2 0.050000001 0.25 0.050000001 0.30000001
-		 0.050000001 0.35000002 0.050000001 0.40000004 0.050000001 0.45000005 0.050000001
-		 0.50000006 0.050000001 0.55000007 0.050000001 0.60000008 0.050000001 0.6500001 0.050000001
-		 0.70000011 0.050000001 0.75000012 0.050000001 0.80000013 0.050000001 0.85000014 0.050000001
-		 0.90000015 0.050000001 0.95000017 0.050000001 1.000000119209 0.050000001 0 0.1 0.050000001
-		 0.1 0.1 0.1 0.15000001 0.1 0.2 0.1 0.25 0.1 0.30000001 0.1 0.35000002 0.1 0.40000004
-		 0.1 0.45000005 0.1 0.50000006 0.1 0.55000007 0.1 0.60000008 0.1 0.6500001 0.1 0.70000011
-		 0.1 0.75000012 0.1 0.80000013 0.1 0.85000014 0.1 0.90000015 0.1 0.95000017 0.1 1.000000119209
-		 0.1 0 0.15000001 0.050000001 0.15000001 0.1 0.15000001 0.15000001 0.15000001 0.2
-		 0.15000001 0.25 0.15000001 0.30000001 0.15000001 0.35000002 0.15000001 0.40000004
-		 0.15000001 0.45000005 0.15000001 0.50000006 0.15000001 0.55000007 0.15000001 0.60000008
-		 0.15000001 0.6500001 0.15000001 0.70000011 0.15000001 0.75000012 0.15000001 0.80000013
-		 0.15000001 0.85000014 0.15000001 0.90000015 0.15000001 0.95000017 0.15000001 1.000000119209
-		 0.15000001 0 0.2 0.050000001 0.2 0.1 0.2 0.15000001 0.2 0.2 0.2 0.25 0.2 0.30000001
-		 0.2 0.35000002 0.2 0.40000004 0.2 0.45000005 0.2 0.50000006 0.2 0.55000007 0.2 0.60000008
-		 0.2 0.6500001 0.2 0.70000011 0.2 0.75000012 0.2 0.80000013 0.2 0.85000014 0.2 0.90000015
-		 0.2 0.95000017 0.2 1.000000119209 0.2 0 0.25 0.050000001 0.25 0.1 0.25 0.15000001
-		 0.25 0.2 0.25 0.25 0.25 0.30000001 0.25 0.35000002 0.25 0.40000004 0.25 0.45000005
-		 0.25 0.50000006 0.25 0.55000007 0.25 0.60000008 0.25 0.6500001 0.25 0.70000011 0.25
-		 0.75000012 0.25 0.80000013 0.25 0.85000014 0.25 0.90000015 0.25 0.95000017 0.25 1.000000119209
-		 0.25 0 0.30000001 0.050000001 0.30000001 0.1 0.30000001 0.15000001 0.30000001 0.2
-		 0.30000001 0.25 0.30000001 0.30000001 0.30000001 0.35000002 0.30000001 0.40000004
-		 0.30000001 0.45000005 0.30000001 0.50000006 0.30000001 0.55000007 0.30000001 0.60000008
-		 0.30000001 0.6500001 0.30000001 0.70000011 0.30000001 0.75000012 0.30000001 0.80000013
-		 0.30000001 0.85000014 0.30000001 0.90000015 0.30000001 0.95000017 0.30000001 1.000000119209
-		 0.30000001 0 0.35000002 0.050000001 0.35000002 0.1 0.35000002 0.15000001 0.35000002
-		 0.2 0.35000002 0.25 0.35000002 0.30000001 0.35000002 0.35000002 0.35000002 0.40000004
-		 0.35000002 0.45000005 0.35000002 0.50000006 0.35000002 0.55000007 0.35000002 0.60000008
-		 0.35000002 0.6500001 0.35000002 0.70000011 0.35000002 0.75000012 0.35000002 0.80000013
-		 0.35000002 0.85000014 0.35000002 0.90000015 0.35000002 0.95000017 0.35000002 1.000000119209
-		 0.35000002 0 0.40000004 0.050000001 0.40000004 0.1 0.40000004 0.15000001 0.40000004
-		 0.2 0.40000004 0.25 0.40000004 0.30000001 0.40000004 0.35000002 0.40000004 0.40000004
-		 0.40000004 0.45000005 0.40000004 0.50000006 0.40000004 0.55000007 0.40000004 0.60000008
-		 0.40000004 0.6500001 0.40000004 0.70000011 0.40000004 0.75000012 0.40000004 0.80000013
-		 0.40000004 0.85000014 0.40000004 0.90000015 0.40000004 0.95000017 0.40000004 1.000000119209
-		 0.40000004 0 0.45000005 0.050000001 0.45000005 0.1 0.45000005 0.15000001 0.45000005
-		 0.2 0.45000005 0.25 0.45000005 0.30000001 0.45000005 0.35000002 0.45000005 0.40000004
-		 0.45000005 0.45000005 0.45000005 0.50000006 0.45000005 0.55000007 0.45000005 0.60000008
-		 0.45000005 0.6500001 0.45000005 0.70000011 0.45000005 0.75000012 0.45000005 0.80000013
-		 0.45000005 0.85000014 0.45000005 0.90000015 0.45000005 0.95000017 0.45000005 1.000000119209
-		 0.45000005 0 0.50000006 0.050000001 0.50000006 0.1 0.50000006 0.15000001 0.50000006
-		 0.2 0.50000006 0.25 0.50000006 0.30000001 0.50000006 0.35000002 0.50000006 0.40000004
-		 0.50000006 0.45000005 0.50000006 0.50000006 0.50000006 0.55000007 0.50000006 0.60000008
-		 0.50000006 0.6500001 0.50000006 0.70000011 0.50000006 0.75000012 0.50000006 0.80000013
-		 0.50000006 0.85000014 0.50000006 0.90000015 0.50000006 0.95000017 0.50000006 1.000000119209
-		 0.50000006 0 0.55000007 0.050000001 0.55000007 0.1 0.55000007 0.15000001 0.55000007
-		 0.2 0.55000007 0.25 0.55000007 0.30000001 0.55000007 0.35000002 0.55000007 0.40000004
-		 0.55000007 0.45000005 0.55000007 0.50000006 0.55000007 0.55000007 0.55000007 0.60000008
-		 0.55000007 0.6500001 0.55000007 0.70000011 0.55000007 0.75000012 0.55000007 0.80000013
-		 0.55000007 0.85000014 0.55000007 0.90000015 0.55000007 0.95000017 0.55000007 1.000000119209
-		 0.55000007 0 0.60000008 0.050000001 0.60000008 0.1 0.60000008 0.15000001 0.60000008
-		 0.2 0.60000008 0.25 0.60000008 0.30000001 0.60000008 0.35000002 0.60000008 0.40000004
-		 0.60000008 0.45000005 0.60000008 0.50000006 0.60000008 0.55000007 0.60000008 0.60000008
-		 0.60000008 0.6500001 0.60000008 0.70000011 0.60000008 0.75000012 0.60000008 0.80000013
-		 0.60000008 0.85000014 0.60000008 0.90000015 0.60000008;
-	setAttr ".uvst[0].uvsp[250:438]" 0.95000017 0.60000008 1.000000119209 0.60000008
-		 0 0.6500001 0.050000001 0.6500001 0.1 0.6500001 0.15000001 0.6500001 0.2 0.6500001
-		 0.25 0.6500001 0.30000001 0.6500001 0.35000002 0.6500001 0.40000004 0.6500001 0.45000005
-		 0.6500001 0.50000006 0.6500001 0.55000007 0.6500001 0.60000008 0.6500001 0.6500001
-		 0.6500001 0.70000011 0.6500001 0.75000012 0.6500001 0.80000013 0.6500001 0.85000014
-		 0.6500001 0.90000015 0.6500001 0.95000017 0.6500001 1.000000119209 0.6500001 0 0.70000011
-		 0.050000001 0.70000011 0.1 0.70000011 0.15000001 0.70000011 0.2 0.70000011 0.25 0.70000011
-		 0.30000001 0.70000011 0.35000002 0.70000011 0.40000004 0.70000011 0.45000005 0.70000011
-		 0.50000006 0.70000011 0.55000007 0.70000011 0.60000008 0.70000011 0.6500001 0.70000011
-		 0.70000011 0.70000011 0.75000012 0.70000011 0.80000013 0.70000011 0.85000014 0.70000011
-		 0.90000015 0.70000011 0.95000017 0.70000011 1.000000119209 0.70000011 0 0.75000012
-		 0.050000001 0.75000012 0.1 0.75000012 0.15000001 0.75000012 0.2 0.75000012 0.25 0.75000012
-		 0.30000001 0.75000012 0.35000002 0.75000012 0.40000004 0.75000012 0.45000005 0.75000012
-		 0.50000006 0.75000012 0.55000007 0.75000012 0.60000008 0.75000012 0.6500001 0.75000012
-		 0.70000011 0.75000012 0.75000012 0.75000012 0.80000013 0.75000012 0.85000014 0.75000012
-		 0.90000015 0.75000012 0.95000017 0.75000012 1.000000119209 0.75000012 0 0.80000013
-		 0.050000001 0.80000013 0.1 0.80000013 0.15000001 0.80000013 0.2 0.80000013 0.25 0.80000013
-		 0.30000001 0.80000013 0.35000002 0.80000013 0.40000004 0.80000013 0.45000005 0.80000013
-		 0.50000006 0.80000013 0.55000007 0.80000013 0.60000008 0.80000013 0.6500001 0.80000013
-		 0.70000011 0.80000013 0.75000012 0.80000013 0.80000013 0.80000013 0.85000014 0.80000013
-		 0.90000015 0.80000013 0.95000017 0.80000013 1.000000119209 0.80000013 0 0.85000014
-		 0.050000001 0.85000014 0.1 0.85000014 0.15000001 0.85000014 0.2 0.85000014 0.25 0.85000014
-		 0.30000001 0.85000014 0.35000002 0.85000014 0.40000004 0.85000014 0.45000005 0.85000014
-		 0.50000006 0.85000014 0.55000007 0.85000014 0.60000008 0.85000014 0.6500001 0.85000014
-		 0.70000011 0.85000014 0.75000012 0.85000014 0.80000013 0.85000014 0.85000014 0.85000014
-		 0.90000015 0.85000014 0.95000017 0.85000014 1.000000119209 0.85000014 0 0.90000015
-		 0.050000001 0.90000015 0.1 0.90000015 0.15000001 0.90000015 0.2 0.90000015 0.25 0.90000015
-		 0.30000001 0.90000015 0.35000002 0.90000015 0.40000004 0.90000015 0.45000005 0.90000015
-		 0.50000006 0.90000015 0.55000007 0.90000015 0.60000008 0.90000015 0.6500001 0.90000015
-		 0.70000011 0.90000015 0.75000012 0.90000015 0.80000013 0.90000015 0.85000014 0.90000015
-		 0.90000015 0.90000015 0.95000017 0.90000015 1.000000119209 0.90000015 0 0.95000017
-		 0.050000001 0.95000017 0.1 0.95000017 0.15000001 0.95000017 0.2 0.95000017 0.25 0.95000017
-		 0.30000001 0.95000017 0.35000002 0.95000017 0.40000004 0.95000017 0.45000005 0.95000017
-		 0.50000006 0.95000017 0.55000007 0.95000017 0.60000008 0.95000017 0.6500001 0.95000017
-		 0.70000011 0.95000017 0.75000012 0.95000017 0.80000013 0.95000017 0.85000014 0.95000017
-		 0.90000015 0.95000017 0.95000017 0.95000017 1.000000119209 0.95000017 0.025 0 0.075000003
-		 0 0.125 0 0.17500001 0 0.22500001 0 0.27500001 0 0.32500002 0 0.375 0 0.42500001
-		 0 0.47500002 0 0.52499998 0 0.57499999 0 0.625 0 0.67500001 0 0.72499996 0 0.77499998
-		 0 0.82499999 0 0.875 0 0.92500001 0 0.97499996 0 0.025 1 0.075000003 1 0.125 1 0.17500001
-		 1 0.22500001 1 0.27500001 1 0.32500002 1 0.375 1 0.42500001 1 0.47500002 1 0.52499998
-		 1 0.57499999 1 0.625 1 0.67500001 1 0.72499996 1 0.77499998 1 0.82499999 1 0.875
-		 1 0.92500001 1 0.97499996 1;
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 382 ".vt";
-	setAttr ".vt[0:165]"  0.070221849 -0.46617946 -0.022816461 0.059734274 -0.46617946 -0.043399487
-		 0.043399487 -0.46617946 -0.05973427 0.022816459 -0.46617946 -0.070221841 0 -0.46617946 -0.073835611
-		 -0.022816459 -0.46617946 -0.070221834 -0.043399479 -0.46617946 -0.059734255 -0.059734251 -0.46617946 -0.043399476
-		 -0.070221826 -0.46617946 -0.022816451 -0.073835589 -0.46617946 0 -0.070221826 -0.46617946 0.022816451
-		 -0.059734248 -0.46617946 0.043399468 -0.043399468 -0.46617946 0.059734244 -0.022816451 -0.46617946 0.070221812
-		 -2.2004716e-09 -0.46617946 0.073835582 0.022816446 -0.46617946 0.070221812 0.043399461 -0.46617946 0.05973424
-		 0.059734236 -0.46617946 0.043399464 0.070221804 -0.46617946 0.022816448 0.073835574 -0.46617946 0
-		 0.13871461 -0.44888958 -0.045071106 0.11799769 -0.44888958 -0.085730337 0.085730337 -0.44888958 -0.11799768
-		 0.045071103 -0.44888958 -0.13871458 0 -0.44888958 -0.14585315 -0.045071103 -0.44888958 -0.13871458
-		 -0.085730322 -0.44888958 -0.11799766 -0.11799765 -0.44888958 -0.085730307 -0.13871455 -0.44888958 -0.045071088
-		 -0.1458531 -0.44888958 0 -0.13871455 -0.44888958 0.045071088 -0.11799764 -0.44888958 0.085730299
-		 -0.085730299 -0.44888958 0.11799763 -0.045071088 -0.44888958 0.13871454 -4.3467603e-09 -0.44888958 0.14585309
-		 0.045071077 -0.44888958 0.13871452 0.085730284 -0.44888958 0.11799762 0.11799762 -0.44888958 0.085730292
-		 0.13871452 -0.44888958 0.04507108 0.14585307 -0.44888958 0 0.20379175 -0.42054656 -0.066215955
-		 0.17335562 -0.42054656 -0.12595022 0.12595022 -0.42054656 -0.17335561 0.066215947 -0.42054656 -0.20379172
-		 0 -0.42054656 -0.21427929 -0.066215947 -0.42054656 -0.20379171 -0.1259502 -0.42054656 -0.17335556
-		 -0.17335556 -0.42054656 -0.12595019 -0.20379168 -0.42054656 -0.066215925 -0.21427923 -0.42054656 0
-		 -0.20379168 -0.42054656 0.066215925 -0.17335555 -0.42054656 0.12595017 -0.12595017 -0.42054656 0.17335553
-		 -0.066215925 -0.42054656 0.20379165 -6.3860175e-09 -0.42054656 0.21427922 0.06621591 -0.42054656 0.20379163
-		 0.12595014 -0.42054656 0.17335552 0.1733555 -0.42054656 0.12595016 0.20379162 -0.42054656 0.06621591
-		 0.21427919 -0.42054656 0 0.26385084 -0.38184828 -0.085730329 0.22444494 -0.38184828 -0.16306879
-		 0.16306879 -0.38184828 -0.22444493 0.085730322 -0.38184828 -0.26385081 0 -0.38184828 -0.27742913
-		 -0.085730322 -0.38184828 -0.26385081 -0.16306874 -0.38184828 -0.22444487 -0.22444485 -0.38184828 -0.16306873
-		 -0.26385075 -0.38184828 -0.085730299 -0.27742907 -0.38184828 0 -0.26385075 -0.38184828 0.085730299
-		 -0.22444484 -0.38184828 0.16306871 -0.16306871 -0.38184828 0.22444482 -0.085730299 -0.38184828 0.26385072
-		 -8.2680289e-09 -0.38184828 0.27742904 0.085730277 -0.38184828 0.26385069 0.16306868 -0.38184828 0.22444481
-		 0.22444479 -0.38184828 0.1630687 0.26385069 -0.38184828 0.085730284 0.27742901 -0.38184828 0
-		 0.31741306 -0.33374763 -0.10313375 0.27000767 -0.33374763 -0.19617204 0.19617204 -0.33374763 -0.27000767
-		 0.10313374 -0.33374763 -0.31741303 0 -0.33374763 -0.33374777 -0.10313374 -0.33374763 -0.317413
-		 -0.19617201 -0.33374763 -0.27000761 -0.27000758 -0.33374763 -0.19617198 -0.31741294 -0.33374763 -0.10313371
-		 -0.33374771 -0.33374763 0 -0.31741294 -0.33374763 0.10313371 -0.27000755 -0.33374763 0.19617197
-		 -0.19617197 -0.33374763 0.27000755 -0.10313371 -0.33374763 0.31741291 -9.9464543e-09 -0.33374763 0.33374766
-		 0.10313368 -0.33374763 0.31741288 0.19617192 -0.33374763 0.27000752 0.27000749 -0.33374763 0.19617195
-		 0.31741285 -0.33374763 0.10313369 0.33374763 -0.33374763 0 0.36315954 -0.27742901 -0.11799768
-		 0.30892196 -0.27742901 -0.22444493 0.22444493 -0.27742901 -0.30892193 0.11799767 -0.27742901 -0.36315948
-		 0 -0.27742901 -0.38184845 -0.11799767 -0.27742901 -0.36315945 -0.22444487 -0.27742901 -0.30892187
-		 -0.30892184 -0.27742901 -0.22444485 -0.36315939 -0.27742901 -0.11799763 -0.38184837 -0.27742901 0
-		 -0.36315939 -0.27742901 0.11799763 -0.30892181 -0.27742901 0.22444482 -0.22444482 -0.27742901 0.30892178
-		 -0.11799763 -0.27742901 0.36315936 -1.1379965e-08 -0.27742901 0.38184834 0.1179976 -0.27742901 0.36315933
-		 0.22444478 -0.27742901 0.30892178 0.30892175 -0.27742901 0.22444481 0.3631593 -0.27742901 0.11799761
-		 0.38184828 -0.27742901 0 0.3999638 -0.21427919 -0.12995611 0.34022954 -0.21427919 -0.24719122
-		 0.24719122 -0.21427919 -0.34022951 0.1299561 -0.21427919 -0.39996377 0 -0.21427919 -0.42054677
-		 -0.1299561 -0.21427919 -0.39996374 -0.24719116 -0.21427919 -0.34022945 -0.34022942 -0.21427919 -0.24719113
-		 -0.39996365 -0.21427919 -0.12995607 -0.42054665 -0.21427919 0 -0.39996365 -0.21427919 0.12995607
-		 -0.34022939 -0.21427919 0.24719112 -0.24719112 -0.21427919 0.34022936 -0.12995607 -0.21427919 0.39996362
-		 -1.2533264e-08 -0.21427919 0.42054662 0.12995602 -0.21427919 0.39996359 0.24719106 -0.21427919 0.34022933
-		 0.34022933 -0.21427919 0.24719109 0.39996356 -0.21427919 0.12995604 0.42054656 -0.21427919 0
-		 0.42691964 -0.14585306 -0.1387146 0.36315954 -0.14585306 -0.26385084 0.26385084 -0.14585306 -0.36315951
-		 0.13871458 -0.14585306 -0.42691958 0 -0.14585306 -0.44888979 -0.13871458 -0.14585306 -0.42691955
-		 -0.26385078 -0.14585306 -0.36315945 -0.36315942 -0.14585306 -0.26385075 -0.42691949 -0.14585306 -0.13871454
-		 -0.4488897 -0.14585306 0 -0.42691949 -0.14585306 0.13871454 -0.36315939 -0.14585306 0.26385072
-		 -0.26385072 -0.14585306 0.36315936 -0.13871454 -0.14585306 0.42691943 -1.3377952e-08 -0.14585306 0.44888964
-		 0.13871451 -0.14585306 0.4269194 0.26385066 -0.14585306 0.36315933 0.3631593 -0.14585306 0.26385069
-		 0.42691937 -0.14585306 0.13871451 0.44888958 -0.14585306 0 0.44336331 -0.073835529 -0.14405747
-		 0.37714735 -0.073835529 -0.27401358 0.27401358 -0.073835529 -0.37714735 0.14405745 -0.073835529 -0.44336325
-		 0 -0.073835529 -0.46617967 -0.14405745 -0.073835529 -0.44336322;
-	setAttr ".vt[166:331]" -0.27401352 -0.073835529 -0.37714726 -0.37714723 -0.073835529 -0.27401349
-		 -0.44336313 -0.073835529 -0.14405741 -0.46617958 -0.073835529 0 -0.44336313 -0.073835529 0.14405741
-		 -0.3771472 -0.073835529 0.27401346 -0.27401346 -0.073835529 0.37714717 -0.14405741 -0.073835529 0.44336307
-		 -1.3893231e-08 -0.073835529 0.46617952 0.14405736 -0.073835529 0.44336304 0.2740134 -0.073835529 0.37714714
-		 0.37714711 -0.073835529 0.27401343 0.44336301 -0.073835529 0.14405738 0.46617946 -0.073835529 0
-		 0.44888988 0 -0.14585315 0.38184854 0 -0.27742919 0.27742919 0 -0.38184851 0.14585315 0 -0.44888982
-		 0 0 -0.47199067 -0.14585315 0 -0.44888979 -0.27742913 0 -0.38184842 -0.38184839 0 -0.2774291
-		 -0.4488897 0 -0.1458531 -0.47199056 0 0 -0.4488897 0 0.1458531 -0.38184837 0 0.27742907
-		 -0.27742907 0 0.38184834 -0.1458531 0 0.44888964 -1.4066411e-08 0 0.4719905 0.14585306 0 0.44888961
-		 0.27742901 0 0.38184831 0.38184828 0 0.27742904 0.44888958 0 0.14585307 0.47199044 0 0
-		 0.44336331 0.073835529 -0.14405747 0.37714735 0.073835529 -0.27401358 0.27401358 0.073835529 -0.37714735
-		 0.14405745 0.073835529 -0.44336325 0 0.073835529 -0.46617967 -0.14405745 0.073835529 -0.44336322
-		 -0.27401352 0.073835529 -0.37714726 -0.37714723 0.073835529 -0.27401349 -0.44336313 0.073835529 -0.14405741
-		 -0.46617958 0.073835529 0 -0.44336313 0.073835529 0.14405741 -0.3771472 0.073835529 0.27401346
-		 -0.27401346 0.073835529 0.37714717 -0.14405741 0.073835529 0.44336307 -1.3893231e-08 0.073835529 0.46617952
-		 0.14405736 0.073835529 0.44336304 0.2740134 0.073835529 0.37714714 0.37714711 0.073835529 0.27401343
-		 0.44336301 0.073835529 0.14405738 0.46617946 0.073835529 0 0.42691964 0.14585306 -0.1387146
-		 0.36315954 0.14585306 -0.26385084 0.26385084 0.14585306 -0.36315951 0.13871458 0.14585306 -0.42691958
-		 0 0.14585306 -0.44888979 -0.13871458 0.14585306 -0.42691955 -0.26385078 0.14585306 -0.36315945
-		 -0.36315942 0.14585306 -0.26385075 -0.42691949 0.14585306 -0.13871454 -0.4488897 0.14585306 0
-		 -0.42691949 0.14585306 0.13871454 -0.36315939 0.14585306 0.26385072 -0.26385072 0.14585306 0.36315936
-		 -0.13871454 0.14585306 0.42691943 -1.3377952e-08 0.14585306 0.44888964 0.13871451 0.14585306 0.4269194
-		 0.26385066 0.14585306 0.36315933 0.3631593 0.14585306 0.26385069 0.42691937 0.14585306 0.13871451
-		 0.44888958 0.14585306 0 0.3999638 0.21427919 -0.12995611 0.34022954 0.21427919 -0.24719122
-		 0.24719122 0.21427919 -0.34022951 0.1299561 0.21427919 -0.39996377 0 0.21427919 -0.42054677
-		 -0.1299561 0.21427919 -0.39996374 -0.24719116 0.21427919 -0.34022945 -0.34022942 0.21427919 -0.24719113
-		 -0.39996365 0.21427919 -0.12995607 -0.42054665 0.21427919 0 -0.39996365 0.21427919 0.12995607
-		 -0.34022939 0.21427919 0.24719112 -0.24719112 0.21427919 0.34022936 -0.12995607 0.21427919 0.39996362
-		 -1.2533264e-08 0.21427919 0.42054662 0.12995602 0.21427919 0.39996359 0.24719106 0.21427919 0.34022933
-		 0.34022933 0.21427919 0.24719109 0.39996356 0.21427919 0.12995604 0.42054656 0.21427919 0
-		 0.36315954 0.27742901 -0.11799768 0.30892196 0.27742901 -0.22444493 0.22444493 0.27742901 -0.30892193
-		 0.11799767 0.27742901 -0.36315948 0 0.27742901 -0.38184845 -0.11799767 0.27742901 -0.36315945
-		 -0.22444487 0.27742901 -0.30892187 -0.30892184 0.27742901 -0.22444485 -0.36315939 0.27742901 -0.11799763
-		 -0.38184837 0.27742901 0 -0.36315939 0.27742901 0.11799763 -0.30892181 0.27742901 0.22444482
-		 -0.22444482 0.27742901 0.30892178 -0.11799763 0.27742901 0.36315936 -1.1379965e-08 0.27742901 0.38184834
-		 0.1179976 0.27742901 0.36315933 0.22444478 0.27742901 0.30892178 0.30892175 0.27742901 0.22444481
-		 0.3631593 0.27742901 0.11799761 0.38184828 0.27742901 0 0.31741306 0.33374763 -0.10313375
-		 0.27000767 0.33374763 -0.19617204 0.19617204 0.33374763 -0.27000767 0.10313374 0.33374763 -0.31741303
-		 0 0.33374763 -0.33374777 -0.10313374 0.33374763 -0.317413 -0.19617201 0.33374763 -0.27000761
-		 -0.27000758 0.33374763 -0.19617198 -0.31741294 0.33374763 -0.10313371 -0.33374771 0.33374763 0
-		 -0.31741294 0.33374763 0.10313371 -0.27000755 0.33374763 0.19617197 -0.19617197 0.33374763 0.27000755
-		 -0.10313371 0.33374763 0.31741291 -9.9464543e-09 0.33374763 0.33374766 0.10313368 0.33374763 0.31741288
-		 0.19617192 0.33374763 0.27000752 0.27000749 0.33374763 0.19617195 0.31741285 0.33374763 0.10313369
-		 0.33374763 0.33374763 0 0.26385084 0.38184828 -0.085730329 0.22444494 0.38184828 -0.16306879
-		 0.16306879 0.38184828 -0.22444493 0.085730322 0.38184828 -0.26385081 0 0.38184828 -0.27742913
-		 -0.085730322 0.38184828 -0.26385081 -0.16306874 0.38184828 -0.22444487 -0.22444485 0.38184828 -0.16306873
-		 -0.26385075 0.38184828 -0.085730299 -0.27742907 0.38184828 0 -0.26385075 0.38184828 0.085730299
-		 -0.22444484 0.38184828 0.16306871 -0.16306871 0.38184828 0.22444482 -0.085730299 0.38184828 0.26385072
-		 -8.2680289e-09 0.38184828 0.27742904 0.085730277 0.38184828 0.26385069 0.16306868 0.38184828 0.22444481
-		 0.22444479 0.38184828 0.1630687 0.26385069 0.38184828 0.085730284 0.27742901 0.38184828 0
-		 0.20379175 0.42054656 -0.066215955 0.17335562 0.42054656 -0.12595022 0.12595022 0.42054656 -0.17335561
-		 0.066215947 0.42054656 -0.20379172 0 0.42054656 -0.21427929 -0.066215947 0.42054656 -0.20379171
-		 -0.1259502 0.42054656 -0.17335556 -0.17335556 0.42054656 -0.12595019 -0.20379168 0.42054656 -0.066215925
-		 -0.21427923 0.42054656 0 -0.20379168 0.42054656 0.066215925 -0.17335555 0.42054656 0.12595017;
-	setAttr ".vt[332:381]" -0.12595017 0.42054656 0.17335553 -0.066215925 0.42054656 0.20379165
-		 -6.3860175e-09 0.42054656 0.21427922 0.06621591 0.42054656 0.20379163 0.12595014 0.42054656 0.17335552
-		 0.1733555 0.42054656 0.12595016 0.20379162 0.42054656 0.06621591 0.21427919 0.42054656 0
-		 0.13871461 0.44888958 -0.045071106 0.11799769 0.44888958 -0.085730337 0.085730337 0.44888958 -0.11799768
-		 0.045071103 0.44888958 -0.13871458 0 0.44888958 -0.14585315 -0.045071103 0.44888958 -0.13871458
-		 -0.085730322 0.44888958 -0.11799766 -0.11799765 0.44888958 -0.085730307 -0.13871455 0.44888958 -0.045071088
-		 -0.1458531 0.44888958 0 -0.13871455 0.44888958 0.045071088 -0.11799764 0.44888958 0.085730299
-		 -0.085730299 0.44888958 0.11799763 -0.045071088 0.44888958 0.13871454 -4.3467603e-09 0.44888958 0.14585309
-		 0.045071077 0.44888958 0.13871452 0.085730284 0.44888958 0.11799762 0.11799762 0.44888958 0.085730292
-		 0.13871452 0.44888958 0.04507108 0.14585307 0.44888958 0 0.070221849 0.46617946 -0.022816461
-		 0.059734274 0.46617946 -0.043399487 0.043399487 0.46617946 -0.05973427 0.022816459 0.46617946 -0.070221841
-		 0 0.46617946 -0.073835611 -0.022816459 0.46617946 -0.070221834 -0.043399479 0.46617946 -0.059734255
-		 -0.059734251 0.46617946 -0.043399476 -0.070221826 0.46617946 -0.022816451 -0.073835589 0.46617946 0
-		 -0.070221826 0.46617946 0.022816451 -0.059734248 0.46617946 0.043399468 -0.043399468 0.46617946 0.059734244
-		 -0.022816451 0.46617946 0.070221812 -2.2004716e-09 0.46617946 0.073835582 0.022816446 0.46617946 0.070221812
-		 0.043399461 0.46617946 0.05973424 0.059734236 0.46617946 0.043399464 0.070221804 0.46617946 0.022816448
-		 0.073835574 0.46617946 0 0 -0.47199044 0 0 0.47199044 0;
-	setAttr -s 780 ".ed";
-	setAttr ".ed[0:165]"  0 1 1 1 2 1 2 3 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 1
-		 9 10 1 10 11 1 11 12 1 12 13 1 13 14 1 14 15 1 15 16 1 16 17 1 17 18 1 18 19 1 19 0 1
-		 20 21 1 21 22 1 22 23 1 23 24 1 24 25 1 25 26 1 26 27 1 27 28 1 28 29 1 29 30 1 30 31 1
-		 31 32 1 32 33 1 33 34 1 34 35 1 35 36 1 36 37 1 37 38 1 38 39 1 39 20 1 40 41 1 41 42 1
-		 42 43 1 43 44 1 44 45 1 45 46 1 46 47 1 47 48 1 48 49 1 49 50 1 50 51 1 51 52 1 52 53 1
-		 53 54 1 54 55 1 55 56 1 56 57 1 57 58 1 58 59 1 59 40 1 60 61 1 61 62 1 62 63 1 63 64 1
-		 64 65 1 65 66 1 66 67 1 67 68 1 68 69 1 69 70 1 70 71 1 71 72 1 72 73 1 73 74 1 74 75 1
-		 75 76 1 76 77 1 77 78 1 78 79 1 79 60 1 80 81 1 81 82 1 82 83 1 83 84 1 84 85 1 85 86 1
-		 86 87 1 87 88 1 88 89 1 89 90 1 90 91 1 91 92 1 92 93 1 93 94 1 94 95 1 95 96 1 96 97 1
-		 97 98 1 98 99 1 99 80 1 100 101 1 101 102 1 102 103 1 103 104 1 104 105 1 105 106 1
-		 106 107 1 107 108 1 108 109 1 109 110 1 110 111 1 111 112 1 112 113 1 113 114 1 114 115 1
-		 115 116 1 116 117 1 117 118 1 118 119 1 119 100 1 120 121 1 121 122 1 122 123 1 123 124 1
-		 124 125 1 125 126 1 126 127 1 127 128 1 128 129 1 129 130 1 130 131 1 131 132 1 132 133 1
-		 133 134 1 134 135 1 135 136 1 136 137 1 137 138 1 138 139 1 139 120 1 140 141 1 141 142 1
-		 142 143 1 143 144 1 144 145 1 145 146 1 146 147 1 147 148 1 148 149 1 149 150 1 150 151 1
-		 151 152 1 152 153 1 153 154 1 154 155 1 155 156 1 156 157 1 157 158 1 158 159 1 159 140 1
-		 160 161 1 161 162 1 162 163 1 163 164 1 164 165 1 165 166 1;
-	setAttr ".ed[166:331]" 166 167 1 167 168 1 168 169 1 169 170 1 170 171 1 171 172 1
-		 172 173 1 173 174 1 174 175 1 175 176 1 176 177 1 177 178 1 178 179 1 179 160 1 180 181 1
-		 181 182 1 182 183 1 183 184 1 184 185 1 185 186 1 186 187 1 187 188 1 188 189 1 189 190 1
-		 190 191 1 191 192 1 192 193 1 193 194 1 194 195 1 195 196 1 196 197 1 197 198 1 198 199 1
-		 199 180 1 200 201 1 201 202 1 202 203 1 203 204 1 204 205 1 205 206 1 206 207 1 207 208 1
-		 208 209 1 209 210 1 210 211 1 211 212 1 212 213 1 213 214 1 214 215 1 215 216 1 216 217 1
-		 217 218 1 218 219 1 219 200 1 220 221 1 221 222 1 222 223 1 223 224 1 224 225 1 225 226 1
-		 226 227 1 227 228 1 228 229 1 229 230 1 230 231 1 231 232 1 232 233 1 233 234 1 234 235 1
-		 235 236 1 236 237 1 237 238 1 238 239 1 239 220 1 240 241 1 241 242 1 242 243 1 243 244 1
-		 244 245 1 245 246 1 246 247 1 247 248 1 248 249 1 249 250 1 250 251 1 251 252 1 252 253 1
-		 253 254 1 254 255 1 255 256 1 256 257 1 257 258 1 258 259 1 259 240 1 260 261 1 261 262 1
-		 262 263 1 263 264 1 264 265 1 265 266 1 266 267 1 267 268 1 268 269 1 269 270 1 270 271 1
-		 271 272 1 272 273 1 273 274 1 274 275 1 275 276 1 276 277 1 277 278 1 278 279 1 279 260 1
-		 280 281 1 281 282 1 282 283 1 283 284 1 284 285 1 285 286 1 286 287 1 287 288 1 288 289 1
-		 289 290 1 290 291 1 291 292 1 292 293 1 293 294 1 294 295 1 295 296 1 296 297 1 297 298 1
-		 298 299 1 299 280 1 300 301 1 301 302 1 302 303 1 303 304 1 304 305 1 305 306 1 306 307 1
-		 307 308 1 308 309 1 309 310 1 310 311 1 311 312 1 312 313 1 313 314 1 314 315 1 315 316 1
-		 316 317 1 317 318 1 318 319 1 319 300 1 320 321 1 321 322 1 322 323 1 323 324 1 324 325 1
-		 325 326 1 326 327 1 327 328 1 328 329 1 329 330 1 330 331 1 331 332 1;
-	setAttr ".ed[332:497]" 332 333 1 333 334 1 334 335 1 335 336 1 336 337 1 337 338 1
-		 338 339 1 339 320 1 340 341 1 341 342 1 342 343 1 343 344 1 344 345 1 345 346 1 346 347 1
-		 347 348 1 348 349 1 349 350 1 350 351 1 351 352 1 352 353 1 353 354 1 354 355 1 355 356 1
-		 356 357 1 357 358 1 358 359 1 359 340 1 360 361 1 361 362 1 362 363 1 363 364 1 364 365 1
-		 365 366 1 366 367 1 367 368 1 368 369 1 369 370 1 370 371 1 371 372 1 372 373 1 373 374 1
-		 374 375 1 375 376 1 376 377 1 377 378 1 378 379 1 379 360 1 0 20 1 1 21 1 2 22 1
-		 3 23 1 4 24 1 5 25 1 6 26 1 7 27 1 8 28 1 9 29 1 10 30 1 11 31 1 12 32 1 13 33 1
-		 14 34 1 15 35 1 16 36 1 17 37 1 18 38 1 19 39 1 20 40 1 21 41 1 22 42 1 23 43 1 24 44 1
-		 25 45 1 26 46 1 27 47 1 28 48 1 29 49 1 30 50 1 31 51 1 32 52 1 33 53 1 34 54 1 35 55 1
-		 36 56 1 37 57 1 38 58 1 39 59 1 40 60 1 41 61 1 42 62 1 43 63 1 44 64 1 45 65 1 46 66 1
-		 47 67 1 48 68 1 49 69 1 50 70 1 51 71 1 52 72 1 53 73 1 54 74 1 55 75 1 56 76 1 57 77 1
-		 58 78 1 59 79 1 60 80 1 61 81 1 62 82 1 63 83 1 64 84 1 65 85 1 66 86 1 67 87 1 68 88 1
-		 69 89 1 70 90 1 71 91 1 72 92 1 73 93 1 74 94 1 75 95 1 76 96 1 77 97 1 78 98 1 79 99 1
-		 80 100 1 81 101 1 82 102 1 83 103 1 84 104 1 85 105 1 86 106 1 87 107 1 88 108 1
-		 89 109 1 90 110 1 91 111 1 92 112 1 93 113 1 94 114 1 95 115 1 96 116 1 97 117 1
-		 98 118 1 99 119 1 100 120 1 101 121 1 102 122 1 103 123 1 104 124 1 105 125 1 106 126 1
-		 107 127 1 108 128 1 109 129 1 110 130 1 111 131 1 112 132 1 113 133 1 114 134 1 115 135 1
-		 116 136 1 117 137 1;
-	setAttr ".ed[498:663]" 118 138 1 119 139 1 120 140 1 121 141 1 122 142 1 123 143 1
-		 124 144 1 125 145 1 126 146 1 127 147 1 128 148 1 129 149 1 130 150 1 131 151 1 132 152 1
-		 133 153 1 134 154 1 135 155 1 136 156 1 137 157 1 138 158 1 139 159 1 140 160 1 141 161 1
-		 142 162 1 143 163 1 144 164 1 145 165 1 146 166 1 147 167 1 148 168 1 149 169 1 150 170 1
-		 151 171 1 152 172 1 153 173 1 154 174 1 155 175 1 156 176 1 157 177 1 158 178 1 159 179 1
-		 160 180 1 161 181 1 162 182 1 163 183 1 164 184 1 165 185 1 166 186 1 167 187 1 168 188 1
-		 169 189 1 170 190 1 171 191 1 172 192 1 173 193 1 174 194 1 175 195 1 176 196 1 177 197 1
-		 178 198 1 179 199 1 180 200 1 181 201 1 182 202 1 183 203 1 184 204 1 185 205 1 186 206 1
-		 187 207 1 188 208 1 189 209 1 190 210 1 191 211 1 192 212 1 193 213 1 194 214 1 195 215 1
-		 196 216 1 197 217 1 198 218 1 199 219 1 200 220 1 201 221 1 202 222 1 203 223 1 204 224 1
-		 205 225 1 206 226 1 207 227 1 208 228 1 209 229 1 210 230 1 211 231 1 212 232 1 213 233 1
-		 214 234 1 215 235 1 216 236 1 217 237 1 218 238 1 219 239 1 220 240 1 221 241 1 222 242 1
-		 223 243 1 224 244 1 225 245 1 226 246 1 227 247 1 228 248 1 229 249 1 230 250 1 231 251 1
-		 232 252 1 233 253 1 234 254 1 235 255 1 236 256 1 237 257 1 238 258 1 239 259 1 240 260 1
-		 241 261 1 242 262 1 243 263 1 244 264 1 245 265 1 246 266 1 247 267 1 248 268 1 249 269 1
-		 250 270 1 251 271 1 252 272 1 253 273 1 254 274 1 255 275 1 256 276 1 257 277 1 258 278 1
-		 259 279 1 260 280 1 261 281 1 262 282 1 263 283 1 264 284 1 265 285 1 266 286 1 267 287 1
-		 268 288 1 269 289 1 270 290 1 271 291 1 272 292 1 273 293 1 274 294 1 275 295 1 276 296 1
-		 277 297 1 278 298 1 279 299 1 280 300 1 281 301 1 282 302 1 283 303 1;
-	setAttr ".ed[664:779]" 284 304 1 285 305 1 286 306 1 287 307 1 288 308 1 289 309 1
-		 290 310 1 291 311 1 292 312 1 293 313 1 294 314 1 295 315 1 296 316 1 297 317 1 298 318 1
-		 299 319 1 300 320 1 301 321 1 302 322 1 303 323 1 304 324 1 305 325 1 306 326 1 307 327 1
-		 308 328 1 309 329 1 310 330 1 311 331 1 312 332 1 313 333 1 314 334 1 315 335 1 316 336 1
-		 317 337 1 318 338 1 319 339 1 320 340 1 321 341 1 322 342 1 323 343 1 324 344 1 325 345 1
-		 326 346 1 327 347 1 328 348 1 329 349 1 330 350 1 331 351 1 332 352 1 333 353 1 334 354 1
-		 335 355 1 336 356 1 337 357 1 338 358 1 339 359 1 340 360 1 341 361 1 342 362 1 343 363 1
-		 344 364 1 345 365 1 346 366 1 347 367 1 348 368 1 349 369 1 350 370 1 351 371 1 352 372 1
-		 353 373 1 354 374 1 355 375 1 356 376 1 357 377 1 358 378 1 359 379 1 380 0 1 380 1 1
-		 380 2 1 380 3 1 380 4 1 380 5 1 380 6 1 380 7 1 380 8 1 380 9 1 380 10 1 380 11 1
-		 380 12 1 380 13 1 380 14 1 380 15 1 380 16 1 380 17 1 380 18 1 380 19 1 360 381 1
-		 361 381 1 362 381 1 363 381 1 364 381 1 365 381 1 366 381 1 367 381 1 368 381 1 369 381 1
-		 370 381 1 371 381 1 372 381 1 373 381 1 374 381 1 375 381 1 376 381 1 377 381 1 378 381 1
-		 379 381 1;
-	setAttr -s 400 -ch 1560 ".fc[0:399]" -type "polyFaces" 
-		f 4 0 381 -21 -381
-		mu 0 4 0 1 22 21
-		f 4 1 382 -22 -382
-		mu 0 4 1 2 23 22
-		f 4 2 383 -23 -383
-		mu 0 4 2 3 24 23
-		f 4 3 384 -24 -384
-		mu 0 4 3 4 25 24
-		f 4 4 385 -25 -385
-		mu 0 4 4 5 26 25
-		f 4 5 386 -26 -386
-		mu 0 4 5 6 27 26
-		f 4 6 387 -27 -387
-		mu 0 4 6 7 28 27
-		f 4 7 388 -28 -388
-		mu 0 4 7 8 29 28
-		f 4 8 389 -29 -389
-		mu 0 4 8 9 30 29
-		f 4 9 390 -30 -390
-		mu 0 4 9 10 31 30
-		f 4 10 391 -31 -391
-		mu 0 4 10 11 32 31
-		f 4 11 392 -32 -392
-		mu 0 4 11 12 33 32
-		f 4 12 393 -33 -393
-		mu 0 4 12 13 34 33
-		f 4 13 394 -34 -394
-		mu 0 4 13 14 35 34
-		f 4 14 395 -35 -395
-		mu 0 4 14 15 36 35
-		f 4 15 396 -36 -396
-		mu 0 4 15 16 37 36
-		f 4 16 397 -37 -397
-		mu 0 4 16 17 38 37
-		f 4 17 398 -38 -398
-		mu 0 4 17 18 39 38
-		f 4 18 399 -39 -399
-		mu 0 4 18 19 40 39
-		f 4 19 380 -40 -400
-		mu 0 4 19 20 41 40
-		f 4 20 401 -41 -401
-		mu 0 4 21 22 43 42
-		f 4 21 402 -42 -402
-		mu 0 4 22 23 44 43
-		f 4 22 403 -43 -403
-		mu 0 4 23 24 45 44
-		f 4 23 404 -44 -404
-		mu 0 4 24 25 46 45
-		f 4 24 405 -45 -405
-		mu 0 4 25 26 47 46
-		f 4 25 406 -46 -406
-		mu 0 4 26 27 48 47
-		f 4 26 407 -47 -407
-		mu 0 4 27 28 49 48
-		f 4 27 408 -48 -408
-		mu 0 4 28 29 50 49
-		f 4 28 409 -49 -409
-		mu 0 4 29 30 51 50
-		f 4 29 410 -50 -410
-		mu 0 4 30 31 52 51
-		f 4 30 411 -51 -411
-		mu 0 4 31 32 53 52
-		f 4 31 412 -52 -412
-		mu 0 4 32 33 54 53
-		f 4 32 413 -53 -413
-		mu 0 4 33 34 55 54
-		f 4 33 414 -54 -414
-		mu 0 4 34 35 56 55
-		f 4 34 415 -55 -415
-		mu 0 4 35 36 57 56
-		f 4 35 416 -56 -416
-		mu 0 4 36 37 58 57
-		f 4 36 417 -57 -417
-		mu 0 4 37 38 59 58
-		f 4 37 418 -58 -418
-		mu 0 4 38 39 60 59
-		f 4 38 419 -59 -419
-		mu 0 4 39 40 61 60
-		f 4 39 400 -60 -420
-		mu 0 4 40 41 62 61
-		f 4 40 421 -61 -421
-		mu 0 4 42 43 64 63
-		f 4 41 422 -62 -422
-		mu 0 4 43 44 65 64
-		f 4 42 423 -63 -423
-		mu 0 4 44 45 66 65
-		f 4 43 424 -64 -424
-		mu 0 4 45 46 67 66
-		f 4 44 425 -65 -425
-		mu 0 4 46 47 68 67
-		f 4 45 426 -66 -426
-		mu 0 4 47 48 69 68
-		f 4 46 427 -67 -427
-		mu 0 4 48 49 70 69
-		f 4 47 428 -68 -428
-		mu 0 4 49 50 71 70
-		f 4 48 429 -69 -429
-		mu 0 4 50 51 72 71
-		f 4 49 430 -70 -430
-		mu 0 4 51 52 73 72
-		f 4 50 431 -71 -431
-		mu 0 4 52 53 74 73
-		f 4 51 432 -72 -432
-		mu 0 4 53 54 75 74
-		f 4 52 433 -73 -433
-		mu 0 4 54 55 76 75
-		f 4 53 434 -74 -434
-		mu 0 4 55 56 77 76
-		f 4 54 435 -75 -435
-		mu 0 4 56 57 78 77
-		f 4 55 436 -76 -436
-		mu 0 4 57 58 79 78
-		f 4 56 437 -77 -437
-		mu 0 4 58 59 80 79
-		f 4 57 438 -78 -438
-		mu 0 4 59 60 81 80
-		f 4 58 439 -79 -439
-		mu 0 4 60 61 82 81
-		f 4 59 420 -80 -440
-		mu 0 4 61 62 83 82
-		f 4 60 441 -81 -441
-		mu 0 4 63 64 85 84
-		f 4 61 442 -82 -442
-		mu 0 4 64 65 86 85
-		f 4 62 443 -83 -443
-		mu 0 4 65 66 87 86
-		f 4 63 444 -84 -444
-		mu 0 4 66 67 88 87
-		f 4 64 445 -85 -445
-		mu 0 4 67 68 89 88
-		f 4 65 446 -86 -446
-		mu 0 4 68 69 90 89
-		f 4 66 447 -87 -447
-		mu 0 4 69 70 91 90
-		f 4 67 448 -88 -448
-		mu 0 4 70 71 92 91
-		f 4 68 449 -89 -449
-		mu 0 4 71 72 93 92
-		f 4 69 450 -90 -450
-		mu 0 4 72 73 94 93
-		f 4 70 451 -91 -451
-		mu 0 4 73 74 95 94
-		f 4 71 452 -92 -452
-		mu 0 4 74 75 96 95
-		f 4 72 453 -93 -453
-		mu 0 4 75 76 97 96
-		f 4 73 454 -94 -454
-		mu 0 4 76 77 98 97
-		f 4 74 455 -95 -455
-		mu 0 4 77 78 99 98
-		f 4 75 456 -96 -456
-		mu 0 4 78 79 100 99
-		f 4 76 457 -97 -457
-		mu 0 4 79 80 101 100
-		f 4 77 458 -98 -458
-		mu 0 4 80 81 102 101
-		f 4 78 459 -99 -459
-		mu 0 4 81 82 103 102
-		f 4 79 440 -100 -460
-		mu 0 4 82 83 104 103
-		f 4 80 461 -101 -461
-		mu 0 4 84 85 106 105
-		f 4 81 462 -102 -462
-		mu 0 4 85 86 107 106
-		f 4 82 463 -103 -463
-		mu 0 4 86 87 108 107
-		f 4 83 464 -104 -464
-		mu 0 4 87 88 109 108
-		f 4 84 465 -105 -465
-		mu 0 4 88 89 110 109
-		f 4 85 466 -106 -466
-		mu 0 4 89 90 111 110
-		f 4 86 467 -107 -467
-		mu 0 4 90 91 112 111
-		f 4 87 468 -108 -468
-		mu 0 4 91 92 113 112
-		f 4 88 469 -109 -469
-		mu 0 4 92 93 114 113
-		f 4 89 470 -110 -470
-		mu 0 4 93 94 115 114
-		f 4 90 471 -111 -471
-		mu 0 4 94 95 116 115
-		f 4 91 472 -112 -472
-		mu 0 4 95 96 117 116
-		f 4 92 473 -113 -473
-		mu 0 4 96 97 118 117
-		f 4 93 474 -114 -474
-		mu 0 4 97 98 119 118
-		f 4 94 475 -115 -475
-		mu 0 4 98 99 120 119
-		f 4 95 476 -116 -476
-		mu 0 4 99 100 121 120
-		f 4 96 477 -117 -477
-		mu 0 4 100 101 122 121
-		f 4 97 478 -118 -478
-		mu 0 4 101 102 123 122
-		f 4 98 479 -119 -479
-		mu 0 4 102 103 124 123
-		f 4 99 460 -120 -480
-		mu 0 4 103 104 125 124
-		f 4 100 481 -121 -481
-		mu 0 4 105 106 127 126
-		f 4 101 482 -122 -482
-		mu 0 4 106 107 128 127
-		f 4 102 483 -123 -483
-		mu 0 4 107 108 129 128
-		f 4 103 484 -124 -484
-		mu 0 4 108 109 130 129
-		f 4 104 485 -125 -485
-		mu 0 4 109 110 131 130
-		f 4 105 486 -126 -486
-		mu 0 4 110 111 132 131
-		f 4 106 487 -127 -487
-		mu 0 4 111 112 133 132
-		f 4 107 488 -128 -488
-		mu 0 4 112 113 134 133
-		f 4 108 489 -129 -489
-		mu 0 4 113 114 135 134
-		f 4 109 490 -130 -490
-		mu 0 4 114 115 136 135
-		f 4 110 491 -131 -491
-		mu 0 4 115 116 137 136
-		f 4 111 492 -132 -492
-		mu 0 4 116 117 138 137
-		f 4 112 493 -133 -493
-		mu 0 4 117 118 139 138
-		f 4 113 494 -134 -494
-		mu 0 4 118 119 140 139
-		f 4 114 495 -135 -495
-		mu 0 4 119 120 141 140
-		f 4 115 496 -136 -496
-		mu 0 4 120 121 142 141
-		f 4 116 497 -137 -497
-		mu 0 4 121 122 143 142
-		f 4 117 498 -138 -498
-		mu 0 4 122 123 144 143
-		f 4 118 499 -139 -499
-		mu 0 4 123 124 145 144
-		f 4 119 480 -140 -500
-		mu 0 4 124 125 146 145
-		f 4 120 501 -141 -501
-		mu 0 4 126 127 148 147
-		f 4 121 502 -142 -502
-		mu 0 4 127 128 149 148
-		f 4 122 503 -143 -503
-		mu 0 4 128 129 150 149
-		f 4 123 504 -144 -504
-		mu 0 4 129 130 151 150
-		f 4 124 505 -145 -505
-		mu 0 4 130 131 152 151
-		f 4 125 506 -146 -506
-		mu 0 4 131 132 153 152
-		f 4 126 507 -147 -507
-		mu 0 4 132 133 154 153
-		f 4 127 508 -148 -508
-		mu 0 4 133 134 155 154
-		f 4 128 509 -149 -509
-		mu 0 4 134 135 156 155
-		f 4 129 510 -150 -510
-		mu 0 4 135 136 157 156
-		f 4 130 511 -151 -511
-		mu 0 4 136 137 158 157
-		f 4 131 512 -152 -512
-		mu 0 4 137 138 159 158
-		f 4 132 513 -153 -513
-		mu 0 4 138 139 160 159
-		f 4 133 514 -154 -514
-		mu 0 4 139 140 161 160
-		f 4 134 515 -155 -515
-		mu 0 4 140 141 162 161
-		f 4 135 516 -156 -516
-		mu 0 4 141 142 163 162
-		f 4 136 517 -157 -517
-		mu 0 4 142 143 164 163
-		f 4 137 518 -158 -518
-		mu 0 4 143 144 165 164
-		f 4 138 519 -159 -519
-		mu 0 4 144 145 166 165
-		f 4 139 500 -160 -520
-		mu 0 4 145 146 167 166
-		f 4 140 521 -161 -521
-		mu 0 4 147 148 169 168
-		f 4 141 522 -162 -522
-		mu 0 4 148 149 170 169
-		f 4 142 523 -163 -523
-		mu 0 4 149 150 171 170
-		f 4 143 524 -164 -524
-		mu 0 4 150 151 172 171
-		f 4 144 525 -165 -525
-		mu 0 4 151 152 173 172
-		f 4 145 526 -166 -526
-		mu 0 4 152 153 174 173
-		f 4 146 527 -167 -527
-		mu 0 4 153 154 175 174
-		f 4 147 528 -168 -528
-		mu 0 4 154 155 176 175
-		f 4 148 529 -169 -529
-		mu 0 4 155 156 177 176
-		f 4 149 530 -170 -530
-		mu 0 4 156 157 178 177
-		f 4 150 531 -171 -531
-		mu 0 4 157 158 179 178
-		f 4 151 532 -172 -532
-		mu 0 4 158 159 180 179
-		f 4 152 533 -173 -533
-		mu 0 4 159 160 181 180
-		f 4 153 534 -174 -534
-		mu 0 4 160 161 182 181
-		f 4 154 535 -175 -535
-		mu 0 4 161 162 183 182
-		f 4 155 536 -176 -536
-		mu 0 4 162 163 184 183
-		f 4 156 537 -177 -537
-		mu 0 4 163 164 185 184
-		f 4 157 538 -178 -538
-		mu 0 4 164 165 186 185
-		f 4 158 539 -179 -539
-		mu 0 4 165 166 187 186
-		f 4 159 520 -180 -540
-		mu 0 4 166 167 188 187
-		f 4 160 541 -181 -541
-		mu 0 4 168 169 190 189
-		f 4 161 542 -182 -542
-		mu 0 4 169 170 191 190
-		f 4 162 543 -183 -543
-		mu 0 4 170 171 192 191
-		f 4 163 544 -184 -544
-		mu 0 4 171 172 193 192
-		f 4 164 545 -185 -545
-		mu 0 4 172 173 194 193
-		f 4 165 546 -186 -546
-		mu 0 4 173 174 195 194
-		f 4 166 547 -187 -547
-		mu 0 4 174 175 196 195
-		f 4 167 548 -188 -548
-		mu 0 4 175 176 197 196
-		f 4 168 549 -189 -549
-		mu 0 4 176 177 198 197
-		f 4 169 550 -190 -550
-		mu 0 4 177 178 199 198
-		f 4 170 551 -191 -551
-		mu 0 4 178 179 200 199
-		f 4 171 552 -192 -552
-		mu 0 4 179 180 201 200
-		f 4 172 553 -193 -553
-		mu 0 4 180 181 202 201
-		f 4 173 554 -194 -554
-		mu 0 4 181 182 203 202
-		f 4 174 555 -195 -555
-		mu 0 4 182 183 204 203
-		f 4 175 556 -196 -556
-		mu 0 4 183 184 205 204
-		f 4 176 557 -197 -557
-		mu 0 4 184 185 206 205
-		f 4 177 558 -198 -558
-		mu 0 4 185 186 207 206
-		f 4 178 559 -199 -559
-		mu 0 4 186 187 208 207
-		f 4 179 540 -200 -560
-		mu 0 4 187 188 209 208
-		f 4 180 561 -201 -561
-		mu 0 4 189 190 211 210
-		f 4 181 562 -202 -562
-		mu 0 4 190 191 212 211
-		f 4 182 563 -203 -563
-		mu 0 4 191 192 213 212
-		f 4 183 564 -204 -564
-		mu 0 4 192 193 214 213
-		f 4 184 565 -205 -565
-		mu 0 4 193 194 215 214
-		f 4 185 566 -206 -566
-		mu 0 4 194 195 216 215
-		f 4 186 567 -207 -567
-		mu 0 4 195 196 217 216
-		f 4 187 568 -208 -568
-		mu 0 4 196 197 218 217
-		f 4 188 569 -209 -569
-		mu 0 4 197 198 219 218
-		f 4 189 570 -210 -570
-		mu 0 4 198 199 220 219
-		f 4 190 571 -211 -571
-		mu 0 4 199 200 221 220
-		f 4 191 572 -212 -572
-		mu 0 4 200 201 222 221
-		f 4 192 573 -213 -573
-		mu 0 4 201 202 223 222
-		f 4 193 574 -214 -574
-		mu 0 4 202 203 224 223
-		f 4 194 575 -215 -575
-		mu 0 4 203 204 225 224
-		f 4 195 576 -216 -576
-		mu 0 4 204 205 226 225
-		f 4 196 577 -217 -577
-		mu 0 4 205 206 227 226
-		f 4 197 578 -218 -578
-		mu 0 4 206 207 228 227
-		f 4 198 579 -219 -579
-		mu 0 4 207 208 229 228
-		f 4 199 560 -220 -580
-		mu 0 4 208 209 230 229
-		f 4 200 581 -221 -581
-		mu 0 4 210 211 232 231
-		f 4 201 582 -222 -582
-		mu 0 4 211 212 233 232
-		f 4 202 583 -223 -583
-		mu 0 4 212 213 234 233
-		f 4 203 584 -224 -584
-		mu 0 4 213 214 235 234
-		f 4 204 585 -225 -585
-		mu 0 4 214 215 236 235
-		f 4 205 586 -226 -586
-		mu 0 4 215 216 237 236
-		f 4 206 587 -227 -587
-		mu 0 4 216 217 238 237
-		f 4 207 588 -228 -588
-		mu 0 4 217 218 239 238
-		f 4 208 589 -229 -589
-		mu 0 4 218 219 240 239
-		f 4 209 590 -230 -590
-		mu 0 4 219 220 241 240
-		f 4 210 591 -231 -591
-		mu 0 4 220 221 242 241
-		f 4 211 592 -232 -592
-		mu 0 4 221 222 243 242
-		f 4 212 593 -233 -593
-		mu 0 4 222 223 244 243
-		f 4 213 594 -234 -594
-		mu 0 4 223 224 245 244
-		f 4 214 595 -235 -595
-		mu 0 4 224 225 246 245
-		f 4 215 596 -236 -596
-		mu 0 4 225 226 247 246
-		f 4 216 597 -237 -597
-		mu 0 4 226 227 248 247
-		f 4 217 598 -238 -598
-		mu 0 4 227 228 249 248
-		f 4 218 599 -239 -599
-		mu 0 4 228 229 250 249
-		f 4 219 580 -240 -600
-		mu 0 4 229 230 251 250
-		f 4 220 601 -241 -601
-		mu 0 4 231 232 253 252
-		f 4 221 602 -242 -602
-		mu 0 4 232 233 254 253
-		f 4 222 603 -243 -603
-		mu 0 4 233 234 255 254
-		f 4 223 604 -244 -604
-		mu 0 4 234 235 256 255
-		f 4 224 605 -245 -605
-		mu 0 4 235 236 257 256
-		f 4 225 606 -246 -606
-		mu 0 4 236 237 258 257
-		f 4 226 607 -247 -607
-		mu 0 4 237 238 259 258
-		f 4 227 608 -248 -608
-		mu 0 4 238 239 260 259
-		f 4 228 609 -249 -609
-		mu 0 4 239 240 261 260
-		f 4 229 610 -250 -610
-		mu 0 4 240 241 262 261
-		f 4 230 611 -251 -611
-		mu 0 4 241 242 263 262
-		f 4 231 612 -252 -612
-		mu 0 4 242 243 264 263
-		f 4 232 613 -253 -613
-		mu 0 4 243 244 265 264
-		f 4 233 614 -254 -614
-		mu 0 4 244 245 266 265
-		f 4 234 615 -255 -615
-		mu 0 4 245 246 267 266
-		f 4 235 616 -256 -616
-		mu 0 4 246 247 268 267
-		f 4 236 617 -257 -617
-		mu 0 4 247 248 269 268
-		f 4 237 618 -258 -618
-		mu 0 4 248 249 270 269
-		f 4 238 619 -259 -619
-		mu 0 4 249 250 271 270
-		f 4 239 600 -260 -620
-		mu 0 4 250 251 272 271
-		f 4 240 621 -261 -621
-		mu 0 4 252 253 274 273
-		f 4 241 622 -262 -622
-		mu 0 4 253 254 275 274
-		f 4 242 623 -263 -623
-		mu 0 4 254 255 276 275
-		f 4 243 624 -264 -624
-		mu 0 4 255 256 277 276
-		f 4 244 625 -265 -625
-		mu 0 4 256 257 278 277
-		f 4 245 626 -266 -626
-		mu 0 4 257 258 279 278
-		f 4 246 627 -267 -627
-		mu 0 4 258 259 280 279
-		f 4 247 628 -268 -628
-		mu 0 4 259 260 281 280
-		f 4 248 629 -269 -629
-		mu 0 4 260 261 282 281
-		f 4 249 630 -270 -630
-		mu 0 4 261 262 283 282
-		f 4 250 631 -271 -631
-		mu 0 4 262 263 284 283
-		f 4 251 632 -272 -632
-		mu 0 4 263 264 285 284
-		f 4 252 633 -273 -633
-		mu 0 4 264 265 286 285
-		f 4 253 634 -274 -634
-		mu 0 4 265 266 287 286
-		f 4 254 635 -275 -635
-		mu 0 4 266 267 288 287
-		f 4 255 636 -276 -636
-		mu 0 4 267 268 289 288
-		f 4 256 637 -277 -637
-		mu 0 4 268 269 290 289
-		f 4 257 638 -278 -638
-		mu 0 4 269 270 291 290
-		f 4 258 639 -279 -639
-		mu 0 4 270 271 292 291
-		f 4 259 620 -280 -640
-		mu 0 4 271 272 293 292
-		f 4 260 641 -281 -641
-		mu 0 4 273 274 295 294
-		f 4 261 642 -282 -642
-		mu 0 4 274 275 296 295
-		f 4 262 643 -283 -643
-		mu 0 4 275 276 297 296
-		f 4 263 644 -284 -644
-		mu 0 4 276 277 298 297
-		f 4 264 645 -285 -645
-		mu 0 4 277 278 299 298
-		f 4 265 646 -286 -646
-		mu 0 4 278 279 300 299
-		f 4 266 647 -287 -647
-		mu 0 4 279 280 301 300
-		f 4 267 648 -288 -648
-		mu 0 4 280 281 302 301
-		f 4 268 649 -289 -649
-		mu 0 4 281 282 303 302
-		f 4 269 650 -290 -650
-		mu 0 4 282 283 304 303
-		f 4 270 651 -291 -651
-		mu 0 4 283 284 305 304
-		f 4 271 652 -292 -652
-		mu 0 4 284 285 306 305
-		f 4 272 653 -293 -653
-		mu 0 4 285 286 307 306
-		f 4 273 654 -294 -654
-		mu 0 4 286 287 308 307
-		f 4 274 655 -295 -655
-		mu 0 4 287 288 309 308
-		f 4 275 656 -296 -656
-		mu 0 4 288 289 310 309
-		f 4 276 657 -297 -657
-		mu 0 4 289 290 311 310
-		f 4 277 658 -298 -658
-		mu 0 4 290 291 312 311
-		f 4 278 659 -299 -659
-		mu 0 4 291 292 313 312
-		f 4 279 640 -300 -660
-		mu 0 4 292 293 314 313
-		f 4 280 661 -301 -661
-		mu 0 4 294 295 316 315
-		f 4 281 662 -302 -662
-		mu 0 4 295 296 317 316
-		f 4 282 663 -303 -663
-		mu 0 4 296 297 318 317
-		f 4 283 664 -304 -664
-		mu 0 4 297 298 319 318
-		f 4 284 665 -305 -665
-		mu 0 4 298 299 320 319
-		f 4 285 666 -306 -666
-		mu 0 4 299 300 321 320
-		f 4 286 667 -307 -667
-		mu 0 4 300 301 322 321
-		f 4 287 668 -308 -668
-		mu 0 4 301 302 323 322
-		f 4 288 669 -309 -669
-		mu 0 4 302 303 324 323
-		f 4 289 670 -310 -670
-		mu 0 4 303 304 325 324
-		f 4 290 671 -311 -671
-		mu 0 4 304 305 326 325
-		f 4 291 672 -312 -672
-		mu 0 4 305 306 327 326
-		f 4 292 673 -313 -673
-		mu 0 4 306 307 328 327
-		f 4 293 674 -314 -674
-		mu 0 4 307 308 329 328
-		f 4 294 675 -315 -675
-		mu 0 4 308 309 330 329
-		f 4 295 676 -316 -676
-		mu 0 4 309 310 331 330
-		f 4 296 677 -317 -677
-		mu 0 4 310 311 332 331
-		f 4 297 678 -318 -678
-		mu 0 4 311 312 333 332
-		f 4 298 679 -319 -679
-		mu 0 4 312 313 334 333
-		f 4 299 660 -320 -680
-		mu 0 4 313 314 335 334
-		f 4 300 681 -321 -681
-		mu 0 4 315 316 337 336
-		f 4 301 682 -322 -682
-		mu 0 4 316 317 338 337
-		f 4 302 683 -323 -683
-		mu 0 4 317 318 339 338
-		f 4 303 684 -324 -684
-		mu 0 4 318 319 340 339
-		f 4 304 685 -325 -685
-		mu 0 4 319 320 341 340
-		f 4 305 686 -326 -686
-		mu 0 4 320 321 342 341
-		f 4 306 687 -327 -687
-		mu 0 4 321 322 343 342
-		f 4 307 688 -328 -688
-		mu 0 4 322 323 344 343
-		f 4 308 689 -329 -689
-		mu 0 4 323 324 345 344
-		f 4 309 690 -330 -690
-		mu 0 4 324 325 346 345
-		f 4 310 691 -331 -691
-		mu 0 4 325 326 347 346
-		f 4 311 692 -332 -692
-		mu 0 4 326 327 348 347
-		f 4 312 693 -333 -693
-		mu 0 4 327 328 349 348
-		f 4 313 694 -334 -694
-		mu 0 4 328 329 350 349
-		f 4 314 695 -335 -695
-		mu 0 4 329 330 351 350
-		f 4 315 696 -336 -696
-		mu 0 4 330 331 352 351
-		f 4 316 697 -337 -697
-		mu 0 4 331 332 353 352
-		f 4 317 698 -338 -698
-		mu 0 4 332 333 354 353
-		f 4 318 699 -339 -699
-		mu 0 4 333 334 355 354
-		f 4 319 680 -340 -700
-		mu 0 4 334 335 356 355
-		f 4 320 701 -341 -701
-		mu 0 4 336 337 358 357
-		f 4 321 702 -342 -702
-		mu 0 4 337 338 359 358
-		f 4 322 703 -343 -703
-		mu 0 4 338 339 360 359
-		f 4 323 704 -344 -704
-		mu 0 4 339 340 361 360
-		f 4 324 705 -345 -705
-		mu 0 4 340 341 362 361
-		f 4 325 706 -346 -706
-		mu 0 4 341 342 363 362
-		f 4 326 707 -347 -707
-		mu 0 4 342 343 364 363
-		f 4 327 708 -348 -708
-		mu 0 4 343 344 365 364
-		f 4 328 709 -349 -709
-		mu 0 4 344 345 366 365
-		f 4 329 710 -350 -710
-		mu 0 4 345 346 367 366
-		f 4 330 711 -351 -711
-		mu 0 4 346 347 368 367
-		f 4 331 712 -352 -712
-		mu 0 4 347 348 369 368
-		f 4 332 713 -353 -713
-		mu 0 4 348 349 370 369
-		f 4 333 714 -354 -714
-		mu 0 4 349 350 371 370
-		f 4 334 715 -355 -715
-		mu 0 4 350 351 372 371
-		f 4 335 716 -356 -716
-		mu 0 4 351 352 373 372
-		f 4 336 717 -357 -717
-		mu 0 4 352 353 374 373
-		f 4 337 718 -358 -718
-		mu 0 4 353 354 375 374
-		f 4 338 719 -359 -719
-		mu 0 4 354 355 376 375
-		f 4 339 700 -360 -720
-		mu 0 4 355 356 377 376
-		f 4 340 721 -361 -721
-		mu 0 4 357 358 379 378
-		f 4 341 722 -362 -722
-		mu 0 4 358 359 380 379
-		f 4 342 723 -363 -723
-		mu 0 4 359 360 381 380
-		f 4 343 724 -364 -724
-		mu 0 4 360 361 382 381
-		f 4 344 725 -365 -725
-		mu 0 4 361 362 383 382
-		f 4 345 726 -366 -726
-		mu 0 4 362 363 384 383
-		f 4 346 727 -367 -727
-		mu 0 4 363 364 385 384
-		f 4 347 728 -368 -728
-		mu 0 4 364 365 386 385
-		f 4 348 729 -369 -729
-		mu 0 4 365 366 387 386
-		f 4 349 730 -370 -730
-		mu 0 4 366 367 388 387
-		f 4 350 731 -371 -731
-		mu 0 4 367 368 389 388
-		f 4 351 732 -372 -732
-		mu 0 4 368 369 390 389
-		f 4 352 733 -373 -733
-		mu 0 4 369 370 391 390
-		f 4 353 734 -374 -734
-		mu 0 4 370 371 392 391
-		f 4 354 735 -375 -735
-		mu 0 4 371 372 393 392
-		f 4 355 736 -376 -736
-		mu 0 4 372 373 394 393
-		f 4 356 737 -377 -737
-		mu 0 4 373 374 395 394
-		f 4 357 738 -378 -738
-		mu 0 4 374 375 396 395
-		f 4 358 739 -379 -739
-		mu 0 4 375 376 397 396
-		f 4 359 720 -380 -740
-		mu 0 4 376 377 398 397
-		f 3 -1 -741 741
-		mu 0 3 1 0 399
-		f 3 -2 -742 742
-		mu 0 3 2 1 400
-		f 3 -3 -743 743
-		mu 0 3 3 2 401
-		f 3 -4 -744 744
-		mu 0 3 4 3 402
-		f 3 -5 -745 745
-		mu 0 3 5 4 403
-		f 3 -6 -746 746
-		mu 0 3 6 5 404
-		f 3 -7 -747 747
-		mu 0 3 7 6 405
-		f 3 -8 -748 748
-		mu 0 3 8 7 406
-		f 3 -9 -749 749
-		mu 0 3 9 8 407
-		f 3 -10 -750 750
-		mu 0 3 10 9 408
-		f 3 -11 -751 751
-		mu 0 3 11 10 409
-		f 3 -12 -752 752
-		mu 0 3 12 11 410
-		f 3 -13 -753 753
-		mu 0 3 13 12 411
-		f 3 -14 -754 754
-		mu 0 3 14 13 412
-		f 3 -15 -755 755
-		mu 0 3 15 14 413
-		f 3 -16 -756 756
-		mu 0 3 16 15 414
-		f 3 -17 -757 757
-		mu 0 3 17 16 415
-		f 3 -18 -758 758
-		mu 0 3 18 17 416
-		f 3 -19 -759 759
-		mu 0 3 19 18 417
-		f 3 -20 -760 740
-		mu 0 3 20 19 418
-		f 3 360 761 -761
-		mu 0 3 378 379 419
-		f 3 361 762 -762
-		mu 0 3 379 380 420
-		f 3 362 763 -763
-		mu 0 3 380 381 421
-		f 3 363 764 -764
-		mu 0 3 381 382 422
-		f 3 364 765 -765
-		mu 0 3 382 383 423
-		f 3 365 766 -766
-		mu 0 3 383 384 424
-		f 3 366 767 -767
-		mu 0 3 384 385 425
-		f 3 367 768 -768
-		mu 0 3 385 386 426
-		f 3 368 769 -769
-		mu 0 3 386 387 427
-		f 3 369 770 -770
-		mu 0 3 387 388 428
-		f 3 370 771 -771
-		mu 0 3 388 389 429
-		f 3 371 772 -772
-		mu 0 3 389 390 430
-		f 3 372 773 -773
-		mu 0 3 390 391 431
-		f 3 373 774 -774
-		mu 0 3 391 392 432
-		f 3 374 775 -775
-		mu 0 3 392 393 433
-		f 3 375 776 -776
-		mu 0 3 393 394 434
-		f 3 376 777 -777
-		mu 0 3 394 395 435
-		f 3 377 778 -778
-		mu 0 3 395 396 436
-		f 3 378 779 -779
-		mu 0 3 396 397 437
-		f 3 379 760 -780
-		mu 0 3 397 398 438;
-	setAttr ".cd" -type "dataPolyComponent" Index_Data Edge 0 ;
-	setAttr ".cvd" -type "dataPolyComponent" Index_Data Vertex 0 ;
-	setAttr ".pd[0]" -type "dataPolyComponent" Index_Data UV 0 ;
-	setAttr ".hfd" -type "dataPolyComponent" Index_Data Face 0 ;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "nurbsCircle1";
-	rename -uid "D5744703-4B2D-9BB9-E26E-8DAAF5509B6A";
-	setAttr ".t" -type "double3" -1.5384164423658533 2.4405444475521341 1.3807497391778476 ;
-	setAttr ".s" -type "double3" 0.61563202772355974 0.81117258701024497 0.61563202772355974 ;
-createNode nurbsCurve -n "nurbsCircleShape1" -p "nurbsCircle1";
-	rename -uid "729B138C-46D2-3FCB-51E9-EE8006344FDD";
-	setAttr -k off ".v";
-	setAttr ".tw" yes;
-createNode transform -n "pTorus1";
-	rename -uid "2C44DC4E-48A0-1D03-08A1-C09F1781B1D4";
-	setAttr ".t" -type "double3" -1.5747965720390897 2.3874339240357236 1.3641278656213043 ;
-	setAttr ".r" -type "double3" 0 -45.297487063888482 0 ;
-	setAttr ".s" -type "double3" 0.28245314935440785 0.28245314935440785 0.28245314935440785 ;
-createNode mesh -n "pTorusShape1" -p "pTorus1";
-	rename -uid "56ED92BC-4B01-A524-640B-A59A7E83961D";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".pv" -type "double2" 0.50000005960464478 0.49999992176890373 ;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".dr" 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere16";
-	rename -uid "2E57DEFA-44A3-1685-0E4D-F79D19BC2976";
-	setAttr ".r" -type "double3" 7.8755850949652757 0 0 ;
-	setAttr ".rp" -type "double3" -1.553226691067108 2.901695835354527 1.0866602114755664 ;
-	setAttr ".sp" -type "double3" -1.553226691067108 2.901695835354527 1.0866602114755664 ;
-createNode transform -n "polySurface1" -p "pSphere16";
-	rename -uid "7BA6DC8F-49A4-7BEE-2C68-E1A6DCB48B0D";
-createNode mesh -n "polySurfaceShape1" -p "polySurface1";
-	rename -uid "4C862F05-498B-59F6-11E5-ACBA30DE263D";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface2" -p "pSphere16";
-	rename -uid "A88C4742-4A3E-76DE-1207-B1A6783C5170";
-createNode transform -n "transform24" -p "polySurface2";
-	rename -uid "61947A78-4AF0-AE41-02DB-C29369D701FE";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape2" -p "transform24";
-	rename -uid "549465A6-4A2F-9386-0293-76A6D97E1F28";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface3" -p "pSphere16";
-	rename -uid "62F26AB2-47C7-B605-6542-9C9331139547";
-createNode transform -n "transform25" -p "|pSphere16|polySurface3";
-	rename -uid "2F423911-46BA-C18A-BF70-BCB6C6749DB0";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape3" -p "transform25";
-	rename -uid "67E0575C-48A8-2C3E-976A-7DB38805451A";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface4" -p "pSphere16";
-	rename -uid "55628F65-416D-2CCF-9B20-54B3849B824B";
-createNode transform -n "transform20" -p "polySurface4";
-	rename -uid "A2754476-4565-0CA2-B3EB-3384AD458F38";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape4" -p "transform20";
-	rename -uid "7B339C7D-4580-E6EE-1FC7-12B30DA4B15C";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface5" -p "pSphere16";
-	rename -uid "C858BF8D-4926-FD30-CDFE-C4A107C31A93";
-createNode transform -n "transform23" -p "polySurface5";
-	rename -uid "CACD41A5-48CF-BA44-A755-51901D453175";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape5" -p "transform23";
-	rename -uid "0BAA062C-44C1-0300-2C9C-17831AB5D11A";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface6" -p "pSphere16";
-	rename -uid "D6CEC393-4A7E-D70D-AF47-F7B5A88F4897";
-createNode transform -n "transform17" -p "polySurface6";
-	rename -uid "18CB004E-465A-97C2-6101-AFB78B4EBE15";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape6" -p "transform17";
-	rename -uid "223FA7CC-4BDB-AF99-46F9-A3A077777D13";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface7" -p "pSphere16";
-	rename -uid "5EBD8D07-416F-D52C-23E4-E28131E5EEE8";
-createNode transform -n "transform22" -p "polySurface7";
-	rename -uid "3D71C9C6-48FF-7AD8-BE4C-DC92D00D9844";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape7" -p "transform22";
-	rename -uid "B4224EAF-453C-AF3B-9E35-3AAC1424CB84";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface8" -p "pSphere16";
-	rename -uid "16550B79-4FDE-DF3D-45B5-41A122BF3871";
-createNode transform -n "transform21" -p "polySurface8";
-	rename -uid "2AEBC01A-4315-D574-2B78-3A847956BBDC";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape8" -p "transform21";
-	rename -uid "EDEF391A-494C-3AA1-8040-3B8C217AD24A";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface9" -p "pSphere16";
-	rename -uid "4327537E-4F5C-4E39-5981-6E815B1F9C82";
-createNode transform -n "transform19" -p "polySurface9";
-	rename -uid "2D925E6E-42A5-C432-10D2-45AF9649D723";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape9" -p "transform19";
-	rename -uid "D7995789-4325-9888-42B5-D4900877BB35";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface10" -p "pSphere16";
-	rename -uid "708B21D9-4DCB-A89B-78A6-E5A1F4754FD0";
-createNode transform -n "transform18" -p "polySurface10";
-	rename -uid "4BB11B32-4F06-CC48-D083-81B64BD4342F";
-	setAttr ".v" no;
-createNode mesh -n "polySurfaceShape10" -p "transform18";
-	rename -uid "F2473F5A-4257-C27E-5243-9DBE6FA78CED";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "polySurface11" -p "pSphere16";
-	rename -uid "1674B776-4696-0F1A-5467-4CA0CC419E99";
-createNode mesh -n "polySurfaceShape11" -p "polySurface11";
-	rename -uid "816CE145-4E1D-99B6-3F0C-F89279FF15A0";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "transform12" -p "pSphere16";
-	rename -uid "FE526CA0-4655-0013-F986-C9931144DE70";
-	setAttr ".v" no;
-createNode mesh -n "pSphere16Shape" -p "transform12";
-	rename -uid "01FD8A5D-4479-48E8-2326-5187BE83F0E8";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".ccls" -type "string" "SculptFreezeColorTemp";
-	setAttr -s 2 ".clst";
-	setAttr ".clst[0].clsn" -type "string" "SculptFreezeColorTemp";
-	setAttr ".clst[1].clsn" -type "string" "SculptMaskColorTemp";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pCone2";
-	rename -uid "A3E3E87E-45A2-DF14-EE89-35975F3C8943";
-	setAttr ".t" -type "double3" -6.2608297801568256 1.5970950572191864 2.8181350335320303 ;
-createNode mesh -n "pConeShape2" -p "pCone2";
-	rename -uid "E7C254C6-487C-5357-675D-E28BF429AB9B";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".pv" -type "double2" 0.50735285878181458 0.58637285232543945 ;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 101 ".pt[240:340]" -type "float3"  -3.259629e-08 -1.0430813e-07 
-		0 -1.7508864e-07 -7.4505806e-09 0 2.514571e-08 9.6857548e-08 0 5.1921234e-08 -3.7252903e-09 
-		0 -5.9059257e-08 -4.4539615e-08 0 -7.9395249e-08 0 0 -1.2107193e-08 -3.7252903e-09 
-		0 -8.7544322e-08 -7.4505806e-09 0 -1.8905848e-07 -6.7055225e-08 0 2.7008355e-08 2.9802322e-08 
-		0 -1.8905848e-07 -6.7055225e-08 0 -8.7544322e-08 -1.4901161e-08 0 -2.8405339e-08 
-		1.8626451e-08 0 -1.6298145e-08 1.4901161e-08 0 -8.897797e-08 -3.8265533e-08 0 9.5926225e-08 
-		-3.5390258e-08 0 -6.2398612e-08 4.4703484e-08 0 -2.104789e-07 7.4505806e-09 0 4.0046871e-08 
-		-5.2154064e-08 0 4.0046871e-08 -1.1175871e-07 0 3.7252903e-09 2.3841858e-07 0 -1.1175871e-08 
-		1.1920929e-07 0 0 -1.7881393e-07 0 1.8626451e-08 1.1920929e-07 0 4.4703484e-08 1.7881393e-07 
-		0 1.4901161e-08 2.3841858e-07 0 1.4901161e-08 1.7881393e-07 0 -1.1175871e-08 5.9604645e-08 
-		0 1.4901161e-08 1.7881393e-07 0 2.9802322e-08 -2.3841858e-07 0 1.4901161e-08 1.7881393e-07 
-		0 -1.1175871e-08 5.9604645e-08 0 1.4901161e-08 1.7881393e-07 0 1.4901161e-08 2.3841858e-07 
-		0 2.6077032e-08 1.1920929e-07 0 1.4901161e-08 5.9604645e-08 0 -7.4505806e-09 1.1920929e-07 
-		0 3.7252903e-09 2.3841858e-07 0 2.2351742e-08 0 0 2.2351742e-08 4.1723251e-07 0 2.9802322e-08 
-		5.9604645e-08 0 5.2154064e-08 1.7881393e-07 0 -3.7252903e-08 2.9802322e-07 0 7.4505806e-09 
-		2.9802322e-07 0 -3.7252903e-08 0 0 1.4901161e-08 5.9604645e-08 0 2.2351742e-08 2.3841858e-07 
-		0 -2.2351742e-08 -5.9604645e-08 0 2.9802322e-08 -5.9604645e-08 0 0 -5.9604645e-08 
-		0 2.9802322e-08 -5.9604645e-08 0 3.7252903e-08 1.1920929e-07 0 7.4505806e-09 2.9802322e-07 
-		0 1.4901161e-08 5.9604645e-08 0 -3.7252903e-08 0 0 -2.2351742e-08 2.9802322e-07 0 
-		-5.9604645e-08 2.3841858e-07 0 3.7252903e-08 5.9604645e-08 0 7.4505806e-09 2.3841858e-07 
-		0 7.4505806e-08 1.1920929e-07 0 1.0430813e-07 1.1920929e-07 0 -7.4505806e-09 1.7881393e-07 
-		0 -9.6857548e-08 3.5762787e-07 0 5.2154064e-08 -5.9604645e-08 0 -1.4901161e-08 1.1920929e-07 
-		0 -5.2154064e-08 3.5762787e-07 0 0 -5.9604645e-08 0 -1.4901161e-08 1.7881393e-07 
-		0 -1.2665987e-07 5.9604645e-08 0 -2.2351742e-08 1.1920929e-07 0 -1.2665987e-07 5.9604645e-08 
-		0 -1.4901161e-08 1.7881393e-07 0 0 -5.9604645e-08 0 -5.2154064e-08 2.9802322e-07 
-		0 -1.4901161e-08 1.1920929e-07 0 6.7055225e-08 -5.9604645e-08 0 -5.2154064e-08 2.9802322e-07 
-		0 0 2.3841858e-07 0 1.0430813e-07 1.1920929e-07 0 5.2154064e-08 5.9604645e-08 0 -8.9406967e-08 
-		2.9802322e-07 0 -7.4505806e-08 1.1920929e-07 0 -1.4901161e-08 -1.7881393e-07 0 -1.4901161e-08 
-		1.1920929e-07 0 1.3411045e-07 2.3841858e-07 0 -2.9802322e-08 1.1920929e-07 0 1.4901161e-08 
-		0 0 5.9604645e-08 -2.9802322e-07 0 2.0861626e-07 0 0 0 1.1920929e-07 0 2.0861626e-07 
-		0 0 5.9604645e-08 -2.9802322e-07 0 1.4901161e-08 0 0 -2.9802322e-08 1.1920929e-07 
-		0 1.3411045e-07 2.3841858e-07 0 -1.4901161e-08 1.1920929e-07 0 -1.4901161e-08 -1.7881393e-07 
-		0 -4.4703484e-08 1.7881393e-07 0 -1.0430813e-07 2.3841858e-07 0 -1.4901161e-08 2.3841858e-07 
-		0 1.0430813e-07 -5.9604645e-08 0;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pCone3";
-	rename -uid "4FD2B06B-451B-1736-C2B6-8294D4767942";
-	setAttr ".t" -type "double3" -2.7601764966935778 4.6331139251483897 1.345582567947605 ;
-	setAttr ".r" -type "double3" 0 0 90.435759744268665 ;
-	setAttr ".s" -type "double3" 0.36282183582094801 0.36282183582094801 0.36282183582094801 ;
-createNode transform -n "transform28" -p "pCone3";
-	rename -uid "380027C1-43BE-69F5-20AB-33A09F61DE83";
-	setAttr ".v" no;
-createNode mesh -n "pConeShape3" -p "transform28";
-	rename -uid "742D1912-4EEB-08F3-E834-1AB3D496E126";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr -s 2 ".ciog[0].cog";
-	setAttr ".pv" -type "double2" 0.5 0.14092814736068249 ;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr -s 40 ".pt";
-	setAttr ".pt[302]" -type "float3" 0.0037943083 -0.059942052 -0.16865449 ;
-	setAttr ".pt[303]" -type "float3" 0.00058993924 -0.0059666745 -0.17884257 ;
-	setAttr ".pt[304]" -type "float3" -0.0026720944 0.048592605 -0.17152427 ;
-	setAttr ".pt[305]" -type "float3" -0.005672405 0.098395534 -0.14741592 ;
-	setAttr ".pt[306]" -type "float3" -0.0081174439 0.13856661 -0.10887755 ;
-	setAttr ".pt[307]" -type "float3" -0.009768012 0.16517386 -0.059681498 ;
-	setAttr ".pt[308]" -type "float3" -0.010462558 0.17561279 -0.0046433834 ;
-	setAttr ".pt[309]" -type "float3" -0.01013269 0.16886151 0.050849315 ;
-	setAttr ".pt[310]" -type "float3" -0.0088111516 0.14558089 0.10136447 ;
-	setAttr ".pt[311]" -type "float3" -0.0066270148 0.10804975 0.14195737 ;
-	setAttr ".pt[312]" -type "float3" -0.0037942256 0.059941966 0.16865455 ;
-	setAttr ".pt[313]" -type "float3" -0.00059007911 0.0059666745 0.17884257 ;
-	setAttr ".pt[314]" -type "float3" 0.0026718697 -0.048592828 0.17152418 ;
-	setAttr ".pt[315]" -type "float3" 0.0056723226 -0.098395549 0.147416 ;
-	setAttr ".pt[316]" -type "float3" 0.0081174979 -0.13856654 0.10887758 ;
-	setAttr ".pt[317]" -type "float3" 0.009768012 -0.16517389 0.059681568 ;
-	setAttr ".pt[318]" -type "float3" 0.010462558 -0.17561279 0.004643451 ;
-	setAttr ".pt[319]" -type "float3" 0.010132631 -0.16886151 -0.050849248 ;
-	setAttr ".pt[320]" -type "float3" 0.0088109244 -0.14558101 -0.10136442 ;
-	setAttr ".pt[321]" -type "float3" 0.0066269306 -0.1080498 -0.14195734 ;
-	setAttr ".pt[662]" -type "float3" 0.0022192823 -0.033362567 -0.1759008 ;
-	setAttr ".pt[663]" -type "float3" -0.0010539826 0.021576984 -0.17735349 ;
-	setAttr ".pt[664]" -type "float3" -0.0042239814 0.074404471 -0.16144551 ;
-	setAttr ".pt[665]" -type "float3" -0.0069803097 0.11994876 -0.12973414 ;
-	setAttr ".pt[666]" -type "float3" -0.0090534752 0.15375154 -0.08532352 ;
-	setAttr ".pt[667]" -type "float3" -0.010240659 0.17250407 -0.032560859 ;
-	setAttr ".pt[668]" -type "float3" -0.010425206 0.17437075 0.023389157 ;
-	setAttr ".pt[669]" -type "float3" -0.0095892353 0.15916874 0.077049658 ;
-	setAttr ".pt[670]" -type "float3" -0.0078146858 0.12838624 0.12316797 ;
-	setAttr ".pt[671]" -type "float3" -0.0052751913 0.085036337 0.15722978 ;
-	setAttr ".pt[672]" -type "float3" -0.0022192823 0.033362504 0.17590085 ;
-	setAttr ".pt[673]" -type "float3" 0.0010537809 -0.021577127 0.17735346 ;
-	setAttr ".pt[674]" -type "float3" 0.004223756 -0.074404635 0.1614455 ;
-	setAttr ".pt[675]" -type "float3" 0.0069803097 -0.1199487 0.12973417 ;
-	setAttr ".pt[676]" -type "float3" 0.009053532 -0.15375142 0.085323565 ;
-	setAttr ".pt[677]" -type "float3" 0.010240545 -0.17250405 0.032560926 ;
-	setAttr ".pt[678]" -type "float3" 0.010425153 -0.17437071 -0.023389088 ;
-	setAttr ".pt[679]" -type "float3" 0.0095890928 -0.15916888 -0.077049613 ;
-	setAttr ".pt[680]" -type "float3" 0.0078145107 -0.12838633 -0.12316793 ;
-	setAttr ".pt[681]" -type "float3" 0.0052751913 -0.085036464 -0.15722975 ;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pTorus2";
-	rename -uid "2DD633A2-4364-433B-6A27-BD9E5CE6CD21";
-	setAttr ".t" -type "double3" -1.5116676366651973 3.4578074370746616 1.3289200803216081 ;
-	setAttr ".r" -type "double3" 0.29567373174804851 -4.0182031584722635 -2.2649060834435057 ;
-	setAttr ".s" -type "double3" 0.3023590039494567 0.23847464428377976 0.28070656746995409 ;
-createNode mesh -n "pTorusShape2" -p "pTorus2";
-	rename -uid "5B974C20-4BEC-5A87-3958-64A8525F3B6B";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere17";
-	rename -uid "0DC68896-4B08-6905-914B-B4ADDB75DB21";
-	setAttr ".t" -type "double3" -2.9506809175011899 4.0354920274238824 1.342316677968733 ;
-	setAttr ".s" -type "double3" 0.74619092633859752 0.74619092633859752 0.74619092633859752 ;
-createNode transform -n "transform29" -p "pSphere17";
-	rename -uid "59F32117-4285-1E06-E08D-2BBC214D1F81";
-	setAttr ".v" no;
-createNode mesh -n "pSphereShape16" -p "transform29";
-	rename -uid "119B9C95-4D5C-9DB0-2E81-D5A0FFF217A3";
-	setAttr -k off ".v";
-	setAttr ".io" yes;
-	setAttr -s 2 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr -s 2 ".ciog[0].cog";
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere18";
-	rename -uid "7BF74C54-4808-F127-9778-B1B2A009F664";
-	setAttr ".rp" -type "double3" -1.5561414991564986 1.7693956313999095 0.25019547378849077 ;
-	setAttr ".sp" -type "double3" -1.5561414991564986 1.7693956313999095 0.25019547378849077 ;
-createNode mesh -n "pSphere18Shape" -p "pSphere18";
-	rename -uid "366C7DAA-47EB-B7C1-2BDF-BF8279C033BB";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "transform16";
-	rename -uid "82019FF2-48ED-A147-03F8-1CA5224A1D73";
-	setAttr ".hio" yes;
-createNode displayPoints -n "displayPoints1" -p "transform16";
-	rename -uid "2CD623D1-458E-339A-E205-FC9800EF31F5";
-	setAttr -k off ".v";
-	setAttr ".boundingBoxes" -type "vectorArray" 0 ;
-	setAttr ".hio" yes;
-createNode transform -n "polySurface3";
-	rename -uid "8F6369EC-4051-6802-4A93-EEB196D21CE7";
-	setAttr ".rp" -type "double3" -1.5674194097518921 2.9821233009153927 0.84200344754868683 ;
-	setAttr ".sp" -type "double3" -1.5674194097518921 2.9821233009153927 0.84200344754868683 ;
-createNode mesh -n "polySurface3Shape" -p "|polySurface3";
-	rename -uid "1BC39D91-43E9-5CDA-23D5-BCA66AD81C96";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pCylinder3";
-	rename -uid "7D1FDA6F-4901-F4DE-914C-03AC25468468";
-	setAttr ".rp" -type "double3" -1.5454092541168361 2.2495526607377614 1.4077334432593935 ;
-	setAttr ".sp" -type "double3" -1.5454092541168361 2.2495526607377614 1.4077334432593935 ;
-createNode mesh -n "pCylinder3Shape" -p "pCylinder3";
-	rename -uid "87E84372-4725-85AF-F2B9-A09C629D822E";
-	setAttr -k off ".v";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "pSphere19";
-	rename -uid "1E031551-41E9-CB65-2E3B-F288839608F2";
-	setAttr ".t" -type "double3" 0.20049684779321697 0 0.3522824980137389 ;
-	setAttr ".r" -type "double3" 0 49.338806104910837 0 ;
-	setAttr ".s" -type "double3" 0.95725058313291866 0.95725058313291866 0.95725058313291866 ;
-	setAttr ".rp" -type "double3" -2.0440367725861099 4.1408287168342177 1.3455822435596054 ;
-	setAttr ".sp" -type "double3" -2.0440367725861099 4.1408287168342177 1.3455822435596054 ;
-createNode mesh -n "pSphere19Shape" -p "pSphere19";
-	rename -uid "DCA2A944-4F5E-BDA6-76A8-65A507D500DC";
-	setAttr -k off ".v";
-	setAttr -s 4 ".iog[0].og";
-	setAttr ".vir" yes;
-	setAttr ".vif" yes;
-	setAttr ".uvst[0].uvsn" -type "string" "map1";
-	setAttr ".cuvs" -type "string" "map1";
-	setAttr ".dcc" -type "string" "Ambient+Diffuse";
-	setAttr ".covm[0]"  0 1 1;
-	setAttr ".cdvm[0]"  0 1 1;
-	setAttr ".ai_translator" -type "string" "polymesh";
-createNode transform -n "aiAreaLight1";
-	rename -uid "9AA13EF3-4D26-FC3E-BE3E-C3B36D82F136";
-	setAttr ".t" -type "double3" 0.17912847860170225 4.4952341452509641 -4.5450971834339153 ;
-	setAttr ".r" -type "double3" -17.399999999996933 161.19999999999516 0 ;
-createNode aiAreaLight -n "aiAreaLightShape1" -p "aiAreaLight1";
-	rename -uid "20235B71-4D0C-A30F-B5AA-75B36CB86F8A";
-	addAttr -ci true -h true -sn "aal" -ln "attributeAliasList" -dt "attributeAlias";
-	setAttr -k off ".v";
-	setAttr ".csh" no;
-	setAttr ".rcsh" no;
-	setAttr ".intensity" 40;
-	setAttr ".ai_translator" -type "string" "quad";
-	setAttr ".aal" -type "attributeAlias" {"exposure","aiExposure","normalize","aiNormalize"
-		} ;
-createNode transform -n "aiAreaLight2";
-	rename -uid "A92E00C5-4BB1-CEA8-2A4A-259BEB2423EE";
-	setAttr ".t" -type "double3" -6.8546381490794346 5.3904044567227958 -1.9428727683063924 ;
-	setAttr ".r" -type "double3" -34.20000000000001 -103.99999999999923 0 ;
-createNode aiAreaLight -n "aiAreaLightShape2" -p "aiAreaLight2";
-	rename -uid "2CC5D569-40D5-8D17-E527-07AEA189E19D";
-	addAttr -ci true -h true -sn "aal" -ln "attributeAliasList" -dt "attributeAlias";
-	setAttr -k off ".v";
-	setAttr ".csh" no;
-	setAttr ".rcsh" no;
-	setAttr ".intensity" 10;
-	setAttr ".ai_translator" -type "string" "quad";
-	setAttr ".aal" -type "attributeAlias" {"exposure","aiExposure","normalize","aiNormalize"
-		} ;
-createNode transform -n "aiAreaLight3";
-	rename -uid "BC3EC5D2-44D0-0006-EA4F-3C909C110990";
-	setAttr ".t" -type "double3" -0.95056337653001832 8.9567382791802572 5.827306608538338 ;
-	setAttr ".r" -type "double3" -43.20000000000185 4.0000000000000107 -1.9927007948982792e-16 ;
-createNode aiAreaLight -n "aiAreaLightShape3" -p "aiAreaLight3";
-	rename -uid "52FB737C-4173-4902-2C52-E584EBC0F1AD";
-	addAttr -ci true -h true -sn "aal" -ln "attributeAliasList" -dt "attributeAlias";
-	setAttr -k off ".v";
-	setAttr ".csh" no;
-	setAttr ".rcsh" no;
-	setAttr ".intensity" 10;
-	setAttr ".ai_translator" -type "string" "quad";
-	setAttr ".aal" -type "attributeAlias" {"exposure","aiExposure","normalize","aiNormalize"
-		} ;
-createNode lightLinker -s -n "lightLinker1";
-	rename -uid "71DD6E6A-4750-17EE-EC06-E595763B2033";
-	setAttr -s 23 ".lnk";
-	setAttr -s 23 ".slnk";
-createNode shapeEditorManager -n "shapeEditorManager";
-	rename -uid "181AF8BF-48C9-BF9E-9ECF-989F21506E7B";
-createNode poseInterpolatorManager -n "poseInterpolatorManager";
-	rename -uid "7D1CE2C2-4AEC-F20A-159F-839F7EAFE80C";
-createNode displayLayerManager -n "layerManager";
-	rename -uid "D2990452-406C-83E6-6504-75A167BD59C2";
-	setAttr ".cdl" 1;
-	setAttr -s 3 ".dli[1:2]"  1 2;
-	setAttr -s 2 ".dli";
-createNode displayLayer -n "defaultLayer";
-	rename -uid "E92BCD81-489C-0C26-14E3-8488FC1C6C0C";
-createNode renderLayerManager -n "renderLayerManager";
-	rename -uid "1AB69134-469A-6AE6-7FC7-08A6818289AD";
-createNode renderLayer -n "defaultRenderLayer";
-	rename -uid "A91BAAA0-479D-AB04-0405-61A01DAA34B6";
-	setAttr ".g" yes;
-createNode polyUnite -n "polyUnite1";
-	rename -uid "86F71061-4033-66B8-DABD-75B883570D22";
-createNode polyUnite -n "polyUnite2";
-	rename -uid "2C86B992-46BC-BA46-A9DD-4D8AEE88782C";
-createNode script -n "uiConfigurationScriptNode";
-	rename -uid "660029E0-430E-5BB8-5C3C-949CD694E814";
-	setAttr ".b" -type "string" (
-		"// Maya Mel UI Configuration File.\n//\n//  This script is machine generated.  Edit at your own risk.\n//\n//\n\nglobal string $gMainPane;\nif (`paneLayout -exists $gMainPane`) {\n\n\tglobal int $gUseScenePanelConfig;\n\tint    $useSceneConfig = $gUseScenePanelConfig;\n\tint    $nodeEditorPanelVisible = stringArrayContains(\"nodeEditorPanel1\", `getPanel -vis`);\n\tint    $nodeEditorWorkspaceControlOpen = (`workspaceControl -exists nodeEditorPanel1Window` && `workspaceControl -q -visible nodeEditorPanel1Window`);\n\tint    $menusOkayInPanels = `optionVar -q allowMenusInPanels`;\n\tint    $nVisPanes = `paneLayout -q -nvp $gMainPane`;\n\tint    $nPanes = 0;\n\tstring $editorName;\n\tstring $panelName;\n\tstring $itemFilterName;\n\tstring $panelConfig;\n\n\t//\n\t//  get current state of the UI\n\t//\n\tsceneUIReplacement -update $gMainPane;\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Top View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Top View\")) -mbv $menusOkayInPanels  $panelName;\n"
-		+ "\t\t$editorName = $panelName;\n        modelEditor -e \n            -camera \"top\" \n            -useInteractiveMode 0\n            -displayLights \"default\" \n            -displayAppearance \"smoothShaded\" \n            -activeOnly 0\n            -ignorePanZoom 0\n            -wireframeOnShaded 0\n            -headsUpDisplay 1\n            -holdOuts 1\n            -selectionHiliteDisplay 1\n            -useDefaultMaterial 0\n            -bufferMode \"double\" \n            -twoSidedLighting 0\n            -backfaceCulling 0\n            -xray 0\n            -jointXray 0\n            -activeComponentsXray 0\n            -displayTextures 0\n            -smoothWireframe 0\n            -lineWidth 1\n            -textureAnisotropic 0\n            -textureHilight 1\n            -textureSampling 2\n            -textureDisplay \"modulate\" \n            -textureMaxSize 16384\n            -fogging 0\n            -fogSource \"fragment\" \n            -fogMode \"linear\" \n            -fogStart 0\n            -fogEnd 100\n            -fogDensity 0.1\n            -fogColor 0.5 0.5 0.5 1 \n"
-		+ "            -depthOfFieldPreview 1\n            -maxConstantTransparency 1\n            -rendererName \"vp2Renderer\" \n            -objectFilterShowInHUD 1\n            -isFiltered 0\n            -colorResolution 256 256 \n            -bumpResolution 512 512 \n            -textureCompression 0\n            -transparencyAlgorithm \"frontAndBackCull\" \n            -transpInShadows 0\n            -cullingOverride \"none\" \n            -lowQualityLighting 0\n            -maximumNumHardwareLights 1\n            -occlusionCulling 0\n            -shadingModel 0\n            -useBaseRenderer 0\n            -useReducedRenderer 0\n            -smallObjectCulling 0\n            -smallObjectThreshold -1 \n            -interactiveDisableShadows 0\n            -interactiveBackFaceCull 0\n            -sortTransparent 1\n            -controllers 1\n            -nurbsCurves 1\n            -nurbsSurfaces 1\n            -polymeshes 1\n            -subdivSurfaces 1\n            -planes 1\n            -lights 1\n            -cameras 1\n            -controlVertices 1\n"
-		+ "            -hulls 1\n            -grid 1\n            -imagePlane 1\n            -joints 1\n            -ikHandles 1\n            -deformers 1\n            -dynamics 1\n            -particleInstancers 1\n            -fluids 1\n            -hairSystems 1\n            -follicles 1\n            -nCloths 1\n            -nParticles 1\n            -nRigids 1\n            -dynamicConstraints 1\n            -locators 1\n            -manipulators 1\n            -pluginShapes 1\n            -dimensions 1\n            -handles 1\n            -pivots 1\n            -textures 1\n            -strokes 1\n            -motionTrails 1\n            -clipGhosts 1\n            -greasePencils 1\n            -shadows 0\n            -captureSequenceNumber -1\n            -width 1\n            -height 1\n            -sceneRenderFilter 0\n            $editorName;\n        modelEditor -e -viewSelected 0 $editorName;\n        modelEditor -e \n            -pluginObjects \"gpuCacheDisplayFilter\" 1 \n            $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n"
-		+ "\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Side View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Side View\")) -mbv $menusOkayInPanels  $panelName;\n\t\t$editorName = $panelName;\n        modelEditor -e \n            -camera \"side\" \n            -useInteractiveMode 0\n            -displayLights \"default\" \n            -displayAppearance \"smoothShaded\" \n            -activeOnly 0\n            -ignorePanZoom 0\n            -wireframeOnShaded 0\n            -headsUpDisplay 1\n            -holdOuts 1\n            -selectionHiliteDisplay 1\n            -useDefaultMaterial 0\n            -bufferMode \"double\" \n            -twoSidedLighting 0\n            -backfaceCulling 0\n            -xray 0\n            -jointXray 0\n            -activeComponentsXray 0\n            -displayTextures 0\n            -smoothWireframe 0\n            -lineWidth 1\n            -textureAnisotropic 0\n            -textureHilight 1\n            -textureSampling 2\n"
-		+ "            -textureDisplay \"modulate\" \n            -textureMaxSize 16384\n            -fogging 0\n            -fogSource \"fragment\" \n            -fogMode \"linear\" \n            -fogStart 0\n            -fogEnd 100\n            -fogDensity 0.1\n            -fogColor 0.5 0.5 0.5 1 \n            -depthOfFieldPreview 1\n            -maxConstantTransparency 1\n            -rendererName \"vp2Renderer\" \n            -objectFilterShowInHUD 1\n            -isFiltered 0\n            -colorResolution 256 256 \n            -bumpResolution 512 512 \n            -textureCompression 0\n            -transparencyAlgorithm \"frontAndBackCull\" \n            -transpInShadows 0\n            -cullingOverride \"none\" \n            -lowQualityLighting 0\n            -maximumNumHardwareLights 1\n            -occlusionCulling 0\n            -shadingModel 0\n            -useBaseRenderer 0\n            -useReducedRenderer 0\n            -smallObjectCulling 0\n            -smallObjectThreshold -1 \n            -interactiveDisableShadows 0\n            -interactiveBackFaceCull 0\n"
-		+ "            -sortTransparent 1\n            -controllers 1\n            -nurbsCurves 1\n            -nurbsSurfaces 1\n            -polymeshes 1\n            -subdivSurfaces 1\n            -planes 1\n            -lights 1\n            -cameras 1\n            -controlVertices 1\n            -hulls 1\n            -grid 1\n            -imagePlane 1\n            -joints 1\n            -ikHandles 1\n            -deformers 1\n            -dynamics 1\n            -particleInstancers 1\n            -fluids 1\n            -hairSystems 1\n            -follicles 1\n            -nCloths 1\n            -nParticles 1\n            -nRigids 1\n            -dynamicConstraints 1\n            -locators 1\n            -manipulators 1\n            -pluginShapes 1\n            -dimensions 1\n            -handles 1\n            -pivots 1\n            -textures 1\n            -strokes 1\n            -motionTrails 1\n            -clipGhosts 1\n            -greasePencils 1\n            -shadows 0\n            -captureSequenceNumber -1\n            -width 1\n            -height 1\n"
-		+ "            -sceneRenderFilter 0\n            $editorName;\n        modelEditor -e -viewSelected 0 $editorName;\n        modelEditor -e \n            -pluginObjects \"gpuCacheDisplayFilter\" 1 \n            $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Front View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Front View\")) -mbv $menusOkayInPanels  $panelName;\n\t\t$editorName = $panelName;\n        modelEditor -e \n            -camera \"front\" \n            -useInteractiveMode 0\n            -displayLights \"default\" \n            -displayAppearance \"smoothShaded\" \n            -activeOnly 0\n            -ignorePanZoom 0\n            -wireframeOnShaded 0\n            -headsUpDisplay 1\n            -holdOuts 1\n            -selectionHiliteDisplay 1\n            -useDefaultMaterial 0\n            -bufferMode \"double\" \n            -twoSidedLighting 0\n            -backfaceCulling 0\n"
-		+ "            -xray 0\n            -jointXray 0\n            -activeComponentsXray 0\n            -displayTextures 0\n            -smoothWireframe 0\n            -lineWidth 1\n            -textureAnisotropic 0\n            -textureHilight 1\n            -textureSampling 2\n            -textureDisplay \"modulate\" \n            -textureMaxSize 16384\n            -fogging 0\n            -fogSource \"fragment\" \n            -fogMode \"linear\" \n            -fogStart 0\n            -fogEnd 100\n            -fogDensity 0.1\n            -fogColor 0.5 0.5 0.5 1 \n            -depthOfFieldPreview 1\n            -maxConstantTransparency 1\n            -rendererName \"vp2Renderer\" \n            -objectFilterShowInHUD 1\n            -isFiltered 0\n            -colorResolution 256 256 \n            -bumpResolution 512 512 \n            -textureCompression 0\n            -transparencyAlgorithm \"frontAndBackCull\" \n            -transpInShadows 0\n            -cullingOverride \"none\" \n            -lowQualityLighting 0\n            -maximumNumHardwareLights 1\n            -occlusionCulling 0\n"
-		+ "            -shadingModel 0\n            -useBaseRenderer 0\n            -useReducedRenderer 0\n            -smallObjectCulling 0\n            -smallObjectThreshold -1 \n            -interactiveDisableShadows 0\n            -interactiveBackFaceCull 0\n            -sortTransparent 1\n            -controllers 1\n            -nurbsCurves 1\n            -nurbsSurfaces 1\n            -polymeshes 1\n            -subdivSurfaces 1\n            -planes 1\n            -lights 1\n            -cameras 1\n            -controlVertices 1\n            -hulls 1\n            -grid 1\n            -imagePlane 1\n            -joints 1\n            -ikHandles 1\n            -deformers 1\n            -dynamics 1\n            -particleInstancers 1\n            -fluids 1\n            -hairSystems 1\n            -follicles 1\n            -nCloths 1\n            -nParticles 1\n            -nRigids 1\n            -dynamicConstraints 1\n            -locators 1\n            -manipulators 1\n            -pluginShapes 1\n            -dimensions 1\n            -handles 1\n            -pivots 1\n"
-		+ "            -textures 1\n            -strokes 1\n            -motionTrails 1\n            -clipGhosts 1\n            -greasePencils 1\n            -shadows 0\n            -captureSequenceNumber -1\n            -width 1\n            -height 1\n            -sceneRenderFilter 0\n            $editorName;\n        modelEditor -e -viewSelected 0 $editorName;\n        modelEditor -e \n            -pluginObjects \"gpuCacheDisplayFilter\" 1 \n            $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"modelPanel\" (localizedPanelLabel(\"Persp View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tmodelPanel -edit -l (localizedPanelLabel(\"Persp View\")) -mbv $menusOkayInPanels  $panelName;\n\t\t$editorName = $panelName;\n        modelEditor -e \n            -camera \"persp\" \n            -useInteractiveMode 0\n            -displayLights \"default\" \n            -displayAppearance \"smoothShaded\" \n            -activeOnly 0\n            -ignorePanZoom 0\n"
-		+ "            -wireframeOnShaded 0\n            -headsUpDisplay 1\n            -holdOuts 1\n            -selectionHiliteDisplay 1\n            -useDefaultMaterial 0\n            -bufferMode \"double\" \n            -twoSidedLighting 0\n            -backfaceCulling 0\n            -xray 0\n            -jointXray 0\n            -activeComponentsXray 0\n            -displayTextures 0\n            -smoothWireframe 0\n            -lineWidth 1\n            -textureAnisotropic 0\n            -textureHilight 1\n            -textureSampling 2\n            -textureDisplay \"modulate\" \n            -textureMaxSize 16384\n            -fogging 0\n            -fogSource \"fragment\" \n            -fogMode \"linear\" \n            -fogStart 0\n            -fogEnd 100\n            -fogDensity 0.1\n            -fogColor 0.5 0.5 0.5 1 \n            -depthOfFieldPreview 1\n            -maxConstantTransparency 1\n            -rendererName \"vp2Renderer\" \n            -objectFilterShowInHUD 1\n            -isFiltered 0\n            -colorResolution 256 256 \n            -bumpResolution 512 512 \n"
-		+ "            -textureCompression 0\n            -transparencyAlgorithm \"frontAndBackCull\" \n            -transpInShadows 0\n            -cullingOverride \"none\" \n            -lowQualityLighting 0\n            -maximumNumHardwareLights 1\n            -occlusionCulling 0\n            -shadingModel 0\n            -useBaseRenderer 0\n            -useReducedRenderer 0\n            -smallObjectCulling 0\n            -smallObjectThreshold -1 \n            -interactiveDisableShadows 0\n            -interactiveBackFaceCull 0\n            -sortTransparent 1\n            -controllers 1\n            -nurbsCurves 1\n            -nurbsSurfaces 1\n            -polymeshes 1\n            -subdivSurfaces 1\n            -planes 1\n            -lights 1\n            -cameras 1\n            -controlVertices 1\n            -hulls 1\n            -grid 1\n            -imagePlane 1\n            -joints 1\n            -ikHandles 1\n            -deformers 1\n            -dynamics 1\n            -particleInstancers 1\n            -fluids 1\n            -hairSystems 1\n            -follicles 1\n"
-		+ "            -nCloths 1\n            -nParticles 1\n            -nRigids 1\n            -dynamicConstraints 1\n            -locators 1\n            -manipulators 1\n            -pluginShapes 1\n            -dimensions 1\n            -handles 1\n            -pivots 1\n            -textures 1\n            -strokes 1\n            -motionTrails 1\n            -clipGhosts 1\n            -greasePencils 1\n            -shadows 0\n            -captureSequenceNumber -1\n            -width 1381\n            -height 702\n            -sceneRenderFilter 0\n            $editorName;\n        modelEditor -e -viewSelected 0 $editorName;\n        modelEditor -e \n            -pluginObjects \"gpuCacheDisplayFilter\" 1 \n            $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"ToggledOutliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"ToggledOutliner\")) -mbv $menusOkayInPanels  $panelName;\n"
-		+ "\t\t$editorName = $panelName;\n        outlinerEditor -e \n            -showShapes 0\n            -showAssignedMaterials 0\n            -showTimeEditor 1\n            -showReferenceNodes 1\n            -showReferenceMembers 1\n            -showAttributes 0\n            -showConnected 0\n            -showAnimCurvesOnly 0\n            -showMuteInfo 0\n            -organizeByLayer 1\n            -organizeByClip 1\n            -showAnimLayerWeight 1\n            -autoExpandLayers 1\n            -autoExpand 0\n            -showDagOnly 1\n            -showAssets 1\n            -showContainedOnly 1\n            -showPublishedAsConnected 0\n            -showParentContainers 0\n            -showContainerContents 1\n            -ignoreDagHierarchy 0\n            -expandConnections 0\n            -showUpstreamCurves 1\n            -showUnitlessCurves 1\n            -showCompounds 1\n            -showLeafs 1\n            -showNumericAttrsOnly 0\n            -highlightActive 1\n            -autoSelectNewObjects 0\n            -doNotSelectNewObjects 0\n            -dropIsParent 1\n"
-		+ "            -transmitFilters 0\n            -setFilter \"defaultSetFilter\" \n            -showSetMembers 1\n            -allowMultiSelection 1\n            -alwaysToggleSelect 0\n            -directSelect 0\n            -isSet 0\n            -isSetMember 0\n            -displayMode \"DAG\" \n            -expandObjects 0\n            -setsIgnoreFilters 1\n            -containersIgnoreFilters 0\n            -editAttrName 0\n            -showAttrValues 0\n            -highlightSecondary 0\n            -showUVAttrsOnly 0\n            -showTextureNodesOnly 0\n            -attrAlphaOrder \"default\" \n            -animLayerFilterOptions \"allAffecting\" \n            -sortOrder \"none\" \n            -longNames 0\n            -niceNames 1\n            -showNamespace 1\n            -showPinIcons 0\n            -mapMotionTrails 0\n            -ignoreHiddenAttribute 0\n            -ignoreOutlinerColor 0\n            -renderFilterVisible 0\n            -renderFilterIndex 0\n            -selectionOrder \"chronological\" \n            -expandAttribute 0\n            $editorName;\n"
-		+ "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"outlinerPanel\" (localizedPanelLabel(\"Outliner\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\toutlinerPanel -edit -l (localizedPanelLabel(\"Outliner\")) -mbv $menusOkayInPanels  $panelName;\n\t\t$editorName = $panelName;\n        outlinerEditor -e \n            -showShapes 0\n            -showAssignedMaterials 0\n            -showTimeEditor 1\n            -showReferenceNodes 0\n            -showReferenceMembers 0\n            -showAttributes 0\n            -showConnected 0\n            -showAnimCurvesOnly 0\n            -showMuteInfo 0\n            -organizeByLayer 1\n            -organizeByClip 1\n            -showAnimLayerWeight 1\n            -autoExpandLayers 1\n            -autoExpand 0\n            -showDagOnly 1\n            -showAssets 1\n            -showContainedOnly 1\n            -showPublishedAsConnected 0\n            -showParentContainers 0\n            -showContainerContents 1\n            -ignoreDagHierarchy 0\n"
-		+ "            -expandConnections 0\n            -showUpstreamCurves 1\n            -showUnitlessCurves 1\n            -showCompounds 1\n            -showLeafs 1\n            -showNumericAttrsOnly 0\n            -highlightActive 1\n            -autoSelectNewObjects 0\n            -doNotSelectNewObjects 0\n            -dropIsParent 1\n            -transmitFilters 0\n            -setFilter \"defaultSetFilter\" \n            -showSetMembers 1\n            -allowMultiSelection 1\n            -alwaysToggleSelect 0\n            -directSelect 0\n            -displayMode \"DAG\" \n            -expandObjects 0\n            -setsIgnoreFilters 1\n            -containersIgnoreFilters 0\n            -editAttrName 0\n            -showAttrValues 0\n            -highlightSecondary 0\n            -showUVAttrsOnly 0\n            -showTextureNodesOnly 0\n            -attrAlphaOrder \"default\" \n            -animLayerFilterOptions \"allAffecting\" \n            -sortOrder \"none\" \n            -longNames 0\n            -niceNames 1\n            -showNamespace 1\n            -showPinIcons 0\n"
-		+ "            -mapMotionTrails 0\n            -ignoreHiddenAttribute 0\n            -ignoreOutlinerColor 0\n            -renderFilterVisible 0\n            $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"graphEditor\" (localizedPanelLabel(\"Graph Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Graph Editor\")) -mbv $menusOkayInPanels  $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n            outlinerEditor -e \n                -showShapes 1\n                -showAssignedMaterials 0\n                -showTimeEditor 1\n                -showReferenceNodes 0\n                -showReferenceMembers 0\n                -showAttributes 1\n                -showConnected 1\n                -showAnimCurvesOnly 1\n                -showMuteInfo 0\n                -organizeByLayer 1\n                -organizeByClip 1\n                -showAnimLayerWeight 1\n                -autoExpandLayers 1\n"
-		+ "                -autoExpand 1\n                -showDagOnly 0\n                -showAssets 1\n                -showContainedOnly 0\n                -showPublishedAsConnected 0\n                -showParentContainers 1\n                -showContainerContents 0\n                -ignoreDagHierarchy 0\n                -expandConnections 1\n                -showUpstreamCurves 1\n                -showUnitlessCurves 1\n                -showCompounds 0\n                -showLeafs 1\n                -showNumericAttrsOnly 1\n                -highlightActive 0\n                -autoSelectNewObjects 1\n                -doNotSelectNewObjects 0\n                -dropIsParent 1\n                -transmitFilters 1\n                -setFilter \"0\" \n                -showSetMembers 0\n                -allowMultiSelection 1\n                -alwaysToggleSelect 0\n                -directSelect 0\n                -displayMode \"DAG\" \n                -expandObjects 0\n                -setsIgnoreFilters 1\n                -containersIgnoreFilters 0\n                -editAttrName 0\n"
-		+ "                -showAttrValues 0\n                -highlightSecondary 0\n                -showUVAttrsOnly 0\n                -showTextureNodesOnly 0\n                -attrAlphaOrder \"default\" \n                -animLayerFilterOptions \"allAffecting\" \n                -sortOrder \"none\" \n                -longNames 0\n                -niceNames 1\n                -showNamespace 1\n                -showPinIcons 1\n                -mapMotionTrails 1\n                -ignoreHiddenAttribute 0\n                -ignoreOutlinerColor 0\n                -renderFilterVisible 0\n                $editorName;\n\n\t\t\t$editorName = ($panelName+\"GraphEd\");\n            animCurveEditor -e \n                -displayKeys 1\n                -displayTangents 0\n                -displayActiveKeys 0\n                -displayActiveKeyTangents 1\n                -displayInfinities 0\n                -displayValues 0\n                -autoFit 1\n                -autoFitTime 0\n                -snapTime \"integer\" \n                -snapValue \"none\" \n                -showResults \"off\" \n"
-		+ "                -showBufferCurves \"off\" \n                -smoothness \"fine\" \n                -resultSamples 1\n                -resultScreenSamples 0\n                -resultUpdate \"delayed\" \n                -showUpstreamCurves 1\n                -showCurveNames 0\n                -showActiveCurveNames 0\n                -stackedCurves 0\n                -stackedCurvesMin -1\n                -stackedCurvesMax 1\n                -stackedCurvesSpace 0.2\n                -displayNormalized 0\n                -preSelectionHighlight 0\n                -constrainDrag 0\n                -classicMode 1\n                -valueLinesToggle 1\n                $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dopeSheetPanel\" (localizedPanelLabel(\"Dope Sheet\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dope Sheet\")) -mbv $menusOkayInPanels  $panelName;\n\n\t\t\t$editorName = ($panelName+\"OutlineEd\");\n"
-		+ "            outlinerEditor -e \n                -showShapes 1\n                -showAssignedMaterials 0\n                -showTimeEditor 1\n                -showReferenceNodes 0\n                -showReferenceMembers 0\n                -showAttributes 1\n                -showConnected 1\n                -showAnimCurvesOnly 1\n                -showMuteInfo 0\n                -organizeByLayer 1\n                -organizeByClip 1\n                -showAnimLayerWeight 1\n                -autoExpandLayers 1\n                -autoExpand 0\n                -showDagOnly 0\n                -showAssets 1\n                -showContainedOnly 0\n                -showPublishedAsConnected 0\n                -showParentContainers 1\n                -showContainerContents 0\n                -ignoreDagHierarchy 0\n                -expandConnections 1\n                -showUpstreamCurves 1\n                -showUnitlessCurves 0\n                -showCompounds 1\n                -showLeafs 1\n                -showNumericAttrsOnly 1\n                -highlightActive 0\n"
-		+ "                -autoSelectNewObjects 0\n                -doNotSelectNewObjects 1\n                -dropIsParent 1\n                -transmitFilters 0\n                -setFilter \"0\" \n                -showSetMembers 0\n                -allowMultiSelection 1\n                -alwaysToggleSelect 0\n                -directSelect 0\n                -displayMode \"DAG\" \n                -expandObjects 0\n                -setsIgnoreFilters 1\n                -containersIgnoreFilters 0\n                -editAttrName 0\n                -showAttrValues 0\n                -highlightSecondary 0\n                -showUVAttrsOnly 0\n                -showTextureNodesOnly 0\n                -attrAlphaOrder \"default\" \n                -animLayerFilterOptions \"allAffecting\" \n                -sortOrder \"none\" \n                -longNames 0\n                -niceNames 1\n                -showNamespace 1\n                -showPinIcons 0\n                -mapMotionTrails 1\n                -ignoreHiddenAttribute 0\n                -ignoreOutlinerColor 0\n                -renderFilterVisible 0\n"
-		+ "                $editorName;\n\n\t\t\t$editorName = ($panelName+\"DopeSheetEd\");\n            dopeSheetEditor -e \n                -displayKeys 1\n                -displayTangents 0\n                -displayActiveKeys 0\n                -displayActiveKeyTangents 0\n                -displayInfinities 0\n                -displayValues 0\n                -autoFit 0\n                -autoFitTime 0\n                -snapTime \"integer\" \n                -snapValue \"none\" \n                -outliner \"dopeSheetPanel1OutlineEd\" \n                -showSummary 1\n                -showScene 0\n                -hierarchyBelow 0\n                -showTicks 1\n                -selectionWindow 0 0 0 0 \n                $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"timeEditorPanel\" (localizedPanelLabel(\"Time Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Time Editor\")) -mbv $menusOkayInPanels  $panelName;\n"
-		+ "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"clipEditorPanel\" (localizedPanelLabel(\"Trax Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Trax Editor\")) -mbv $menusOkayInPanels  $panelName;\n\n\t\t\t$editorName = clipEditorNameFromPanel($panelName);\n            clipEditor -e \n                -displayKeys 0\n                -displayTangents 0\n                -displayActiveKeys 0\n                -displayActiveKeyTangents 0\n                -displayInfinities 0\n                -displayValues 0\n                -autoFit 0\n                -autoFitTime 0\n                -snapTime \"none\" \n                -snapValue \"none\" \n                -initialized 0\n                -manageSequencer 0 \n                $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"sequenceEditorPanel\" (localizedPanelLabel(\"Camera Sequencer\")) `;\n"
-		+ "\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Camera Sequencer\")) -mbv $menusOkayInPanels  $panelName;\n\n\t\t\t$editorName = sequenceEditorNameFromPanel($panelName);\n            clipEditor -e \n                -displayKeys 0\n                -displayTangents 0\n                -displayActiveKeys 0\n                -displayActiveKeyTangents 0\n                -displayInfinities 0\n                -displayValues 0\n                -autoFit 0\n                -autoFitTime 0\n                -snapTime \"none\" \n                -snapValue \"none\" \n                -initialized 0\n                -manageSequencer 1 \n                $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperGraphPanel\" (localizedPanelLabel(\"Hypergraph Hierarchy\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypergraph Hierarchy\")) -mbv $menusOkayInPanels  $panelName;\n"
-		+ "\n\t\t\t$editorName = ($panelName+\"HyperGraphEd\");\n            hyperGraph -e \n                -graphLayoutStyle \"hierarchicalLayout\" \n                -orientation \"horiz\" \n                -mergeConnections 0\n                -zoom 1\n                -animateTransition 0\n                -showRelationships 1\n                -showShapes 0\n                -showDeformers 0\n                -showExpressions 0\n                -showConstraints 0\n                -showConnectionFromSelected 0\n                -showConnectionToSelected 0\n                -showConstraintLabels 0\n                -showUnderworld 0\n                -showInvisible 0\n                -transitionFrames 1\n                -opaqueContainers 0\n                -freeform 0\n                -imagePosition 0 0 \n                -imageScale 1\n                -imageEnabled 0\n                -graphType \"DAG\" \n                -heatMapDisplay 0\n                -updateSelection 1\n                -updateNodeAdded 1\n                -useDrawOverrideColor 0\n                -limitGraphTraversal -1\n"
-		+ "                -range 0 0 \n                -iconSize \"smallIcons\" \n                -showCachedConnections 0\n                $editorName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"hyperShadePanel\" (localizedPanelLabel(\"Hypershade\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Hypershade\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"visorPanel\" (localizedPanelLabel(\"Visor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Visor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"nodeEditorPanel\" (localizedPanelLabel(\"Node Editor\")) `;\n\tif ($nodeEditorPanelVisible || $nodeEditorWorkspaceControlOpen) {\n"
-		+ "\t\tif (\"\" == $panelName) {\n\t\t\tif ($useSceneConfig) {\n\t\t\t\t$panelName = `scriptedPanel -unParent  -type \"nodeEditorPanel\" -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels `;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n            nodeEditor -e \n                -allAttributes 0\n                -allNodes 0\n                -autoSizeNodes 1\n                -consistentNameSize 1\n                -createNodeCommand \"nodeEdCreateNodeCommand\" \n                -connectNodeOnCreation 0\n                -connectOnDrop 0\n                -copyConnectionsOnPaste 0\n                -connectionStyle \"bezier\" \n                -defaultPinnedState 0\n                -additiveGraphingMode 0\n                -settingsChangedCallback \"nodeEdSyncControls\" \n                -traversalDepthLimit -1\n                -keyPressCommand \"nodeEdKeyPressCommand\" \n                -nodeTitleMode \"name\" \n                -gridSnap 0\n                -gridVisibility 1\n                -crosshairOnEdgeDragging 0\n                -popupMenuScript \"nodeEdBuildPanelMenus\" \n"
-		+ "                -showNamespace 1\n                -showShapes 1\n                -showSGShapes 0\n                -showTransforms 1\n                -useAssets 1\n                -syncedSelection 1\n                -extendToShapes 1\n                -editorMode \"default\" \n                -hasWatchpoint 0\n                $editorName;\n\t\t\t}\n\t\t} else {\n\t\t\t$label = `panel -q -label $panelName`;\n\t\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Node Editor\")) -mbv $menusOkayInPanels  $panelName;\n\n\t\t\t$editorName = ($panelName+\"NodeEditorEd\");\n            nodeEditor -e \n                -allAttributes 0\n                -allNodes 0\n                -autoSizeNodes 1\n                -consistentNameSize 1\n                -createNodeCommand \"nodeEdCreateNodeCommand\" \n                -connectNodeOnCreation 0\n                -connectOnDrop 0\n                -copyConnectionsOnPaste 0\n                -connectionStyle \"bezier\" \n                -defaultPinnedState 0\n                -additiveGraphingMode 0\n                -settingsChangedCallback \"nodeEdSyncControls\" \n"
-		+ "                -traversalDepthLimit -1\n                -keyPressCommand \"nodeEdKeyPressCommand\" \n                -nodeTitleMode \"name\" \n                -gridSnap 0\n                -gridVisibility 1\n                -crosshairOnEdgeDragging 0\n                -popupMenuScript \"nodeEdBuildPanelMenus\" \n                -showNamespace 1\n                -showShapes 1\n                -showSGShapes 0\n                -showTransforms 1\n                -useAssets 1\n                -syncedSelection 1\n                -extendToShapes 1\n                -editorMode \"default\" \n                -hasWatchpoint 0\n                $editorName;\n\t\t\tif (!$useSceneConfig) {\n\t\t\t\tpanel -e -l $label $panelName;\n\t\t\t}\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"createNodePanel\" (localizedPanelLabel(\"Create Node\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Create Node\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n"
-		+ "\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"polyTexturePlacementPanel\" (localizedPanelLabel(\"UV Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"UV Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"renderWindowPanel\" (localizedPanelLabel(\"Render View\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Render View\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"shapePanel\" (localizedPanelLabel(\"Shape Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tshapePanel -edit -l (localizedPanelLabel(\"Shape Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n"
-		+ "\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextPanel \"posePanel\" (localizedPanelLabel(\"Pose Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tposePanel -edit -l (localizedPanelLabel(\"Pose Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynRelEdPanel\" (localizedPanelLabel(\"Dynamic Relationships\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Dynamic Relationships\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"relationshipPanel\" (localizedPanelLabel(\"Relationship Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Relationship Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n"
-		+ "\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"referenceEditorPanel\" (localizedPanelLabel(\"Reference Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Reference Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"componentEditorPanel\" (localizedPanelLabel(\"Component Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Component Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"dynPaintScriptedPanelType\" (localizedPanelLabel(\"Paint Effects\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Paint Effects\")) -mbv $menusOkayInPanels  $panelName;\n"
-		+ "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"scriptEditorPanel\" (localizedPanelLabel(\"Script Editor\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Script Editor\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"profilerPanel\" (localizedPanelLabel(\"Profiler Tool\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Profiler Tool\")) -mbv $menusOkayInPanels  $panelName;\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"contentBrowserPanel\" (localizedPanelLabel(\"Content Browser\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Content Browser\")) -mbv $menusOkayInPanels  $panelName;\n"
-		+ "\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\t$panelName = `sceneUIReplacement -getNextScriptedPanel \"Stereo\" (localizedPanelLabel(\"Stereo\")) `;\n\tif (\"\" != $panelName) {\n\t\t$label = `panel -q -label $panelName`;\n\t\tscriptedPanel -edit -l (localizedPanelLabel(\"Stereo\")) -mbv $menusOkayInPanels  $panelName;\n{ string $editorName = ($panelName+\"Editor\");\n            stereoCameraView -e \n                -camera \"persp\" \n                -useInteractiveMode 0\n                -displayLights \"default\" \n                -displayAppearance \"wireframe\" \n                -activeOnly 0\n                -ignorePanZoom 0\n                -wireframeOnShaded 0\n                -headsUpDisplay 1\n                -holdOuts 1\n                -selectionHiliteDisplay 1\n                -useDefaultMaterial 0\n                -bufferMode \"double\" \n                -twoSidedLighting 1\n                -backfaceCulling 0\n                -xray 0\n                -jointXray 0\n                -activeComponentsXray 0\n                -displayTextures 0\n"
-		+ "                -smoothWireframe 0\n                -lineWidth 1\n                -textureAnisotropic 0\n                -textureHilight 1\n                -textureSampling 2\n                -textureDisplay \"modulate\" \n                -textureMaxSize 16384\n                -fogging 0\n                -fogSource \"fragment\" \n                -fogMode \"linear\" \n                -fogStart 0\n                -fogEnd 100\n                -fogDensity 0.1\n                -fogColor 0.5 0.5 0.5 1 \n                -depthOfFieldPreview 1\n                -maxConstantTransparency 1\n                -objectFilterShowInHUD 1\n                -isFiltered 0\n                -colorResolution 4 4 \n                -bumpResolution 4 4 \n                -textureCompression 0\n                -transparencyAlgorithm \"frontAndBackCull\" \n                -transpInShadows 0\n                -cullingOverride \"none\" \n                -lowQualityLighting 0\n                -maximumNumHardwareLights 0\n                -occlusionCulling 0\n                -shadingModel 0\n"
-		+ "                -useBaseRenderer 0\n                -useReducedRenderer 0\n                -smallObjectCulling 0\n                -smallObjectThreshold -1 \n                -interactiveDisableShadows 0\n                -interactiveBackFaceCull 0\n                -sortTransparent 1\n                -controllers 1\n                -nurbsCurves 1\n                -nurbsSurfaces 1\n                -polymeshes 1\n                -subdivSurfaces 1\n                -planes 1\n                -lights 1\n                -cameras 1\n                -controlVertices 1\n                -hulls 1\n                -grid 1\n                -imagePlane 1\n                -joints 1\n                -ikHandles 1\n                -deformers 1\n                -dynamics 1\n                -particleInstancers 1\n                -fluids 1\n                -hairSystems 1\n                -follicles 1\n                -nCloths 1\n                -nParticles 1\n                -nRigids 1\n                -dynamicConstraints 1\n                -locators 1\n                -manipulators 1\n"
-		+ "                -pluginShapes 1\n                -dimensions 1\n                -handles 1\n                -pivots 1\n                -textures 1\n                -strokes 1\n                -motionTrails 1\n                -clipGhosts 1\n                -greasePencils 1\n                -shadows 0\n                -captureSequenceNumber -1\n                -width 0\n                -height 0\n                -sceneRenderFilter 0\n                -displayMode \"centerEye\" \n                -viewColor 0 0 0 1 \n                -useCustomBackground 1\n                $editorName;\n            stereoCameraView -e -viewSelected 0 $editorName;\n            stereoCameraView -e \n                -pluginObjects \"gpuCacheDisplayFilter\" 1 \n                $editorName; };\n\t\tif (!$useSceneConfig) {\n\t\t\tpanel -e -l $label $panelName;\n\t\t}\n\t}\n\n\n\tif ($useSceneConfig) {\n        string $configName = `getPanel -cwl (localizedPanelLabel(\"Current Layout\"))`;\n        if (\"\" != $configName) {\n\t\t\tpanelConfiguration -edit -label (localizedPanelLabel(\"Current Layout\")) \n"
-		+ "\t\t\t\t-userCreated false\n\t\t\t\t-defaultImage \"vacantCell.xP:/\"\n\t\t\t\t-image \"\"\n\t\t\t\t-sc false\n\t\t\t\t-configString \"global string $gMainPane; paneLayout -e -cn \\\"single\\\" -ps 1 100 100 $gMainPane;\"\n\t\t\t\t-removeAllPanels\n\t\t\t\t-ap false\n\t\t\t\t\t(localizedPanelLabel(\"Persp View\")) \n\t\t\t\t\t\"modelPanel\"\n"
-		+ "\t\t\t\t\t\"$panelName = `modelPanel -unParent -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels `;\\n$editorName = $panelName;\\nmodelEditor -e \\n    -cam `findStartUpCamera persp` \\n    -useInteractiveMode 0\\n    -displayLights \\\"default\\\" \\n    -displayAppearance \\\"smoothShaded\\\" \\n    -activeOnly 0\\n    -ignorePanZoom 0\\n    -wireframeOnShaded 0\\n    -headsUpDisplay 1\\n    -holdOuts 1\\n    -selectionHiliteDisplay 1\\n    -useDefaultMaterial 0\\n    -bufferMode \\\"double\\\" \\n    -twoSidedLighting 0\\n    -backfaceCulling 0\\n    -xray 0\\n    -jointXray 0\\n    -activeComponentsXray 0\\n    -displayTextures 0\\n    -smoothWireframe 0\\n    -lineWidth 1\\n    -textureAnisotropic 0\\n    -textureHilight 1\\n    -textureSampling 2\\n    -textureDisplay \\\"modulate\\\" \\n    -textureMaxSize 16384\\n    -fogging 0\\n    -fogSource \\\"fragment\\\" \\n    -fogMode \\\"linear\\\" \\n    -fogStart 0\\n    -fogEnd 100\\n    -fogDensity 0.1\\n    -fogColor 0.5 0.5 0.5 1 \\n    -depthOfFieldPreview 1\\n    -maxConstantTransparency 1\\n    -rendererName \\\"vp2Renderer\\\" \\n    -objectFilterShowInHUD 1\\n    -isFiltered 0\\n    -colorResolution 256 256 \\n    -bumpResolution 512 512 \\n    -textureCompression 0\\n    -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n    -transpInShadows 0\\n    -cullingOverride \\\"none\\\" \\n    -lowQualityLighting 0\\n    -maximumNumHardwareLights 1\\n    -occlusionCulling 0\\n    -shadingModel 0\\n    -useBaseRenderer 0\\n    -useReducedRenderer 0\\n    -smallObjectCulling 0\\n    -smallObjectThreshold -1 \\n    -interactiveDisableShadows 0\\n    -interactiveBackFaceCull 0\\n    -sortTransparent 1\\n    -controllers 1\\n    -nurbsCurves 1\\n    -nurbsSurfaces 1\\n    -polymeshes 1\\n    -subdivSurfaces 1\\n    -planes 1\\n    -lights 1\\n    -cameras 1\\n    -controlVertices 1\\n    -hulls 1\\n    -grid 1\\n    -imagePlane 1\\n    -joints 1\\n    -ikHandles 1\\n    -deformers 1\\n    -dynamics 1\\n    -particleInstancers 1\\n    -fluids 1\\n    -hairSystems 1\\n    -follicles 1\\n    -nCloths 1\\n    -nParticles 1\\n    -nRigids 1\\n    -dynamicConstraints 1\\n    -locators 1\\n    -manipulators 1\\n    -pluginShapes 1\\n    -dimensions 1\\n    -handles 1\\n    -pivots 1\\n    -textures 1\\n    -strokes 1\\n    -motionTrails 1\\n    -clipGhosts 1\\n    -greasePencils 1\\n    -shadows 0\\n    -captureSequenceNumber -1\\n    -width 1381\\n    -height 702\\n    -sceneRenderFilter 0\\n    $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n    -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n    $editorName\"\n"
-		+ "\t\t\t\t\t\"modelPanel -edit -l (localizedPanelLabel(\\\"Persp View\\\")) -mbv $menusOkayInPanels  $panelName;\\n$editorName = $panelName;\\nmodelEditor -e \\n    -cam `findStartUpCamera persp` \\n    -useInteractiveMode 0\\n    -displayLights \\\"default\\\" \\n    -displayAppearance \\\"smoothShaded\\\" \\n    -activeOnly 0\\n    -ignorePanZoom 0\\n    -wireframeOnShaded 0\\n    -headsUpDisplay 1\\n    -holdOuts 1\\n    -selectionHiliteDisplay 1\\n    -useDefaultMaterial 0\\n    -bufferMode \\\"double\\\" \\n    -twoSidedLighting 0\\n    -backfaceCulling 0\\n    -xray 0\\n    -jointXray 0\\n    -activeComponentsXray 0\\n    -displayTextures 0\\n    -smoothWireframe 0\\n    -lineWidth 1\\n    -textureAnisotropic 0\\n    -textureHilight 1\\n    -textureSampling 2\\n    -textureDisplay \\\"modulate\\\" \\n    -textureMaxSize 16384\\n    -fogging 0\\n    -fogSource \\\"fragment\\\" \\n    -fogMode \\\"linear\\\" \\n    -fogStart 0\\n    -fogEnd 100\\n    -fogDensity 0.1\\n    -fogColor 0.5 0.5 0.5 1 \\n    -depthOfFieldPreview 1\\n    -maxConstantTransparency 1\\n    -rendererName \\\"vp2Renderer\\\" \\n    -objectFilterShowInHUD 1\\n    -isFiltered 0\\n    -colorResolution 256 256 \\n    -bumpResolution 512 512 \\n    -textureCompression 0\\n    -transparencyAlgorithm \\\"frontAndBackCull\\\" \\n    -transpInShadows 0\\n    -cullingOverride \\\"none\\\" \\n    -lowQualityLighting 0\\n    -maximumNumHardwareLights 1\\n    -occlusionCulling 0\\n    -shadingModel 0\\n    -useBaseRenderer 0\\n    -useReducedRenderer 0\\n    -smallObjectCulling 0\\n    -smallObjectThreshold -1 \\n    -interactiveDisableShadows 0\\n    -interactiveBackFaceCull 0\\n    -sortTransparent 1\\n    -controllers 1\\n    -nurbsCurves 1\\n    -nurbsSurfaces 1\\n    -polymeshes 1\\n    -subdivSurfaces 1\\n    -planes 1\\n    -lights 1\\n    -cameras 1\\n    -controlVertices 1\\n    -hulls 1\\n    -grid 1\\n    -imagePlane 1\\n    -joints 1\\n    -ikHandles 1\\n    -deformers 1\\n    -dynamics 1\\n    -particleInstancers 1\\n    -fluids 1\\n    -hairSystems 1\\n    -follicles 1\\n    -nCloths 1\\n    -nParticles 1\\n    -nRigids 1\\n    -dynamicConstraints 1\\n    -locators 1\\n    -manipulators 1\\n    -pluginShapes 1\\n    -dimensions 1\\n    -handles 1\\n    -pivots 1\\n    -textures 1\\n    -strokes 1\\n    -motionTrails 1\\n    -clipGhosts 1\\n    -greasePencils 1\\n    -shadows 0\\n    -captureSequenceNumber -1\\n    -width 1381\\n    -height 702\\n    -sceneRenderFilter 0\\n    $editorName;\\nmodelEditor -e -viewSelected 0 $editorName;\\nmodelEditor -e \\n    -pluginObjects \\\"gpuCacheDisplayFilter\\\" 1 \\n    $editorName\"\n"
-		+ "\t\t\t\t$configName;\n\n            setNamedPanelLayout (localizedPanelLabel(\"Current Layout\"));\n        }\n\n        panelHistory -e -clear mainPanelHistory;\n        sceneUIReplacement -clear;\n\t}\n\n\ngrid -spacing 5 -size 12 -divisions 5 -displayAxes yes -displayGridLines yes -displayDivisionLines yes -displayPerspectiveLabels no -displayOrthographicLabels no -displayAxesBold yes -perspectiveLabelPosition axis -orthographicLabelPosition edge;\nviewManip -drawCompass 0 -compassAngle 0 -frontParameters \"\" -homeParameters \"\" -selectionLockParameters \"\";\n}\n");
-	setAttr ".st" 3;
-createNode script -n "sceneConfigurationScriptNode";
-	rename -uid "F61D7276-4198-38E4-ED16-E4B01C117DC5";
-	setAttr ".b" -type "string" "playbackOptions -min 1 -max 120 -ast 1 -aet 200 ";
-	setAttr ".st" 6;
-createNode aiStandardSurface -n "aiStandardSurface1";
-	rename -uid "A83E27A3-4159-4ABB-441D-62A1916ADB9B";
-	setAttr ".specular_roughness" 0.80000001192092896;
-	setAttr ".specular_IOR" 2.4200000762939453;
-createNode shadingEngine -n "aiStandardSurface1SG";
-	rename -uid "437BDA42-41EE-F812-BD08-D4AC2956E430";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo1";
-	rename -uid "8BF88139-4761-917B-9674-46A00DF65843";
-createNode aiOptions -s -n "defaultArnoldRenderOptions";
-	rename -uid "65EFC63E-4EFD-0B47-C29D-21930325A769";
-	addAttr -ci true -sn "ARV_options" -ln "ARV_options" -dt "string";
-	setAttr ".GI_diffuse_samples" 4;
-	setAttr ".GI_specular_samples" 4;
-	setAttr ".GI_transmission_samples" 4;
-	setAttr ".GI_sss_samples" 4;
-	setAttr ".GI_volume_samples" 4;
-	setAttr ".enable_progressive_render" yes;
-	setAttr ".version" -type "string" "3.2.2";
-createNode aiAOVFilter -s -n "defaultArnoldFilter";
-	rename -uid "AA0EA6BB-45D5-DC32-D136-5EAE2083321D";
-	setAttr ".ai_translator" -type "string" "gaussian";
-createNode aiAOVDriver -s -n "defaultArnoldDriver";
-	rename -uid "099949DA-4B6C-9460-39D2-F094E8160E08";
-	setAttr ".ai_translator" -type "string" "exr";
-createNode aiAOVDriver -s -n "defaultArnoldDisplayDriver";
-	rename -uid "50D043A2-4BD8-F072-8519-F59DE9BDF982";
-	setAttr ".output_mode" 0;
-	setAttr ".ai_translator" -type "string" "maya";
-createNode file -n "file1";
-	rename -uid "BF04855D-43EB-F6A0-7CF3-C4B0DBEF3437";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture1";
-	rename -uid "027D2CE2-4B60-DEC6-9A4B-239427751B79";
-createNode aiStandardSurface -n "aiStandardSurface2";
-	rename -uid "EFA802EB-4901-EEA2-4DE1-C2B2F196F094";
-	setAttr ".specular_roughness" 1;
-	setAttr ".specular_IOR" 1.3999999761581421;
-createNode shadingEngine -n "aiStandardSurface2SG";
-	rename -uid "03219A1E-4AB5-A42C-C5CD-2993208C6BA6";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo2";
-	rename -uid "AE575A36-4B16-92A5-41F3-038B867398A1";
-createNode file -n "file2";
-	rename -uid "17485456-4CCC-84B4-65F9-83B3B73E753B";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/red-velvet-texture-background.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture2";
-	rename -uid "D27D9A32-4C1F-BCEE-0B57-F993961EF967";
-createNode aiStandardSurface -n "aiStandardSurface3";
-	rename -uid "4AFFFFA3-429A-FC27-C75E-2E9249B6E567";
-	setAttr ".specular_roughness" 0.80000001192092896;
-	setAttr ".specular_IOR" 2.4200000762939453;
-createNode shadingEngine -n "aiStandardSurface3SG";
-	rename -uid "CED5A633-4992-528D-C9DC-A6BAFE593B9A";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo3";
-	rename -uid "DB4587CA-40E6-87D5-02B7-A88F852FEE9E";
-createNode file -n "file3";
-	rename -uid "738968C4-470B-AFA2-86EA-E49584577745";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture3";
-	rename -uid "673F55C8-474B-B3C5-8851-4593399AFFDA";
-createNode aiStandardSurface -n "aiStandardSurface4";
-	rename -uid "E8B77310-40C5-D76D-FE98-D58A7A17526A";
-	setAttr ".specular_roughness" 0.80000001192092896;
-	setAttr ".specular_IOR" 2.4200000762939453;
-createNode shadingEngine -n "aiStandardSurface4SG";
-	rename -uid "1AFA418E-4501-A7AB-9285-A78D86500986";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo4";
-	rename -uid "E0A614F9-4DFD-06B6-B2DC-4C82AD4257A6";
-createNode file -n "file4";
-	rename -uid "2F924760-498B-F355-DB99-C68033E0C8E9";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture4";
-	rename -uid "1467456C-4905-97F2-4296-94A10D2B1CE6";
-createNode file -n "file5";
-	rename -uid "C95A00E1-401C-A4B4-D3CE-11B83C1684AA";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/snowy_park_01_2k.hdr";
-	setAttr ".cs" -type "string" "Raw";
-createNode place2dTexture -n "place2dTexture5";
-	rename -uid "CD022E7D-46A8-1671-7043-3798E69C3FFA";
-createNode file -n "file6";
-	rename -uid "3F20BF3F-4B76-6906-927B-1F8CDA2B215F";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/snowy_park_01_2k.hdr";
-	setAttr ".cs" -type "string" "Raw";
-createNode place2dTexture -n "place2dTexture6";
-	rename -uid "132DA6E3-485F-0A02-22F0-BE818450C836";
-createNode file -n "file7";
-	rename -uid "38D3C5ED-4B1E-55A9-5D9C-259C067AB755";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/snowy_park_01_2k.hdr";
-	setAttr ".cs" -type "string" "Raw";
-createNode place2dTexture -n "place2dTexture7";
-	rename -uid "7461BD1F-4C3B-396A-43C4-5B90C8412795";
-createNode file -n "file8";
-	rename -uid "4ACD2624-4320-5F9D-4F33-40BF21FC4405";
-	setAttr ".ail" yes;
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture8";
-	rename -uid "0126FE95-4359-15C6-854C-C3896FB34E96";
-createNode bump2d -n "bump2d1";
-	rename -uid "3C53CD59-4732-9B06-CB6A-E8A8D9904D31";
-	setAttr ".bd" 1.1445783376693726;
-	setAttr -av ".bv" 1;
-	setAttr ".vc1" -type "float3" 0 0.00058999995 0 ;
-	setAttr ".vc2" -type "float3" 9.9999997e-06 9.9999997e-06 0 ;
-createNode file -n "file9";
-	rename -uid "FD1837FB-43B1-C1AD-8AD8-A9813B0681C3";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/snowy_park_01_2k.hdr";
-	setAttr ".cs" -type "string" "Raw";
-createNode place2dTexture -n "place2dTexture9";
-	rename -uid "B864C5AA-4C10-A23A-4412-1B9170020D2E";
-createNode aiStandardSurface -n "aiStandardSurface5";
-	rename -uid "E1B4DBB8-431E-7B41-D426-92AF6F7F7B16";
-	setAttr ".specular_roughness" 1;
-	setAttr ".specular_IOR" 1.3999999761581421;
-createNode shadingEngine -n "aiStandardSurface5SG";
-	rename -uid "DC63B459-4308-4D73-62F2-2FABE477E46B";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo5";
-	rename -uid "27A465A5-4FF4-DADA-4FB4-1E98C9EAE584";
-createNode file -n "file10";
-	rename -uid "35726321-40B8-4E00-C468-72A64A39703C";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/Snow004_2K-JPG/Snow004_2K_Color.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture10";
-	rename -uid "C51219C5-426C-A2BA-FA55-E791B3EEA359";
-createNode file -n "file11";
-	rename -uid "2BFD2F1B-41F6-4C44-C864-889D606A66C9";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/Snow004_2K-JPG/Snow004_2K_Displacement.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture11";
-	rename -uid "6FCEDDD9-450A-17ED-0989-BB87342AD5EB";
-createNode file -n "file12";
-	rename -uid "2BF3F935-4DC4-0905-A66B-A58AFA0F2829";
-	setAttr ".ail" yes;
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture12";
-	rename -uid "F3D94331-495D-6EBA-4023-8E98E4201431";
-createNode bump2d -n "bump2d2";
-	rename -uid "4552B601-4E2A-142C-8911-55AE578A6B48";
-	setAttr ".vc1" -type "float3" 0 1.9999999e-05 0 ;
-	setAttr ".vc2" -type "float3" 9.9999997e-06 9.9999997e-06 0 ;
-createNode file -n "file13";
-	rename -uid "609FAD9E-4C99-AD90-5E02-F2A1FBD6784F";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/Snow004_2K-JPG/Snow004_2K_Roughness.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture13";
-	rename -uid "75F4E750-43B5-DA43-85F8-03BB3A3402BA";
-createNode aiStandardSurface -n "aiStandardSurface6";
-	rename -uid "59FA2B86-45BD-160C-4B26-4AA335CF2946";
-	setAttr ".specular_roughness" 0.83766233921051025;
-createNode shadingEngine -n "aiStandardSurface6SG";
-	rename -uid "745F390E-4E42-2353-F1A8-CCAC566EBBFA";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo6";
-	rename -uid "88EC8729-4F35-1E48-0B28-BBA308F5BA7A";
-createNode file -n "file14";
-	rename -uid "61AA887A-4A08-F4DC-B27E-45A1C2AE463F";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/snow.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture14";
-	rename -uid "ECBB201B-4CE4-713B-EAA5-2780086ACFD2";
-createNode file -n "file15";
-	rename -uid "97BF5F32-46E2-F0BA-3C1B-D0A4F94D130A";
-	setAttr ".ail" yes;
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture15";
-	rename -uid "CEFA9C5A-4AF2-F7D7-F2FE-0490900AC15F";
-createNode bump2d -n "bump2d3";
-	rename -uid "6C0CA24A-4DB9-71EA-98E9-22B87C87FC49";
-	setAttr -av ".bd" 1;
-	setAttr ".vc1" -type "float3" 0 1.9999999e-05 0 ;
-	setAttr ".vc2" -type "float3" 9.9999997e-06 9.9999997e-06 0 ;
-createNode file -n "file16";
-	rename -uid "D91F3563-4477-75A9-6557-3F9C5D218E57";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/snow.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture16";
-	rename -uid "514647BD-40E9-7245-D85B-44BDA5BFF35E";
-createNode aiStandardSurface -n "aiStandardSurface7";
-	rename -uid "5A8D5E87-478C-936C-4A1F-60B100943032";
-	setAttr ".specular_roughness" 0.87012988328933716;
-createNode shadingEngine -n "aiStandardSurface7SG";
-	rename -uid "79DD3DE0-4D07-B70E-FD6D-3EB37111EDEF";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo7";
-	rename -uid "3C2892FC-4B49-DA98-7610-1AAC4DD59DA4";
-createNode file -n "file17";
-	rename -uid "E0F7EDD2-4407-7221-A58B-A485EA15FD23";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture17";
-	rename -uid "EBA9EA79-4424-8991-9EFA-12B0A5A615CA";
-createNode file -n "file18";
-	rename -uid "F6DACEE3-4BAB-B300-868A-67AFBCF67328";
-	setAttr ".ail" yes;
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture18";
-	rename -uid "6108A604-4135-6839-3324-55A1A1D5241A";
-createNode bump2d -n "bump2d4";
-	rename -uid "CF0BD43E-4A9D-504A-B885-51BEB06A0FC3";
-	setAttr ".vc1" -type "float3" 0 2.9999999e-05 0 ;
-	setAttr ".vc2" -type "float3" 9.9999997e-06 9.9999997e-06 0 ;
-createNode file -n "file19";
-	rename -uid "149710B1-4570-AEF6-B0A8-A1B1F758A560";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture19";
-	rename -uid "4C5EDB33-45A9-BE73-CEFD-EAB1F0CCE70B";
-createNode nodeGraphEditorInfo -n "hyperShadePrimaryNodeEditorSavedTabsInfo";
-	rename -uid "CDDC8350-4E64-C622-6C01-8A908115811D";
-	setAttr ".tgi[0].tn" -type "string" "Untitled_1";
-	setAttr ".tgi[0].vl" -type "double2" -330.95236780151544 -323.80951094248991 ;
-	setAttr ".tgi[0].vh" -type "double2" 317.85713022663526 338.09522466054096 ;
-createNode aiStandardSurface -n "aiStandardSurface8";
-	rename -uid "50BA714D-48FD-DFB9-AFA6-56A2AD8079D0";
-	setAttr ".specular_roughness" 1;
-createNode shadingEngine -n "aiStandardSurface8SG";
-	rename -uid "A8A6C0C4-4F2B-9821-C101-1897A4194BD9";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo8";
-	rename -uid "1699090A-4FBA-380B-ACD8-C58B0BCE274C";
-createNode file -n "file20";
-	rename -uid "8149FB4D-4CB2-E836-0D41-27A5487C3A83";
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture20";
-	rename -uid "C2816937-44CF-8FBB-F124-E2BDA3B227F1";
-createNode file -n "file21";
-	rename -uid "565A4DA6-4D4A-4566-6CF2-448514F0F125";
-	setAttr ".ail" yes;
-	setAttr ".ftn" -type "string" "E:/3D Class/Snow Man/Snow man//sourceimages/33082941-snow-texture.jpg";
-	setAttr ".cs" -type "string" "sRGB";
-createNode place2dTexture -n "place2dTexture21";
-	rename -uid "BEA7210C-4465-5336-361E-C3B3A4B0B9E4";
-createNode bump2d -n "bump2d5";
-	rename -uid "6E361D2B-45A9-C04D-6CB7-BAA7D48FC985";
-	setAttr ".bd" -0.60240966081619263;
-	setAttr ".vc1" -type "float3" 0 1.9999999e-05 0 ;
-	setAttr ".vc2" -type "float3" 9.9999997e-06 9.9999997e-06 0 ;
-createNode polySphere -n "polySphere1";
-	rename -uid "2823CC01-4C85-CF86-8A5D-3FAAE7B075BD";
-	setAttr ".r" 1.4087706643350586;
-createNode createColorSet -n "createColorSet7";
-	rename -uid "67A94BBA-43BF-257B-A4CC-23B7494D07CC";
-	setAttr ".colos" -type "string" "SculptFreezeColorTemp";
-	setAttr ".clam" no;
-createNode createColorSet -n "createColorSet8";
-	rename -uid "9741C614-41C3-663B-A0A4-4FBAEEBCB391";
-	setAttr ".colos" -type "string" "SculptMaskColorTemp";
-	setAttr ".clam" no;
-createNode polySphere -n "polySphere2";
-	rename -uid "E6FD77B5-4D17-6667-418B-19BA391BCAA9";
-	setAttr ".r" 0.19895764159623841;
-createNode polyCylinder -n "polyCylinder1";
-	rename -uid "C55D2AAF-42BC-8B9E-1C1A-40AE55C78711";
-	setAttr ".r" 0.72453733333840653;
-	setAttr ".h" 5.0686651108470668;
-	setAttr ".sc" 1;
-	setAttr ".cuv" 3;
-createNode polySplitRing -n "polySplitRing1";
-	rename -uid "BD8876A9-46A3-6DD1-6282-088C58E4C443";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 1 "e[40:59]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.3582785427570343;
-	setAttr ".dr" no;
-	setAttr ".re" 43;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak1";
-	rename -uid "45335732-4C37-96D4-86AB-869871FBA921";
-	setAttr ".uopa" yes;
-	setAttr -s 42 ".tk[0:41]" -type "float3"  -0.53867418 0 0.17502572 -0.45822334
-		 0 0.33291849 -0.33291873 0 0.45822307 -0.17502582 0 0.53867388 -6.989238e-08 0 0.56639481
-		 0.17502564 0 0.53867382 0.33291847 0 0.45822296 0.45822296 0 0.33291841 0.53867376
-		 0 0.17502563 0.56639469 0 -1.1648734e-07 0.53867376 0 -0.17502581 0.45822296 0 -0.33291861
-		 0.33291844 0 -0.4582231 0.17502569 0 -0.53867394 -5.3012496e-08 0 -0.56639481 -0.17502569
-		 0 -0.53867388 -0.33291849 0 -0.45822307 -0.45822296 0 -0.33291858 -0.53867376 0 -0.17502576
-		 -0.56639469 0 -1.1648734e-07 -0.63927436 0 0.20771272 -0.54379684 0 0.39509267 -0.3950929
-		 0 0.54379654 -0.20771295 0 0.639274 -8.2944851e-08 0 0.67217278 0.20771277 0 0.639274
-		 0.39509264 0 0.54379642 0.54379642 0 0.39509255 0.63927388 0 0.20771264 0.67217267
-		 0 -1.3824162e-07 0.63927388 0 -0.20771293 0.54379642 0 -0.39509279 0.39509255 0 -0.5437966
-		 0.2077127 0 -0.63927412 -6.2912655e-08 0 -0.67217278 -0.20771281 0 -0.639274 -0.39509267
-		 0 -0.54379654 -0.54379642 0 -0.39509276 -0.63927388 0 -0.20771289 -0.67217267 0 -1.3824162e-07
-		 -6.989238e-08 0 -1.1648734e-07 -8.2944851e-08 0 -1.3824162e-07;
-createNode polySplitRing -n "polySplitRing2";
-	rename -uid "0B2C29BA-4360-B5BF-940F-748AC0125BBE";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[100:101]" "e[103]" "e[105]" "e[107]" "e[109]" "e[111]" "e[113]" "e[115]" "e[117]" "e[119]" "e[121]" "e[123]" "e[125]" "e[127]" "e[129]" "e[131]" "e[133]" "e[135]" "e[137]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.22558361291885376;
-	setAttr ".dr" no;
-	setAttr ".re" 100;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing3";
-	rename -uid "7B5C65D1-4774-69F5-C012-3382290A81CC";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[140:141]" "e[143]" "e[145]" "e[147]" "e[149]" "e[151]" "e[153]" "e[155]" "e[157]" "e[159]" "e[161]" "e[163]" "e[165]" "e[167]" "e[169]" "e[171]" "e[173]" "e[175]" "e[177]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.25035691261291504;
-	setAttr ".dr" no;
-	setAttr ".re" 140;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing4";
-	rename -uid "68C9FB91-438B-41A2-9A5E-42A4439B8116";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[180:181]" "e[183]" "e[185]" "e[187]" "e[189]" "e[191]" "e[193]" "e[195]" "e[197]" "e[199]" "e[201]" "e[203]" "e[205]" "e[207]" "e[209]" "e[211]" "e[213]" "e[215]" "e[217]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.27693790197372437;
-	setAttr ".dr" no;
-	setAttr ".re" 180;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing5";
-	rename -uid "00497A52-43D6-D6DC-C8FA-13BE35C92E6F";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.58957266807556152;
-	setAttr ".dr" no;
-	setAttr ".re" 220;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing6";
-	rename -uid "FDC00F7A-42DB-4AA9-4D13-1293F67CDBE1";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[260:261]" "e[263]" "e[265]" "e[267]" "e[269]" "e[271]" "e[273]" "e[275]" "e[277]" "e[279]" "e[281]" "e[283]" "e[285]" "e[287]" "e[289]" "e[291]" "e[293]" "e[295]" "e[297]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.6933940052986145;
-	setAttr ".dr" no;
-	setAttr ".re" 261;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak2";
-	rename -uid "9E45C389-4751-57F6-30C9-7A95963D8B9B";
-	setAttr ".uopa" yes;
-	setAttr -s 121 ".tk";
-	setAttr ".tk[20]" -type "float3" 0.61939824 -0.15551673 0.011090486 ;
-	setAttr ".tk[21]" -type "float3" 0.62449431 -0.15551673 0.021095729 ;
-	setAttr ".tk[22]" -type "float3" 0.63243562 -0.15551673 0.029037099 ;
-	setAttr ".tk[23]" -type "float3" 0.6424408 -0.15551673 0.034133211 ;
-	setAttr ".tk[24]" -type "float3" 0.65353131 -0.15551673 0.035889544 ;
-	setAttr ".tk[25]" -type "float3" 0.66462189 -0.15551673 0.03413317 ;
-	setAttr ".tk[26]" -type "float3" 0.67462713 -0.15551673 0.029037099 ;
-	setAttr ".tk[27]" -type "float3" 0.68256849 -0.15551673 0.021095729 ;
-	setAttr ".tk[28]" -type "float3" 0.68766463 -0.15551673 0.011090486 ;
-	setAttr ".tk[29]" -type "float3" 0.689421 -0.15551673 -7.3814985e-09 ;
-	setAttr ".tk[30]" -type "float3" 0.68766463 -0.15551673 -0.011090486 ;
-	setAttr ".tk[31]" -type "float3" 0.68256849 -0.15551673 -0.021095729 ;
-	setAttr ".tk[32]" -type "float3" 0.67462713 -0.15551673 -0.029037099 ;
-	setAttr ".tk[33]" -type "float3" 0.66462189 -0.15551673 -0.03413317 ;
-	setAttr ".tk[34]" -type "float3" 0.65353131 -0.15551673 -0.035889544 ;
-	setAttr ".tk[35]" -type "float3" 0.6424408 -0.15551673 -0.034133211 ;
-	setAttr ".tk[36]" -type "float3" 0.63243562 -0.15551673 -0.029037099 ;
-	setAttr ".tk[37]" -type "float3" 0.62449431 -0.15551673 -0.021095729 ;
-	setAttr ".tk[38]" -type "float3" 0.61939818 -0.15551673 -0.011090486 ;
-	setAttr ".tk[39]" -type "float3" 0.61764187 -0.15551673 -7.3814985e-09 ;
-	setAttr ".tk[41]" -type "float3" 0.65353131 -0.15551673 -7.3814985e-09 ;
-	setAttr ".tk[42]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[43]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[44]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[45]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[46]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[47]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[48]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[49]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[50]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[51]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[52]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[53]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[54]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[55]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[56]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[57]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[58]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[59]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[60]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[61]" -type "float3" -0.076980047 -0.013513422 0 ;
-	setAttr ".tk[62]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[63]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[64]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[65]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[66]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[67]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[68]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[69]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[70]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[71]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[72]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[73]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[74]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[75]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[76]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[77]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[78]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[79]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[80]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[81]" -type "float3" -0.40320134 -0.070779786 0 ;
-	setAttr ".tk[82]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[83]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[84]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[85]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[86]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[87]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[88]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[89]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[90]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[91]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[92]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[93]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[94]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[95]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[96]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[97]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[98]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[99]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[100]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[101]" -type "float3" -0.11977238 -0.021025395 0 ;
-	setAttr ".tk[102]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[103]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[104]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[105]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[106]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[107]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[108]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[109]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[110]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[111]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[112]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[113]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[114]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[115]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[116]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[117]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[118]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[119]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[120]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[121]" -type "float3" -0.30987459 -0.054396812 0 ;
-	setAttr ".tk[122]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[123]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[124]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[125]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[126]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[127]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[128]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[129]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[130]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[131]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[132]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[133]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[134]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[135]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[136]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[137]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[138]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[139]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[140]" -type "float3" 0.03732916 0.0065529314 0 ;
-	setAttr ".tk[141]" -type "float3" 0.03732916 0.0065529314 0 ;
-createNode polySplitRing -n "polySplitRing7";
-	rename -uid "1246ED58-46B2-AAA0-5BB5-87A1F85F0E59";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[260:261]" "e[263]" "e[265]" "e[267]" "e[269]" "e[271]" "e[273]" "e[275]" "e[277]" "e[279]" "e[281]" "e[283]" "e[285]" "e[287]" "e[289]" "e[291]" "e[293]" "e[295]" "e[297]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.96619498729705811;
-	setAttr ".dr" no;
-	setAttr ".re" 260;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing8";
-	rename -uid "6A466EFA-4DC1-8739-EF18-2682565ECBC6";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[260:261]" "e[263]" "e[265]" "e[267]" "e[269]" "e[271]" "e[273]" "e[275]" "e[277]" "e[279]" "e[281]" "e[283]" "e[285]" "e[287]" "e[289]" "e[291]" "e[293]" "e[295]" "e[297]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.96233975887298584;
-	setAttr ".dr" no;
-	setAttr ".re" 297;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyCircularize -n "polyCircularize1";
-	rename -uid "A60B98F1-48A4-16CA-0B2E-5FB498F31F2D";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 2 "f[182:183]" "f[203:204]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".nor" 1;
-createNode polyExtrudeFace -n "polyExtrudeFace1";
-	rename -uid "CD558F92-4453-B683-EFB7-74B425E79FA0";
-	setAttr ".ics" -type "componentList" 2 "f[182:183]" "f[203:204]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -3.9224916 2.5921164 1.3919425 ;
-	setAttr ".rs" 64148;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -3.925381887987875 2.5880570419619318 1.3875001092280472 ;
-	setAttr ".cbx" -type "double3" -3.9196014051336023 2.5961754668760229 1.3963848648920734 ;
-	setAttr ".raf" no;
-createNode displayLayer -n "layer1";
-	rename -uid "01A68527-45AF-E4EE-30F9-36801AC43EF5";
-	setAttr ".do" 1;
-createNode polySplitRing -n "polySplitRing9";
-	rename -uid "D89B4D87-4BBA-8C61-1BE0-67A5A4538467";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.8972892165184021;
-	setAttr ".dr" no;
-	setAttr ".re" 257;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak3";
-	rename -uid "81028DBC-49D2-DBD2-2F80-8B93DD8AF266";
-	setAttr ".uopa" yes;
-	setAttr -s 9 ".tk[201:209]" -type "float3"  0.18565492 0.028958671 0.015498181
-		 0.18599358 0.032588314 8.0707308e-05 0.17988557 0.02582141 0.007003787 0.17773259
-		 0.026691547 -0.0055922414 0.18646249 0.036365692 -0.01549818 0.18045568 0.031060491
-		 -0.014913057 0.19166112 0.034263909 0.014914292 0.19438386 0.038631357 0.0055934777
-		 0.19223088 0.039501484 -0.007003786;
-createNode polySplitRing -n "polySplitRing10";
-	rename -uid "21A83D9B-40A4-A09A-18D3-C8AAF8D02DB3";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.98739320039749146;
-	setAttr ".dr" no;
-	setAttr ".re" 255;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing11";
-	rename -uid "7542BFA5-4E02-B40B-6E1C-5F9A549E6764";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.98296982049942017;
-	setAttr ".dr" no;
-	setAttr ".re" 255;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyCircularize -n "polyCircularize2";
-	rename -uid "0A1FCD81-4A81-B1C4-7E9A-119BFFD4358A";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 3 "f[248]" "f[267:268]" "f[287]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".nor" 1;
-createNode polyExtrudeFace -n "polyExtrudeFace2";
-	rename -uid "A9545682-4142-CA0F-0B08-C9A180BF878B";
-	setAttr ".ics" -type "componentList" 3 "f[248]" "f[267:268]" "f[287]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -3.8101585 2.4289162 1.3792965 ;
-	setAttr ".rs" 50549;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -3.8156874854843714 2.4234201405291591 1.3774008345170097 ;
-	setAttr ".cbx" -type "double3" -3.8046293213026479 2.4344121088454429 1.3811922820726119 ;
-	setAttr ".raf" no;
-createNode polySplitRing -n "polySplitRing12";
-	rename -uid "B809AE9E-41A6-77FE-E3DA-318D1A8FA91C";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.51941007375717163;
-	setAttr ".dr" no;
-	setAttr ".re" 255;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak4";
-	rename -uid "6D3EFE20-4BC1-8029-4DBC-A6A02E564BD4";
-	setAttr ".uopa" yes;
-	setAttr -s 9 ".tk[269:277]" -type "float3"  0.305446 0.053062577 -0.7015335
-		 0.28641286 0.055212472 -0.7015335 0.30239266 0.041847456 -0.7015335 0.28981283 0.04641946
-		 -0.7015335 0.32456386 0.05204137 -0.7015335 0.31678697 0.044175647 -0.7015335 0.30858451
-		 0.065406375 -0.7015335 0.2941899 0.063078187 -0.7015335 0.32116669 0.060834359 -0.7015335;
-createNode polySplitRing -n "polySplitRing13";
-	rename -uid "B7B7BC71-44F5-0362-E208-AAAE84AB9141";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.92639827728271484;
-	setAttr ".dr" no;
-	setAttr ".re" 257;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing14";
-	rename -uid "4F9D2AAE-4F5B-E8F1-B457-BB917A25EAC3";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[220:221]" "e[223]" "e[225]" "e[227]" "e[229]" "e[231]" "e[233]" "e[235]" "e[237]" "e[239]" "e[241]" "e[243]" "e[245]" "e[247]" "e[249]" "e[251]" "e[253]" "e[255]" "e[257]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.91127544641494751;
-	setAttr ".dr" no;
-	setAttr ".re" 257;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyCircularize -n "polyCircularize3";
-	rename -uid "DD888B22-4417-A2DD-01F9-CA9EAED70852";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 2 "f[317:319]" "f[337:339]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".nor" 1;
-createNode polyExtrudeFace -n "polyExtrudeFace3";
-	rename -uid "39B0EE9B-4D27-8370-BB36-CAA476850043";
-	setAttr ".ics" -type "componentList" 2 "f[317:319]" "f[337:339]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -3.6535828 2.3580267 1.3821858 ;
-	setAttr ".rs" 57259;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -3.6656977947562899 2.3479826321096779 1.3731153173082695 ;
-	setAttr ".cbx" -type "double3" -3.6414677876869979 2.3680710678476884 1.3912562660941397 ;
-	setAttr ".raf" no;
-createNode polySplitRing -n "polySplitRing15";
-	rename -uid "1AD0B4D7-41DB-67F2-99CA-83B8DBF07C4C";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[180:181]" "e[183]" "e[185]" "e[187]" "e[189]" "e[191]" "e[193]" "e[195]" "e[197]" "e[199]" "e[201]" "e[203]" "e[205]" "e[207]" "e[209]" "e[211]" "e[213]" "e[215]" "e[217]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.71745717525482178;
-	setAttr ".dr" no;
-	setAttr ".re" 197;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak5";
-	rename -uid "28D4D12C-4000-CDCC-E44D-B4B9A7E7E2E6";
-	setAttr ".uopa" yes;
-	setAttr -s 12 ".tk[336:347]" -type "float3"  0.79388195 0.12684229 -0.56603491
-		 0.78390038 0.13640305 -0.58748186 0.78451854 0.11784234 -0.57798511 0.77304888 0.11606511
-		 -0.5968253 0.77417016 0.13682652 -0.6043433 0.76385552 0.12218852 -0.61535859 0.76413125
-		 0.14665869 -0.62601089 0.76044917 0.13387457 -0.62650609 0.79756355 0.13962573 -0.56553924
-		 0.79415745 0.15131205 -0.57668722 0.78496432 0.15743609 -0.59522003 0.7734949 0.15565868
-		 -0.6140607;
-createNode polySplitRing -n "polySplitRing16";
-	rename -uid "06597672-4845-FD8E-9EEE-3F8C9F7A0F44";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[180:181]" "e[183]" "e[185]" "e[187]" "e[189]" "e[191]" "e[193]" "e[195]" "e[197]" "e[199]" "e[201]" "e[203]" "e[205]" "e[207]" "e[209]" "e[211]" "e[213]" "e[215]" "e[217]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.87988448143005371;
-	setAttr ".dr" no;
-	setAttr ".re" 195;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing17";
-	rename -uid "7D21764E-48D8-ED90-5261-73A0C79F1691";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[180:181]" "e[183]" "e[185]" "e[187]" "e[189]" "e[191]" "e[193]" "e[195]" "e[197]" "e[199]" "e[201]" "e[203]" "e[205]" "e[207]" "e[209]" "e[211]" "e[213]" "e[215]" "e[217]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.87981331348419189;
-	setAttr ".dr" no;
-	setAttr ".re" 197;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyCircularize -n "polyCircularize4";
-	rename -uid "B28807EC-4CD4-26AF-CE16-20B2C75F760D";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 3 "f[386:387]" "f[405:406]" "f[424:425]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".nor" 1;
-createNode polyExtrudeFace -n "polyExtrudeFace4";
-	rename -uid "6F2B4D85-4F9E-37EF-E593-668F2323DA9E";
-	setAttr ".ics" -type "componentList" 3 "f[386:387]" "f[405:406]" "f[424:425]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -3.4433603 2.2662477 1.4138111 ;
-	setAttr ".rs" 53922;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -3.4599658287070074 2.2501129130826798 1.4111715015067423 ;
-	setAttr ".cbx" -type "double3" -3.4267547691837206 2.2823825844286429 1.4164505873586062 ;
-	setAttr ".raf" no;
-createNode polySplitRing -n "polySplitRing18";
-	rename -uid "2DE93A9E-4792-5C37-CD33-A0B6794F5F9E";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 8 "e[826]" "e[828]" "e[831]" "e[833]" "e[836]" "e[838]" "e[841:842]" "e[846:847]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.21944910287857056;
-	setAttr ".re" 836;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak6";
-	rename -uid "A0C25936-4345-15AD-A328-3A9B92FE2D72";
-	setAttr ".uopa" yes;
-	setAttr -s 22 ".tk";
-	setAttr ".tk[348]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[349]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[366]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[367]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[368]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[369]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[370]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[387]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[388]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[389]" -type "float3" 0 0 -1.7881393e-07 ;
-	setAttr ".tk[406]" -type "float3" 1.4783126 0.26159665 0.63674045 ;
-	setAttr ".tk[407]" -type "float3" 1.5001812 0.26250076 0.63222939 ;
-	setAttr ".tk[408]" -type "float3" 1.4794608 0.22505893 0.63928455 ;
-	setAttr ".tk[409]" -type "float3" 1.5060073 0.22691756 0.63375098 ;
-	setAttr ".tk[410]" -type "float3" 1.5320712 0.26441327 0.62560701 ;
-	setAttr ".tk[411]" -type "float3" 1.5261016 0.24195045 0.62852603 ;
-	setAttr ".tk[412]" -type "float3" 1.4461641 0.25839955 0.64351296 ;
-	setAttr ".tk[413]" -type "float3" 1.4566031 0.2370833 0.64301318 ;
-	setAttr ".tk[414]" -type "float3" 1.4987737 0.29775319 0.6298359 ;
-	setAttr ".tk[415]" -type "float3" 1.521631 0.28572851 0.62610728 ;
-	setAttr ".tk[416]" -type "float3" 1.4521328 0.28086227 0.64059359 ;
-	setAttr ".tk[417]" -type "float3" 1.4722276 0.29589519 0.63536948 ;
-createNode polySplitRing -n "polySplitRing19";
-	rename -uid "EE069C36-4DD5-0764-7B2B-08B026FA26FF";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 9 "e[852:853]" "e[855]" "e[857]" "e[859]" "e[861]" "e[863]" "e[865]" "e[867]" "e[869]";
-	setAttr ".ix" -type "matrix" 0.070847409903024197 0.23716916395274862 0 0 -0.40358645714692487 0.12055975019793937 0 0
-		 0 0 0.24752488323401525 0 -3.0495508936227207 2.2075000192530632 1.3943256118490017 1;
-	setAttr ".wt" 0.38317269086837769;
-	setAttr ".dr" no;
-	setAttr ".re" 853;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyCone -n "polyCone1";
-	rename -uid "1B51A87D-4DB9-5C59-4179-2F94D2F2BAB0";
-	setAttr ".r" 0.41777063299215572;
-	setAttr ".h" 2.2238886242781386;
-	setAttr ".cuv" 3;
-createNode polySphere -n "polySphere3";
-	rename -uid "BA35C117-402C-B25D-1985-DCABBBBDFF22";
-	setAttr ".r" 0.47199044773812115;
-createNode makeNurbCircle -n "makeNurbCircle1";
-	rename -uid "311780C1-4BB9-8279-A36C-E4A25128CA74";
-	setAttr ".nr" -type "double3" 0 1 0 ;
-createNode polyTorus -n "polyTorus1";
-	rename -uid "D877D019-4BB2-1A39-510D-E5826A5D182A";
-	setAttr ".r" 1.9578000216352436;
-createNode polyExtrudeFace -n "polyExtrudeFace5";
-	rename -uid "73965805-4227-569C-7D31-72828E1A9A7B";
-	setAttr ".ics" -type "componentList" 2 "f[184]" "f[204]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -1.6919841 2.3968859 0.69018972 ;
-	setAttr ".rs" 54661;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -1.7893204199368606 2.3437925028262137 0.66991413608294903 ;
-	setAttr ".cbx" -type "double3" -1.5946475983977468 2.449979470428775 0.71046524614415263 ;
-	setAttr ".raf" no;
-createNode polyTweak -n "polyTweak7";
-	rename -uid "D3EE3ABB-42CB-84F6-3FB9-B5B0520B2439";
-	setAttr ".uopa" yes;
-	setAttr -s 200 ".tk";
-	setAttr ".tk[0]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[1]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[2]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[3]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[4]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[5]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[8]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[16]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[17]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[18]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[20]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[21]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[22]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[23]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[24]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[25]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[28]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[36]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[37]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[38]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[40]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[41]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[42]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[43]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[44]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[45]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[48]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[56]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[57]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[58]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[60]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[61]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[62]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[63]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[64]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[65]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[68]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[76]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[77]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[78]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[80]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[81]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[82]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[83]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[84]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[85]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[88]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[96]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[97]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[98]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[100]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[101]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[102]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[103]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[104]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[105]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[108]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[116]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[117]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[118]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[120]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[121]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[122]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[123]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[124]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[125]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[128]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[136]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[137]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[138]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[140]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[141]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[142]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[143]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[144]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[145]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[148]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[156]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[157]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[158]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[160]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[161]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[162]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[163]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[164]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[165]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[168]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[176]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[177]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[178]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[180]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[181]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[182]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[183]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[184]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[185]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[188]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[196]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[197]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[198]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[200]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[201]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[202]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[203]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[204]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[205]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[208]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[216]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[217]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[218]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[220]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[221]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[222]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[223]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[224]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[225]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[228]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[236]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[237]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[238]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[240]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[241]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[242]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[243]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[244]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[245]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[248]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[256]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[257]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[258]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[260]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[261]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[262]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[263]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[264]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[265]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[268]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[276]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[277]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[278]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[280]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[281]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[282]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[283]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[284]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[285]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[288]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[296]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[297]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[298]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[300]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[301]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[302]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[303]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[304]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[305]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[308]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[316]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[317]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[318]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[320]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[321]" -type "float3" -0.044863392 -0.11822127 8.8817842e-16 ;
-	setAttr ".tk[322]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[323]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[324]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[325]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[328]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[336]" -type "float3" -1.7763568e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[337]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[338]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[340]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[341]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[342]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[343]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[344]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[345]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[348]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[356]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[357]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[358]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[360]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[361]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[362]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[363]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[364]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[365]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[368]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[376]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[377]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[378]" -type "float3" 0 0.12727246 0 ;
-	setAttr ".tk[380]" -type "float3" 0 0.077407934 0.099227346 ;
-	setAttr ".tk[381]" -type "float3" -0.044863392 -0.11822127 7.7715612e-16 ;
-	setAttr ".tk[382]" -type "float3" 0 0.061625116 4.4408921e-16 ;
-	setAttr ".tk[383]" -type "float3" 7.7715612e-16 -0.034786552 -8.8817842e-16 ;
-	setAttr ".tk[384]" -type "float3" -0.070280775 0 -8.8817842e-16 ;
-	setAttr ".tk[385]" -type "float3" 0 0.066928364 -8.8817842e-16 ;
-	setAttr ".tk[388]" -type "float3" 0 -0.14828542 0 ;
-	setAttr ".tk[396]" -type "float3" -1.5543122e-15 -0.014973516 -0.00062322244 ;
-	setAttr ".tk[397]" -type "float3" 0.1847029 0 -0.17914324 ;
-	setAttr ".tk[398]" -type "float3" 0 0.12727246 0 ;
-createNode polySplitRing -n "polySplitRing20";
-	rename -uid "E3A4E607-4F23-4ECA-5138-2E8276601C72";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[799:800]" "e[802]" "e[804]" "e[807]" "e[809]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.17068581283092499;
-	setAttr ".re" 800;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak8";
-	rename -uid "E6E974C1-441D-0A43-B2AE-54BB2771A38B";
-	setAttr ".uopa" yes;
-	setAttr -s 6 ".tk[400:405]" -type "float3"  -1.42169535 -1.6886704 -2.39741182
-		 -1.42169535 -1.6886704 -2.39741182 -1.42169535 -1.6886704 -2.39741182 -1.42169535
-		 -1.6886704 -2.39741182 -1.42169535 -1.6886704 -2.39741182 -1.42169535 -1.6886704
-		 -2.39741182;
-createNode polySplitRing -n "polySplitRing21";
-	rename -uid "BC8D54A3-43A2-281B-2D7C-D690CCD6F748";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[812:813]" "e[815]" "e[817]" "e[819]" "e[821]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.21629734337329865;
-	setAttr ".re" 812;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing22";
-	rename -uid "4E5FCB7D-4596-8487-4BA2-8EB3FF9F07CF";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[824:825]" "e[827]" "e[829]" "e[831]" "e[833]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.3061445951461792;
-	setAttr ".re" 824;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing23";
-	rename -uid "D15238B6-499A-7C6C-CCAA-58B04D4742E1";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[836:837]" "e[839]" "e[841]" "e[843]" "e[845]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.35251283645629883;
-	setAttr ".re" 836;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing24";
-	rename -uid "929D5052-4625-787C-24EF-D59959EA1CA1";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[848:849]" "e[851]" "e[853]" "e[855]" "e[857]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.47447496652603149;
-	setAttr ".re" 848;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing25";
-	rename -uid "1C2C4ACE-4588-52E2-B079-EB9BA1DEAF3B";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[860:861]" "e[863]" "e[865]" "e[867]" "e[869]";
-	setAttr ".ix" -type "matrix" 0.28245314935440785 0 0 0 0 0.28245314935440785 0 0
-		 0 0 0.28245314935440785 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.66496670246124268;
-	setAttr ".re" 860;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyUnite -n "polyUnite3";
-	rename -uid "3D55AEAF-4CC1-21A4-E958-0F858E797622";
-	setAttr -s 11 ".ip";
-	setAttr -s 11 ".im";
-createNode groupId -n "groupId1";
-	rename -uid "C9FB702D-4E48-25E8-A902-44B959FC904A";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId2";
-	rename -uid "30FDD042-433D-A201-6AE9-64918F58BF09";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId3";
-	rename -uid "B3E59680-429C-243D-1641-18A2025E2CFA";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId4";
-	rename -uid "F8E4AE0E-4C04-3E7D-5E75-53B77BE5E67E";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId5";
-	rename -uid "D60FD7B1-4668-9EC7-90B3-8596C5A68050";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId6";
-	rename -uid "750ABF64-4149-7A02-C435-8C8E6DD3514B";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId7";
-	rename -uid "F3EDA1B8-41B1-456B-05C0-0FA6E441D422";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts1";
-	rename -uid "7ED915E5-40AD-55ED-548B-668725DFEDA3";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId8";
-	rename -uid "EAF62629-430F-3447-181C-F7891236394A";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId9";
-	rename -uid "6A697DC4-4233-587F-9A72-3CA8537E5A16";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId10";
-	rename -uid "E3CFD8A0-478A-5B74-841B-41AB84D3485B";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId11";
-	rename -uid "EE5E9ACA-467F-8723-365F-43BE6CE173BE";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId12";
-	rename -uid "E64B0B25-4ECB-85A7-D49E-3DAB991D37A6";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId13";
-	rename -uid "C6F360C5-4786-6F1B-7E4D-A6AF8B41610F";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId14";
-	rename -uid "E3569669-4380-0622-F714-60B61E4BF902";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId15";
-	rename -uid "F93746A6-4634-0C3E-0282-13A072382D2F";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId16";
-	rename -uid "FB616DE3-4348-D272-5EFE-3780F3E26510";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId17";
-	rename -uid "1519630E-43BE-3407-CABB-598DCCBE027E";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId18";
-	rename -uid "073340C6-4568-A546-A08B-218A21B42B09";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId19";
-	rename -uid "985EF63C-43A6-B6F1-9960-43B08BE79BE0";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId20";
-	rename -uid "4CA11ABC-4C21-BE19-292A-34A7E06B9520";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId21";
-	rename -uid "4EBA18C7-43E1-C0E8-A53F-08ADEB9E2B4B";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts2";
-	rename -uid "FF03CED5-450B-F6C3-8F41-22AC01D0C820";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:20]";
-createNode groupId -n "groupId22";
-	rename -uid "397A41C6-48F2-49AD-12CC-64BAE717AFB1";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId23";
-	rename -uid "D48601F5-4CC6-03F9-9CC2-06B13D7FDC33";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts3";
-	rename -uid "047AD465-49F8-00FB-EC0A-A7AA68E74320";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:4020]";
-createNode polyExtrudeFace -n "polyExtrudeFace6";
-	rename -uid "2C8B4582-4244-7AB9-E08F-E18EFE4191B1";
-	setAttr ".ics" -type "componentList" 2 "f[145]" "f[165]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -2.1215739 2.4758341 0.99950463 ;
-	setAttr ".rs" 35621;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -2.199907193075191 2.4310753620807533 0.89924841955945545 ;
-	setAttr ".cbx" -type "double3" -2.0432406110183319 2.5205929177048132 1.0997608838241375 ;
-	setAttr ".raf" no;
-createNode polyTweak -n "polyTweak9";
-	rename -uid "5DFA46BC-4A79-ED5F-E939-28979CFD4BB0";
-	setAttr ".uopa" yes;
-	setAttr -s 36 ".tk";
-	setAttr ".tk[400]" -type "float3" 0 -1.2124549 0.47734791 ;
-	setAttr ".tk[401]" -type "float3" 0 -1.2124548 0.47734785 ;
-	setAttr ".tk[402]" -type "float3" 0 -1.2124549 0.47734791 ;
-	setAttr ".tk[403]" -type "float3" 0 -1.2124548 0.47734785 ;
-	setAttr ".tk[404]" -type "float3" 0 -1.2124549 0.47734791 ;
-	setAttr ".tk[405]" -type "float3" 0 -1.2124548 0.47734785 ;
-	setAttr ".tk[412]" -type "float3" 0 -0.15748908 -8.8817842e-16 ;
-	setAttr ".tk[413]" -type "float3" 0 -0.15748908 -8.8817842e-16 ;
-	setAttr ".tk[414]" -type "float3" 0 -0.15748908 -8.8817842e-16 ;
-	setAttr ".tk[415]" -type "float3" 0 -0.15748908 -8.8817842e-16 ;
-	setAttr ".tk[416]" -type "float3" 0 -0.15748908 -8.8817842e-16 ;
-	setAttr ".tk[417]" -type "float3" 0 -0.15748908 -8.8817842e-16 ;
-	setAttr ".tk[418]" -type "float3" 0 -0.28021008 0.16045944 ;
-	setAttr ".tk[419]" -type "float3" 0 -0.28021008 0.16045944 ;
-	setAttr ".tk[420]" -type "float3" 0 -0.28021008 0.16045944 ;
-	setAttr ".tk[421]" -type "float3" 0 -0.28021014 0.16045944 ;
-	setAttr ".tk[422]" -type "float3" 0 -0.28021014 0.16045944 ;
-	setAttr ".tk[423]" -type "float3" 0 -0.28021014 0.16045944 ;
-	setAttr ".tk[424]" -type "float3" 0 -0.58537549 0.26585409 ;
-	setAttr ".tk[425]" -type "float3" 0 -0.58537549 0.26585409 ;
-	setAttr ".tk[426]" -type "float3" 0 -0.58537549 0.26585409 ;
-	setAttr ".tk[427]" -type "float3" 0 -0.58537549 0.26585409 ;
-	setAttr ".tk[428]" -type "float3" 0 -0.58537549 0.26585409 ;
-	setAttr ".tk[429]" -type "float3" 0 -0.58537549 0.26585409 ;
-	setAttr ".tk[430]" -type "float3" 0 -0.6840896 0.46200725 ;
-	setAttr ".tk[431]" -type "float3" 0 -0.6840896 0.46200725 ;
-	setAttr ".tk[432]" -type "float3" 0 -0.6840896 0.46200725 ;
-	setAttr ".tk[433]" -type "float3" 0 -0.6840896 0.46200725 ;
-	setAttr ".tk[434]" -type "float3" 0 -0.6840896 0.46200725 ;
-	setAttr ".tk[435]" -type "float3" 0 -0.6840896 0.46200725 ;
-	setAttr ".tk[436]" -type "float3" 0 -0.91594905 0.54968977 ;
-	setAttr ".tk[437]" -type "float3" 0 -0.91594905 0.54968977 ;
-	setAttr ".tk[438]" -type "float3" 0 -0.91594905 0.54968977 ;
-	setAttr ".tk[439]" -type "float3" 0 -0.91594905 0.54968977 ;
-	setAttr ".tk[440]" -type "float3" 0 -0.91594905 0.54968977 ;
-	setAttr ".tk[441]" -type "float3" 0 -0.91594905 0.54968977 ;
-createNode polySplitRing -n "polySplitRing26";
-	rename -uid "E12ED50F-48E8-CFAF-C5CD-AC85CF5C33FB";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[883:884]" "e[886]" "e[888]" "e[891]" "e[893]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.1665128618478775;
-	setAttr ".re" 883;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak10";
-	rename -uid "B7CBBCFB-4365-0A15-46C8-279C8D2DDFC5";
-	setAttr ".uopa" yes;
-	setAttr -s 6 ".tk[442:447]" -type "float3"  0.51439184 0.36466008 -2.16893435
-		 0.51439184 0.36466008 -2.16893435 0.51439184 0.36466008 -2.16893435 0.51439184 0.36466008
-		 -2.16893435 0.51439184 0.36466008 -2.16893435 0.51439184 0.36466008 -2.16893435;
-createNode polySplitRing -n "polySplitRing27";
-	rename -uid "F4E38F9C-4487-C1FA-4907-D0A6FD177689";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[896:897]" "e[899]" "e[901]" "e[903]" "e[905]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.22067859768867493;
-	setAttr ".re" 896;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing28";
-	rename -uid "16568A2D-4B38-5091-AB28-808007EBAB9E";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[908:909]" "e[911]" "e[913]" "e[915]" "e[917]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.31474480032920837;
-	setAttr ".re" 908;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing29";
-	rename -uid "1A6CE12C-4188-FEDE-040A-D3BF23488C50";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[920:921]" "e[923]" "e[925]" "e[927]" "e[929]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.29513981938362122;
-	setAttr ".re" 921;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing30";
-	rename -uid "13F9DE26-450C-56A2-486B-3A9E8593D26F";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[932:933]" "e[935]" "e[937]" "e[939]" "e[941]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.5293920636177063;
-	setAttr ".re" 941;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyDelEdge -n "polyDelEdge1";
-	rename -uid "1443E5AD-485D-DBFE-3F44-638720337108";
-	setAttr ".ics" -type "componentList" 5 "e[946]" "e[948]" "e[950]" "e[952]" "e[954:955]";
-	setAttr ".cv" yes;
-createNode polyTweak -n "polyTweak11";
-	rename -uid "BAF2C274-4A3F-6FAC-9C44-7B8917066EF4";
-	setAttr ".uopa" yes;
-	setAttr -s 36 ".tk[442:477]" -type "float3"  0.46675107 -0.84142315 -0.55312711
-		 0.46675107 -0.84142315 -0.55312711 0.46675107 -0.84142315 -0.55312711 0.46675107
-		 -0.84142315 -0.55312711 0.46675107 -0.84142315 -0.55312711 0.46675107 -0.84142315
-		 -0.55312711 0.31201756 -0.10878776 -0.060630333 0.31201756 -0.10878776 -0.060630333
-		 0.31201756 -0.10878776 -0.060630333 0.31201756 -0.10878776 -0.060630333 0.31201756
-		 -0.10878776 -0.060630333 0.31201756 -0.10878776 -0.060630333 0.65850043 -0.15590669
-		 -0.34122318 0.65850049 -0.15590656 -0.34122318 0.65850055 -0.15590656 -0.34122315
-		 0.65850055 -0.1559066 -0.34122321 0.65850049 -0.15590657 -0.34122327 0.65850037 -0.15590665
-		 -0.34122318 -5.9604645e-08 -0.26086187 1.4901161e-08 -5.9604645e-08 -0.26086187 1.4901161e-08
-		 -5.9604645e-08 -0.26086187 1.4901161e-08 -5.9604645e-08 -0.26086187 1.4901161e-08
-		 -5.9604645e-08 -0.26086187 1.4901161e-08 -5.9604645e-08 -0.26086187 1.4901161e-08
-		 -6.6613381e-16 -0.30059332 1.7763568e-15 -8.8817842e-16 -0.30059332 1.7763568e-15
-		 -8.8817842e-16 -0.30059332 1.7763568e-15 -7.7715612e-16 -0.3005932 1.7763568e-15
-		 -7.7715612e-16 -0.3005932 1.7763568e-15 -7.7715612e-16 -0.3005932 1.7763568e-15 0.28685132
-		 -0.38645768 0.026155174 0.28685132 -0.38645768 0.026155174 0.28685132 -0.38645768
-		 0.026155174 0.28685132 -0.38645768 0.026155174 0.28685132 -0.38645768 0.026155174
-		 0.28685132 -0.38645768 0.026155174;
-createNode polyDelEdge -n "polyDelEdge2";
-	rename -uid "B8919620-49BB-E3B4-3A74-C79AC1AC983E";
-	setAttr ".ics" -type "componentList" 2 "e[932:935]" "e[937:938]";
-	setAttr ".cv" yes;
-createNode polyDelEdge -n "polyDelEdge3";
-	rename -uid "AC96D44D-4563-6FDA-0C5A-68A5059C4DF8";
-	setAttr ".ics" -type "componentList" 1 "e[920:925]";
-	setAttr ".cv" yes;
-createNode polyDelEdge -n "polyDelEdge4";
-	rename -uid "8C04AF9A-4F30-8A87-404A-CB84BB838039";
-	setAttr ".ics" -type "componentList" 1 "e[908:913]";
-	setAttr ".cv" yes;
-createNode polySplitRing -n "polySplitRing31";
-	rename -uid "83A6C573-497B-209A-B8C7-53A6290ECB9D";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[883:884]" "e[886]" "e[888]" "e[891]" "e[893]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.52769190073013306;
-	setAttr ".re" 883;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak12";
-	rename -uid "BAE940E5-409C-B095-73E7-9CAF409C61B8";
-	setAttr ".uopa" yes;
-	setAttr -s 12 ".tk[442:453]" -type "float3"  1.20877481 -0.73537028 1.1688261
-		 1.17341471 -0.91565633 0.84538257 1.30059564 -0.76073766 1.32558537 1.26329446 -0.95169091
-		 0.98332155 1.36376905 -0.73938274 1.48715663 1.32522345 -0.93718457 1.13281047 0.36327782
-		 -0.23220199 -0.14523724 0.31873605 -0.3519007 -0.58355296 0.39354533 -0.3957909 -0.4716185
-		 0.43670473 -0.3969855 -0.34555101 0.48445377 -0.26550001 0.13240112 0.44004077 -0.26891404
-		 -0.0091637233;
-createNode polySplitRing -n "polySplitRing32";
-	rename -uid "8302C21F-4E1C-44F1-A041-EF850AB89DA7";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 1 "e[902:907]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.31212893128395081;
-	setAttr ".re" 903;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing33";
-	rename -uid "E317066F-4F9B-2E7B-8ADB-14A977786536";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 5 "e[920:921]" "e[923]" "e[925]" "e[927]" "e[929]";
-	setAttr ".ix" -type "matrix" 0.24598431966130341 0 -0.13882181406749128 0 0 0.28245314935440785 0 0
-		 0.13882181406749128 0 0.24598431966130341 0 -1.5747965720390897 2.3874339240357236 1.3641278656213043 1;
-	setAttr ".wt" 0.47575864195823669;
-	setAttr ".re" 920;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySmoothFace -n "polySmoothFace1";
-	rename -uid "BC3B143B-40BD-74FA-B0C5-B38E7DC52FF0";
-	setAttr ".ics" -type "componentList" 1 "f[*]";
-	setAttr ".sdt" 2;
-	setAttr ".suv" yes;
-	setAttr ".ps" 0.10000000149011612;
-	setAttr ".ro" 1;
-	setAttr ".ma" yes;
-	setAttr ".m08" yes;
-createNode polyTweak -n "polyTweak13";
-	rename -uid "2ADDC951-4DDE-ABD6-3D46-269965A7984C";
-	setAttr ".uopa" yes;
-	setAttr -s 44 ".tk";
-	setAttr ".tk[10]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[30]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[50]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[70]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[90]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[110]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[130]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[150]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[170]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[190]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[210]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[230]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[250]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[270]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[290]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[310]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[330]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[350]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[370]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[390]" -type "float3" -0.002412023 -0.1023018 0.31633514 ;
-	setAttr ".tk[442]" -type "float3" -0.33722714 -0.68067956 -0.23701397 ;
-	setAttr ".tk[443]" -type "float3" -0.37934372 -0.37481245 -0.22549883 ;
-	setAttr ".tk[444]" -type "float3" -0.40000871 -0.69427961 -0.24307314 ;
-	setAttr ".tk[445]" -type "float3" -0.44358328 -0.37332115 -0.23093678 ;
-	setAttr ".tk[446]" -type "float3" -0.45302591 -0.70437312 -0.24812108 ;
-	setAttr ".tk[447]" -type "float3" -0.4975366 -0.37372497 -0.23558573 ;
-	setAttr ".tk[448]" -type "float3" 0.020716779 -0.018964436 -0.13114366 ;
-	setAttr ".tk[449]" -type "float3" 0.020716779 -0.050470643 -0.048524912 ;
-	setAttr ".tk[450]" -type "float3" 0.020716779 -0.029314656 0.01023144 ;
-	setAttr ".tk[451]" -type "float3" 0.020716779 0.0088197682 0.059836693 ;
-	setAttr ".tk[452]" -type "float3" 0.020716779 0.04480616 -0.028508732 ;
-	setAttr ".tk[453]" -type "float3" 0.020716779 0.0049199034 -0.075874612 ;
-	setAttr ".tk[460]" -type "float3" -0.10219026 -0.27454388 -0.057671286 ;
-	setAttr ".tk[461]" -type "float3" -0.10219026 -0.27454388 -0.057671286 ;
-	setAttr ".tk[462]" -type "float3" -0.10219026 -0.27454388 -0.057671286 ;
-	setAttr ".tk[463]" -type "float3" -0.10219026 -0.27454388 -0.057671286 ;
-	setAttr ".tk[464]" -type "float3" -0.10219026 -0.27454388 -0.057671286 ;
-	setAttr ".tk[465]" -type "float3" -0.10219026 -0.27454388 -0.057671286 ;
-	setAttr ".tk[466]" -type "float3" -0.35738325 -0.2697573 -0.18486072 ;
-	setAttr ".tk[467]" -type "float3" -0.35738325 -0.27364287 -0.24263801 ;
-	setAttr ".tk[468]" -type "float3" -0.35738325 -0.2952469 -0.29656768 ;
-	setAttr ".tk[469]" -type "float3" -0.35738325 -0.33178037 -0.21165246 ;
-	setAttr ".tk[470]" -type "float3" -0.35738325 -0.30856383 -0.15972039 ;
-	setAttr ".tk[471]" -type "float3" -0.35738325 -0.30216718 -0.10505399 ;
-createNode polyCone -n "polyCone2";
-	rename -uid "D79D963B-4B5E-B91F-BEFB-3FBB998E0FEA";
-	setAttr ".r" 1.0883751902856782;
-	setAttr ".h" 3.1941901144383729;
-	setAttr ".sh" 17;
-	setAttr ".cuv" 3;
-createNode deleteComponent -n "deleteComponent1";
-	rename -uid "C0EB2B88-412C-1677-0392-919BAF3565B5";
-	setAttr ".dc" -type "componentList" 2 "e[0:18]" "e[20:679]";
-createNode deleteComponent -n "deleteComponent2";
-	rename -uid "0EDF0891-4B21-3D23-D528-4C999CB32DFC";
-	setAttr ".dc" -type "componentList" 1 "e[0:34]";
-createNode polyCone -n "polyCone3";
-	rename -uid "3CC508E0-4CBC-7F0F-6B9F-99989E91B777";
-	setAttr ".r" 1.1258999236838794;
-	setAttr ".h" 2.9751521317711438;
-	setAttr ".cuv" 3;
-createNode polyExtrudeFace -n "polyExtrudeFace7";
-	rename -uid "3AE2CEC7-4F44-E822-D33C-12A9BEA1C4A2";
-	setAttr ".ics" -type "componentList" 1 "f[0]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -6.4783287 1.8937308 3.7714217 ;
-	setAttr ".rs" 63767;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -6.7857345236764672 0.8106092030885137 2.6455212921405584 ;
-	setAttr ".cbx" -type "double3" -6.1709225407285615 2.9768524343683311 4.8973218292499334 ;
-	setAttr ".raf" no;
-createNode polyExtrudeFace -n "polyExtrudeFace8";
-	rename -uid "0B2484BC-46ED-0D59-7DD0-0B9869BD7F68";
-	setAttr ".ics" -type "componentList" 1 "f[0]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -5.8613915 2.155133 3.7714214 ;
-	setAttr ".rs" 41741;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -6.1687974441507425 1.0720111952242837 2.6455212921405584 ;
-	setAttr ".cbx" -type "double3" -5.5539853961070929 3.238254655864 4.8973215908313543 ;
-	setAttr ".raf" no;
-createNode polyTweak -n "polyTweak14";
-	rename -uid "90C4A9FA-4A79-E5BD-853D-F296A148E6BC";
-	setAttr ".uopa" yes;
-	setAttr -s 20 ".tk[21:40]" -type "float3"  0.083027296 -0.66486758 0
-		 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296
-		 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758
-		 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296
-		 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758
-		 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296 -0.66486758 0 0.083027296
-		 -0.66486758 0 0.083027296 -0.66486758 0;
-createNode polyExtrudeFace -n "polyExtrudeFace9";
-	rename -uid "B6C530F1-4232-A626-4B8A-0D94C54404DF";
-	setAttr ".ics" -type "componentList" 1 "f[0]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -4.7150807 0.60798198 3.771421 ;
-	setAttr ".rs" 54922;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -5.0979028361250727 -0.45083683916750728 2.6455208153034002 ;
-	setAttr ".cbx" -type "double3" -4.3322583048173016 1.6668008027908643 4.8973211139941961 ;
-	setAttr ".raf" no;
-createNode polyTweak -n "polyTweak15";
-	rename -uid "46F2FCCF-4027-905B-ABEA-01AD0ECFCB60";
-	setAttr ".uopa" yes;
-	setAttr -s 20 ".tk[41:60]" -type "float3"  -2.013179064 -1.33770406 -4.7683716e-07
-		 -2.0028111935 -1.30553162 -4.7683716e-07 -2.0028104782 -1.30553031 -4.7683716e-07
-		 -1.97272217 -1.21215796 -4.7683716e-07 -1.92585826 -1.066727161 -4.7683716e-07 -1.8668052
-		 -0.88347441 -4.7683716e-07 -1.80134547 -0.68033683 -4.7683716e-07 -1.73588574 -0.4771989
-		 -4.7683716e-07 -1.67683327 -0.29394552 -4.7683716e-07 -1.62996876 -0.14851531 -4.7683716e-07
-		 -1.59988058 -0.055143271 -4.7683716e-07 -1.58951223 -0.022968773 -4.7683716e-07 -1.59988058
-		 -0.055143271 -4.7683716e-07 -1.62996876 -0.14851531 -4.7683716e-07 -1.67683303 -0.29394564
-		 -4.7683716e-07 -1.73588574 -0.4771989 -4.7683716e-07 -1.80134547 -0.68033683 -4.7683716e-07
-		 -1.86680591 -0.88347453 -4.7683716e-07 -1.92585802 -1.066727638 -4.7683716e-07 -1.97272217
-		 -1.21215856 -4.7683716e-07;
-createNode polyExtrudeFace -n "polyExtrudeFace10";
-	rename -uid "EE96F2EC-4247-EE35-75C5-34A827AADD69";
-	setAttr ".ics" -type "componentList" 1 "f[0]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".ws" yes;
-	setAttr ".pvt" -type "float3" -4.1320415 -0.010470985 3.7714212 ;
-	setAttr ".rs" 35331;
-	setAttr ".c[0]"  0 1 1;
-	setAttr ".cbn" -type "double3" -5.0579662696516436 -0.97782286014243525 2.4597929806018621 ;
-	setAttr ".cbx" -type "double3" -3.2061165617609166 0.95688089159237455 5.083049544742182 ;
-	setAttr ".raf" no;
-createNode polyTweak -n "polyTweak16";
-	rename -uid "D9D5C1B1-4B92-FD32-9D29-629326529C8C";
-	setAttr ".uopa" yes;
-	setAttr -s 20 ".tk[61:80]" -type "float3"  -1.043893456 -0.87434655 -0.28195316
-		 -1.11998081 -0.8017593 -0.31809515 -0.93944412 -0.89972132 -0.21821146 -0.81685627
-		 -0.8754003 -0.13310961 -0.68812913 -0.80376238 -0.034978449 -0.56586421 -0.69182312
-		 0.066576928 -0.46202984 -0.55053657 0.16161501 -0.38678849 -0.39373422 0.24083361
-		 -0.34750685 -0.23676583 0.2964772 -0.34802961 -0.094994791 0.32309967 -0.38830557
-		 0.017699944 0.31809509 -0.46439168 0.090287521 0.28195313 -0.56884181 0.11566249
-		 0.21821141 -0.69142914 0.091341011 0.13310985 -0.82015622 0.019703917 0.034978427
-		 -0.9424212 -0.092236027 -0.066576593 -1.046256423 -0.2335231 -0.16161525 -1.12149751
-		 -0.39032471 -0.24083334 -1.16077828 -0.54729384 -0.29647744 -1.16025651 -0.68906438
-		 -0.32309973;
-createNode polyDelEdge -n "polyDelEdge5";
-	rename -uid "366651B5-4C5B-E16F-4EAB-DF8ECFA04417";
-	setAttr ".ics" -type "componentList" 1 "e[0:19]";
-	setAttr ".cv" yes;
-createNode polyTweak -n "polyTweak17";
-	rename -uid "A0604B4E-433F-8CF5-2035-9EB7040B296B";
-	setAttr ".uopa" yes;
-	setAttr -s 61 ".tk";
-	setAttr ".tk[0]" -type "float3" -0.57447559 0.78957212 0.055101242 ;
-	setAttr ".tk[1]" -type "float3" -0.5226838 0.70942473 0.10480884 ;
-	setAttr ".tk[2]" -type "float3" -0.4420177 0.58459395 0.14425707 ;
-	setAttr ".tk[3]" -type "float3" -0.34037182 0.42729744 0.16958427 ;
-	setAttr ".tk[4]" -type "float3" -0.22769675 0.25293317 0.1783115 ;
-	setAttr ".tk[5]" -type "float3" -0.11502124 0.078567922 0.16958427 ;
-	setAttr ".tk[6]" -type "float3" -0.013375476 -0.078728512 0.14425701 ;
-	setAttr ".tk[7]" -type "float3" 0.067290924 -0.20355895 0.10480882 ;
-	setAttr ".tk[8]" -type "float3" 0.1190821 -0.28370601 0.055101242 ;
-	setAttr ".tk[9]" -type "float3" 0.13692825 -0.3113226 -5.6638367e-08 ;
-	setAttr ".tk[10]" -type "float3" 0.1190821 -0.28370601 -0.055101346 ;
-	setAttr ".tk[11]" -type "float3" 0.067290924 -0.20355895 -0.10480891 ;
-	setAttr ".tk[12]" -type "float3" -0.013375595 -0.078728423 -0.14425707 ;
-	setAttr ".tk[13]" -type "float3" -0.11502124 0.078567922 -0.16958435 ;
-	setAttr ".tk[14]" -type "float3" -0.22769675 0.25293317 -0.1783115 ;
-	setAttr ".tk[15]" -type "float3" -0.34037182 0.42729744 -0.16958435 ;
-	setAttr ".tk[16]" -type "float3" -0.4420177 0.58459395 -0.14425707 ;
-	setAttr ".tk[17]" -type "float3" -0.52268368 0.7094239 -0.10480891 ;
-	setAttr ".tk[18]" -type "float3" -0.57447511 0.78957063 -0.055101346 ;
-	setAttr ".tk[19]" -type "float3" -0.5923211 0.81718832 -5.6638367e-08 ;
-	setAttr ".tk[20]" -type "float3" -0.67314452 -0.32086664 0 ;
-	setAttr ".tk[41]" -type "float3" 0.13584213 -0.097693309 5.3148131e-08 ;
-	setAttr ".tk[42]" -type "float3" 0.12919345 -0.092912018 -0.051705666 ;
-	setAttr ".tk[43]" -type "float3" 0.12919345 -0.092911892 0.051705759 ;
-	setAttr ".tk[44]" -type "float3" 0.10989857 -0.079035535 0.098350227 ;
-	setAttr ".tk[45]" -type "float3" 0.079845905 -0.057422705 0.13536747 ;
-	setAttr ".tk[46]" -type "float3" 0.041977547 -0.030188898 0.15913385 ;
-	setAttr ".tk[47]" -type "float3" 8.7590507e-08 -1.3652813e-07 0.16732314 ;
-	setAttr ".tk[48]" -type "float3" -0.041977599 0.030188898 0.15913385 ;
-	setAttr ".tk[49]" -type "float3" -0.079845905 0.057422571 0.13536732 ;
-	setAttr ".tk[50]" -type "float3" -0.10989862 0.079035476 0.098350227 ;
-	setAttr ".tk[51]" -type "float3" -0.12919347 0.092911631 0.051705759 ;
-	setAttr ".tk[52]" -type "float3" -0.13584213 0.097693309 5.3148131e-08 ;
-	setAttr ".tk[53]" -type "float3" -0.12919347 0.092911631 -0.051705666 ;
-	setAttr ".tk[54]" -type "float3" -0.10989862 0.079035476 -0.098350063 ;
-	setAttr ".tk[55]" -type "float3" -0.079845905 0.057422571 -0.13536741 ;
-	setAttr ".tk[56]" -type "float3" -0.041977599 0.030188898 -0.15913379 ;
-	setAttr ".tk[57]" -type "float3" 8.7590507e-08 -1.3652813e-07 -0.16732314 ;
-	setAttr ".tk[58]" -type "float3" 0.041977547 -0.030188898 -0.15913379 ;
-	setAttr ".tk[59]" -type "float3" 0.079846084 -0.057422638 -0.13536747 ;
-	setAttr ".tk[60]" -type "float3" 0.1098986 -0.07903555 -0.098350152 ;
-	setAttr ".tk[81]" -type "float3" -1.5836524 -0.45587271 -0.17422733 ;
-	setAttr ".tk[82]" -type "float3" -1.4542171 -0.34739098 -0.22459617 ;
-	setAttr ".tk[83]" -type "float3" -1.6508434 -0.53121644 -0.10680319 ;
-	setAttr ".tk[84]" -type "float3" -1.6492165 -0.56604683 -0.028925166 ;
-	setAttr ".tk[85]" -type "float3" -1.5789253 -0.55695444 0.051784221 ;
-	setAttr ".tk[86]" -type "float3" -1.4468555 -0.50483006 0.12742481 ;
-	setAttr ".tk[87]" -type "float3" -1.2659316 -0.41477501 0.1905919 ;
-	setAttr ".tk[88]" -type "float3" -1.0538638 -0.29560477 0.23510291 ;
-	setAttr ".tk[89]" -type "float3" -0.83141303 -0.15898508 0.25660029 ;
-	setAttr ".tk[90]" -type "float3" -0.62035215 -0.018288366 0.25297987 ;
-	setAttr ".tk[91]" -type "float3" -0.44134206 0.11271236 0.22459559 ;
-	setAttr ".tk[92]" -type "float3" -0.31190607 0.22119339 0.17422684 ;
-	setAttr ".tk[93]" -type "float3" -0.24471423 0.29653779 0.10680285 ;
-	setAttr ".tk[94]" -type "float3" -0.24634227 0.33136755 0.028924629 ;
-	setAttr ".tk[95]" -type "float3" -0.31663123 0.32227519 -0.051784419 ;
-	setAttr ".tk[96]" -type "float3" -0.44870269 0.27015141 -0.12742501 ;
-	setAttr ".tk[97]" -type "float3" -0.62962824 0.18009609 -0.19059278 ;
-	setAttr ".tk[98]" -type "float3" -0.84169412 0.060925975 -0.23510359 ;
-	setAttr ".tk[99]" -type "float3" -1.0641446 -0.075694554 -0.25660059 ;
-	setAttr ".tk[100]" -type "float3" -1.2752061 -0.21639049 -0.25297987 ;
-createNode polySplitRing -n "polySplitRing34";
-	rename -uid "2630412D-4B48-8E30-02CA-B2A91E2EE907";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[40:41]" "e[43]" "e[45]" "e[47]" "e[49]" "e[51]" "e[53]" "e[55]" "e[57]" "e[59]" "e[61]" "e[63]" "e[65]" "e[67]" "e[69]" "e[71]" "e[73]" "e[75]" "e[77]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".wt" 0.58059066534042358;
-	setAttr ".re" 77;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polyTweak -n "polyTweak18";
-	rename -uid "5BD45CC9-4E44-E6C1-5726-CF8B4C49631D";
-	setAttr ".uopa" yes;
-	setAttr -s 21 ".tk[0:20]" -type "float3"  -0.88226825 -0.44291943 -2.4697152e-07
-		 -0.251569 0.55875993 -2.4697152e-07 -0.25043687 0.54979122 0.2402688 -0.25043681
-		 0.54979068 -0.24026933 -0.24715093 0.52376127 -0.45701903 -0.24203321 0.48321918
-		 -0.62903243 -0.23558453 0.43213311 -0.73947209 -0.22843589 0.37550417 -0.77752686
-		 -0.22128762 0.31887451 -0.73947209 -0.21483894 0.2677885 -0.62903273 -0.20972113
-		 0.22724646 -0.45701903 -0.20643531 0.20121698 -0.24026933 -0.20530315 0.19224766
-		 -2.4697152e-07 -0.20643531 0.20121698 0.2402688 -0.20972113 0.22724646 0.45701864
-		 -0.21483894 0.26778844 0.62903237 -0.22128762 0.31887451 0.73947185 -0.22843589 0.37550417
-		 0.77752686 -0.23558435 0.43213356 0.73947185 -0.24203327 0.48321918 0.62903243 -0.24715105
-		 0.52376127 0.45701888;
-createNode polySplitRing -n "polySplitRing35";
-	rename -uid "FCCBAB5C-46C1-23C8-56B8-63B759A2245E";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[80:81]" "e[83]" "e[85]" "e[87]" "e[89]" "e[91]" "e[93]" "e[95]" "e[97]" "e[99]" "e[101]" "e[103]" "e[105]" "e[107]" "e[109]" "e[111]" "e[113]" "e[115]" "e[117]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".wt" 0.67538243532180786;
-	setAttr ".re" 115;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing36";
-	rename -uid "5B93A713-4B2F-6746-0C9E-A6ABF0BEB95F";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[120:121]" "e[123]" "e[125]" "e[127]" "e[129]" "e[131]" "e[133]" "e[135]" "e[137]" "e[139]" "e[141]" "e[143]" "e[145]" "e[147]" "e[149]" "e[151]" "e[153]" "e[155]" "e[157]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".wt" 0.69441992044448853;
-	setAttr ".re" 155;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing37";
-	rename -uid "BF663D4D-4588-FB21-6DCE-78A85C5D331C";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[40:41]" "e[43]" "e[45]" "e[47]" "e[49]" "e[51]" "e[53]" "e[55]" "e[57]" "e[59]" "e[61]" "e[63]" "e[65]" "e[67]" "e[69]" "e[71]" "e[73]" "e[75]" "e[77]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".wt" 0.59203886985778809;
-	setAttr ".re" 77;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySplitRing -n "polySplitRing38";
-	rename -uid "506D3776-40EC-DB6B-4490-33ACC3857BF9";
-	setAttr ".uopa" yes;
-	setAttr ".ics" -type "componentList" 19 "e[160:161]" "e[163]" "e[165]" "e[167]" "e[169]" "e[171]" "e[173]" "e[175]" "e[177]" "e[179]" "e[181]" "e[183]" "e[185]" "e[187]" "e[189]" "e[191]" "e[193]" "e[195]" "e[197]";
-	setAttr ".ix" -type "matrix" -0.2730313378149487 0.96200513957617695 0 0 -0.96200513957617695 -0.2730313378149487 0 0
-		 0 0 1 0 -7.9093843298055804 1.4875760658855719 3.771421799113825 1;
-	setAttr ".wt" 0.67657464742660522;
-	setAttr ".dr" no;
-	setAttr ".re" 160;
-	setAttr ".sma" 29.999999999999996;
-	setAttr ".p[0]"  0 0 1;
-	setAttr ".fq" yes;
-createNode polySmoothFace -n "polySmoothFace2";
-	rename -uid "D9F02CE6-482F-9F18-7CCF-2E86DA608396";
-	setAttr ".ics" -type "componentList" 1 "f[*]";
-	setAttr ".sdt" 2;
-	setAttr ".suv" yes;
-	setAttr ".ps" 0.10000000149011612;
-	setAttr ".ro" 1;
-	setAttr ".ma" yes;
-	setAttr ".m08" yes;
-createNode polyTweak -n "polyTweak19";
-	rename -uid "ABA8558D-4B84-B45F-85AE-1CA78A614C88";
-	setAttr ".uopa" yes;
-	setAttr -s 60 ".tk";
-	setAttr ".tk[1]" -type "float3" 0.027042488 -0.14156552 0.017475551 ;
-	setAttr ".tk[2]" -type "float3" 0.027989037 -0.13570072 0.016679252 ;
-	setAttr ".tk[3]" -type "float3" 0.024629029 -0.12941487 0.016561236 ;
-	setAttr ".tk[4]" -type "float3" 0.020984853 -0.10043821 0.014025807 ;
-	setAttr ".tk[5]" -type "float3" 0.016466742 -0.057471491 0.010117437 ;
-	setAttr ".tk[6]" -type "float3" 0.011516984 -0.0047207307 0.0052186521 ;
-	setAttr ".tk[7]" -type "float3" 0.0066198483 0.052650012 -0.0001908922 ;
-	setAttr ".tk[8]" -type "float3" 0.0022550886 0.10902562 -0.0055818204 ;
-	setAttr ".tk[9]" -type "float3" -0.0011502567 0.15888695 -0.010426332 ;
-	setAttr ".tk[10]" -type "float3" -0.0032629967 0.19735368 -0.014250222 ;
-	setAttr ".tk[11]" -type "float3" -0.0038761678 0.22066021 -0.016679203 ;
-	setAttr ".tk[12]" -type "float3" -0.0029295932 0.22652538 -0.017475551 ;
-	setAttr ".tk[13]" -type "float3" -0.00051622646 0.21437466 -0.016561208 ;
-	setAttr ".tk[14]" -type "float3" 0.0031279735 0.18539788 -0.014025804 ;
-	setAttr ".tk[15]" -type "float3" 0.0076461374 0.14243127 -0.010117417 ;
-	setAttr ".tk[16]" -type "float3" 0.012595903 0.089680642 -0.0052186591 ;
-	setAttr ".tk[17]" -type "float3" 0.017492821 0.032309551 0.00019095729 ;
-	setAttr ".tk[18]" -type "float3" 0.021857699 -0.024065929 0.0055818572 ;
-	setAttr ".tk[19]" -type "float3" 0.025263242 -0.073927216 0.010426328 ;
-	setAttr ".tk[20]" -type "float3" 0.027375899 -0.1123941 0.014250251 ;
-	setAttr ".tk[81]" -type "float3" 0.057971619 -0.019548928 -0.035238307 ;
-	setAttr ".tk[82]" -type "float3" 0.042118844 -0.014203141 -0.04850138 ;
-	setAttr ".tk[83]" -type "float3" 0.022143209 -0.0074670441 -0.057016797 ;
-	setAttr ".tk[84]" -type "float3" 5.0388067e-08 -5.4264081e-08 -0.059951004 ;
-	setAttr ".tk[85]" -type "float3" -0.022143204 0.0074670441 -0.057016797 ;
-	setAttr ".tk[86]" -type "float3" -0.042118791 0.01420311 -0.048501369 ;
-	setAttr ".tk[87]" -type "float3" -0.057971559 0.019548928 -0.035238296 ;
-	setAttr ".tk[88]" -type "float3" -0.068149649 0.022981098 -0.018525861 ;
-	setAttr ".tk[89]" -type "float3" -0.071656786 0.024163829 2.0458067e-08 ;
-	setAttr ".tk[90]" -type "float3" -0.068149649 0.022981098 0.018525897 ;
-	setAttr ".tk[91]" -type "float3" -0.057971559 0.019548928 0.035238344 ;
-	setAttr ".tk[92]" -type "float3" -0.04211878 0.014203125 0.048501402 ;
-	setAttr ".tk[93]" -type "float3" -0.022143204 0.0074670441 0.057016809 ;
-	setAttr ".tk[94]" -type "float3" 5.0388067e-08 -5.4264081e-08 0.059951004 ;
-	setAttr ".tk[95]" -type "float3" 0.022143163 -0.0074670278 0.057016809 ;
-	setAttr ".tk[96]" -type "float3" 0.042118799 -0.014203155 0.048501384 ;
-	setAttr ".tk[97]" -type "float3" 0.057971574 -0.019548943 0.035238344 ;
-	setAttr ".tk[98]" -type "float3" 0.068149656 -0.022981174 0.018525897 ;
-	setAttr ".tk[99]" -type "float3" 0.071656778 -0.024163829 2.0458067e-08 ;
-	setAttr ".tk[100]" -type "float3" 0.068149708 -0.022981193 -0.018525861 ;
-	setAttr ".tk[141]" -type "float3" -0.016641822 -0.091344155 0 ;
-	setAttr ".tk[142]" -type "float3" -0.012091005 -0.066365361 0 ;
-	setAttr ".tk[143]" -type "float3" -0.0063566505 -0.034890417 0 ;
-	setAttr ".tk[144]" -type "float3" -8.7884843e-08 -8.4010686e-08 0 ;
-	setAttr ".tk[145]" -type "float3" 0.0063566286 0.034890346 0 ;
-	setAttr ".tk[146]" -type "float3" 0.012091 0.066365317 0 ;
-	setAttr ".tk[147]" -type "float3" 0.016641838 0.091344021 0 ;
-	setAttr ".tk[148]" -type "float3" 0.019563571 0.10738128 0 ;
-	setAttr ".tk[149]" -type "float3" 0.020570438 0.11290745 0 ;
-	setAttr ".tk[150]" -type "float3" 0.019563571 0.10738128 0 ;
-	setAttr ".tk[151]" -type "float3" 0.016641838 0.091344021 0 ;
-	setAttr ".tk[152]" -type "float3" 0.012091001 0.066365279 0 ;
-	setAttr ".tk[153]" -type "float3" 0.0063566286 0.034890346 0 ;
-	setAttr ".tk[154]" -type "float3" -8.7884843e-08 -8.4010686e-08 0 ;
-	setAttr ".tk[155]" -type "float3" -0.0063566002 -0.034890302 0 ;
-	setAttr ".tk[156]" -type "float3" -0.012091028 -0.066365346 0 ;
-	setAttr ".tk[157]" -type "float3" -0.016641866 -0.091344096 0 ;
-	setAttr ".tk[158]" -type "float3" -0.01956364 -0.10738135 0 ;
-	setAttr ".tk[159]" -type "float3" -0.020570436 -0.11290744 0 ;
-	setAttr ".tk[160]" -type "float3" -0.019563664 -0.10738146 0 ;
-createNode polyTorus -n "polyTorus2";
-	rename -uid "E31ADF5E-430E-B400-B1A9-FFBD0FF1A347";
-	setAttr ".r" 1.7435880457228539;
-	setAttr ".sa" 17;
-	setAttr ".sh" 21;
-createNode polySphere -n "polySphere4";
-	rename -uid "A11206E2-44FF-8FAF-02FC-77B623E7A99C";
-	setAttr ".r" 0.25206350378547526;
-createNode aiStandardSurface -n "aiStandardSurface9";
-	rename -uid "EECE432C-4E49-2B84-0AE8-62919366DDFB";
-	setAttr ".base" 1;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface9SG";
-	rename -uid "BD7D23F4-4CB7-4125-1A3A-8BBD1D00F6DD";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo9";
-	rename -uid "AB67CCAE-483F-CD0A-C8CE-0F86B9258BE3";
-createNode polySeparate -n "polySeparate1";
-	rename -uid "8EF67C50-48C4-18C1-331F-F7BCDD99E981";
-	setAttr ".ic" 11;
-	setAttr -s 11 ".out";
-createNode groupId -n "groupId25";
-	rename -uid "9D991EBD-4F9C-EFE8-115A-FF8F259CC4C6";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts5";
-	rename -uid "B17E2A5B-4BD5-AA31-52A8-F79E09C0E6A2";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId26";
-	rename -uid "2C1B966B-467B-5F6A-988E-E38D50C3F207";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts6";
-	rename -uid "AC839554-4C13-CB38-8A16-D4993C5CB6DC";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId27";
-	rename -uid "3ACBF532-4AB2-BF0E-996B-E898BA8A5E2E";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts7";
-	rename -uid "EB346639-4B31-EC42-DE34-A2A30DEF4D4F";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId28";
-	rename -uid "107DE0E4-4D3C-E0F3-6DB9-5AA3113448B8";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts8";
-	rename -uid "0E3F54F2-4EB2-6EB9-B2EE-9192B45A84BB";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId29";
-	rename -uid "CB012BC5-4560-5707-32A9-6A91C9CAF710";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts9";
-	rename -uid "36C28337-4094-5A86-294C-10A2A127B05C";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId30";
-	rename -uid "AFFB8AF7-411D-E68E-D285-48B6252427E3";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts10";
-	rename -uid "DFC9AC03-4727-7B54-6A5A-CFAFCAAC3FFC";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId31";
-	rename -uid "64C687D9-47E4-6C79-DC1B-77B683E39593";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts11";
-	rename -uid "7F97654C-499F-697D-BC21-3597DE82771F";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId32";
-	rename -uid "6457979F-47DC-6BDD-B125-51A0FDB06C77";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts12";
-	rename -uid "0C3C27C0-4340-DC5D-429A-E98C9E958360";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId33";
-	rename -uid "E70D6DC1-405C-BA16-B474-0D9E6D30D470";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts13";
-	rename -uid "3A40C24E-46F2-2C38-635B-E394E6383EEB";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode aiStandardSurface -n "aiStandardSurface10";
-	rename -uid "21C6A504-484A-C4AE-F8FF-3EB8C1C14477";
-	setAttr ".base" 1;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface10SG";
-	rename -uid "C6F11D44-472B-952B-24AA-2FA2A0D89554";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo10";
-	rename -uid "1A1A5ADF-4967-32D0-5270-53811F04EDAA";
-createNode aiStandardSurface -n "aiStandardSurface11";
-	rename -uid "726C5847-4BE8-D5C3-9EAA-1A855FF38A00";
-	setAttr ".base_color" -type "float3" 0.30000001 0 0 ;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface11SG";
-	rename -uid "A796E27D-401A-0E06-42EF-E4B3EFA7CF8B";
-	setAttr ".ihi" 0;
-	setAttr -s 3 ".dsm";
-	setAttr ".ro" yes;
-	setAttr -s 3 ".gn";
-createNode materialInfo -n "materialInfo11";
-	rename -uid "73735742-4CD0-8507-7E1D-B7B3C9CA1ED4";
-createNode aiStandardSurface -n "aiStandardSurface12";
-	rename -uid "F2D80E34-4E06-863F-CB68-13B952323784";
-	setAttr ".base" 1;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface12SG";
-	rename -uid "11EDBEFB-4CEC-233F-933E-00BFEA9D325F";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo12";
-	rename -uid "A5164249-4661-EBF9-BBD5-049CE9A4FB79";
-createNode aiStandardSurface -n "aiStandardSurface13";
-	rename -uid "83563A5E-4DCE-7353-2615-E6A53773B4DF";
-createNode shadingEngine -n "aiStandardSurface13SG";
-	rename -uid "3B80F6B5-44E3-4C32-DBD9-538B6F4EB1DC";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo13";
-	rename -uid "A703259D-4CEF-40F6-130E-59B3BAFDCADB";
-createNode aiStandardSurface -n "aiStandardSurface14";
-	rename -uid "4092E74F-483B-17CB-ABF7-748EBED6CD41";
-	setAttr ".base" 1;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface14SG";
-	rename -uid "9469B32D-4FF1-DC50-4C3C-5397D2DDC2FE";
-	setAttr ".ihi" 0;
-	setAttr -s 3 ".dsm";
-	setAttr ".ro" yes;
-	setAttr -s 3 ".gn";
-createNode materialInfo -n "materialInfo14";
-	rename -uid "6C3192FF-4635-1BE5-E163-3183E901AB0C";
-createNode aiStandardSurface -n "aiStandardSurface15";
-	rename -uid "E8368EF3-40B1-6653-63B9-AAB2CA2F4DD6";
-	setAttr ".base" 1;
-	setAttr ".base_color" -type "float3" 0.30000001 0 0 ;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface15SG";
-	rename -uid "86781BAC-46DE-E07A-79CC-48AE13036610";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo15";
-	rename -uid "3C6DA887-40DD-BCC3-69BF-3FB9BD7EBD3C";
-createNode polyUnite -n "polyUnite4";
-	rename -uid "29BC8BF4-4257-9CCD-3CF9-F2A6BA4D40A7";
-	setAttr -s 3 ".ip";
-	setAttr -s 3 ".im";
-createNode groupId -n "groupId35";
-	rename -uid "3E6A0707-47C9-64C8-724A-9A93D30F3A50";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts15";
-	rename -uid "3D2248A3-4048-32F7-CE78-AD9170137067";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId36";
-	rename -uid "5340D597-4A5D-D7BB-2BF9-8289AF1626B2";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId37";
-	rename -uid "5D880796-42E5-D05F-DBF2-2B829F22E425";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId38";
-	rename -uid "4617EAB9-4ACB-DDFE-0995-6BBA0E2AC08E";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId39";
-	rename -uid "9CCB9EAF-4CF8-D8FE-9F8A-289A3314F470";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId40";
-	rename -uid "46EB591E-4F40-0B02-A00C-F7883C52D925";
-	setAttr ".ihi" 0;
-createNode blinn -n "typeBlinn";
-	rename -uid "2065EA95-4FBF-99FF-345B-D3889B1113EB";
-	setAttr ".c" -type "float3" 1 1 1 ;
-createNode shadingEngine -n "typeBlinnSG";
-	rename -uid "1CD6EEEF-441B-20B8-9F51-238C4408D8A6";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo16";
-	rename -uid "0C54D078-432F-C382-9203-C491E752E842";
-createNode aiStandardSurface -n "aiStandardSurface16";
-	rename -uid "3B265C8E-449F-8AC3-F53F-E5BDD5F1BBDB";
-	setAttr ".base" 1;
-	setAttr ".base_color" -type "float3" 0.0099999998 0.0099999998 0.0099999998 ;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface16SG";
-	rename -uid "3E902CC2-4360-3E21-7FFC-B39380A66603";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo17";
-	rename -uid "4E583EDD-4024-B8CC-935A-A99100752B95";
-createNode polyUnite -n "polyUnite5";
-	rename -uid "3F562B00-4356-0EE4-6F0E-6A846B5E1CC6";
-	setAttr -s 9 ".ip";
-	setAttr -s 9 ".im";
-createNode aiStandardSurface -n "aiStandardSurface17";
-	rename -uid "21C9CF31-4955-7614-A111-B2B224C9C10C";
-	setAttr ".base_color" -type "float3" 0 0 0 ;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface17SG";
-	rename -uid "425E7FCD-4599-96B4-856D-24911A9BED49";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo18";
-	rename -uid "334BB5C9-42F5-E03A-15A7-4D9FEE708211";
-createNode aiStandardSurface -n "aiStandardSurface18";
-	rename -uid "2CD1AFBA-4005-A20C-7F78-69ADBA9EF316";
-	setAttr ".base_color" -type "float3" 0.95499998 0.077434547 0 ;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface18SG";
-	rename -uid "58006CDF-4529-4C39-3953-AD92A167D717";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo19";
-	rename -uid "659641E5-455C-12B0-556E-E6AAF614D732";
-createNode polyUnite -n "polyUnite6";
-	rename -uid "1A25E863-4865-999F-3D4F-DBAC1B30681F";
-	setAttr -s 2 ".ip";
-	setAttr -s 2 ".im";
-createNode groupId -n "groupId41";
-	rename -uid "C537DF06-40F6-8E65-4BB6-41B0258B5EDA";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts16";
-	rename -uid "F9C0BCC3-43AE-0111-42BA-8C83D940903A";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:455]";
-createNode groupId -n "groupId42";
-	rename -uid "4B27FBEA-48C0-E814-3A30-56B807F46BE5";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId43";
-	rename -uid "92023570-4A6F-20AB-9BB4-308C30C693D9";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId44";
-	rename -uid "409A9A33-4B0B-D2E3-3E5B-FEBC23D9EE91";
-	setAttr ".ihi" 0;
-createNode aiStandardSurface -n "aiStandardSurface19";
-	rename -uid "DCDF5859-4B33-E793-F698-E88BBE1BEDCD";
-	setAttr ".base_color" -type "float3" 0.127 0.027830698 0.0086360024 ;
-	setAttr ".specular" 0;
-	setAttr ".specular_roughness" 0.5;
-createNode shadingEngine -n "aiStandardSurface19SG";
-	rename -uid "37140C7D-4D10-220C-C29A-26AF358C761D";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo20";
-	rename -uid "E1819E91-47EC-27DF-DA0D-D6984B347F42";
-createNode aiStandardSurface -n "aiStandardSurface20";
-	rename -uid "742660C0-4BBB-DC72-A6E5-F9A7A32CAB58";
-	setAttr ".base" 1;
-	setAttr ".specular_roughness" 1;
-createNode shadingEngine -n "aiStandardSurface20SG";
-	rename -uid "C9B97CD9-46F6-BCDD-A359-A38DD7BFFD96";
-	setAttr ".ihi" 0;
-	setAttr ".ro" yes;
-createNode materialInfo -n "materialInfo21";
-	rename -uid "C2685066-4C9B-694B-D718-6D93C611B13C";
-createNode aiPhysicalSky -n "aiPhysicalSky1";
-	rename -uid "69F5FE50-4E2E-032F-9068-A49A64ED04D7";
-createNode polyUnite -n "polyUnite7";
-	rename -uid "868F467F-4C36-BEDE-5360-82BCA3DD83DA";
-	setAttr -s 2 ".ip";
-	setAttr -s 2 ".im";
-createNode groupId -n "groupId45";
-	rename -uid "F1D03046-4FB3-AC54-C8D2-38AB34B61A26";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts17";
-	rename -uid "3B8826F2-4A21-AEE6-C2E8-8FA23289D4AC";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId46";
-	rename -uid "BCF823C5-47C2-8FFE-2581-50B80E42E37B";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId47";
-	rename -uid "1057817F-4B98-164F-1E02-D597D94A1A01";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts18";
-	rename -uid "8896252E-4317-AB12-829A-BB8FD815AF74";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:719]";
-createNode groupId -n "groupId48";
-	rename -uid "B7261B43-4A00-0F7B-9566-B6A891602FE7";
-	setAttr ".ihi" 0;
-createNode groupId -n "groupId49";
-	rename -uid "9936421A-4607-AE2D-9354-C1A2EF06EED3";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts19";
-	rename -uid "04222D6A-4455-22D3-1189-E59D583FAE4F";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[0:399]";
-createNode groupId -n "groupId50";
-	rename -uid "6EA02A9A-41EA-3512-4DE8-DAAE36E7EEDF";
-	setAttr ".ihi" 0;
-createNode groupParts -n "groupParts20";
-	rename -uid "AE73541F-427B-F052-ECCE-D9A66909271D";
-	setAttr ".ihi" 0;
-	setAttr ".ic" -type "componentList" 1 "f[400:1119]";
-createNode aiPhysicalSky -n "aiPhysicalSky2";
-	rename -uid "27C77A67-4BC1-5332-9535-2E8623B188C9";
-select -ne :time1;
-	setAttr ".o" 1;
-	setAttr ".unw" 1;
-select -ne :hardwareRenderingGlobals;
-	setAttr ".otfna" -type "stringArray" 22 "NURBS Curves" "NURBS Surfaces" "Polygons" "Subdiv Surface" "Particles" "Particle Instance" "Fluids" "Strokes" "Image Planes" "UI" "Lights" "Cameras" "Locators" "Joints" "IK Handles" "Deformers" "Motion Trails" "Components" "Hair Systems" "Follicles" "Misc. UI" "Ornaments"  ;
-	setAttr ".otfva" -type "Int32Array" 22 0 1 1 1 1 1
-		 1 1 1 0 0 0 0 0 0 0 0 0
-		 0 0 0 0 ;
-	setAttr ".fprt" yes;
-select -ne :renderPartition;
-	setAttr -s 23 ".st";
-select -ne :renderGlobalsList1;
-select -ne :defaultShaderList1;
-	setAttr -s 25 ".s";
-select -ne :postProcessList1;
-	setAttr -s 2 ".p";
-select -ne :defaultRenderUtilityList1;
-	setAttr -s 26 ".u";
-select -ne :defaultRenderingList1;
-select -ne :lightList1;
-	setAttr -s 3 ".l";
-select -ne :defaultTextureList1;
-	setAttr -s 21 ".tx";
-select -ne :initialShadingGroup;
-	setAttr -s 43 ".dsm";
-	setAttr ".ro" yes;
-	setAttr -s 42 ".gn";
-select -ne :initialParticleSE;
-	setAttr ".ro" yes;
-select -ne :defaultRenderGlobals;
-	setAttr ".ren" -type "string" "arnold";
-	setAttr ".outf" 51;
-	setAttr ".imfkey" -type "string" "exr";
-select -ne :defaultResolution;
-	setAttr ".w" 1920;
-	setAttr ".h" 1080;
-	setAttr ".pa" 1;
-	setAttr ".dar" 1.7769999504089355;
-select -ne :defaultLightSet;
-	setAttr -s 3 ".dsm";
-select -ne :hardwareRenderGlobals;
-	setAttr ".ctrs" 256;
-	setAttr ".btrs" 512;
-connectAttr "createColorSet8.og" "pSphereShape1.i";
-connectAttr "groupId1.id" "pSphereShape2.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape2.iog.og[0].gco";
-connectAttr "groupId2.id" "pSphereShape2.ciog.cog[0].cgid";
-connectAttr "groupParts15.og" "pSphereShape3.i";
-connectAttr "groupId35.id" "pSphereShape3.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape3.iog.og[0].gco";
-connectAttr "groupId36.id" "pSphereShape3.ciog.cog[0].cgid";
-connectAttr "groupId37.id" "pSphereShape4.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape4.iog.og[0].gco";
-connectAttr "groupId38.id" "pSphereShape4.ciog.cog[0].cgid";
-connectAttr "groupId39.id" "pSphereShape5.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape5.iog.og[0].gco";
-connectAttr "groupId40.id" "pSphereShape5.ciog.cog[0].cgid";
-connectAttr "groupId5.id" "pSphereShape7.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape7.iog.og[0].gco";
-connectAttr "groupId6.id" "pSphereShape7.ciog.cog[0].cgid";
-connectAttr "groupParts16.og" "pCylinderShape1.i";
-connectAttr "groupId41.id" "pCylinderShape1.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pCylinderShape1.iog.og[0].gco";
-connectAttr "groupId42.id" "pCylinderShape1.ciog.cog[0].cgid";
-connectAttr "groupId3.id" "pSphereShape8.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape8.iog.og[0].gco";
-connectAttr "groupId4.id" "pSphereShape8.ciog.cog[0].cgid";
-connectAttr "groupId43.id" "pCylinderShape2.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pCylinderShape2.iog.og[0].gco";
-connectAttr "groupId44.id" "pCylinderShape2.ciog.cog[0].cgid";
-connectAttr "groupId21.id" "pConeShape1.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pConeShape1.iog.og[0].gco";
-connectAttr "groupParts2.og" "pConeShape1.i";
-connectAttr "groupId22.id" "pConeShape1.ciog.cog[0].cgid";
-connectAttr "groupId7.id" "pSphereShape9.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape9.iog.og[0].gco";
-connectAttr "groupParts1.og" "pSphereShape9.i";
-connectAttr "groupId8.id" "pSphereShape9.ciog.cog[0].cgid";
-connectAttr "groupId17.id" "pSphereShape10.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape10.iog.og[0].gco";
-connectAttr "groupId18.id" "pSphereShape10.ciog.cog[0].cgid";
-connectAttr "groupId15.id" "pSphereShape11.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape11.iog.og[0].gco";
-connectAttr "groupId16.id" "pSphereShape11.ciog.cog[0].cgid";
-connectAttr "groupId13.id" "pSphereShape12.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape12.iog.og[0].gco";
-connectAttr "groupId14.id" "pSphereShape12.ciog.cog[0].cgid";
-connectAttr "groupId19.id" "pSphereShape13.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape13.iog.og[0].gco";
-connectAttr "groupId20.id" "pSphereShape13.ciog.cog[0].cgid";
-connectAttr "groupId11.id" "pSphereShape14.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape14.iog.og[0].gco";
-connectAttr "groupId12.id" "pSphereShape14.ciog.cog[0].cgid";
-connectAttr "groupId9.id" "pSphereShape15.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphereShape15.iog.og[0].gco";
-connectAttr "groupId10.id" "pSphereShape15.ciog.cog[0].cgid";
-connectAttr "makeNurbCircle1.oc" "nurbsCircleShape1.cr";
-connectAttr "polySmoothFace1.out" "pTorusShape1.i";
-connectAttr "polySeparate1.out[0]" "polySurfaceShape1.i";
-connectAttr "groupParts5.og" "polySurfaceShape2.i";
-connectAttr "groupId25.id" "polySurfaceShape2.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape2.iog.og[0].gco";
-connectAttr "groupParts6.og" "polySurfaceShape3.i";
-connectAttr "groupId26.id" "polySurfaceShape3.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape3.iog.og[0].gco";
-connectAttr "groupParts7.og" "polySurfaceShape4.i";
-connectAttr "groupId27.id" "polySurfaceShape4.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape4.iog.og[0].gco";
-connectAttr "groupParts8.og" "polySurfaceShape5.i";
-connectAttr "groupId28.id" "polySurfaceShape5.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape5.iog.og[0].gco";
-connectAttr "groupParts9.og" "polySurfaceShape6.i";
-connectAttr "groupId29.id" "polySurfaceShape6.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape6.iog.og[0].gco";
-connectAttr "groupParts10.og" "polySurfaceShape7.i";
-connectAttr "groupId30.id" "polySurfaceShape7.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape7.iog.og[0].gco";
-connectAttr "groupParts11.og" "polySurfaceShape8.i";
-connectAttr "groupId31.id" "polySurfaceShape8.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape8.iog.og[0].gco";
-connectAttr "groupParts12.og" "polySurfaceShape9.i";
-connectAttr "groupId32.id" "polySurfaceShape9.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape9.iog.og[0].gco";
-connectAttr "groupParts13.og" "polySurfaceShape10.i";
-connectAttr "groupId33.id" "polySurfaceShape10.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "polySurfaceShape10.iog.og[0].gco";
-connectAttr "polySeparate1.out[10]" "polySurfaceShape11.i";
-connectAttr "groupParts3.og" "pSphere16Shape.i";
-connectAttr "groupId23.id" "pSphere16Shape.iog.og[0].gid";
-connectAttr ":initialShadingGroup.mwc" "pSphere16Shape.iog.og[0].gco";
-connectAttr "deleteComponent2.og" "pConeShape2.i";
-connectAttr "groupParts18.og" "pConeShape3.i";
-connectAttr "groupId47.id" "pConeShape3.iog.og[1].gid";
-connectAttr "aiStandardSurface11SG.mwc" "pConeShape3.iog.og[1].gco";
-connectAttr "groupId48.id" "pConeShape3.ciog.cog[1].cgid";
-connectAttr "polyTorus2.out" "pTorusShape2.i";
-connectAttr "groupParts17.og" "pSphereShape16.i";
-connectAttr "groupId45.id" "pSphereShape16.iog.og[1].gid";
-connectAttr "aiStandardSurface14SG.mwc" "pSphereShape16.iog.og[1].gco";
-connectAttr "groupId46.id" "pSphereShape16.ciog.cog[1].cgid";
-connectAttr "polyUnite4.out" "pSphere18Shape.i";
-connectAttr "polyUnite5.out" "polySurface3Shape.i";
-connectAttr "polyUnite6.out" "pCylinder3Shape.i";
-connectAttr "groupParts20.og" "pSphere19Shape.i";
-connectAttr "groupId49.id" "pSphere19Shape.iog.og[0].gid";
-connectAttr "aiStandardSurface14SG.mwc" "pSphere19Shape.iog.og[0].gco";
-connectAttr "groupId50.id" "pSphere19Shape.iog.og[1].gid";
-connectAttr "aiStandardSurface11SG.mwc" "pSphere19Shape.iog.og[1].gco";
-relationship "link" ":lightLinker1" ":initialShadingGroup.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" ":initialParticleSE.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface1SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface2SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface3SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface4SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface5SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface6SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface7SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface8SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface9SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface10SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface11SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface12SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface13SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface14SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface15SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "typeBlinnSG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface16SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface17SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface18SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface19SG.message" ":defaultLightSet.message";
-relationship "link" ":lightLinker1" "aiStandardSurface20SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" ":initialShadingGroup.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" ":initialParticleSE.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface1SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface2SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface3SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface4SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface5SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface6SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface7SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface8SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface9SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface10SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface11SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface12SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface13SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface14SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface15SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "typeBlinnSG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface16SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface17SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface18SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface19SG.message" ":defaultLightSet.message";
-relationship "shadowLink" ":lightLinker1" "aiStandardSurface20SG.message" ":defaultLightSet.message";
-connectAttr "layerManager.dli[0]" "defaultLayer.id";
-connectAttr "renderLayerManager.rlmi[0]" "defaultRenderLayer.rlid";
-connectAttr "file1.oc" "aiStandardSurface1.base_color";
-connectAttr "aiStandardSurface1.out" "aiStandardSurface1SG.ss";
-connectAttr "aiStandardSurface1SG.msg" "materialInfo1.sg";
-connectAttr "aiStandardSurface1.msg" "materialInfo1.m";
-connectAttr "aiStandardSurface1.msg" "materialInfo1.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file1.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file1.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file1.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file1.ws";
-connectAttr "place2dTexture1.c" "file1.c";
-connectAttr "place2dTexture1.tf" "file1.tf";
-connectAttr "place2dTexture1.rf" "file1.rf";
-connectAttr "place2dTexture1.mu" "file1.mu";
-connectAttr "place2dTexture1.mv" "file1.mv";
-connectAttr "place2dTexture1.s" "file1.s";
-connectAttr "place2dTexture1.wu" "file1.wu";
-connectAttr "place2dTexture1.wv" "file1.wv";
-connectAttr "place2dTexture1.re" "file1.re";
-connectAttr "place2dTexture1.of" "file1.of";
-connectAttr "place2dTexture1.r" "file1.ro";
-connectAttr "place2dTexture1.n" "file1.n";
-connectAttr "place2dTexture1.vt1" "file1.vt1";
-connectAttr "place2dTexture1.vt2" "file1.vt2";
-connectAttr "place2dTexture1.vt3" "file1.vt3";
-connectAttr "place2dTexture1.vc1" "file1.vc1";
-connectAttr "place2dTexture1.o" "file1.uv";
-connectAttr "place2dTexture1.ofs" "file1.fs";
-connectAttr "file2.oc" "aiStandardSurface2.base_color";
-connectAttr "aiStandardSurface2.out" "aiStandardSurface2SG.ss";
-connectAttr "aiStandardSurface2SG.msg" "materialInfo2.sg";
-connectAttr "aiStandardSurface2.msg" "materialInfo2.m";
-connectAttr "file2.msg" "materialInfo2.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file2.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file2.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file2.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file2.ws";
-connectAttr "place2dTexture2.c" "file2.c";
-connectAttr "place2dTexture2.tf" "file2.tf";
-connectAttr "place2dTexture2.rf" "file2.rf";
-connectAttr "place2dTexture2.mu" "file2.mu";
-connectAttr "place2dTexture2.mv" "file2.mv";
-connectAttr "place2dTexture2.s" "file2.s";
-connectAttr "place2dTexture2.wu" "file2.wu";
-connectAttr "place2dTexture2.wv" "file2.wv";
-connectAttr "place2dTexture2.re" "file2.re";
-connectAttr "place2dTexture2.of" "file2.of";
-connectAttr "place2dTexture2.r" "file2.ro";
-connectAttr "place2dTexture2.n" "file2.n";
-connectAttr "place2dTexture2.vt1" "file2.vt1";
-connectAttr "place2dTexture2.vt2" "file2.vt2";
-connectAttr "place2dTexture2.vt3" "file2.vt3";
-connectAttr "place2dTexture2.vc1" "file2.vc1";
-connectAttr "place2dTexture2.o" "file2.uv";
-connectAttr "place2dTexture2.ofs" "file2.fs";
-connectAttr "file3.oc" "aiStandardSurface3.base_color";
-connectAttr "bump2d1.o" "aiStandardSurface3.n";
-connectAttr "aiStandardSurface3.out" "aiStandardSurface3SG.ss";
-connectAttr "aiStandardSurface3SG.msg" "materialInfo3.sg";
-connectAttr "aiStandardSurface3.msg" "materialInfo3.m";
-connectAttr "aiStandardSurface3.msg" "materialInfo3.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file3.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file3.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file3.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file3.ws";
-connectAttr "place2dTexture3.c" "file3.c";
-connectAttr "place2dTexture3.tf" "file3.tf";
-connectAttr "place2dTexture3.rf" "file3.rf";
-connectAttr "place2dTexture3.mu" "file3.mu";
-connectAttr "place2dTexture3.mv" "file3.mv";
-connectAttr "place2dTexture3.s" "file3.s";
-connectAttr "place2dTexture3.wu" "file3.wu";
-connectAttr "place2dTexture3.wv" "file3.wv";
-connectAttr "place2dTexture3.re" "file3.re";
-connectAttr "place2dTexture3.of" "file3.of";
-connectAttr "place2dTexture3.r" "file3.ro";
-connectAttr "place2dTexture3.n" "file3.n";
-connectAttr "place2dTexture3.vt1" "file3.vt1";
-connectAttr "place2dTexture3.vt2" "file3.vt2";
-connectAttr "place2dTexture3.vt3" "file3.vt3";
-connectAttr "place2dTexture3.vc1" "file3.vc1";
-connectAttr "place2dTexture3.o" "file3.uv";
-connectAttr "place2dTexture3.ofs" "file3.fs";
-connectAttr "file4.oc" "aiStandardSurface4.base_color";
-connectAttr "aiStandardSurface4.out" "aiStandardSurface4SG.ss";
-connectAttr "aiStandardSurface4SG.msg" "materialInfo4.sg";
-connectAttr "aiStandardSurface4.msg" "materialInfo4.m";
-connectAttr "aiStandardSurface4.msg" "materialInfo4.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file4.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file4.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file4.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file4.ws";
-connectAttr "place2dTexture4.c" "file4.c";
-connectAttr "place2dTexture4.tf" "file4.tf";
-connectAttr "place2dTexture4.rf" "file4.rf";
-connectAttr "place2dTexture4.mu" "file4.mu";
-connectAttr "place2dTexture4.mv" "file4.mv";
-connectAttr "place2dTexture4.s" "file4.s";
-connectAttr "place2dTexture4.wu" "file4.wu";
-connectAttr "place2dTexture4.wv" "file4.wv";
-connectAttr "place2dTexture4.re" "file4.re";
-connectAttr "place2dTexture4.of" "file4.of";
-connectAttr "place2dTexture4.r" "file4.ro";
-connectAttr "place2dTexture4.n" "file4.n";
-connectAttr "place2dTexture4.vt1" "file4.vt1";
-connectAttr "place2dTexture4.vt2" "file4.vt2";
-connectAttr "place2dTexture4.vt3" "file4.vt3";
-connectAttr "place2dTexture4.vc1" "file4.vc1";
-connectAttr "place2dTexture4.o" "file4.uv";
-connectAttr "place2dTexture4.ofs" "file4.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file5.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file5.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file5.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file5.ws";
-connectAttr "place2dTexture5.c" "file5.c";
-connectAttr "place2dTexture5.tf" "file5.tf";
-connectAttr "place2dTexture5.rf" "file5.rf";
-connectAttr "place2dTexture5.mu" "file5.mu";
-connectAttr "place2dTexture5.mv" "file5.mv";
-connectAttr "place2dTexture5.s" "file5.s";
-connectAttr "place2dTexture5.wu" "file5.wu";
-connectAttr "place2dTexture5.wv" "file5.wv";
-connectAttr "place2dTexture5.re" "file5.re";
-connectAttr "place2dTexture5.of" "file5.of";
-connectAttr "place2dTexture5.r" "file5.ro";
-connectAttr "place2dTexture5.n" "file5.n";
-connectAttr "place2dTexture5.vt1" "file5.vt1";
-connectAttr "place2dTexture5.vt2" "file5.vt2";
-connectAttr "place2dTexture5.vt3" "file5.vt3";
-connectAttr "place2dTexture5.vc1" "file5.vc1";
-connectAttr "place2dTexture5.o" "file5.uv";
-connectAttr "place2dTexture5.ofs" "file5.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file6.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file6.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file6.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file6.ws";
-connectAttr "place2dTexture6.c" "file6.c";
-connectAttr "place2dTexture6.tf" "file6.tf";
-connectAttr "place2dTexture6.rf" "file6.rf";
-connectAttr "place2dTexture6.mu" "file6.mu";
-connectAttr "place2dTexture6.mv" "file6.mv";
-connectAttr "place2dTexture6.s" "file6.s";
-connectAttr "place2dTexture6.wu" "file6.wu";
-connectAttr "place2dTexture6.wv" "file6.wv";
-connectAttr "place2dTexture6.re" "file6.re";
-connectAttr "place2dTexture6.of" "file6.of";
-connectAttr "place2dTexture6.r" "file6.ro";
-connectAttr "place2dTexture6.n" "file6.n";
-connectAttr "place2dTexture6.vt1" "file6.vt1";
-connectAttr "place2dTexture6.vt2" "file6.vt2";
-connectAttr "place2dTexture6.vt3" "file6.vt3";
-connectAttr "place2dTexture6.vc1" "file6.vc1";
-connectAttr "place2dTexture6.o" "file6.uv";
-connectAttr "place2dTexture6.ofs" "file6.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file7.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file7.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file7.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file7.ws";
-connectAttr "place2dTexture7.c" "file7.c";
-connectAttr "place2dTexture7.tf" "file7.tf";
-connectAttr "place2dTexture7.rf" "file7.rf";
-connectAttr "place2dTexture7.mu" "file7.mu";
-connectAttr "place2dTexture7.mv" "file7.mv";
-connectAttr "place2dTexture7.s" "file7.s";
-connectAttr "place2dTexture7.wu" "file7.wu";
-connectAttr "place2dTexture7.wv" "file7.wv";
-connectAttr "place2dTexture7.re" "file7.re";
-connectAttr "place2dTexture7.of" "file7.of";
-connectAttr "place2dTexture7.r" "file7.ro";
-connectAttr "place2dTexture7.n" "file7.n";
-connectAttr "place2dTexture7.vt1" "file7.vt1";
-connectAttr "place2dTexture7.vt2" "file7.vt2";
-connectAttr "place2dTexture7.vt3" "file7.vt3";
-connectAttr "place2dTexture7.vc1" "file7.vc1";
-connectAttr "place2dTexture7.o" "file7.uv";
-connectAttr "place2dTexture7.ofs" "file7.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file8.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file8.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file8.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file8.ws";
-connectAttr "place2dTexture8.c" "file8.c";
-connectAttr "place2dTexture8.tf" "file8.tf";
-connectAttr "place2dTexture8.rf" "file8.rf";
-connectAttr "place2dTexture8.mu" "file8.mu";
-connectAttr "place2dTexture8.mv" "file8.mv";
-connectAttr "place2dTexture8.s" "file8.s";
-connectAttr "place2dTexture8.wu" "file8.wu";
-connectAttr "place2dTexture8.wv" "file8.wv";
-connectAttr "place2dTexture8.re" "file8.re";
-connectAttr "place2dTexture8.of" "file8.of";
-connectAttr "place2dTexture8.r" "file8.ro";
-connectAttr "place2dTexture8.n" "file8.n";
-connectAttr "place2dTexture8.vt1" "file8.vt1";
-connectAttr "place2dTexture8.vt2" "file8.vt2";
-connectAttr "place2dTexture8.vt3" "file8.vt3";
-connectAttr "place2dTexture8.vc1" "file8.vc1";
-connectAttr "place2dTexture8.o" "file8.uv";
-connectAttr "place2dTexture8.ofs" "file8.fs";
-connectAttr "file8.oa" "bump2d1.bv";
-connectAttr ":defaultColorMgtGlobals.cme" "file9.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file9.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file9.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file9.ws";
-connectAttr "place2dTexture9.c" "file9.c";
-connectAttr "place2dTexture9.tf" "file9.tf";
-connectAttr "place2dTexture9.rf" "file9.rf";
-connectAttr "place2dTexture9.mu" "file9.mu";
-connectAttr "place2dTexture9.mv" "file9.mv";
-connectAttr "place2dTexture9.s" "file9.s";
-connectAttr "place2dTexture9.wu" "file9.wu";
-connectAttr "place2dTexture9.wv" "file9.wv";
-connectAttr "place2dTexture9.re" "file9.re";
-connectAttr "place2dTexture9.of" "file9.of";
-connectAttr "place2dTexture9.r" "file9.ro";
-connectAttr "place2dTexture9.n" "file9.n";
-connectAttr "place2dTexture9.vt1" "file9.vt1";
-connectAttr "place2dTexture9.vt2" "file9.vt2";
-connectAttr "place2dTexture9.vt3" "file9.vt3";
-connectAttr "place2dTexture9.vc1" "file9.vc1";
-connectAttr "place2dTexture9.o" "file9.uv";
-connectAttr "place2dTexture9.ofs" "file9.fs";
-connectAttr "file10.oc" "aiStandardSurface5.base_color";
-connectAttr "file11.oc" "aiStandardSurface5.opacity";
-connectAttr "bump2d2.o" "aiStandardSurface5.n";
-connectAttr "aiStandardSurface5.out" "aiStandardSurface5SG.ss";
-connectAttr "aiStandardSurface5SG.msg" "materialInfo5.sg";
-connectAttr "aiStandardSurface5.msg" "materialInfo5.m";
-connectAttr "aiStandardSurface5.msg" "materialInfo5.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file10.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file10.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file10.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file10.ws";
-connectAttr "place2dTexture10.c" "file10.c";
-connectAttr "place2dTexture10.tf" "file10.tf";
-connectAttr "place2dTexture10.rf" "file10.rf";
-connectAttr "place2dTexture10.mu" "file10.mu";
-connectAttr "place2dTexture10.mv" "file10.mv";
-connectAttr "place2dTexture10.s" "file10.s";
-connectAttr "place2dTexture10.wu" "file10.wu";
-connectAttr "place2dTexture10.wv" "file10.wv";
-connectAttr "place2dTexture10.re" "file10.re";
-connectAttr "place2dTexture10.of" "file10.of";
-connectAttr "place2dTexture10.r" "file10.ro";
-connectAttr "place2dTexture10.n" "file10.n";
-connectAttr "place2dTexture10.vt1" "file10.vt1";
-connectAttr "place2dTexture10.vt2" "file10.vt2";
-connectAttr "place2dTexture10.vt3" "file10.vt3";
-connectAttr "place2dTexture10.vc1" "file10.vc1";
-connectAttr "place2dTexture10.o" "file10.uv";
-connectAttr "place2dTexture10.ofs" "file10.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file11.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file11.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file11.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file11.ws";
-connectAttr "place2dTexture11.c" "file11.c";
-connectAttr "place2dTexture11.tf" "file11.tf";
-connectAttr "place2dTexture11.rf" "file11.rf";
-connectAttr "place2dTexture11.mu" "file11.mu";
-connectAttr "place2dTexture11.mv" "file11.mv";
-connectAttr "place2dTexture11.s" "file11.s";
-connectAttr "place2dTexture11.wu" "file11.wu";
-connectAttr "place2dTexture11.wv" "file11.wv";
-connectAttr "place2dTexture11.re" "file11.re";
-connectAttr "place2dTexture11.of" "file11.of";
-connectAttr "place2dTexture11.r" "file11.ro";
-connectAttr "place2dTexture11.n" "file11.n";
-connectAttr "place2dTexture11.vt1" "file11.vt1";
-connectAttr "place2dTexture11.vt2" "file11.vt2";
-connectAttr "place2dTexture11.vt3" "file11.vt3";
-connectAttr "place2dTexture11.vc1" "file11.vc1";
-connectAttr "place2dTexture11.o" "file11.uv";
-connectAttr "place2dTexture11.ofs" "file11.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file12.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file12.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file12.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file12.ws";
-connectAttr "place2dTexture12.c" "file12.c";
-connectAttr "place2dTexture12.tf" "file12.tf";
-connectAttr "place2dTexture12.rf" "file12.rf";
-connectAttr "place2dTexture12.mu" "file12.mu";
-connectAttr "place2dTexture12.mv" "file12.mv";
-connectAttr "place2dTexture12.s" "file12.s";
-connectAttr "place2dTexture12.wu" "file12.wu";
-connectAttr "place2dTexture12.wv" "file12.wv";
-connectAttr "place2dTexture12.re" "file12.re";
-connectAttr "place2dTexture12.of" "file12.of";
-connectAttr "place2dTexture12.r" "file12.ro";
-connectAttr "place2dTexture12.n" "file12.n";
-connectAttr "place2dTexture12.vt1" "file12.vt1";
-connectAttr "place2dTexture12.vt2" "file12.vt2";
-connectAttr "place2dTexture12.vt3" "file12.vt3";
-connectAttr "place2dTexture12.vc1" "file12.vc1";
-connectAttr "place2dTexture12.o" "file12.uv";
-connectAttr "place2dTexture12.ofs" "file12.fs";
-connectAttr "file12.oa" "bump2d2.bv";
-connectAttr "file13.oa" "bump2d2.bd";
-connectAttr ":defaultColorMgtGlobals.cme" "file13.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file13.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file13.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file13.ws";
-connectAttr "place2dTexture13.c" "file13.c";
-connectAttr "place2dTexture13.tf" "file13.tf";
-connectAttr "place2dTexture13.rf" "file13.rf";
-connectAttr "place2dTexture13.mu" "file13.mu";
-connectAttr "place2dTexture13.mv" "file13.mv";
-connectAttr "place2dTexture13.s" "file13.s";
-connectAttr "place2dTexture13.wu" "file13.wu";
-connectAttr "place2dTexture13.wv" "file13.wv";
-connectAttr "place2dTexture13.re" "file13.re";
-connectAttr "place2dTexture13.of" "file13.of";
-connectAttr "place2dTexture13.r" "file13.ro";
-connectAttr "place2dTexture13.n" "file13.n";
-connectAttr "place2dTexture13.vt1" "file13.vt1";
-connectAttr "place2dTexture13.vt2" "file13.vt2";
-connectAttr "place2dTexture13.vt3" "file13.vt3";
-connectAttr "place2dTexture13.vc1" "file13.vc1";
-connectAttr "place2dTexture13.o" "file13.uv";
-connectAttr "place2dTexture13.ofs" "file13.fs";
-connectAttr "file14.oc" "aiStandardSurface6.base_color";
-connectAttr "bump2d3.o" "aiStandardSurface6.n";
-connectAttr "aiStandardSurface6.out" "aiStandardSurface6SG.ss";
-connectAttr "aiStandardSurface6SG.msg" "materialInfo6.sg";
-connectAttr "aiStandardSurface6.msg" "materialInfo6.m";
-connectAttr "aiStandardSurface6.msg" "materialInfo6.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file14.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file14.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file14.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file14.ws";
-connectAttr "place2dTexture14.c" "file14.c";
-connectAttr "place2dTexture14.tf" "file14.tf";
-connectAttr "place2dTexture14.rf" "file14.rf";
-connectAttr "place2dTexture14.mu" "file14.mu";
-connectAttr "place2dTexture14.mv" "file14.mv";
-connectAttr "place2dTexture14.s" "file14.s";
-connectAttr "place2dTexture14.wu" "file14.wu";
-connectAttr "place2dTexture14.wv" "file14.wv";
-connectAttr "place2dTexture14.re" "file14.re";
-connectAttr "place2dTexture14.of" "file14.of";
-connectAttr "place2dTexture14.r" "file14.ro";
-connectAttr "place2dTexture14.n" "file14.n";
-connectAttr "place2dTexture14.vt1" "file14.vt1";
-connectAttr "place2dTexture14.vt2" "file14.vt2";
-connectAttr "place2dTexture14.vt3" "file14.vt3";
-connectAttr "place2dTexture14.vc1" "file14.vc1";
-connectAttr "place2dTexture14.o" "file14.uv";
-connectAttr "place2dTexture14.ofs" "file14.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file15.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file15.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file15.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file15.ws";
-connectAttr "place2dTexture15.c" "file15.c";
-connectAttr "place2dTexture15.tf" "file15.tf";
-connectAttr "place2dTexture15.rf" "file15.rf";
-connectAttr "place2dTexture15.mu" "file15.mu";
-connectAttr "place2dTexture15.mv" "file15.mv";
-connectAttr "place2dTexture15.s" "file15.s";
-connectAttr "place2dTexture15.wu" "file15.wu";
-connectAttr "place2dTexture15.wv" "file15.wv";
-connectAttr "place2dTexture15.re" "file15.re";
-connectAttr "place2dTexture15.of" "file15.of";
-connectAttr "place2dTexture15.r" "file15.ro";
-connectAttr "place2dTexture15.n" "file15.n";
-connectAttr "place2dTexture15.vt1" "file15.vt1";
-connectAttr "place2dTexture15.vt2" "file15.vt2";
-connectAttr "place2dTexture15.vt3" "file15.vt3";
-connectAttr "place2dTexture15.vc1" "file15.vc1";
-connectAttr "place2dTexture15.o" "file15.uv";
-connectAttr "place2dTexture15.ofs" "file15.fs";
-connectAttr "file16.oa" "bump2d3.bd";
-connectAttr "file15.oa" "bump2d3.bv";
-connectAttr ":defaultColorMgtGlobals.cme" "file16.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file16.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file16.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file16.ws";
-connectAttr "place2dTexture16.c" "file16.c";
-connectAttr "place2dTexture16.tf" "file16.tf";
-connectAttr "place2dTexture16.rf" "file16.rf";
-connectAttr "place2dTexture16.mu" "file16.mu";
-connectAttr "place2dTexture16.mv" "file16.mv";
-connectAttr "place2dTexture16.s" "file16.s";
-connectAttr "place2dTexture16.wu" "file16.wu";
-connectAttr "place2dTexture16.wv" "file16.wv";
-connectAttr "place2dTexture16.re" "file16.re";
-connectAttr "place2dTexture16.of" "file16.of";
-connectAttr "place2dTexture16.r" "file16.ro";
-connectAttr "place2dTexture16.n" "file16.n";
-connectAttr "place2dTexture16.vt1" "file16.vt1";
-connectAttr "place2dTexture16.vt2" "file16.vt2";
-connectAttr "place2dTexture16.vt3" "file16.vt3";
-connectAttr "place2dTexture16.vc1" "file16.vc1";
-connectAttr "place2dTexture16.o" "file16.uv";
-connectAttr "place2dTexture16.ofs" "file16.fs";
-connectAttr "file17.oc" "aiStandardSurface7.base_color";
-connectAttr "bump2d4.o" "aiStandardSurface7.n";
-connectAttr "aiStandardSurface7.out" "aiStandardSurface7SG.ss";
-connectAttr "aiStandardSurface7SG.msg" "materialInfo7.sg";
-connectAttr "aiStandardSurface7.msg" "materialInfo7.m";
-connectAttr "aiStandardSurface7.msg" "materialInfo7.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file17.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file17.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file17.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file17.ws";
-connectAttr "place2dTexture17.c" "file17.c";
-connectAttr "place2dTexture17.tf" "file17.tf";
-connectAttr "place2dTexture17.rf" "file17.rf";
-connectAttr "place2dTexture17.mu" "file17.mu";
-connectAttr "place2dTexture17.mv" "file17.mv";
-connectAttr "place2dTexture17.s" "file17.s";
-connectAttr "place2dTexture17.wu" "file17.wu";
-connectAttr "place2dTexture17.wv" "file17.wv";
-connectAttr "place2dTexture17.re" "file17.re";
-connectAttr "place2dTexture17.of" "file17.of";
-connectAttr "place2dTexture17.r" "file17.ro";
-connectAttr "place2dTexture17.n" "file17.n";
-connectAttr "place2dTexture17.vt1" "file17.vt1";
-connectAttr "place2dTexture17.vt2" "file17.vt2";
-connectAttr "place2dTexture17.vt3" "file17.vt3";
-connectAttr "place2dTexture17.vc1" "file17.vc1";
-connectAttr "place2dTexture17.o" "file17.uv";
-connectAttr "place2dTexture17.ofs" "file17.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file18.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file18.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file18.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file18.ws";
-connectAttr "place2dTexture18.c" "file18.c";
-connectAttr "place2dTexture18.tf" "file18.tf";
-connectAttr "place2dTexture18.rf" "file18.rf";
-connectAttr "place2dTexture18.mu" "file18.mu";
-connectAttr "place2dTexture18.mv" "file18.mv";
-connectAttr "place2dTexture18.s" "file18.s";
-connectAttr "place2dTexture18.wu" "file18.wu";
-connectAttr "place2dTexture18.wv" "file18.wv";
-connectAttr "place2dTexture18.re" "file18.re";
-connectAttr "place2dTexture18.of" "file18.of";
-connectAttr "place2dTexture18.r" "file18.ro";
-connectAttr "place2dTexture18.n" "file18.n";
-connectAttr "place2dTexture18.vt1" "file18.vt1";
-connectAttr "place2dTexture18.vt2" "file18.vt2";
-connectAttr "place2dTexture18.vt3" "file18.vt3";
-connectAttr "place2dTexture18.vc1" "file18.vc1";
-connectAttr "place2dTexture18.o" "file18.uv";
-connectAttr "place2dTexture18.ofs" "file18.fs";
-connectAttr "file18.oa" "bump2d4.bv";
-connectAttr "file19.oa" "bump2d4.bd";
-connectAttr ":defaultColorMgtGlobals.cme" "file19.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file19.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file19.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file19.ws";
-connectAttr "place2dTexture19.c" "file19.c";
-connectAttr "place2dTexture19.tf" "file19.tf";
-connectAttr "place2dTexture19.rf" "file19.rf";
-connectAttr "place2dTexture19.mu" "file19.mu";
-connectAttr "place2dTexture19.mv" "file19.mv";
-connectAttr "place2dTexture19.s" "file19.s";
-connectAttr "place2dTexture19.wu" "file19.wu";
-connectAttr "place2dTexture19.wv" "file19.wv";
-connectAttr "place2dTexture19.re" "file19.re";
-connectAttr "place2dTexture19.of" "file19.of";
-connectAttr "place2dTexture19.r" "file19.ro";
-connectAttr "place2dTexture19.n" "file19.n";
-connectAttr "place2dTexture19.vt1" "file19.vt1";
-connectAttr "place2dTexture19.vt2" "file19.vt2";
-connectAttr "place2dTexture19.vt3" "file19.vt3";
-connectAttr "place2dTexture19.vc1" "file19.vc1";
-connectAttr "place2dTexture19.o" "file19.uv";
-connectAttr "place2dTexture19.ofs" "file19.fs";
-connectAttr "file20.oc" "aiStandardSurface8.base_color";
-connectAttr "bump2d5.o" "aiStandardSurface8.n";
-connectAttr "aiStandardSurface8.out" "aiStandardSurface8SG.ss";
-connectAttr "aiStandardSurface8SG.msg" "materialInfo8.sg";
-connectAttr "aiStandardSurface8.msg" "materialInfo8.m";
-connectAttr "aiStandardSurface8.msg" "materialInfo8.t" -na;
-connectAttr ":defaultColorMgtGlobals.cme" "file20.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file20.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file20.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file20.ws";
-connectAttr "place2dTexture20.c" "file20.c";
-connectAttr "place2dTexture20.tf" "file20.tf";
-connectAttr "place2dTexture20.rf" "file20.rf";
-connectAttr "place2dTexture20.mu" "file20.mu";
-connectAttr "place2dTexture20.mv" "file20.mv";
-connectAttr "place2dTexture20.s" "file20.s";
-connectAttr "place2dTexture20.wu" "file20.wu";
-connectAttr "place2dTexture20.wv" "file20.wv";
-connectAttr "place2dTexture20.re" "file20.re";
-connectAttr "place2dTexture20.of" "file20.of";
-connectAttr "place2dTexture20.r" "file20.ro";
-connectAttr "place2dTexture20.n" "file20.n";
-connectAttr "place2dTexture20.vt1" "file20.vt1";
-connectAttr "place2dTexture20.vt2" "file20.vt2";
-connectAttr "place2dTexture20.vt3" "file20.vt3";
-connectAttr "place2dTexture20.vc1" "file20.vc1";
-connectAttr "place2dTexture20.o" "file20.uv";
-connectAttr "place2dTexture20.ofs" "file20.fs";
-connectAttr ":defaultColorMgtGlobals.cme" "file21.cme";
-connectAttr ":defaultColorMgtGlobals.cfe" "file21.cmcf";
-connectAttr ":defaultColorMgtGlobals.cfp" "file21.cmcp";
-connectAttr ":defaultColorMgtGlobals.wsn" "file21.ws";
-connectAttr "place2dTexture21.c" "file21.c";
-connectAttr "place2dTexture21.tf" "file21.tf";
-connectAttr "place2dTexture21.rf" "file21.rf";
-connectAttr "place2dTexture21.mu" "file21.mu";
-connectAttr "place2dTexture21.mv" "file21.mv";
-connectAttr "place2dTexture21.s" "file21.s";
-connectAttr "place2dTexture21.wu" "file21.wu";
-connectAttr "place2dTexture21.wv" "file21.wv";
-connectAttr "place2dTexture21.re" "file21.re";
-connectAttr "place2dTexture21.of" "file21.of";
-connectAttr "place2dTexture21.r" "file21.ro";
-connectAttr "place2dTexture21.n" "file21.n";
-connectAttr "place2dTexture21.vt1" "file21.vt1";
-connectAttr "place2dTexture21.vt2" "file21.vt2";
-connectAttr "place2dTexture21.vt3" "file21.vt3";
-connectAttr "place2dTexture21.vc1" "file21.vc1";
-connectAttr "place2dTexture21.o" "file21.uv";
-connectAttr "place2dTexture21.ofs" "file21.fs";
-connectAttr "file21.oa" "bump2d5.bv";
-connectAttr "polySphere1.out" "createColorSet7.ig";
-connectAttr "createColorSet7.og" "createColorSet8.ig";
-connectAttr "polyTweak1.out" "polySplitRing1.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing1.mp";
-connectAttr "polyCylinder1.out" "polyTweak1.ip";
-connectAttr "polySplitRing1.out" "polySplitRing2.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing2.mp";
-connectAttr "polySplitRing2.out" "polySplitRing3.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing3.mp";
-connectAttr "polySplitRing3.out" "polySplitRing4.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing4.mp";
-connectAttr "polySplitRing4.out" "polySplitRing5.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing5.mp";
-connectAttr "polyTweak2.out" "polySplitRing6.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing6.mp";
-connectAttr "polySplitRing5.out" "polyTweak2.ip";
-connectAttr "polySplitRing6.out" "polySplitRing7.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing7.mp";
-connectAttr "polySplitRing7.out" "polySplitRing8.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing8.mp";
-connectAttr "polySplitRing8.out" "polyCircularize1.ip";
-connectAttr "pCylinderShape1.wm" "polyCircularize1.mp";
-connectAttr "polyCircularize1.out" "polyExtrudeFace1.ip";
-connectAttr "pCylinderShape1.wm" "polyExtrudeFace1.mp";
-connectAttr "layerManager.dli[2]" "layer1.id";
-connectAttr "polyTweak3.out" "polySplitRing9.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing9.mp";
-connectAttr "polyExtrudeFace1.out" "polyTweak3.ip";
-connectAttr "polySplitRing9.out" "polySplitRing10.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing10.mp";
-connectAttr "polySplitRing10.out" "polySplitRing11.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing11.mp";
-connectAttr "polySplitRing11.out" "polyCircularize2.ip";
-connectAttr "pCylinderShape1.wm" "polyCircularize2.mp";
-connectAttr "polyCircularize2.out" "polyExtrudeFace2.ip";
-connectAttr "pCylinderShape1.wm" "polyExtrudeFace2.mp";
-connectAttr "polyTweak4.out" "polySplitRing12.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing12.mp";
-connectAttr "polyExtrudeFace2.out" "polyTweak4.ip";
-connectAttr "polySplitRing12.out" "polySplitRing13.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing13.mp";
-connectAttr "polySplitRing13.out" "polySplitRing14.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing14.mp";
-connectAttr "polySplitRing14.out" "polyCircularize3.ip";
-connectAttr "pCylinderShape1.wm" "polyCircularize3.mp";
-connectAttr "polyCircularize3.out" "polyExtrudeFace3.ip";
-connectAttr "pCylinderShape1.wm" "polyExtrudeFace3.mp";
-connectAttr "polyTweak5.out" "polySplitRing15.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing15.mp";
-connectAttr "polyExtrudeFace3.out" "polyTweak5.ip";
-connectAttr "polySplitRing15.out" "polySplitRing16.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing16.mp";
-connectAttr "polySplitRing16.out" "polySplitRing17.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing17.mp";
-connectAttr "polySplitRing17.out" "polyCircularize4.ip";
-connectAttr "pCylinderShape1.wm" "polyCircularize4.mp";
-connectAttr "polyCircularize4.out" "polyExtrudeFace4.ip";
-connectAttr "pCylinderShape1.wm" "polyExtrudeFace4.mp";
-connectAttr "polyTweak6.out" "polySplitRing18.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing18.mp";
-connectAttr "polyExtrudeFace4.out" "polyTweak6.ip";
-connectAttr "polySplitRing18.out" "polySplitRing19.ip";
-connectAttr "pCylinderShape1.wm" "polySplitRing19.mp";
-connectAttr "polyTweak7.out" "polyExtrudeFace5.ip";
-connectAttr "pTorusShape1.wm" "polyExtrudeFace5.mp";
-connectAttr "polyTorus1.out" "polyTweak7.ip";
-connectAttr "polyTweak8.out" "polySplitRing20.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing20.mp";
-connectAttr "polyExtrudeFace5.out" "polyTweak8.ip";
-connectAttr "polySplitRing20.out" "polySplitRing21.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing21.mp";
-connectAttr "polySplitRing21.out" "polySplitRing22.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing22.mp";
-connectAttr "polySplitRing22.out" "polySplitRing23.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing23.mp";
-connectAttr "polySplitRing23.out" "polySplitRing24.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing24.mp";
-connectAttr "polySplitRing24.out" "polySplitRing25.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing25.mp";
-connectAttr "pSphereShape2.o" "polyUnite3.ip[0]";
-connectAttr "pSphereShape8.o" "polyUnite3.ip[1]";
-connectAttr "pSphereShape7.o" "polyUnite3.ip[2]";
-connectAttr "pSphereShape9.o" "polyUnite3.ip[3]";
-connectAttr "pSphereShape15.o" "polyUnite3.ip[4]";
-connectAttr "pSphereShape14.o" "polyUnite3.ip[5]";
-connectAttr "pSphereShape12.o" "polyUnite3.ip[6]";
-connectAttr "pSphereShape11.o" "polyUnite3.ip[7]";
-connectAttr "pSphereShape10.o" "polyUnite3.ip[8]";
-connectAttr "pSphereShape13.o" "polyUnite3.ip[9]";
-connectAttr "pConeShape1.o" "polyUnite3.ip[10]";
-connectAttr "pSphereShape2.wm" "polyUnite3.im[0]";
-connectAttr "pSphereShape8.wm" "polyUnite3.im[1]";
-connectAttr "pSphereShape7.wm" "polyUnite3.im[2]";
-connectAttr "pSphereShape9.wm" "polyUnite3.im[3]";
-connectAttr "pSphereShape15.wm" "polyUnite3.im[4]";
-connectAttr "pSphereShape14.wm" "polyUnite3.im[5]";
-connectAttr "pSphereShape12.wm" "polyUnite3.im[6]";
-connectAttr "pSphereShape11.wm" "polyUnite3.im[7]";
-connectAttr "pSphereShape10.wm" "polyUnite3.im[8]";
-connectAttr "pSphereShape13.wm" "polyUnite3.im[9]";
-connectAttr "pConeShape1.wm" "polyUnite3.im[10]";
-connectAttr "polySphere3.out" "groupParts1.ig";
-connectAttr "groupId7.id" "groupParts1.gi";
-connectAttr "polyCone1.out" "groupParts2.ig";
-connectAttr "groupId21.id" "groupParts2.gi";
-connectAttr "polyUnite3.out" "groupParts3.ig";
-connectAttr "groupId23.id" "groupParts3.gi";
-connectAttr "polyTweak9.out" "polyExtrudeFace6.ip";
-connectAttr "pTorusShape1.wm" "polyExtrudeFace6.mp";
-connectAttr "polySplitRing25.out" "polyTweak9.ip";
-connectAttr "polyTweak10.out" "polySplitRing26.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing26.mp";
-connectAttr "polyExtrudeFace6.out" "polyTweak10.ip";
-connectAttr "polySplitRing26.out" "polySplitRing27.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing27.mp";
-connectAttr "polySplitRing27.out" "polySplitRing28.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing28.mp";
-connectAttr "polySplitRing28.out" "polySplitRing29.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing29.mp";
-connectAttr "polySplitRing29.out" "polySplitRing30.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing30.mp";
-connectAttr "polyTweak11.out" "polyDelEdge1.ip";
-connectAttr "polySplitRing30.out" "polyTweak11.ip";
-connectAttr "polyDelEdge1.out" "polyDelEdge2.ip";
-connectAttr "polyDelEdge2.out" "polyDelEdge3.ip";
-connectAttr "polyDelEdge3.out" "polyDelEdge4.ip";
-connectAttr "polyTweak12.out" "polySplitRing31.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing31.mp";
-connectAttr "polyDelEdge4.out" "polyTweak12.ip";
-connectAttr "polySplitRing31.out" "polySplitRing32.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing32.mp";
-connectAttr "polySplitRing32.out" "polySplitRing33.ip";
-connectAttr "pTorusShape1.wm" "polySplitRing33.mp";
-connectAttr "polyTweak13.out" "polySmoothFace1.ip";
-connectAttr "polySplitRing33.out" "polyTweak13.ip";
-connectAttr "polyCone2.out" "deleteComponent1.ig";
-connectAttr "deleteComponent1.og" "deleteComponent2.ig";
-connectAttr "polyCone3.out" "polyExtrudeFace7.ip";
-connectAttr "pConeShape3.wm" "polyExtrudeFace7.mp";
-connectAttr "polyTweak14.out" "polyExtrudeFace8.ip";
-connectAttr "pConeShape3.wm" "polyExtrudeFace8.mp";
-connectAttr "polyExtrudeFace7.out" "polyTweak14.ip";
-connectAttr "polyTweak15.out" "polyExtrudeFace9.ip";
-connectAttr "pConeShape3.wm" "polyExtrudeFace9.mp";
-connectAttr "polyExtrudeFace8.out" "polyTweak15.ip";
-connectAttr "polyTweak16.out" "polyExtrudeFace10.ip";
-connectAttr "pConeShape3.wm" "polyExtrudeFace10.mp";
-connectAttr "polyExtrudeFace9.out" "polyTweak16.ip";
-connectAttr "polyTweak17.out" "polyDelEdge5.ip";
-connectAttr "polyExtrudeFace10.out" "polyTweak17.ip";
-connectAttr "polyTweak18.out" "polySplitRing34.ip";
-connectAttr "pConeShape3.wm" "polySplitRing34.mp";
-connectAttr "polyDelEdge5.out" "polyTweak18.ip";
-connectAttr "polySplitRing34.out" "polySplitRing35.ip";
-connectAttr "pConeShape3.wm" "polySplitRing35.mp";
-connectAttr "polySplitRing35.out" "polySplitRing36.ip";
-connectAttr "pConeShape3.wm" "polySplitRing36.mp";
-connectAttr "polySplitRing36.out" "polySplitRing37.ip";
-connectAttr "pConeShape3.wm" "polySplitRing37.mp";
-connectAttr "polySplitRing37.out" "polySplitRing38.ip";
-connectAttr "pConeShape3.wm" "polySplitRing38.mp";
-connectAttr "polyTweak19.out" "polySmoothFace2.ip";
-connectAttr "polySplitRing38.out" "polyTweak19.ip";
-connectAttr "aiStandardSurface9.out" "aiStandardSurface9SG.ss";
-connectAttr "pSphereShape1.iog" "aiStandardSurface9SG.dsm" -na;
-connectAttr "aiStandardSurface9SG.msg" "materialInfo9.sg";
-connectAttr "aiStandardSurface9.msg" "materialInfo9.m";
-connectAttr "aiStandardSurface9.msg" "materialInfo9.t" -na;
-connectAttr "pSphere16Shape.o" "polySeparate1.ip";
-connectAttr "polySeparate1.out[1]" "groupParts5.ig";
-connectAttr "groupId25.id" "groupParts5.gi";
-connectAttr "polySeparate1.out[2]" "groupParts6.ig";
-connectAttr "groupId26.id" "groupParts6.gi";
-connectAttr "polySeparate1.out[3]" "groupParts7.ig";
-connectAttr "groupId27.id" "groupParts7.gi";
-connectAttr "polySeparate1.out[4]" "groupParts8.ig";
-connectAttr "groupId28.id" "groupParts8.gi";
-connectAttr "polySeparate1.out[5]" "groupParts9.ig";
-connectAttr "groupId29.id" "groupParts9.gi";
-connectAttr "polySeparate1.out[6]" "groupParts10.ig";
-connectAttr "groupId30.id" "groupParts10.gi";
-connectAttr "polySeparate1.out[7]" "groupParts11.ig";
-connectAttr "groupId31.id" "groupParts11.gi";
-connectAttr "polySeparate1.out[8]" "groupParts12.ig";
-connectAttr "groupId32.id" "groupParts12.gi";
-connectAttr "polySeparate1.out[9]" "groupParts13.ig";
-connectAttr "groupId33.id" "groupParts13.gi";
-connectAttr "aiStandardSurface10.out" "aiStandardSurface10SG.ss";
-connectAttr "polySurfaceShape1.iog" "aiStandardSurface10SG.dsm" -na;
-connectAttr "aiStandardSurface10SG.msg" "materialInfo10.sg";
-connectAttr "aiStandardSurface10.msg" "materialInfo10.m";
-connectAttr "aiStandardSurface10.msg" "materialInfo10.t" -na;
-connectAttr "aiStandardSurface11.out" "aiStandardSurface11SG.ss";
-connectAttr "pConeShape3.iog.og[1]" "aiStandardSurface11SG.dsm" -na;
-connectAttr "pConeShape3.ciog.cog[1]" "aiStandardSurface11SG.dsm" -na;
-connectAttr "pSphere19Shape.iog.og[1]" "aiStandardSurface11SG.dsm" -na;
-connectAttr "groupId47.msg" "aiStandardSurface11SG.gn" -na;
-connectAttr "groupId48.msg" "aiStandardSurface11SG.gn" -na;
-connectAttr "groupId50.msg" "aiStandardSurface11SG.gn" -na;
-connectAttr "aiStandardSurface11SG.msg" "materialInfo11.sg";
-connectAttr "aiStandardSurface11.msg" "materialInfo11.m";
-connectAttr "aiStandardSurface11.msg" "materialInfo11.t" -na;
-connectAttr "aiStandardSurface12.out" "aiStandardSurface12SG.ss";
-connectAttr "pTorusShape2.iog" "aiStandardSurface12SG.dsm" -na;
-connectAttr "aiStandardSurface12SG.msg" "materialInfo12.sg";
-connectAttr "aiStandardSurface12.msg" "materialInfo12.m";
-connectAttr "aiStandardSurface12.msg" "materialInfo12.t" -na;
-connectAttr "aiStandardSurface13.out" "aiStandardSurface13SG.ss";
-connectAttr "aiStandardSurface13SG.msg" "materialInfo13.sg";
-connectAttr "aiStandardSurface13.msg" "materialInfo13.m";
-connectAttr "aiStandardSurface13.msg" "materialInfo13.t" -na;
-connectAttr "aiStandardSurface14.out" "aiStandardSurface14SG.ss";
-connectAttr "pSphereShape16.iog.og[1]" "aiStandardSurface14SG.dsm" -na;
-connectAttr "pSphereShape16.ciog.cog[1]" "aiStandardSurface14SG.dsm" -na;
-connectAttr "pSphere19Shape.iog.og[0]" "aiStandardSurface14SG.dsm" -na;
-connectAttr "groupId45.msg" "aiStandardSurface14SG.gn" -na;
-connectAttr "groupId46.msg" "aiStandardSurface14SG.gn" -na;
-connectAttr "groupId49.msg" "aiStandardSurface14SG.gn" -na;
-connectAttr "aiStandardSurface14SG.msg" "materialInfo14.sg";
-connectAttr "aiStandardSurface14.msg" "materialInfo14.m";
-connectAttr "aiStandardSurface14.msg" "materialInfo14.t" -na;
-connectAttr "aiStandardSurface15.out" "aiStandardSurface15SG.ss";
-connectAttr "pTorusShape1.iog" "aiStandardSurface15SG.dsm" -na;
-connectAttr "aiStandardSurface15SG.msg" "materialInfo15.sg";
-connectAttr "aiStandardSurface15.msg" "materialInfo15.m";
-connectAttr "aiStandardSurface15.msg" "materialInfo15.t" -na;
-connectAttr "pSphereShape3.o" "polyUnite4.ip[0]";
-connectAttr "pSphereShape4.o" "polyUnite4.ip[1]";
-connectAttr "pSphereShape5.o" "polyUnite4.ip[2]";
-connectAttr "pSphereShape3.wm" "polyUnite4.im[0]";
-connectAttr "pSphereShape4.wm" "polyUnite4.im[1]";
-connectAttr "pSphereShape5.wm" "polyUnite4.im[2]";
-connectAttr "polySphere2.out" "groupParts15.ig";
-connectAttr "groupId35.id" "groupParts15.gi";
-connectAttr "typeBlinn.oc" "typeBlinnSG.ss";
-connectAttr "typeBlinnSG.msg" "materialInfo16.sg";
-connectAttr "typeBlinn.msg" "materialInfo16.m";
-connectAttr "aiStandardSurface16.out" "aiStandardSurface16SG.ss";
-connectAttr "pSphere18Shape.iog" "aiStandardSurface16SG.dsm" -na;
-connectAttr "aiStandardSurface16SG.msg" "materialInfo17.sg";
-connectAttr "aiStandardSurface16.msg" "materialInfo17.m";
-connectAttr "aiStandardSurface16.msg" "materialInfo17.t" -na;
-connectAttr "polySurfaceShape3.o" "polyUnite5.ip[0]";
-connectAttr "polySurfaceShape2.o" "polyUnite5.ip[1]";
-connectAttr "polySurfaceShape5.o" "polyUnite5.ip[2]";
-connectAttr "polySurfaceShape7.o" "polyUnite5.ip[3]";
-connectAttr "polySurfaceShape8.o" "polyUnite5.ip[4]";
-connectAttr "polySurfaceShape4.o" "polyUnite5.ip[5]";
-connectAttr "polySurfaceShape9.o" "polyUnite5.ip[6]";
-connectAttr "polySurfaceShape10.o" "polyUnite5.ip[7]";
-connectAttr "polySurfaceShape6.o" "polyUnite5.ip[8]";
-connectAttr "polySurfaceShape3.wm" "polyUnite5.im[0]";
-connectAttr "polySurfaceShape2.wm" "polyUnite5.im[1]";
-connectAttr "polySurfaceShape5.wm" "polyUnite5.im[2]";
-connectAttr "polySurfaceShape7.wm" "polyUnite5.im[3]";
-connectAttr "polySurfaceShape8.wm" "polyUnite5.im[4]";
-connectAttr "polySurfaceShape4.wm" "polyUnite5.im[5]";
-connectAttr "polySurfaceShape9.wm" "polyUnite5.im[6]";
-connectAttr "polySurfaceShape10.wm" "polyUnite5.im[7]";
-connectAttr "polySurfaceShape6.wm" "polyUnite5.im[8]";
-connectAttr "aiStandardSurface17.out" "aiStandardSurface17SG.ss";
-connectAttr "polySurface3Shape.iog" "aiStandardSurface17SG.dsm" -na;
-connectAttr "aiStandardSurface17SG.msg" "materialInfo18.sg";
-connectAttr "aiStandardSurface17.msg" "materialInfo18.m";
-connectAttr "aiStandardSurface17.msg" "materialInfo18.t" -na;
-connectAttr "aiStandardSurface18.out" "aiStandardSurface18SG.ss";
-connectAttr "polySurfaceShape11.iog" "aiStandardSurface18SG.dsm" -na;
-connectAttr "aiStandardSurface18SG.msg" "materialInfo19.sg";
-connectAttr "aiStandardSurface18.msg" "materialInfo19.m";
-connectAttr "aiStandardSurface18.msg" "materialInfo19.t" -na;
-connectAttr "pCylinderShape1.o" "polyUnite6.ip[0]";
-connectAttr "pCylinderShape2.o" "polyUnite6.ip[1]";
-connectAttr "pCylinderShape1.wm" "polyUnite6.im[0]";
-connectAttr "pCylinderShape2.wm" "polyUnite6.im[1]";
-connectAttr "polySplitRing19.out" "groupParts16.ig";
-connectAttr "groupId41.id" "groupParts16.gi";
-connectAttr "aiStandardSurface19.out" "aiStandardSurface19SG.ss";
-connectAttr "pCylinder3Shape.iog" "aiStandardSurface19SG.dsm" -na;
-connectAttr "aiStandardSurface19SG.msg" "materialInfo20.sg";
-connectAttr "aiStandardSurface19.msg" "materialInfo20.m";
-connectAttr "aiStandardSurface19.msg" "materialInfo20.t" -na;
-connectAttr "aiStandardSurface20.out" "aiStandardSurface20SG.ss";
-connectAttr "aiStandardSurface20SG.msg" "materialInfo21.sg";
-connectAttr "aiStandardSurface20.msg" "materialInfo21.m";
-connectAttr "aiStandardSurface20.msg" "materialInfo21.t" -na;
-connectAttr "pSphereShape16.o" "polyUnite7.ip[0]";
-connectAttr "pConeShape3.o" "polyUnite7.ip[1]";
-connectAttr "pSphereShape16.wm" "polyUnite7.im[0]";
-connectAttr "pConeShape3.wm" "polyUnite7.im[1]";
-connectAttr "polySphere4.out" "groupParts17.ig";
-connectAttr "groupId45.id" "groupParts17.gi";
-connectAttr "polySmoothFace2.out" "groupParts18.ig";
-connectAttr "groupId47.id" "groupParts18.gi";
-connectAttr "polyUnite7.out" "groupParts19.ig";
-connectAttr "groupId49.id" "groupParts19.gi";
-connectAttr "groupParts19.og" "groupParts20.ig";
-connectAttr "groupId50.id" "groupParts20.gi";
-connectAttr "aiStandardSurface1SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface2SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface3SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface4SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface5SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface6SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface7SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface8SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface9SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface10SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface11SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface12SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface13SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface14SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface15SG.pa" ":renderPartition.st" -na;
-connectAttr "typeBlinnSG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface16SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface17SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface18SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface19SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface20SG.pa" ":renderPartition.st" -na;
-connectAttr "aiStandardSurface1.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface2.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface3.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface4.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface5.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface6.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface7.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface8.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface9.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface10.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface11.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface12.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface13.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface14.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface15.msg" ":defaultShaderList1.s" -na;
-connectAttr "typeBlinn.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface16.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface17.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface18.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface19.msg" ":defaultShaderList1.s" -na;
-connectAttr "aiStandardSurface20.msg" ":defaultShaderList1.s" -na;
-connectAttr "place2dTexture1.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture2.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture3.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture4.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture5.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture6.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture7.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture8.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "bump2d1.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture9.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture10.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture11.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture12.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "bump2d2.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture13.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture14.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture15.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "bump2d3.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture16.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture17.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture18.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "bump2d4.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture19.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture20.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "place2dTexture21.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "bump2d5.msg" ":defaultRenderUtilityList1.u" -na;
-connectAttr "defaultRenderLayer.msg" ":defaultRenderingList1.r" -na;
-connectAttr "aiAreaLightShape1.ltd" ":lightList1.l" -na;
-connectAttr "aiAreaLightShape2.ltd" ":lightList1.l" -na;
-connectAttr "aiAreaLightShape3.ltd" ":lightList1.l" -na;
-connectAttr "file1.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file2.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file3.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file4.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file5.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file6.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file7.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file8.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file9.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file10.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file11.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file12.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file13.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file14.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file15.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file16.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file17.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file18.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file19.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file20.msg" ":defaultTextureList1.tx" -na;
-connectAttr "file21.msg" ":defaultTextureList1.tx" -na;
-connectAttr "pSphereShape2.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape2.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape8.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape8.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape7.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape7.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape9.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape9.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape15.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape15.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape14.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape14.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape12.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape12.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape11.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape11.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape10.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape10.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape13.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape13.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pConeShape1.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pConeShape1.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphere16Shape.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pConeShape2.iog" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape2.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape3.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape4.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape5.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape6.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape7.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape8.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape9.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "polySurfaceShape10.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape3.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape3.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape4.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape4.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape5.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pSphereShape5.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pCylinderShape1.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pCylinderShape1.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pCylinderShape2.iog.og[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "pCylinderShape2.ciog.cog[0]" ":initialShadingGroup.dsm" -na;
-connectAttr "groupId1.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId2.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId3.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId4.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId5.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId6.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId7.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId8.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId9.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId10.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId11.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId12.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId13.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId14.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId15.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId16.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId17.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId18.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId19.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId20.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId21.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId22.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId23.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId25.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId26.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId27.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId28.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId29.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId30.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId31.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId32.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId33.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId35.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId36.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId37.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId38.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId39.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId40.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId41.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId42.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId43.msg" ":initialShadingGroup.gn" -na;
-connectAttr "groupId44.msg" ":initialShadingGroup.gn" -na;
-connectAttr "aiAreaLight1.iog" ":defaultLightSet.dsm" -na;
-connectAttr "aiAreaLight2.iog" ":defaultLightSet.dsm" -na;
-connectAttr "aiAreaLight3.iog" ":defaultLightSet.dsm" -na;
-// End of snowman.ma
diff --git a/game/chaineddecos/assets/models_backup/snowman.obj.chmeta b/game/chaineddecos/assets/models_backup/snowman.obj.chmeta
deleted file mode 100644
index ba3884101..000000000
--- a/game/chaineddecos/assets/models_backup/snowman.obj.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 7503689905861426168
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/source/cozyfantasyhome.glb b/game/chaineddecos/assets/models_backup/source/cozyfantasyhome.glb
deleted file mode 100644
index b9e0d6309..000000000
--- a/game/chaineddecos/assets/models_backup/source/cozyfantasyhome.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0af3d6ce83c825623617f6abf2b2a60c52ff11e81b09446e82b18cbde8619797
-size 40474164
diff --git a/game/chaineddecos/assets/models_backup/source/cozyfantasyhome.glb.chmeta b/game/chaineddecos/assets/models_backup/source/cozyfantasyhome.glb.chmeta
deleted file mode 100644
index fa294dcbe..000000000
--- a/game/chaineddecos/assets/models_backup/source/cozyfantasyhome.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 11706383179567734210
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/source/harry.glb b/game/chaineddecos/assets/models_backup/source/harry.glb
deleted file mode 100644
index de5f3f8e8..000000000
--- a/game/chaineddecos/assets/models_backup/source/harry.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c34e640cee22e6f40df64cf0647697577cc02ac10b00c5b7cdd08ee12cc4d87b
-size 8424320
diff --git a/game/chaineddecos/assets/models_backup/source/harry.glb.chmeta b/game/chaineddecos/assets/models_backup/source/harry.glb.chmeta
deleted file mode 100644
index ceed83356..000000000
--- a/game/chaineddecos/assets/models_backup/source/harry.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 17300079892011459145
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/source/storybookhouse.glb b/game/chaineddecos/assets/models_backup/source/storybookhouse.glb
deleted file mode 100644
index 3f0e4dee7..000000000
--- a/game/chaineddecos/assets/models_backup/source/storybookhouse.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ae6c0ec871f95f96fe0e3441c6dffef1115e04152e042ca02d66c8ad7aa59a7
-size 2140644
diff --git a/game/chaineddecos/assets/models_backup/source/storybookhouse.glb.chmeta b/game/chaineddecos/assets/models_backup/source/storybookhouse.glb.chmeta
deleted file mode 100644
index 37a38c0e1..000000000
--- a/game/chaineddecos/assets/models_backup/source/storybookhouse.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 4545344503096866458
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_0.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_0.jpg
deleted file mode 100644
index 002345b5c..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_0.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41b5ff971ac321f617dfd8e5d80f711d7cbe2e5ba162153b2ea10e4ec889670c
-size 1598459
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_1.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_1.jpg
deleted file mode 100644
index c0f13d121..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_1.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c1e128016ed76fbc236907fd35f1f592a2570d8543693534038099738b674f0
-size 288
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_10.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_10.jpg
deleted file mode 100644
index f6f235323..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_10.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39f478adefe059cf69b328f7bd39dbc7e2f4918c89fa84101b31f491ca70ddfd
-size 502178
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_11.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_11.jpg
deleted file mode 100644
index aed377f7f..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_11.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d09ff5c1e8198f8ef52d866e76eea111cf58f25d880cbb2a4a554238b118890
-size 55126
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_13.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_13.jpg
deleted file mode 100644
index 67fa99d88..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_13.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cb59ba283b277a5f872da283cb763af038e44a1d3eba13ad9ca30b0ddc754bd
-size 56662
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_14.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_14.jpg
deleted file mode 100644
index 2b18c6baa..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_14.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e44f735b0891a682e413a55219f3ff26eb98ade95fa3cc96818394cfdf11cd83
-size 631615
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_16.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_16.jpg
deleted file mode 100644
index e2e7a7096..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_16.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc5201784015d140eb426dbc4111564c9ce3c1952f523c31e89d5c5a14fa3a18
-size 823934
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_17.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_17.jpg
deleted file mode 100644
index b1270b67c..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_17.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56d6b0444e732a57ecb0c6f36c5f41acae0a83a1e13115470b097aa48788440e
-size 61799
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_2.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_2.jpg
deleted file mode 100644
index a9c874f16..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_2.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:664cf75bdaecbbc3dbaffa58dad8965fd4d4106c015a4c9a70f29839e72fcf4b
-size 4387051
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_3.png b/game/chaineddecos/assets/models_backup/source/textures/embedded_3.png
deleted file mode 100644
index 63f33bffe..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c5f35eaa6efea5ec3fb898d4399d59e0e482bc7e116933c8f2fbfdb8868ba85
-size 24657
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_5.png b/game/chaineddecos/assets/models_backup/source/textures/embedded_5.png
deleted file mode 100644
index cfe419d6d..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_5.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51373a03a8b771e534a1899c7ae23b6e9e742054d850d98d71e94ff3c31a269f
-size 13829
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_6.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_6.jpg
deleted file mode 100644
index c338d79fb..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_6.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b3b6bd2cb2d82efd94141243d67eca79144d1863db96681246f1dfffee7a52b
-size 1665
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_7.png b/game/chaineddecos/assets/models_backup/source/textures/embedded_7.png
deleted file mode 100644
index 6b5f2ac9b..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_7.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9a4818cfcd13f48f575a4e3cc40a94f245cde067008ea5ca8e201ee69e6d29c
-size 77802
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_8.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_8.jpg
deleted file mode 100644
index adc071c0e..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_8.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:913688ff368b13372614db51116e5d4d4442b7ff82772c9466bad5c87bd8144e
-size 19499
diff --git a/game/chaineddecos/assets/models_backup/source/textures/embedded_9.jpg b/game/chaineddecos/assets/models_backup/source/textures/embedded_9.jpg
deleted file mode 100644
index dd1810826..000000000
--- a/game/chaineddecos/assets/models_backup/source/textures/embedded_9.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed725218f0837bd6d0f83b0781eea7b8b7214593b5603cda96ed93c9fa094192
-size 1007759
diff --git a/game/chaineddecos/assets/models_backup/stairs.glb b/game/chaineddecos/assets/models_backup/stairs.glb
deleted file mode 100644
index c5826bceb..000000000
--- a/game/chaineddecos/assets/models_backup/stairs.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9992905f706d71e629aaef388a52c0738d328a67fc49a067348629e6dcd15ed8
-size 5460
diff --git a/game/chaineddecos/assets/models_backup/stairs.glb.chmeta b/game/chaineddecos/assets/models_backup/stairs.glb.chmeta
deleted file mode 100644
index 45e299480..000000000
--- a/game/chaineddecos/assets/models_backup/stairs.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 9327847391794294108
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/stairs_f.glb b/game/chaineddecos/assets/models_backup/stairs_f.glb
deleted file mode 100644
index b042ba125..000000000
--- a/game/chaineddecos/assets/models_backup/stairs_f.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90d36f7f85670cc77bf72d84be206a6605b029f1f63ad030b220927a34a3fd20
-size 9260
diff --git a/game/chaineddecos/assets/models_backup/stairs_f.glb.chmeta b/game/chaineddecos/assets/models_backup/stairs_f.glb.chmeta
deleted file mode 100644
index 5faabb489..000000000
--- a/game/chaineddecos/assets/models_backup/stairs_f.glb.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 1681573796833900424
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/tavergltf.bin b/game/chaineddecos/assets/models_backup/tavergltf.bin
deleted file mode 100644
index 0ebc45f4d..000000000
--- a/game/chaineddecos/assets/models_backup/tavergltf.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daee56e29853d9153b8faf55b2765c18e6d3117510acab82c08fbbf11379ace0
-size 6421840
diff --git a/game/chaineddecos/assets/models_backup/tavergltf.gltf b/game/chaineddecos/assets/models_backup/tavergltf.gltf
deleted file mode 100644
index 9d9a4427c..000000000
--- a/game/chaineddecos/assets/models_backup/tavergltf.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:624e8d55f025f2ef14e52e7064f7ffc1a664fc1d9a3260d716d785f519fe2709
-size 284280
diff --git a/game/chaineddecos/assets/models_backup/tavergltf.gltf.chmeta b/game/chaineddecos/assets/models_backup/tavergltf.gltf.chmeta
deleted file mode 100644
index df659478b..000000000
--- a/game/chaineddecos/assets/models_backup/tavergltf.gltf.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 11463321441767715412
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea.zip b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea.zip
deleted file mode 100644
index 4a64fff1c..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:abbe911c52e8255996ac3a1e5fc5c47b4b1c54ee26e989f40a1157ad3d16588d
-size 56597352
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/license.txt b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/license.txt
deleted file mode 100644
index c97493536..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	The house lost at sea
-* source:	https://sketchfab.com/3d-models/the-house-lost-at-sea-bdf8ea72acd946798e250067e576c70d
-* author:	Michel Donze (https://sketchfab.com/mdonze)
-
-Model License:
-* license type:	CC-BY-NC-4.0 (http://creativecommons.org/licenses/by-nc/4.0/)
-* requirements:	Author must be credited. No commercial use.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "The house lost at sea" (https://sketchfab.com/3d-models/the-house-lost-at-sea-bdf8ea72acd946798e250067e576c70d) by Michel Donze (https://sketchfab.com/mdonze) licensed under CC-BY-NC-4.0 (http://creativecommons.org/licenses/by-nc/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/scene.bin b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/scene.bin
deleted file mode 100644
index 7485b3f61..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:628a8e8777998ebc9d11df2937669306b3eae8977811fc5d7bfb53b69b156966
-size 18312639
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/scene.gltf b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/scene.gltf
deleted file mode 100644
index c3ac90542..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f2543c118ba8fd15f5e1e2690fe75f94a60e04adeb927285661a2f9edefb7cd
-size 568497
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/BushesRefl_baseColor.png b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/BushesRefl_baseColor.png
deleted file mode 100644
index 12e55016c..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/BushesRefl_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbf0a27367c0f0e7da4c4ff1ab04f3b9c3a7359cb8dd63231d30ba52a404317b
-size 19977
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/Bushes_baseColor.png b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/Bushes_baseColor.png
deleted file mode 100644
index d908b092c..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/Bushes_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3408878290d5631b568d2d469feea6dc1275fea9746107114cbd3d72b8cb66f7
-size 57825
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/HouseShdr_baseColor.jpeg b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/HouseShdr_baseColor.jpeg
deleted file mode 100644
index 387bf93ec..000000000
Binary files a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/HouseShdr_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/Shrubs_baseColor.png b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/Shrubs_baseColor.png
deleted file mode 100644
index 155804ef1..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/Shrubs_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a48f827e81f6364e606ccc84e6be038c82c15bc4a388daaacbd34d6ecb410c34
-size 376390
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowGlassShdr_baseColor.png b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowGlassShdr_baseColor.png
deleted file mode 100644
index 7aa502f99..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowGlassShdr_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a20308668766d825db8c8519370bba85332ccb5d2dc079ea0cc1bcbc705afc10
-size 13383149
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowLightGlow_baseColor.png b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowLightGlow_baseColor.png
deleted file mode 100644
index 7aa502f99..000000000
--- a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowLightGlow_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a20308668766d825db8c8519370bba85332ccb5d2dc079ea0cc1bcbc705afc10
-size 13383149
diff --git a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowsInsideShdr_baseColor.jpeg b/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowsInsideShdr_baseColor.jpeg
deleted file mode 100644
index c9421f978..000000000
Binary files a/game/chaineddecos/assets/models_backup/the_house_lost_at_sea/textures/WindowsInsideShdr_baseColor.jpeg and /dev/null differ
diff --git a/game/chaineddecos/assets/models_backup/toy_train/license.txt b/game/chaineddecos/assets/models_backup/toy_train/license.txt
deleted file mode 100644
index 922325702..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Toy Train
-* source:	https://sketchfab.com/3d-models/toy-train-93399465c93547f4b5408a5c75e44cdb
-* author:	studio.permeated (https://sketchfab.com/studio.permeated)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Toy Train" (https://sketchfab.com/3d-models/toy-train-93399465c93547f4b5408a5c75e44cdb) by studio.permeated (https://sketchfab.com/studio.permeated) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/toy_train/scene.bin b/game/chaineddecos/assets/models_backup/toy_train/scene.bin
deleted file mode 100644
index 7fdb7c919..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:325ae1fcaf385716576adf72dbb9c572dcf6c5ad7e0075f2ced002e0b7d9176b
-size 38259387
diff --git a/game/chaineddecos/assets/models_backup/toy_train/scene.gltf b/game/chaineddecos/assets/models_backup/toy_train/scene.gltf
deleted file mode 100644
index 4f73bbfa8..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cfc69d0a171ca26cd43209a3ed53a6f89d5b26009c1a253186f7f52e69fcbf38
-size 104363
diff --git a/game/chaineddecos/assets/models_backup/toy_train/textures/Octane_Mix_Material1_specularGlossiness.png b/game/chaineddecos/assets/models_backup/toy_train/textures/Octane_Mix_Material1_specularGlossiness.png
deleted file mode 100644
index 7b1b635fb..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/textures/Octane_Mix_Material1_specularGlossiness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d5b65484030eca3f7afc88b29e1f853c52137052d136aea7dacbf616704b960
-size 1840470
diff --git a/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_0.png
deleted file mode 100644
index de8f78262..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60d2e2b71dc7a4377f8718fc6fda514dead47635227ee8b46ee7b29bd8c24c05
-size 16474859
diff --git a/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_1.png b/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_1.png
deleted file mode 100644
index dbe95ab82..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf6685fd9ade257efb2f1b8a51f35d0d5e737846968b4107cdd024477e240a0a
-size 1154101
diff --git a/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_2.png b/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_2.png
deleted file mode 100644
index a1c6be7f3..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/textures/embedded_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:837ff1281c7fe69ba716e8198d629f9b84ba31a157e40eab3bc8dfdc9014b639
-size 29689
diff --git a/game/chaineddecos/assets/models_backup/toy_train/toy_train.glb b/game/chaineddecos/assets/models_backup/toy_train/toy_train.glb
deleted file mode 100644
index 319d51891..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/toy_train.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:912f6a7d2af4ace0f03dd12c889e5a09086187df57891677109bbb8e3022c765
-size 40159165
diff --git a/game/chaineddecos/assets/models_backup/toy_train/toy_train.zip b/game/chaineddecos/assets/models_backup/toy_train/toy_train.zip
deleted file mode 100644
index ba605f4e1..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/toy_train.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ba723ef001f11f56337c3ba125248c0cba786e83ee5708e6faeab12f5d1cea6
-size 116
diff --git a/game/chaineddecos/assets/models_backup/toy_train/train_vagon.glb b/game/chaineddecos/assets/models_backup/toy_train/train_vagon.glb
deleted file mode 100644
index 14f304ef5..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/train_vagon.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80b0bc1612d6f56f0d571704a4ada0eabb08c1abff4ddc4883a11dc03767dfc9
-size 2699186
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train.glb b/game/chaineddecos/assets/models_backup/toy_train/wooden_train.glb
deleted file mode 100644
index 5bc264e19..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1442236c7506b224f234ed4c1627a5979354aecae650ea90084ad30cb898eb5f
-size 20114092
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train.zip b/game/chaineddecos/assets/models_backup/toy_train/wooden_train.zip
deleted file mode 100644
index 37cf9f937..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f7f85fc0d8c0ed07b45b2ed50c0d8d451820ace0f80544351f06202b1318195
-size 17948274
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/license.txt b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/license.txt
deleted file mode 100644
index 81733304f..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Wooden Train
-* source:	https://sketchfab.com/3d-models/wooden-train-ca04431879454045aebb7089aa67d5b0
-* author:	ArbitraryCanary (https://sketchfab.com/ArbitraryCanary)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Wooden Train" (https://sketchfab.com/3d-models/wooden-train-ca04431879454045aebb7089aa67d5b0) by ArbitraryCanary (https://sketchfab.com/ArbitraryCanary) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/scene.bin b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/scene.bin
deleted file mode 100644
index fba89f840..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff4d93c5dc8a46e6b92abad5b74333c36f967fa9f22e0b495d122cb8a3f7b211
-size 3103114
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/scene.gltf b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/scene.gltf
deleted file mode 100644
index 41afc8de7..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd374e765793381d2dcc6ebdfa27ab46a736720a90563e40a800daff0b402f4a
-size 12713
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Tree_baseColor.png b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Tree_baseColor.png
deleted file mode 100644
index a1c6be7f3..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Tree_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:837ff1281c7fe69ba716e8198d629f9b84ba31a157e40eab3bc8dfdc9014b639
-size 29689
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Tree_metallicRoughness.png b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Tree_metallicRoughness.png
deleted file mode 100644
index 3d6a1f16a..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Tree_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5b4a0a8fd22e8a234464e56b8911ca7fb9e89c96767b246db4bad6c3487d258
-size 11411
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Wood_baseColor.png b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Wood_baseColor.png
deleted file mode 100644
index de8f78262..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Wood_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60d2e2b71dc7a4377f8718fc6fda514dead47635227ee8b46ee7b29bd8c24c05
-size 16474859
diff --git a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Wood_metallicRoughness.png b/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Wood_metallicRoughness.png
deleted file mode 100644
index a4d050013..000000000
--- a/game/chaineddecos/assets/models_backup/toy_train/wooden_train/textures/Wood_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89686a8c90c164d5f4823dd077f5f20b63f22ad015e0ebdf6a688f46a90bee72
-size 487758
diff --git a/game/chaineddecos/assets/models_backup/train/license.txt b/game/chaineddecos/assets/models_backup/train/license.txt
deleted file mode 100644
index fab4b4ebd..000000000
--- a/game/chaineddecos/assets/models_backup/train/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Train Track
-* source:	https://sketchfab.com/3d-models/train-track-bbfcc6c769434911ad704ef42eb4d2fb
-* author:	timblewee (https://sketchfab.com/timblewee)
-
-Model License:
-* license type:	CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-* requirements:	Author must be credited. Commercial use is allowed.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Train Track" (https://sketchfab.com/3d-models/train-track-bbfcc6c769434911ad704ef42eb4d2fb) by timblewee (https://sketchfab.com/timblewee) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/train/scene.bin b/game/chaineddecos/assets/models_backup/train/scene.bin
deleted file mode 100644
index f913a7b71..000000000
--- a/game/chaineddecos/assets/models_backup/train/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b32a486df986cc769652486ea73afdfc59658265fd4c6dbe2439caa1d84f12f5
-size 20985900
diff --git a/game/chaineddecos/assets/models_backup/train/scene.gltf b/game/chaineddecos/assets/models_backup/train/scene.gltf
deleted file mode 100644
index b41668a38..000000000
--- a/game/chaineddecos/assets/models_backup/train/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df2607163cd1bf43c61207adf2a63c9f1fbdc2b89a596f921bdd8fa2242b90bf
-size 14358
diff --git a/game/chaineddecos/assets/models_backup/train/scene.gltf.chmeta b/game/chaineddecos/assets/models_backup/train/scene.gltf.chmeta
deleted file mode 100644
index 8eb0947c9..000000000
--- a/game/chaineddecos/assets/models_backup/train/scene.gltf.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 13466208947943330873
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/trains/model.glb b/game/chaineddecos/assets/models_backup/trains/model.glb
deleted file mode 100644
index e19b73575..000000000
--- a/game/chaineddecos/assets/models_backup/trains/model.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8771ec55d619031755da5c3f5bcc427425ef3b90868d8da5f0c045fa5a8569e1
-size 4294927
diff --git a/game/chaineddecos/assets/models_backup/trains/textures/embedded_0.jpg b/game/chaineddecos/assets/models_backup/trains/textures/embedded_0.jpg
deleted file mode 100644
index 95a39df8f..000000000
--- a/game/chaineddecos/assets/models_backup/trains/textures/embedded_0.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18441023bf433ed8078d120289a49837ac57996957fc523bfcbe78af2702209b
-size 364350
diff --git a/game/chaineddecos/assets/models_backup/tripo_convert_3fca58a7-6191-4be9-bab8-db63777b7eb1.mtl b/game/chaineddecos/assets/models_backup/tripo_convert_3fca58a7-6191-4be9-bab8-db63777b7eb1.mtl
deleted file mode 100644
index 804252da6..000000000
--- a/game/chaineddecos/assets/models_backup/tripo_convert_3fca58a7-6191-4be9-bab8-db63777b7eb1.mtl
+++ /dev/null
@@ -1,16 +0,0 @@
-# Blender 4.5.0 MTL File: 'None'
-# www.blender.org
-
-newmtl tripo_mat_3fca58a7-6191-4be9-bab8-db63777b7eb1
-Ka 1.000000 1.000000 1.000000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.500000
-d 1.000000
-illum 2
-map_Kd boy_basecolor.JPEG
-map_Ns boy_roughness.JPEG
-map_Pr boy_roughness.JPEG
-map_refl boy_metallic.JPEG
-map_Pm boy_metallic.JPEG
-map_Bump -bm 1.000000 boy_normal.JPEG
diff --git a/game/chaineddecos/assets/models_backup/tripo_convert_3fca58a7-6191-4be9-bab8-db63777b7eb1.obj.chmeta b/game/chaineddecos/assets/models_backup/tripo_convert_3fca58a7-6191-4be9-bab8-db63777b7eb1.obj.chmeta
deleted file mode 100644
index d57499eda..000000000
--- a/game/chaineddecos/assets/models_backup/tripo_convert_3fca58a7-6191-4be9-bab8-db63777b7eb1.obj.chmeta
+++ /dev/null
@@ -1,3 +0,0 @@
-Asset: 8821208325721797256
-Type: 1
-ImportScale: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready.zip b/game/chaineddecos/assets/models_backup/windmill_game_ready.zip
deleted file mode 100644
index 51e6c16b2..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e090ecee2912586bd708e1d5ac0c493b7ab4b414f8a7b3bcbe955f59e5a44af3
-size 18460286
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/license.txt b/game/chaineddecos/assets/models_backup/windmill_game_ready/license.txt
deleted file mode 100644
index 7b2abf52e..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Model Information:
-* title:	Windmill (game ready)
-* source:	https://sketchfab.com/3d-models/windmill-game-ready-6a006afce57a447baa60c7a6791f0086
-* author:	LamedeFeu (https://sketchfab.com/lamedefeu)
-
-Model License:
-* license type:	CC-BY-NC-SA-4.0 (http://creativecommons.org/licenses/by-nc-sa/4.0/)
-* requirements:	Author must be credited. No commercial use. Modified versions must have the same license.
-
-If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
-This work is based on "Windmill (game ready)" (https://sketchfab.com/3d-models/windmill-game-ready-6a006afce57a447baa60c7a6791f0086) by LamedeFeu (https://sketchfab.com/lamedefeu) licensed under CC-BY-NC-SA-4.0 (http://creativecommons.org/licenses/by-nc-sa/4.0/)
\ No newline at end of file
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/scene.bin b/game/chaineddecos/assets/models_backup/windmill_game_ready/scene.bin
deleted file mode 100644
index ffe1233ec..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/scene.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5c56574836acbca503b14472645b1cc1ab7358b0cea317019b8b7b5c5d7f478
-size 570703
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/scene.gltf b/game/chaineddecos/assets/models_backup/windmill_game_ready/scene.gltf
deleted file mode 100644
index a039f3d76..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/scene.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ae24603d9a5d1991a0946ed4c4956180f9de892b3cb7efbeb5489d0ef185236
-size 17309
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/embedded_0.png b/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/embedded_0.png
deleted file mode 100644
index 692f6a9de..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/embedded_0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8f6a354f0fb8d044e89e795a715d140d5e9c590172c9b02975871eccc018ab6
-size 1747164
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/embedded_2.png b/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/embedded_2.png
deleted file mode 100644
index 223aead55..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/embedded_2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:549965c3c68499694df00bb225650b7eaf834438fd5173918a0349c2d331bcbf
-size 2095796
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_baseColor.png b/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_baseColor.png
deleted file mode 100644
index 20ac509d9..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_baseColor.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e512acfeb7e260059e5c9d40ccf4138883a7d56d74235ae011f63d5d1ef6be03
-size 7075849
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_metallicRoughness.png b/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_metallicRoughness.png
deleted file mode 100644
index f7895ddd7..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_metallicRoughness.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad4a20393b81d8a4c425ceb988fea02aa799bb4dbdeaaf7a72a051868e5eadec
-size 2684597
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_normal.png b/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_normal.png
deleted file mode 100644
index b65e05adb..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/textures/standardSurface1_normal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8eb50c22c10b69f0926ab7e9f4a63c459956c34a2bd60e88a7bcc6baf24dadca
-size 8423717
diff --git a/game/chaineddecos/assets/models_backup/windmill_game_ready/windmill_game_ready.glb b/game/chaineddecos/assets/models_backup/windmill_game_ready/windmill_game_ready.glb
deleted file mode 100644
index 14cb084f1..000000000
--- a/game/chaineddecos/assets/models_backup/windmill_game_ready/windmill_game_ready.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e352ccfcfd0b8e659240d0fed711ee4e897b2fb8639c55cc64760092e387e614
-size 5118542
diff --git a/game/chaineddecos/assets/models_backup/wooden_bridge/textures/embedded_0.jpg b/game/chaineddecos/assets/models_backup/wooden_bridge/textures/embedded_0.jpg
deleted file mode 100644
index cb69fcffe..000000000
--- a/game/chaineddecos/assets/models_backup/wooden_bridge/textures/embedded_0.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5507e7291e7af1f97c828d9cd080929756518aab70360347826b1b147f77b168
-size 7820406
diff --git a/game/chaineddecos/assets/models_backup/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb b/game/chaineddecos/assets/models_backup/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
deleted file mode 100644
index 5d95a29e0..000000000
--- a/game/chaineddecos/assets/models_backup/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:776b5539c311b53a60b2f26093c1428ff73978afd16aa91f83a1749b66adc0ba
-size 15926446
diff --git a/game/chaineddecos/assets/prefab/object_default.chprefab b/game/chaineddecos/assets/prefab/object_default.chprefab
new file mode 100644
index 000000000..3eb32dad3
--- /dev/null
+++ b/game/chaineddecos/assets/prefab/object_default.chprefab
@@ -0,0 +1,29 @@
+Prefab: Arena
+RootEntity: 17759443269579762832
+Entities:
+  - Entity: 17759443269579762832
+    ModelComponent:
+      ModelPath: models/arena.glb
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-1.52065945, -4.32776833, -35.4009895]
+      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      IsColliding: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/prefab/player.chprefab b/game/chaineddecos/assets/prefab/player.chprefab
new file mode 100644
index 000000000..ecc9ff1f0
--- /dev/null
+++ b/game/chaineddecos/assets/prefab/player.chprefab
@@ -0,0 +1,65 @@
+Prefab: Player
+RootEntity: 10143220268921709979
+Entities:
+  - Entity: 10143220268921709979
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.gamehud
+        - ClassName: chaineddecos.scripts.ingamechat
+        - ClassName: chaineddecos.scripts.debuginfoscript
+        - ClassName: chaineddecos.scripts.playercontroller
+        - ClassName: chaineddecos.scripts.cameracontroller
+    ModelComponent:
+      ModelPath: models/skeleton/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/skeleton/scene_material_0.chmat
+        - models/skeleton/scene_material_1.chmat
+        - models/skeleton/scene_material_2.chmat
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Player
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.8, 1.8, 0.8]
+      Offset: [0, 0.9, 0]
+      Radius: 0.4
+      Height: 1.8
+      Friction: 0.5
+      Restitution: 0.0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/skeleton/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
+    PlayerComponent:
+      MovementSpeed: 15
+      JumpForce: 10
+      LookSensitivity: 0.9
+    RigidBodyComponent:
+      Type: 1
+      Mass: 70
+      LinearDamping: 0
+      AngularDamping: 0
+      UseGravity: true
+      IsFixedRotation: true
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: true
+      VelocityForced: false
+    AnimationComponent:
+      GraphPath: animations/new_graph.chag
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        speed: 0
+        isMoving: 0
diff --git a/game/chaineddecos/assets/prefab/player_copy.chprefab b/game/chaineddecos/assets/prefab/player_copy.chprefab
new file mode 100644
index 000000000..5617ec856
--- /dev/null
+++ b/game/chaineddecos/assets/prefab/player_copy.chprefab
@@ -0,0 +1,20 @@
+Prefab: Helicopter
+RootEntity: 2935625289872398916
+Entities:
+  - Entity: 2935625289872398916
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
+    TagComponent:
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AnimationComponent:
+      BlendDuration: 0
+      IsLooping: true
+      PlayOnStart: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/Cube.chmesh b/game/chaineddecos/assets/primitives/Cube.chmesh
new file mode 100644
index 000000000..ee3257aa7
Binary files /dev/null and b/game/chaineddecos/assets/primitives/Cube.chmesh differ
diff --git a/game/chaineddecos/assets/primitives/Cube.chmesh.meta b/game/chaineddecos/assets/primitives/Cube.chmesh.meta
new file mode 100644
index 000000000..3273069e6
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/Cube.chmesh.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 13024432157689355867
+Type: Model
+ContentHash: 1206774197764565688
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/CubeWithTexture.chmesh b/game/chaineddecos/assets/primitives/CubeWithTexture.chmesh
new file mode 100644
index 000000000..21062e6c1
Binary files /dev/null and b/game/chaineddecos/assets/primitives/CubeWithTexture.chmesh differ
diff --git a/game/chaineddecos/assets/primitives/CubeWithTexture.chmesh.meta b/game/chaineddecos/assets/primitives/CubeWithTexture.chmesh.meta
new file mode 100644
index 000000000..8cd1f5242
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/CubeWithTexture.chmesh.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 7652099192965133075
+Type: Model
+ContentHash: 13933334148737465256
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/Cube_material_0.chmat b/game/chaineddecos/assets/primitives/Cube_material_0.chmat
new file mode 100644
index 000000000..62df9aa6d
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/Cube_material_0.chmat
@@ -0,0 +1,17 @@
+Material:
+  Name: Primitive Material
+  AlbedoColor:
+    - 0.630331755
+    - 0.13443093
+    - 0.13443093
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.5
+  Transparent: false
+  Alpha: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/Cube_material_0.chmat.meta b/game/chaineddecos/assets/primitives/Cube_material_0.chmat.meta
new file mode 100644
index 000000000..1f3f24441
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/Cube_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 3397109184596839450
+Type: Material
+ContentHash: 9446026091875763981
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/Hemisphere.chmesh b/game/chaineddecos/assets/primitives/Hemisphere.chmesh
new file mode 100644
index 000000000..53aae2ad7
Binary files /dev/null and b/game/chaineddecos/assets/primitives/Hemisphere.chmesh differ
diff --git a/game/chaineddecos/assets/primitives/Hemisphere.chmesh.meta b/game/chaineddecos/assets/primitives/Hemisphere.chmesh.meta
new file mode 100644
index 000000000..3ca3f66ec
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/Hemisphere.chmesh.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 13521150867533287993
+Type: Model
+ContentHash: 9478109670813991364
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/Hemisphere_material_0.chmat b/game/chaineddecos/assets/primitives/Hemisphere_material_0.chmat
new file mode 100644
index 000000000..f3aae5536
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/Hemisphere_material_0.chmat
@@ -0,0 +1,17 @@
+Material:
+  Name: Primitive Material
+  AlbedoColor:
+    - 0.309803933
+    - 0.470588237
+    - 0.172549024
+    - 1
+  EmissiveColor:
+    - 0
+    - 0
+    - 0
+    - 1
+  EmissiveIntensity: 0
+  Metalness: 0
+  Roughness: 0.5
+  Transparent: true
+  Alpha: 0
\ No newline at end of file
diff --git a/game/chaineddecos/assets/primitives/Hemisphere_material_0.chmat.meta b/game/chaineddecos/assets/primitives/Hemisphere_material_0.chmat.meta
new file mode 100644
index 000000000..136bb0016
--- /dev/null
+++ b/game/chaineddecos/assets/primitives/Hemisphere_material_0.chmat.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 8928809091473330416
+Type: Material
+ContentHash: 8949899216357467778
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/client_waiting.chscene b/game/chaineddecos/assets/scenes/client_waiting.chscene
new file mode 100644
index 000000000..cbd6c134e
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/client_waiting.chscene
@@ -0,0 +1,188 @@
+Scene: Client Waiting Room
+SceneType: 1
+Background:
+  Mode: 0
+  Color: [0, 0, 0, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 1
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ""
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [130, 130, 130, 255]
+  Density: 0.00999999978
+  Start: 10
+  End: 100
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 50000000000000000001
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_client_waiting
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-300, -340]
+        OffsetMax: [300, -280]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Waiting for Host...
+      Auto Size: false
+  - Entity: 50000000000000000002
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: status_label
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-300, -180]
+        OffsetMax: [300, -140]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 22
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Connecting...
+      Auto Size: false
+  - Entity: 50000000000000000003
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_back
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/multiplayer_menu.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-703.046265, 458.698608]
+        OffsetMax: [-573.430542, 498.698669]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
+      Auto Size: false
diff --git a/game/chaineddecos/assets/scenes/game_mode_selection.chscene b/game/chaineddecos/assets/scenes/game_mode_selection.chscene
index 33e51e4b7..cef2bd47c 100644
--- a/game/chaineddecos/assets/scenes/game_mode_selection.chscene
+++ b/game/chaineddecos/assets/scenes/game_mode_selection.chscene
@@ -1,4 +1,5 @@
-Scene: Untitled Scene
+Scene: Game Mode Selection
+SceneType: 1
 Background:
   Mode: 0
   Color: [0, 0, 0, 255]
@@ -28,193 +29,217 @@ DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
   DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 1004
-    TagComponent:
-      Tag: back_button
+  - Entity: 8022080373601641388
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
+    TagComponent:
+      Tag: back_button
+    IDComponent:
+      {}
+    Scene TransitionComponent:
       TargetScenePath: scenes/start_menu.chscene
       Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-539.809082, 478.698639]
-        Size: [99.9998474, 40.000061]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-589.809021, 458.698608]
-        Offset Max: [-489.809174, 498.698669]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-703.046265, 458.698608]
+        OffsetMax: [-573.430542, 498.698669]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Back
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
+        Font Name: font/static/Figtree-Regular.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [235, 238, 242, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
+      Widget Type: 1
+      Label: Back
       Interactable: true
       Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 1003
-    TagComponent:
-      Tag: btn_multiplayer
+  - Entity: 7609763586537435541
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_multiplayer
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/multiplayer_menu.chscene
+      Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-299.441284, -81.4806061]
-        Size: [100.000061, 40.0000267]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-349.441315, -101.480621]
-        Offset Max: [-249.441254, -61.4805946]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-535.847168, -99.7385101]
+        OffsetMax: [-230.27803, -59.7384834]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Multiplayer (Coming Soon)
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 0
+        Border Color: [255, 255, 255, 100]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
+        Font Name: font/static/Figtree-Regular.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [15, 24, 26, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: false
+      Widget Type: 1
+      Label: Multiplayer
+      Interactable: true
       Auto Size: false
-  - Entity: 1002
-    TagComponent:
-      Tag: btn_singleplayer
+  - Entity: 8794121719671112016
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
+    TagComponent:
+      Tag: btn_singleplayer
+    IDComponent:
+      {}
+    Scene TransitionComponent:
       TargetScenePath: scenes/map_selection.chscene
       Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-303.515259, -175.18335]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-353.515259, -195.18335]
-        Offset Max: [-253.515259, -155.18335]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-534.694824, -170.793793]
+        OffsetMax: [-237.836258, -130.793793]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Singleplayer
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
+        Font Name: font/static/Figtree-Regular.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [15, 24, 26, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
+      Widget Type: 1
+      Label: Singleplayer
       Interactable: true
       Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 1001
-    TagComponent:
-      Tag: title_game_mode
+  - Entity: 4520422631998712412
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_game_mode
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-541.66272, -385.66098]
-        Size: [99.9997864, 40.000061]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-591.662598, -405.661011]
-        Offset Max: [-491.662811, -365.66095]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-591.662598, -405.661011]
+        OffsetMax: [-491.662811, -365.66095]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: Select Mode
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
+      Widget Type: 3
+      Text: Select Mode
       Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/host_setup.chscene b/game/chaineddecos/assets/scenes/host_setup.chscene
new file mode 100644
index 000000000..8ce257044
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/host_setup.chscene
@@ -0,0 +1,778 @@
+Scene: Host Setup
+SceneType: 1
+Background:
+  Mode: 0
+  Color: [0, 0, 0, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 1
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ""
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [130, 130, 130, 255]
+  Density: 0.00999999978
+  Start: 10
+  End: 100
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 8825933867783459107
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_host
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-296.767212, -414.353882]
+        OffsetMax: [303.232788, -318.793335]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Host Game
+      Auto Size: false
+  - Entity: 5479663314283937112
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_port
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-200, -230]
+        OffsetMax: [-60, -200]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [110, 231, 211, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 3
+      Text: Port
+      Auto Size: false
+  - Entity: 4614700225393627954
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: input_nick
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-40, -295]
+        OffsetMax: [200, -255]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [40, 45, 55, 255]
+        Pressed Color: [50, 55, 65, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: Player
+      Placeholder: Nickname
+      Max Length: 32
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 14855013641281188874
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_nick
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-200, -290]
+        OffsetMax: [-60, -260]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [150, 160, 170, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 0
+        V Align: 1
+      Widget Type: 3
+      Text: Nickname
+      Auto Size: false
+  - Entity: 17606126149509967772
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: input_port
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-40, -235]
+        OffsetMax: [200, -195]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [40, 45, 55, 255]
+        Pressed Color: [50, 55, 65, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: 7777
+      Placeholder: 7777
+      Max Length: 256
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 938172948172948101
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_max_clients
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-200, -170]
+        OffsetMax: [-60, -140]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [110, 231, 211, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 3
+      Text: Max Players
+      Auto Size: false
+  - Entity: 938172948172948102
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: input_max_clients
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-40, -175]
+        OffsetMax: [200, -135]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [40, 45, 55, 255]
+        Pressed Color: [50, 55, 65, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: 4
+      Placeholder: 4
+      Max Length: 4
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 10088629688581200225
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: section_map
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-300, -100]
+        OffsetMax: [300, -60]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 24
+        Text Color: [110, 231, 211, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Select Map
+      Auto Size: false
+  - Entity: 7870718217057279192
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectMapButton
+          Fields:
+            - Name: MapScene
+              Type: 4
+              Value: scenes/test_rpg_mp.chscene
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_map_rpg
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-340, -40]
+        OffsetMax: [-170, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [40, 44, 52, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: RPG World
+      Interactable: true
+      Auto Size: false
+  - Entity: 3866708852609606095
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectMapButton
+          Fields:
+            - Name: MapScene
+              Type: 4
+              Value: scenes/test_platform_scene_mp.chscene
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_map_platformer
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-150, -40]
+        OffsetMax: [20, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [40, 44, 52, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Platformer
+      Interactable: true
+      Auto Size: false
+  - Entity: 13905190142311289332
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectMapButton
+          Fields:
+            - Name: MapScene
+              Type: 4
+              Value: scenes/rpg_strategy_scene_mp.chscene
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_map_strategy
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [30, -40]
+        OffsetMax: [200, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [40, 44, 52, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: RPG Strategy
+      Interactable: true
+      Auto Size: false
+  - Entity: 17895611561346080046
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectMapButton
+          Fields:
+            - Name: MapScene
+              Type: 4
+              Value: scenes/rpg_strategy_scene_mp.chscene
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_map_first
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [210, -40]
+        OffsetMax: [380, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [40, 44, 52, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: First Scene
+      Interactable: true
+      Auto Size: false
+  - Entity: 4515440088910859926
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.StartServerButton
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_start_server
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, 60]
+        OffsetMax: [180, 124]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 0
+        Border Color: [255, 255, 255, 100]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 26
+        Text Color: [15, 24, 26, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Start Server
+      Interactable: true
+      Auto Size: false
+  - Entity: 8323760101290421280
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_back
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/multiplayer_menu.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-703.046265, 458.698608]
+        OffsetMax: [-573.430542, 498.698669]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
+      Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/host_waiting.chscene b/game/chaineddecos/assets/scenes/host_waiting.chscene
new file mode 100644
index 000000000..8c2d0e4b4
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/host_waiting.chscene
@@ -0,0 +1,245 @@
+Scene: Host Waiting Room
+SceneType: 1
+Background:
+  Mode: 0
+  Color: [0, 0, 0, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 1
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ""
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [130, 130, 130, 255]
+  Density: 0.00999999978
+  Start: 10
+  End: 100
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 30000000000000000001
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_waiting
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-300, -340]
+        OffsetMax: [300, -280]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Waiting Room
+      Auto Size: false
+  - Entity: 30000000000000000002
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: player_count
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.HostWaitingUI
+          Fields: []
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-300, -180]
+        OffsetMax: [300, -140]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 22
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Waiting for players...
+      Auto Size: false
+  - Entity: 30000000000000000003
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_start_game
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, -80]
+        OffsetMax: [180, -16]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 0
+        Border Color: [255, 255, 255, 100]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 26
+        Text Color: [15, 24, 26, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Start Game
+      Interactable: true
+      Auto Size: false
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.StartGameButton
+  - Entity: 30000000000000000004
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_back
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/multiplayer_menu.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-703.046265, 458.698608]
+        OffsetMax: [-573.430542, 498.698669]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
+      Auto Size: false
diff --git a/game/chaineddecos/assets/scenes/info_scene.chscene b/game/chaineddecos/assets/scenes/info_scene.chscene
index 55de6ee53..cc055eacb 100644
--- a/game/chaineddecos/assets/scenes/info_scene.chscene
+++ b/game/chaineddecos/assets/scenes/info_scene.chscene
@@ -1,4 +1,4 @@
-Scene: Untitled Scene
+Scene: Info Scene
 Background:
   Mode: 0
   Color: [0, 0, 0, 255]
@@ -28,194 +28,258 @@ DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
   DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 2002
-    TagComponent:
-      Tag: info_project
+  - Entity: 9713408907339877801
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: back_button
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/start_menu.chscene
+      Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-31.6659088, -132.238693]
-        Size: [374.510468, 86.5034485]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-218.921143, -175.490417]
-        Offset Max: [155.589325, -88.986969]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-694.28064, 272.122009]
+        OffsetMax: [-448.361908, 352.654694]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: "Project: Chained Decos"
-      Style:
-        Font Name: Default
-        Font Size: 21.7250004
-        Text Color: [255, 255, 255, 255]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
         Shadow: false
-        Letter Spacing: 1.26699996
-        Line Height: 1.28600001
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
         H Align: 1
         V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
       Auto Size: false
-  - Entity: 2001
-    TagComponent:
-      Tag: title_info
+  - Entity: 15340164695204985997
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: info_text_4
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-616.812073, -385.069275]
-        Size: [414.535522, 75.6689148]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-824.079834, -422.903748]
-        Offset Max: [-409.544312, -347.234833]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-220.071594, -93.3335114]
+        OffsetMax: [166.901703, -7.93653107]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: Information
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 20
+        Text Color: [200, 204, 212, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
+      Widget Type: 3
+      Text: "Developer: Oleg (IOleg-crypto)"
       Auto Size: false
-  - Entity: 2004
-    TagComponent:
-      Tag: info_text_3
+  - Entity: 14452598080826121559
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: info_text_3
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-31.8438187, -211.002258]
-        Size: [408.050293, 67.5622864]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-235.868973, -244.783401]
-        Offset Max: [172.181335, -177.221115]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-235.868973, -244.783401]
+        OffsetMax: [172.181335, -177.221115]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: "Engine: Chained Engine"
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 20
+        Text Color: [200, 204, 212, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
+      Widget Type: 3
+      Text: "Engine: Chained Engine"
       Auto Size: false
-  - Entity: 2005
-    TagComponent:
-      Tag: info_text_4
+  - Entity: 14564633910809536244
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_info
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-26.5849457, -50.6350212]
-        Size: [386.973297, 85.3969803]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-220.071594, -93.3335114]
-        Offset Max: [166.901703, -7.93653107]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-824.079834, -422.903748]
+        OffsetMax: [-409.544312, -347.234833]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: "Developer: Oleg (IOleg-crypto)"
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 44
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
+      Widget Type: 3
+      Text: Information
       Auto Size: false
-  - Entity: 2006
-    TagComponent:
-      Tag: back_button
+  - Entity: 4167907334565114158
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/start_menu.chscene
-      Triggered: false
+    TagComponent:
+      Tag: info_project
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-571.321289, 312.388367]
-        Size: [245.918732, 80.5326843]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-694.28064, 272.122009]
-        Offset Max: [-448.361908, 352.654694]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-218.921143, -175.490417]
+        OffsetMax: [155.589325, -88.986969]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Back
-      Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
         Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
\ No newline at end of file
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 22
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.20000005
+        Line Height: 1.28600001
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: "Project: Chained Decos"
+      Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/join_setup.chscene b/game/chaineddecos/assets/scenes/join_setup.chscene
new file mode 100644
index 000000000..a617639f3
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/join_setup.chscene
@@ -0,0 +1,501 @@
+Scene: Join Setup
+SceneType: 1
+Background:
+  Mode: 0
+  Color: [0, 0, 0, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 1
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ""
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [130, 130, 130, 255]
+  Density: 0.00999999978
+  Start: 10
+  End: 100
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 7037658707394121711
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_back
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/multiplayer_menu.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-703.046265, 458.698608]
+        OffsetMax: [-573.430542, 498.698669]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
+      Auto Size: false
+  - Entity: 15349157472545293824
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.ConnectButton
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_connect
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, -20]
+        OffsetMax: [180, 44]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 0
+        Border Color: [255, 255, 255, 100]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 26
+        Text Color: [15, 24, 26, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Connect to Server
+      Interactable: true
+      Auto Size: false
+  - Entity: 106195967097032646
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: input_nick
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-40, -355]
+        OffsetMax: [200, -315]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [40, 45, 55, 255]
+        Pressed Color: [50, 55, 65, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/gantari/static/gantari-black.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: Player
+      Placeholder: Nickname
+      Max Length: 32
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 15748609262065323096
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_nick
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-200, -350]
+        OffsetMax: [-60, -320]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [150, 160, 170, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 0
+        V Align: 1
+      Widget Type: 3
+      Text: Nickname
+      Auto Size: false
+  - Entity: 4442177719855331895
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: input_port
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-40, -165]
+        OffsetMax: [200, -125]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [40, 45, 55, 255]
+        Pressed Color: [50, 55, 65, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/gantari/static/gantari-black.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: 7777
+      Placeholder: 7777
+      Max Length: 256
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 4547297835837580507
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_port
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-200, -160]
+        OffsetMax: [-60, -130]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [110, 231, 211, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 3
+      Text: Port
+      Auto Size: false
+  - Entity: 9014834773303136563
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: input_ip
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-40, -235]
+        OffsetMax: [200, -195]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [40, 45, 55, 255]
+        Pressed Color: [50, 55, 65, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/gantari/static/gantari-black.ttf
+        Font Size: 16
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: 127.0.0.1
+      Placeholder: 127.0.0.1
+      Max Length: 256
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 144981501275222977
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_ip
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-200, -230]
+        OffsetMax: [-60, -200]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [110, 231, 211, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 2
+        V Align: 1
+      Widget Type: 3
+      Text: IP Address
+      Auto Size: false
+  - Entity: 4797089471926780887
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_join
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-308.489319, -455.454681]
+        OffsetMax: [291.510681, -395.454681]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Join Game
+      Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/lobby.chscene b/game/chaineddecos/assets/scenes/lobby.chscene
new file mode 100644
index 000000000..c127c3baf
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/lobby.chscene
@@ -0,0 +1,1101 @@
+Scene: Lobby
+SceneType: 1
+Background:
+  Mode: 0
+  Color: [20, 20, 30, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 1
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: environments/menu_environment.chenv
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ""
+  Mode: 0
+  Exposure: 0.99000001
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [158, 148, 148, 255]
+  Density: 0.00100000005
+  Start: 10
+  End: 5000
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 2163670510110017044
+    TransformComponent:
+      Translation: [0, -100, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    PrimitiveComponent:
+      Type: 1
+      Radius: 0.5
+      InnerRadius: 0.200000003
+      Height: 1
+      Slices: 16
+      Stacks: 16
+      Dimensions: [1, 1, 1]
+      AlbedoPath: ""
+      AlbedoColor: [1, 1, 1, 1]
+      NormalPath: ""
+      MetallicRoughnessPath: ""
+      EmissivePath: ""
+      EmissiveColor: [0, 0, 0, 1]
+      EmissiveIntensity: 0
+      Metalness: 0
+      Roughness: 0.5
+      Transparent: false
+      Alpha: 1
+    TagComponent:
+      Tag: avatar_3
+    IDComponent:
+      {}
+  - Entity: 15195757239442346361
+    TransformComponent:
+      Translation: [0, -100, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    PrimitiveComponent:
+      Type: 1
+      Radius: 0.5
+      InnerRadius: 0.200000003
+      Height: 1
+      Slices: 16
+      Stacks: 16
+      Dimensions: [1, 1, 1]
+      AlbedoPath: ""
+      AlbedoColor: [1, 1, 1, 1]
+      NormalPath: ""
+      MetallicRoughnessPath: ""
+      EmissivePath: ""
+      EmissiveColor: [0, 0, 0, 1]
+      EmissiveIntensity: 0
+      Metalness: 0
+      Roughness: 0.5
+      Transparent: false
+      Alpha: 1
+    TagComponent:
+      Tag: avatar_2
+    IDComponent:
+      {}
+  - Entity: 16763722746931335686
+    TransformComponent:
+      Translation: [0, -100, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    PrimitiveComponent:
+      Type: 1
+      Radius: 0.5
+      InnerRadius: 0.200000003
+      Height: 1
+      Slices: 16
+      Stacks: 16
+      Dimensions: [1, 1, 1]
+      AlbedoPath: ""
+      AlbedoColor: [1, 1, 1, 1]
+      NormalPath: ""
+      MetallicRoughnessPath: ""
+      EmissivePath: ""
+      EmissiveColor: [0, 0, 0, 1]
+      EmissiveIntensity: 0
+      Metalness: 0
+      Roughness: 0.5
+      Transparent: false
+      Alpha: 1
+    TagComponent:
+      Tag: avatar_1
+    IDComponent:
+      {}
+  - Entity: 50237590426086779
+    TransformComponent:
+      Translation: [0, -100, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    PrimitiveComponent:
+      Type: 1
+      Radius: 0.5
+      InnerRadius: 0.200000003
+      Height: 1
+      Slices: 16
+      Stacks: 16
+      Dimensions: [1, 1, 1]
+      AlbedoPath: ""
+      AlbedoColor: [1, 1, 1, 1]
+      NormalPath: ""
+      MetallicRoughnessPath: ""
+      EmissivePath: ""
+      EmissiveColor: [0, 0, 0, 1]
+      EmissiveIntensity: 0
+      Metalness: 0
+      Roughness: 0.5
+      Transparent: false
+      Alpha: 1
+    TagComponent:
+      Tag: avatar_0
+    IDComponent:
+      {}
+  - Entity: 14565665045984815288
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 7
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_7
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.819999993, 0.850000024]
+        AnchorMax: [0.920000017, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [255, 128, 0, 255]
+        Hover Color: [230, 115, 0, 255]
+        Pressed Color: [200, 100, 0, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [150, 80, 0, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Orange
+      Interactable: true
+      Auto Size: false
+  - Entity: 3730352326450737938
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 6
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_6
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.709999979, 0.850000024]
+        AnchorMax: [0.810000002, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 204, 204, 255]
+        Hover Color: [0, 180, 180, 255]
+        Pressed Color: [0, 150, 150, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [0, 120, 120, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Cyan
+      Interactable: true
+      Auto Size: false
+  - Entity: 11166470100013338923
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 5
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_5
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.600000024, 0.850000024]
+        AnchorMax: [0.699999988, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [204, 51, 255, 255]
+        Hover Color: [180, 50, 230, 255]
+        Pressed Color: [150, 40, 200, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [120, 30, 150, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Purple
+      Interactable: true
+      Auto Size: false
+  - Entity: 16762231271915398359
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 4
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_4
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.49000001, 0.850000024]
+        AnchorMax: [0.589999974, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [255, 204, 0, 255]
+        Hover Color: [230, 180, 0, 255]
+        Pressed Color: [200, 160, 0, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [150, 120, 0, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [30, 30, 30, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Yellow
+      Interactable: true
+      Auto Size: false
+  - Entity: 11051277910905632287
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 3
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_3
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.379999995, 0.850000024]
+        AnchorMax: [0.479999989, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [51, 102, 255, 255]
+        Hover Color: [50, 90, 230, 255]
+        Pressed Color: [40, 80, 200, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [30, 60, 150, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Blue
+      Interactable: true
+      Auto Size: false
+  - Entity: 1521358411477463717
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 2
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_2
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.270000011, 0.850000024]
+        AnchorMax: [0.370000005, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [51, 204, 51, 255]
+        Hover Color: [50, 180, 50, 255]
+        Pressed Color: [40, 150, 40, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [30, 100, 30, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Green
+      Interactable: true
+      Auto Size: false
+  - Entity: 8253676054281124036
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 1
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_1
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.159999996, 0.850000024]
+        AnchorMax: [0.25999999, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [255, 51, 51, 255]
+        Hover Color: [230, 50, 50, 255]
+        Pressed Color: [200, 40, 40, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [100, 30, 30, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Red
+      Interactable: true
+      Auto Size: false
+  - Entity: 6954020226423012674
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.SelectSkinButton
+          Fields:
+            - Name: SkinIndex
+              Type: 2
+              Value: 0
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_skin_0
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.0500000007, 0.850000024]
+        AnchorMax: [0.150000006, 0.920000017]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [255, 255, 255, 255]
+        Hover Color: [230, 230, 230, 255]
+        Pressed Color: [200, 200, 200, 255]
+        Rounding: 6
+        Border Size: 2
+        Border Color: [100, 100, 100, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [30, 30, 30, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: White
+      Interactable: true
+      Auto Size: false
+  - Entity: 697316193292682461
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_send_chat
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.889999986, 0.200000003]
+        AnchorMax: [0.980000019, 0.270000011]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [60, 100, 200, 255]
+        Hover Color: [75, 120, 225, 255]
+        Pressed Color: [50, 85, 175, 255]
+        Rounding: 6
+        Border Size: 0
+        Border Color: [255, 255, 255, 0]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.04999995
+        Pressed Scale: 0.949999988
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Send
+      Interactable: true
+      Auto Size: false
+  - Entity: 12854606682601253265
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: chat_input
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.670000017, 0.200000003]
+        AnchorMax: [0.879999995, 0.270000011]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 32, 44, 255]
+        Hover Color: [40, 42, 58, 255]
+        Pressed Color: [30, 32, 44, 255]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [70, 75, 100, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 15
+        Text Color: [220, 225, 240, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 12
+      Label: Input
+      Text: ""
+      Placeholder: Type a message...
+      Max Length: 256
+      Multiline: false
+      Read Only: false
+      Password: false
+  - Entity: 695765240982621471
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: chat_messages
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.670000017, 0.289999992]
+        AnchorMax: [0.980000019, 0.74000001]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 1]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [12, 14, 20, 180]
+        Hover Color: [12, 14, 20, 180]
+        Pressed Color: [12, 14, 20, 180]
+        Rounding: 6
+        Border Size: 0
+        Border Color: [255, 255, 255, 0]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [210, 215, 230, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 0
+        V Align: 0
+      Widget Type: 3
+      Text: ""
+      Auto Size: false
+  - Entity: 15462606184185002690
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_chat_title
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.670000017, 0.75]
+        AnchorMax: [0.980000019, 0.819999993]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [25, 27, 38, 0]
+        Hover Color: [25, 27, 38, 0]
+        Pressed Color: [25, 27, 38, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 0]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 8
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 15
+        Text Color: [140, 145, 175, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: CHAT
+      Auto Size: false
+  - Entity: 12710633908340845533
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: chat_panel
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.670000017, 0.140000001]
+        AnchorMax: [0.980000019, 0.819999993]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 15
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [18, 20, 28, 210]
+        Hover Color: [18, 20, 28, 210]
+        Pressed Color: [18, 20, 28, 210]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [60, 62, 80, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 10
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 14
+        Text Color: [200, 200, 210, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 8
+      Texture Path: ""
+      Full Screen: false
+  - Entity: 13452941908663936165
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.DisconnectButton
+          Fields:
+            - Name: MenuScene
+              Type: 4
+              Value: scenes/multiplayer_menu.chscene
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_disconnect
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.0500000007, 0.0500000007]
+        AnchorMax: [0.200000003, 0.119999997]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [180, 50, 50, 255]
+        Hover Color: [200, 60, 60, 255]
+        Pressed Color: [150, 40, 40, 255]
+        Rounding: 8
+        Border Size: 0
+        Border Color: [255, 255, 255, 0]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Disconnect
+      Interactable: true
+      Auto Size: false
+  - Entity: 197702033032135749
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.StartGameButton
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_start_game
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.699999988, 0.0500000007]
+        AnchorMax: [0.949999988, 0.119999997]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [40, 160, 80, 255]
+        Hover Color: [50, 180, 90, 255]
+        Pressed Color: [30, 130, 60, 255]
+        Rounding: 8
+        Border Size: 0
+        Border Color: [255, 255, 255, 0]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 20
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Start Game
+      Interactable: true
+      Auto Size: false
+  - Entity: 6310467683453004953
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: label_server_info
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.25, 0.0500000007]
+        AnchorMax: [0.649999976, 0.119999997]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 20
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 35, 48, 180]
+        Hover Color: [30, 35, 48, 180]
+        Pressed Color: [30, 35, 48, 180]
+        Rounding: 6
+        Border Size: 1
+        Border Color: [70, 75, 100, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 16
+        Text Color: [110, 231, 211, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: "Server IP & Port"
+      Auto Size: false
+  - Entity: 6451330714062150842
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.LobbyUI
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: LobbyUIRoot
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0, 0]
+        AnchorMax: [1, 1]
+        OffsetMin: [20, 20]
+        OffsetMax: [-20, -20]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 10
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [20, 22, 30, 200]
+        Hover Color: [20, 22, 30, 200]
+        Pressed Color: [20, 22, 30, 200]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 0]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 10
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 8
+      Texture Path: ""
+      Full Screen: false
+  - Entity: 13984942435077209345
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: ChainedDecos.Scripts.LobbyManager
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: LobbyRoot
+    IDComponent:
+      {}
+  - Entity: 3774568952061291611
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+      nearClip: 0.100000001
+      farClip: 1000
+      verticalFov: 60
+      orthographicSize: 10
+    TransformComponent:
+      Translation: [0, 0, 10]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Main Camera
+    IDComponent:
+      {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/main_menu.chscene b/game/chaineddecos/assets/scenes/main_menu.chscene
deleted file mode 100644
index cd9a6d370..000000000
--- a/game/chaineddecos/assets/scenes/main_menu.chscene
+++ /dev/null
@@ -1,365 +0,0 @@
-Scene: Untitled Scene
-Background:
-  Mode: 0
-  Color: [0, 0, 0, 255]
-  TexturePath: ""
-Canvas:
-  ReferenceResolution: [1920, 1080]
-  ScaleMode: 1
-  MatchWidthOrHeight: 0.5
-EnvironmentPath: ""
-Lighting:
-  Direction: [-1, -1, -1]
-  LightColor: [255, 255, 255, 255]
-  Ambient: 0.300000012
-Skybox:
-  TexturePath: ""
-  Mode: 0
-  Exposure: 1
-  Brightness: 0
-  Contrast: 1
-Fog:
-  Enabled: false
-  Color: [130, 130, 130, 255]
-  Density: 0.00999999978
-  Start: 10
-  End: 100
-DebugSettings:
-  DiagnosticMode: 0
-  DrawColliders: false
-  DrawHierarchy: false
-  DrawCollisionModelBox: false
-  DrawGrid: false
-  DrawSelection: true
-  DrawLights: true
-  DrawSpawnZones: true
-  CollisionWireframeMode: 0
-Entities:
-  - Entity: 1234567890123456789
-    TagComponent:
-      Tag: Main Camera
-    TransformComponent:
-      Translation: [0, 0, 10]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: true
-      FixedAspectRatio: false
-      Camera:
-        ProjectionType: 0
-        PerspectiveFOV: 45
-        PerspectiveNear: 0.1
-        PerspectiveFar: 1000
-        OrthographicSize: 10
-        OrthographicNear: -1
-        OrthographicFar: 1
-  - Entity: 17694975162465223617
-    TagComponent:
-      Tag: title_image
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ImageControl:
-      Texture Handle: 0
-      Texture Path: ""
-      Tint Color: [255, 255, 255, 255]
-      Border Color: [0, 0, 0, 0]
-      Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 0
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 0
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-  - Entity: 2149386149282995176
-    TagComponent:
-      Tag: Start
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/game_mode_selection.chscene
-      Triggered: false
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Start Game
-      Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-        - ClassName: ChainedDecos.Scripts.DebugInfoScript
-  - Entity: 17229056952832949834
-    TagComponent:
-      Tag: Info
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/info_scene.chscene
-      Triggered: false
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Info
-      Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 10048507876963945433
-    TagComponent:
-      Tag: Options
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/video_scene.chscene
-      Triggered: false
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Options
-      Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 9971589997937633979
-    TagComponent:
-      Tag: Exit
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Exit
-      Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.ExitScript
-  - Entity: 6803442666813639815
-    TagComponent:
-      Tag: game_info_1
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: This game is currently in development.
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      Auto Size: false
-  - Entity: 1069064208128281074
-    TagComponent:
-      Tag: game_info_2
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ControlComponent:
-      Rect Transform:
-        Position: [0, 0]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-50, -20]
-        Offset Max: [50, 20]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: Some functionality or aspects of the game may differ from the final version.
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/map_selection.chscene b/game/chaineddecos/assets/scenes/map_selection.chscene
index 35cbe671b..5c6b4de81 100644
--- a/game/chaineddecos/assets/scenes/map_selection.chscene
+++ b/game/chaineddecos/assets/scenes/map_selection.chscene
@@ -1,4 +1,5 @@
-Scene: Untitled Scene
+Scene: Map Selection
+SceneType: 1
 Background:
   Mode: 0
   Color: [0, 0, 0, 255]
@@ -28,199 +29,317 @@ DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
   DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 3001
-    TagComponent:
-      Tag: title_map_selection
+  - Entity: 2534969863497046244
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: back_button
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/game_mode_selection.chscene
+      Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-616.455811, -365.501465]
-        Size: [115.73938, 39.9999695]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-674.3255, -385.501434]
-        Offset Max: [-558.586121, -345.501465]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-665.581421, 380.477661]
+        OffsetMax: [-565.581421, 420.477661]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: Select Map
-      Style:
-        Font Name: Default
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [235, 238, 242, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
       Auto Size: false
-  - Entity: 3002
-    TagComponent:
-      Tag: btn_map_alpha
+  - Entity: 9010000000000000001
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/rpg_strategy_scene.chscene
-      Triggered: false
+    TagComponent:
+      Tag: preview_map_training
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-345.390137, -106.677452]
-        Size: [350.079956, 88.9666901]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-520.430115, -151.160797]
-        Offset Max: [-170.350159, -62.1941071]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-520, -100]
+        OffsetMax: [-120, 100]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Laboratory Alpha
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [30, 33, 40, 255]
+        Pressed Color: [30, 33, 40, 255]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 0
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.1
       Text Style:
-        Font Name: Default
+        Font Name: font/static/Figtree-Regular.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [235, 238, 242, 255]
         Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 0
+        Line Height: 1.2
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
+      Widget Type: 9
+      Texture Path: map_previews/placeholder.jpg
+      Tint Color: [255, 255, 255, 255]
+      Border Color: [0, 0, 0, 0]
+  - Entity: 9010000000000000002
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: preview_map_laboratory
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [120, -100]
+        OffsetMax: [520, 100]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [30, 33, 40, 255]
+        Pressed Color: [30, 33, 40, 255]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
         Gradient: false
-        Padding: 4
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 0
         Hover Scale: 1
         Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 3003
-    TagComponent:
-      Tag: btn_map_bravo
+        Transition Speed: 0.1
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 0
+        Line Height: 1.2
+        H Align: 1
+        V Align: 1
+      Widget Type: 9
+      Texture Path: map_previews/placeholder.jpg
+      Tint Color: [255, 255, 255, 255]
+      Border Color: [0, 0, 0, 0]
+  - Entity: 15983045709783596391
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/scene_tem.chscene
+    TagComponent:
+      Tag: btn_map_bravo
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/test_platform_scene.chscene
       Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-350.636536, 37.5994301]
-        Size: [336.089447, 87.2178879]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-518.681274, -6.00951385]
-        Offset Max: [-182.591827, 81.208374]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-520, 125]
+        OffsetMax: [-120, 181]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Training Grounds
+      ZOrder: 1
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
-        Font Size: 45.1110001
-        Text Color: [255, 255, 255, 255]
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 22
+        Text Color: [235, 238, 242, 255]
         Shadow: false
-        Letter Spacing: 2.02900004
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.20000005
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 0, 255]
-        Hover Color: [60, 60, 92, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
+      Widget Type: 1
+      Label: Training Grounds
       Interactable: true
       Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        []
-  - Entity: 3004
-    TagComponent:
-      Tag: back_button
+  - Entity: 13883782067647492855
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/game_mode_selection.chscene
+    TagComponent:
+      Tag: btn_map_alpha
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/rpg_strategy_scene.chscene
       Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-615.581421, 400.477661]
-        Size: [100, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-665.581421, 380.477661]
-        Offset Max: [-565.581421, 420.477661]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [120, 125]
+        OffsetMax: [520, 181]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Back
+      ZOrder: 1
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 22
+        Text Color: [235, 238, 242, 255]
         Shadow: false
-        Letter Spacing: 1
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.20000005
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
+      Widget Type: 1
+      Label: Laboratory Alpha
+      Interactable: true
+      Auto Size: false
+  - Entity: 6606072194051433189
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_map_selection
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-220, -385.501434]
+        OffsetMax: [220, -345.501465]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
         Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
\ No newline at end of file
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Select Map
+      Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/multiplayer_menu.chscene b/game/chaineddecos/assets/scenes/multiplayer_menu.chscene
new file mode 100644
index 000000000..a6ba535d7
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/multiplayer_menu.chscene
@@ -0,0 +1,266 @@
+Scene: Multiplayer Menu
+SceneType: 1
+Background:
+  Mode: 0
+  Color: [0, 0, 0, 255]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 1
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: ""
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: ""
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: false
+  Color: [130, 130, 130, 255]
+  Density: 0.00999999978
+  Start: 10
+  End: 100
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 10000000000000000001
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_multiplayer
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-300, -340]
+        OffsetMax: [300, -280]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.100000001
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 40
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Multiplayer
+      Auto Size: false
+  - Entity: 10000000000000000002
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_host_game
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/host_setup.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, -100]
+        OffsetMax: [180, -36]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 0
+        Border Color: [255, 255, 255, 100]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 26
+        Text Color: [15, 24, 26, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Host Game
+      Interactable: true
+      Auto Size: false
+  - Entity: 10000000000000000003
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_join_game
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/join_setup.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, 20]
+        OffsetMax: [180, 84]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [66, 135, 245, 255]
+        Hover Color: [96, 160, 255, 255]
+        Pressed Color: [46, 110, 210, 255]
+        Rounding: 10
+        Border Size: 0
+        Border Color: [255, 255, 255, 100]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 26
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Join Game
+      Interactable: true
+      Auto Size: false
+  - Entity: 10000000000000000004
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_back
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/game_mode_selection.chscene
+      Triggered: false
+    ControlComponent:
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-703.046265, 458.698608]
+        OffsetMax: [-573.430542, 498.698669]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Back
+      Interactable: true
+      Auto Size: false
+  - Entity: 10000000000000000005
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: multiplayer_menu_root
+    IDComponent:
+      {}
+    ControlComponent:
+      Transform:
+        AnchorMin: [0, 0]
+        AnchorMax: [1, 1]
+        OffsetMin: [0, 0]
+        OffsetMax: [0, 0]
+        Pivot: [0.5, 0.5]
+        Rotation: 0
+        Scale: [1, 1]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
diff --git a/game/chaineddecos/assets/scenes/newtest.chscene b/game/chaineddecos/assets/scenes/newtest.chscene
deleted file mode 100644
index f82556058..000000000
--- a/game/chaineddecos/assets/scenes/newtest.chscene
+++ /dev/null
@@ -1,14 +0,0 @@
-Scene: Untitled
-Skybox:
-  TexturePath: ""
-  Exposure: 1
-  Brightness: 0
-  Contrast: 1
-Entities:
-  - Entity: 1380461834910463902
-    TagComponent:
-      Tag: Default Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/no_tile.chscene b/game/chaineddecos/assets/scenes/no_tile.chscene
deleted file mode 100644
index a358bcc23..000000000
--- a/game/chaineddecos/assets/scenes/no_tile.chscene
+++ /dev/null
@@ -1,184 +0,0 @@
-Scene: Untitled
-Background:
-  Mode: 0
-  Color: [0, 0, 0, 255]
-  TexturePath: ""
-EnvironmentPath: ""
-Canvas:
-  ReferenceResolution: [1920, 1080]
-  ScaleMode: 1
-  MatchWidthOrHeight: 0.5
-Entities:
-  - Entity: 13765047633248252361
-    TagComponent:
-      ? Tag: start_game_menu_options
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-60, -60]
-          OffsetMax: [60, -20]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    ButtonControl:
-      ? Label: Options
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
-  - Entity: 11188570711873615005
-    TagComponent:
-      ? Tag: start_button_start
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-57, -120]
-          OffsetMax: [63, -80]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    ButtonControl:
-      ? Label: Start
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
-  - Entity: 12750009872668354234
-    TagComponent:
-      ? Tag: start_button_exit
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-60, 60]
-          OffsetMax: [60, 100]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    ButtonControl:
-      ? Label: Exit
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
-    NativeScriptComponent:
-      Scripts:
-        - ScriptName: ExitScript
-  - Entity: 15500646445384167357
-    TagComponent:
-      ? Tag: start_game_info
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0, 0]
-          AnchorMax: [1, 1]
-          OffsetMin: [-393, 276]
-          OffsetMax: [-393, 276]
-          Pivot: [0, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    LabelControl:
-      ? Text: The game is currently in development.
-        TextStyle:
-          FontSize: 26.2999992
-          TextColor: [188, 188, 188, 255]
-          HAlign: 1
-          VAlign: 1
-  - Entity: 6090748651460201744
-    TagComponent:
-      ? Tag: start_game_info_2
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.100000001, 0.899999976]
-          AnchorMax: [0.100000001, 0.899999976]
-          OffsetMin: [-68, 4]
-          OffsetMax: [282, 34]
-          Pivot: [0, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    LabelControl:
-      ? Text: Some functionality or aspects can be changed in final version.
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-  - Entity: 15051911593141375302
-    TagComponent:
-      ? Tag: start_menu_game_info
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-60, 0]
-          OffsetMax: [60, 40]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    ButtonControl:
-      ? Label: Info
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/rpg_strategy_scene.chscene b/game/chaineddecos/assets/scenes/rpg_strategy_scene.chscene
index 93a2ca98a..1c3528d1b 100644
--- a/game/chaineddecos/assets/scenes/rpg_strategy_scene.chscene
+++ b/game/chaineddecos/assets/scenes/rpg_strategy_scene.chscene
@@ -1,4 +1,5 @@
 Scene: Untitled Scene
+SceneType: 0
 Background:
   Mode: 2
   Color: [0, 123, 0, 124]
@@ -9,3111 +10,1090 @@ Canvas:
   MatchWidthOrHeight: 0.5
 EnvironmentPath: environments/new_environment.chenv
 Lighting:
-  Direction: [-0.769999981, 1, 1]
+  Direction: [1, -1, 0.25]
   LightColor: [255, 255, 255, 255]
-  Ambient: 0.0850000009
+  Ambient: 0.185000002
 Skybox:
-  TexturePath: skyboxes/qwantani_dusk_2_puresky_8k.hdr
+  TexturePath: skyboxes/citrus_orchard_road_puresky_8k.hdr
   Mode: 0
-  Exposure: 1.00999999
-  Brightness: -0.699999988
-  Contrast: 0.449999988
+  Exposure: 1.59000003
+  Brightness: -0.49000001
+  Contrast: 0.25999999
 Fog:
   Enabled: false
   Color: [255, 255, 255, 255]
-  Density: 0.100000001
-  Start: 180
-  End: 174
+  Density: 0.130700007
+  Start: 0
+  End: 2001
 DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
   DrawGrid: false
   DrawSelection: true
-  DrawLights: false
+  DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 9582408851066360367
+  - Entity: 8921588570766092537
+    TransformComponent:
+      Translation: [-51.6971283, 137.265976, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
     TagComponent:
-      Tag: anim_mode#4_copy
+      Tag: ambient_sound_parkour
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/soundsurfer-parkour-262367.mp3
+      Volume: 2
+      Pitch: 3
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 1000
+      IsPlaying: false
+  - Entity: 16983688319520252512
     TransformComponent:
-      Translation: [456.769592, 92.3261108, 838.863159]
-      Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
-      Scale: [0.999980867, 1.0000428, 1.00002789]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 16037231256126668794
-      ModelPath: models/bridge.glb
-      AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 9393782307517162306
+      Translation: [-135.637207, 137.265976, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
     TagComponent:
-      Tag: island_minigames
+      Tag: ambient_sound
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/storegraphic-soft-wind-477404.mp3
+      Volume: 2
+      Pitch: 3
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 10000
+      IsPlaying: false
+  - Entity: 8957851083612821612
+    ModelComponent:
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 8378150816431493396
+      MaterialPaths:
     TransformComponent:
       Translation: [-118.395287, 12.3910465, 826.530884]
       Rotation: [0, -0, 0]
       Scale: [673.435242, 411.5466, 440.887085]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/minigames/hub_for_minigames_server.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 9
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 10
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 11
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: island_minigames
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [1.56521797, 1.00000179, 1.90062201]
+      Offset: [0, 0, 0]
+      Radius: 0.950311005
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.782608986, 0.0434782989, -0.950311005]
-      ModelHandle: 9420659687506125546
-      ModelPath: models/minigames/hub_for_minigames_server.glb
       AutoCalculate: true
-  - Entity: 6516797172325941388
-    TagComponent:
-      Tag: buildings_6_pack
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 20
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 14877704320157329547
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
     TransformComponent:
-      Translation: [23.264637, -27.1361389, -506.157532]
+      Translation: [73.4315643, -38.012413, -506.157532]
       Rotation: [0, -0, 0]
       Scale: [342.240997, 325.262634, 245.059052]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/building/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface2_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface3_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface4_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface5_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface6_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface8_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-  - Entity: 6064633921243342758
     TagComponent:
-      Tag: Entity_copy
-    TransformComponent:
-      Translation: [46.4636726, -2.98017597, 14.336463]
-      Rotation: [-3.14153385, -0.624083161, -3.1415863]
-      Scale: [2.29999304, 2.70000005, 0.979451716]
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 4584993786599931606
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+    TransformComponent:
+      Translation: [49.9999466, -7.93971395, 14.3911505]
+      Rotation: [-3.14158368, -1.12095582, -3.14159083]
+      Scale: [2.29999614, 2.70000005, 0.979452133]
+    TagComponent:
+      Tag: Entity_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [34.1756821, 8.59185219, 22.6057091]
+      Offset: [0, -9.53674316e-07, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      ModelHandle: 5264879641539067062
+      AutoCalculate: false
+      UseFastBuildQuality: true
       ModelPath: models/stairs.glb
-      AutoCalculate: true
-  - Entity: 1295158128682646344
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [89.7119217, 34.3363914, -15.4183016]
-      Rotation: [-1.96055889, -0.999783337, -2.69811749]
-      Scale: [2.81780839, 1.8383373, 2.52324486]
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 5257260574408404479
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [89.7119217, 34.3363914, -8.52000618]
+      Rotation: [-3.14159083, 1.42225266, -3.14159083]
+      Scale: [2.81781149, 1.8383373, 2.5232451]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.3900001, 6.01000023, 12.9899998]
+      Offset: [2.26999998, -0.0299999993, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 217210127212770073
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [160.559677, 34.3363914, -15.4183016]
-      Rotation: [-2.88122821, -1.07542729, -1.95391703]
-      Scale: [2.81780005, 1.83833647, 2.52321053]
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      IsColliding: false
+  - Entity: 11401909492287334595
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [160.559677, 34.3363914, -15.4183016]
+      Rotation: [-3.1415906, 1.3848865, -3.1415906]
+      Scale: [2.81779981, 1.83833647, 2.52321267]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 11053255314081653602
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [195.275909, 34.3363914, -15.4183016]
-      Rotation: [-2.1531477, -1.10677683, -2.63240695]
-      Scale: [2.81779408, 1.83833039, 2.52320075]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 15985022402331619113
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [195.275909, 34.3363914, -15.4183016]
+      Rotation: [-5.00722963e-05, 1.52510715, -5.01285613e-05]
+      Scale: [2.81781769, 1.83833349, 2.52321935]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 2562263663181998965
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [232.729095, 34.3363914, -15.4183016]
-      Rotation: [3.1402328, -1.54398417, -1.52254927]
-      Scale: [2.81773686, 1.83830583, 2.52309632]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 17681522036398970650
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [232.729095, 34.3363914, -15.4183016]
+      Rotation: [-3.14158916, 1.47876322, -3.14158916]
+      Scale: [2.81773591, 1.83830583, 2.52309585]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 5967097730784712040
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [269.359863, 34.3363914, -15.4183016]
-      Rotation: [3.14023447, -1.543975, -1.55569565]
-      Scale: [2.81769967, 1.83829546, 2.52312875]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 11392592734846798224
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [269.359863, 34.3363914, -15.4183016]
+      Rotation: [-3.14157701, 1.51824713, -3.14157701]
+      Scale: [2.81769633, 1.83829546, 2.52312613]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 7772933172421174645
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [304.469788, 34.3363914, -15.4183016]
-      Rotation: [3.14017534, -1.54393637, -1.68613875]
-      Scale: [2.81769824, 1.83826065, 2.52310705]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 15328722545948240954
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [304.469788, 34.3363914, -15.4183016]
+      Rotation: [-3.14159083, 1.48598051, -3.14159083]
+      Scale: [2.81769323, 1.83826065, 2.52310586]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 8791625222606561716
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [340.353027, 34.3363914, -15.4183016]
-      Rotation: [3.14018416, -1.54396355, -1.52885783]
-      Scale: [2.81768346, 1.83830261, 2.52313828]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 3333592866819108675
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [340.353027, 34.3363914, -15.4183016]
+      Rotation: [-2.64324285e-06, 1.51514268, -2.64865866e-06]
+      Scale: [2.8176837, 1.83830261, 2.52313876]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 8982711742810159238
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [369.179901, 34.9479713, -15.4183016]
-      Rotation: [3.14019299, -1.54396594, -1.55295646]
-      Scale: [2.81770563, 1.83824468, 2.52313542]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 7293594529414317233
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [369.179901, 34.9479713, -15.4183016]
+      Rotation: [-3.14159083, 1.49346161, -3.14159083]
+      Scale: [2.81770754, 1.83824468, 2.52313972]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 1283719283719285
-    TagComponent:
-      Tag: Arena
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 17651472411287412421
+    ModelComponent:
+      ModelPath: models/arena.glb
+      ModelUUID: 10755992412146045657
+      MaterialPaths:
     TransformComponent:
       Translation: [-1.52065945, -4.32776833, -35.4009895]
       Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
       Scale: [0.99993974, 0.999890089, 0.999929249]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/arena.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [143, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [7, 233, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [3, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [90, 84, 77, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [91, 86, 85, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [102, 70, 58, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [83, 57, 47, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [86.6819458, 89.0095215, 94.478302]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-43.8236694, -46.1545258, -25.5901108]
-      ModelHandle: 5584169064464973589
-      ModelPath: models/arena.glb
       AutoCalculate: true
-  - Entity: 10653066213482940164
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 7355314980495058060
+    ModelComponent:
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 9161924301726423648
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
+    TransformComponent:
+      Translation: [60.8389587, 103.205635, 4.72679806]
+      Rotation: [0.0431710109, -0.0900942832, 0.0843906254]
+      Scale: [26.4252377, 28.1725788, 26.7647877]
     TagComponent:
       Tag: ghost
-    TransformComponent:
-      Translation: [60.8389587, 87.5022202, 37.5509796]
-      Rotation: [0, -0, 0]
-      Scale: [26.4252186, 28.1715183, 26.7638988]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [1.71000004, 2.50999999, 0.5]
+      Offset: [-0.604161263, 27.9200001, -2.00118709]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
       Enabled: true
-      Offset: [-0.604161263, -0.379055023, -2.00118709]
-      Size: [1.20832253, 0.709288359, 2.00317812]
       AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      IsColliding: false
     AnimationComponent:
-      AnimationPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
+      GraphPath: ""
+      GraphUUID: 0
       BlendDuration: 0
-  - Entity: 5150207293164281694
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 8629905039437136594
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
     TagComponent:
-      Tag: SceneCamera
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 10849883558425976860
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.gamehud
+        - ClassName: chaineddecos.scripts.debuginfoscript
+        - ClassName: chaineddecos.scripts.playercontroller
+        - ClassName: chaineddecos.scripts.spawnzone
+    ModelComponent:
+      ModelPath: models/skeleton/scene.gltf
+      ModelUUID: 3520787229482223369
+      MaterialPaths:
+        - models/skeleton/scene_material_0.chmat
+        - models/skeleton/scene_material_1.chmat
+        - models/skeleton/scene_material_2.chmat
     TransformComponent:
-      Translation: [-143.294968, 200.081146, -337.524475]
-      Rotation: [376.001373, -3188.74268, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: false
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 100000
-      Enabled: false
-      TargetTag: Player
-      Distance: 10
-      Yaw: 0
-      Pitch: 20
-      Sensitivity: 0.899999976
-  - Entity: 1326311650816898569
+      Translation: [159.748581, 251.752823, 654.22052]
+      Rotation: [0, -0, 0]
+      Scale: [0.999903202, 1, 0.999903202]
     TagComponent:
       Tag: Player
-    TransformComponent:
-      Translation: [-321.279785, 315.597015, 1020.75476]
-      Rotation: [-3.14159083, -0.0872663558, -3.14159083]
-      Scale: [0.999901831, 1, 0.999901831]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/pilot/wizard_tower_animated.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.0613496937
-            Roughness: 0.932515323
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [35, 69, 23, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.245398775
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [28, 28, 28, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [26, 48, 4, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [6, 5, 4, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [204, 10, 6, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.220858902
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 9
-          Target: 0
-          Material:
-            AlbedoColor: [11, 74, 204, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.21472393
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 10
-          Target: 0
-          Material:
-            AlbedoColor: [204, 38, 138, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.171779141
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 11
-          Target: 0
-          Material:
-            AlbedoColor: [6, 204, 5, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.147239268
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 12
-          Target: 0
-          Material:
-            AlbedoColor: [56, 65, 135, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [9, 92, 104, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.337423325
-            Roughness: 0
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 13
-          Target: 0
-          Material:
-            AlbedoColor: [77, 150, 204, 10]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.21472393
-            Roughness: 0.171779141
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 14
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    IDComponent:
+      {}
     ShaderComponent:
-      ShaderPath: ""
-      Enabled: true
+      ShaderPath: shaders/screen_falling.chshader
+      ShaderUUID: 14962409001541335283
       Uniforms:
-        []
+        - Name: uIntensity
+          Value: 7.30000019
+        - Name: color
+          Value: 6.30000019
+      Enabled: false
     ColliderComponent:
-      Type: 3
+      Type: 1
+      Size: [2.88000011, 6.32000017, 1.80999994]
+      Offset: [0, 2.70000005, 0]
+      Radius: 1.92200005
+      Height: 4.5
+      Friction: 0.5
+      Restitution: 0.419999987
+      IsTrigger: false
       Enabled: true
-      Offset: [2.16411662, 5.66642523, 3.99894166]
-      Radius: 10.4223652
       AutoCalculate: true
-    RigidBodyComponent:
-      Mass: 91.3000031
-      Velocity: [0, 0, 0]
-      UseGravity: true
-      IsKinematic: false
-      IsGrounded: true
-    AudioComponent:
-      SoundHandle: 12072688409972847527
-      SoundPath: audio/storegraphic-soft-wind-477404.mp3
-      Volume: 0.635142922
-      Pitch: 1
-      Loop: true
-      PlayOnStart: true
-      Spatialized: true
-      Position: [0, 0, 0]
-      MinDistance: 22.9529991
-      MaxDistance: 100
+      UseFastBuildQuality: true
+      ModelPath: models/pilot/wizard_tower_animated.glb
+      IsColliding: false
     PlayerComponent:
       MovementSpeed: 15
-      JumpForce: 10
+      JumpForce: 16.5
       LookSensitivity: 0.899999976
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.playercontroller
-          Fields:
-            - Name: Gravity
-              Type: 1
-              Value: 9.80000019
-            - Name: JumpForce
-              Type: 1
-              Value: 32.5
-            - Name: MovementSpeed
-              Type: 1
-              Value: 17.7999992
-        - ClassName: chaineddecos.scripts.gamehud
-        - ClassName: chaineddecos.scripts.spawnzone
-        - ClassName: chaineddecos.scripts.playerfall
-        - ClassName: chaineddecos.scripts.gamemanagerpattern
-          Fields:
-            - Name: Coins
-              Type: 2
-              Value: 72
-        - ClassName: chaineddecos.scripts.patternusagecontroller
-        - ClassName: chaineddecos.scripts.herostrategyscript
-        - ClassName: chaineddecos.scripts.herobehavioralscript
-  - Entity: 2241149956455545874
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [55.4628983, 34.3363914, -15.9756889]
-      Rotation: [-0.0299999993, 0.0617705695, -1.59763551]
-      Scale: [2.81781125, 1.83835185, 2.52317905]
+    Rigid BodyComponent:
+      Type: 1
+      Mass: 10000
+      LinearDamping: 0
+      AngularDamping: 0
+      UseGravity: true
+      IsFixedRotation: true
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+    AnimationComponent:
+      GraphPath: animations/new_graph.chag
+      GraphUUID: 0
+      BlendDuration: 0.200000003
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        speed: 0
+        isMoving: 0
+        isGrounded: 0
+  - Entity: 11695186692927286162
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [55.4628983, 34.3363914, -15.9756889]
+      Rotation: [0, 1.55682349, 0]
+      Scale: [2.81781912, 1.83835185, 2.52317667]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ShaderComponent:
       ShaderPath: ""
-      Enabled: true
+      ShaderUUID: 0
       Uniforms:
         []
+      Enabled: true
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [0, 2.20000002e-05, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 6428169142076434776
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [411.734222, 21.1899738, 188.952682]
-      Rotation: [3.63230574e-05, -1.51887417, -1.12990801e-05]
-      Scale: [0.999889433, 1, 0.979455113]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 1
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 6304305992958705519
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/stone_floor.glb
+      ModelUUID: 5231694586974801729
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-231.075317, -62.7547264, 67.6377563]
+      Rotation: [0, -0, 0]
+      Scale: [2.702842, 1, 4.74170446]
+    TagComponent:
+      Tag: floor_lol
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [449.48999, 114.440002, 440.48999]
+      Offset: [0, 0, 0]
+      Radius: 191.044159
+      Height: 12.9499998
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      ModelHandle: 5264879641539067062
-      ModelPath: models/stairs.glb
       AutoCalculate: true
-  - Entity: 5796298439135209667
-    TagComponent:
-      Tag: Camera
-    TransformComponent:
-      Translation: [-450.628143, 404.78244, 903.982483]
-      Rotation: [6.56941032, 4.60590219, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: true
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 100000
-      Enabled: true
-      TargetTag: Player
-      Distance: 29.516674
-      Yaw: 813.700073
-      Pitch: -10
-      Sensitivity: 0.899999976
+      UseFastBuildQuality: true
+      ModelPath: models/stone_floor.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 7350294682867205488
     ManagedScriptComponent:
       Scripts:
         - ClassName: chaineddecos.scripts.cameracontroller
-          Fields:
-            - Name: LookSensitivity
-              Type: 1
-              Value: 6.19999981
-  - Entity: 7094686869644715316
-    TagComponent:
-      Tag: arena_two
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 41.4000015
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+      nearClip: 0.100000001
+      farClip: 100000
+      verticalFov: 60
+      orthographicSize: 10
     TransformComponent:
-      Translation: [-949.601318, 51.8037796, 331.382965]
-      Rotation: [2.86779284, 1.33893979, 2.90103149]
-      Scale: [20.9453735, 17.1169147, 17.6528664]
+      Translation: [0, 0, 10]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
+    IDComponent:
+      {}
+    ShaderComponent:
+      ShaderPath: shaders/screen_falling.chshader
+      ShaderUUID: 14962409001541335283
+      Uniforms:
+        - Name: uIntensity
+          Value: 0
+        - Name: color
+          Value: 0
+      Enabled: true
+  - Entity: 11799260272920553111
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/container_ship/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Bridge_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Bridge_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Bridge_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Hull_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Hull_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Hull_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Containers_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Containers_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Containers_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 16650958288931697221
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
+    TransformComponent:
+      Translation: [-949.601318, 51.8037796, 331.382965]
+      Rotation: [-3.14158845, -1.50888491, -3.14156556]
+      Scale: [20.9452457, 17.1169147, 17.6528263]
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [91.2528992, 16.8988438, 12.8652821]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1.95000005
+      Friction: 0.5
+      Restitution: 0.209999993
+      IsTrigger: true
       Enabled: true
-      Offset: [-33.2911491, -0.000321388245, -6.43264723]
-      ModelHandle: 5974497828464772849
-      ModelPath: models/container_ship/scene.gltf
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: models/container_ship/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 10680602693042542455
-    TagComponent:
-      Tag: Empty Entity
-    TransformComponent:
-      Translation: [-216.192169, -6.67572021e-06, 0]
-      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
-      Scale: [46.0502167, 47.251339, 53.7656708]
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 17778531375198067166
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg
-            OverrideAlbedo: true
-            NormalMapPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, 150.740036, 81.6223679]
+      Rotation: [0.061792668, 0.0883243978, -0.0563300811]
+      Scale: [46.0502167, 47.2513237, 53.765667]
+    TagComponent:
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/universfield-solar-system-space-journey-153272.mp3
+      Volume: 2
+      Pitch: 1
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 10000
+      IsPlaying: false
     AnimationComponent:
-      AnimationPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
+      GraphPath: ""
+      GraphUUID: 0
       BlendDuration: 0
-  - Entity: 193077798077705471
-    TagComponent:
-      Tag: rail#3d
-    TransformComponent:
-      Translation: [124.947281, 34.3363914, -15.4183016]
-      Rotation: [3.14005208, -1.54395568, -1.59915721]
-      Scale: [2.81767035, 1.83825684, 2.5230813]
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 7640774398700855148
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [124.947281, 34.3363914, -15.4183016]
+      Rotation: [0, 1.46746063, 0]
+      Scale: [2.81766772, 1.83825684, 2.5230844]
+    TagComponent:
+      Tag: rail#3d
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
       Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 2383946809372162777
-    TagComponent:
-      Tag: train_vagons
+      Offset: [1.16999996, 0.0700000003, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      IsColliding: false
+  - Entity: 8941803284423417767
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-  - Entity: 18441510849027507452
     TagComponent:
-      Tag: anim_mode#2
-    TransformComponent:
-      Translation: [424.876801, 17.5073452, 22.4167747]
-      Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
-      Scale: [0.999992907, 1.36125314, 0.999930501]
+      Tag: train_vagons
+    IDComponent:
+      {}
+  - Entity: 7122397092777195235
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [424.876801, 17.2099991, 22.4167747]
+      Rotation: [-1.61778486, -0.127626747, -0.0149760507]
+      Scale: [3.91608334, 1.36131144, 0.999961495]
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 138.598022
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 16037231256126668794
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 17079309488884899572
-    TagComponent:
-      Tag: anim_mode#4
-    TransformComponent:
-      Translation: [421.805664, 97.7958374, 838.863159]
-      Rotation: [-1.98333037, -0.564842701, -0.0120932925]
-      Scale: [0.999979079, 1.00004041, 1.00003195]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 8049596971069589073
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [456.769592, 92.3261108, 838.863159]
+      Rotation: [-2.07865191, -0, 0]
+      Scale: [3.9020257, 0.99999398, 0.999984682]
+    TagComponent:
+      Tag: anim_mode#4_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 16037231256126668794
+      AutoCalculate: false
+      UseFastBuildQuality: true
       ModelPath: models/bridge.glb
-      AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 11499449198343814881
-    TagComponent:
-      Tag: anim_mode#3
-    TransformComponent:
-      Translation: [440.960266, 32.5502625, 581.221497]
-      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
-      Scale: [0.999992847, 0.999961555, 0.999930501]
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 18135390839531274944
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [440.960266, 32.5502625, 581.221497]
+      Rotation: [-1.48049641, -0, 0]
+      Scale: [3.71524119, 0.99993968, 0.999904871]
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [23.1599998, 279.299988, 21.0499992]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 16037231256126668794
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 1996324266450563914
-    TagComponent:
-      Tag: wooden_bridge
-    TransformComponent:
-      Translation: [226.774567, 10.7833824, 119.315414]
-      Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
-      Scale: [7.04011488, 8.74738693, 19.0374851]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 3566649554454976385
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 4537241321556691418
+      MaterialPaths:
+    TransformComponent:
+      Translation: [228.521362, 10.7833824, 119.315414]
+      Rotation: [0, 1.06864882, 0]
+      Scale: [7.04011631, 8.74738693, 19.0374699]
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [9.28319931, 7.15296078, 23.5704517]
+      Offset: [0, 0, 0]
+      Radius: 11.7852259
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-4.6624608, -3.7252903e-08, -11.7852259]
-      ModelHandle: 6012522308394890432
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
       AutoCalculate: true
-  - Entity: 3962667947486927982
-    TagComponent:
-      Tag: anim_mode
-    TransformComponent:
-      Translation: [428.76062, 30.1878853, 305.481506]
-      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
-      Scale: [0.999992847, 0.999961555, 0.999930501]
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 56.9000015
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 17392183440764330060
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [428.76062, 30.1878853, 305.481506]
+      Rotation: [-1.84119403, -0, 0]
+      Scale: [3.51185083, 0.99995327, 0.99992317]
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 16037231256126668794
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 11859063027363205809
-    TagComponent:
-      Tag: rail#3d_copy_copy
-    TransformComponent:
-      Translation: [394.406952, 36.0981331, -15.4183016]
-      Rotation: [3.13979626, -1.54386234, -1.49447083]
-      Scale: [2.81729794, 1.83831346, 2.52311802]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    Rigid BodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 17185237558581931323
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [394.406952, 36.0981331, -15.4183016]
+      Rotation: [0.04082435, 1.53854108, 9.24113579e-07]
+      Scale: [2.81729794, 1.83831227, 2.52311134]
+    TagComponent:
+      Tag: rail#3d_copy_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 7107305315600848246
-    TagComponent:
-      Tag: SpawnPoint
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 9284976267268344130
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.spawnzone
     TransformComponent:
-      Translation: [-321.279785, 312.607849, 1022.75677]
+      Translation: [-321.279785, 318.53894, 1022.75677]
       Rotation: [0, -0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SpawnPoint
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [2.79999995, 0, 0]
-      Size: [-6.4000001, -3.5999999, 7.30000019]
       AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
     SpawnComponent:
-      Active: true
-      ZoneSize: [1, 1, 1]
-      TextureHandle: 0
-      TexturePath: engine/resources/icons/leaf_icon.png
-      RenderZone: true
+      IsActive: true
+      IsCheckpoint: true
       SpawnPoint: [0, 0, 0]
-  - Entity: 13419404670353191655
-    TagComponent:
-      Tag: toy_train_platform
+      ZoneSize: [1, 1, 1]
+      RenderSpawnZoneInScene: true
+  - Entity: 2021076809945131024
+    ModelComponent:
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 6503497834854385828
+      MaterialPaths:
     TransformComponent:
       Translation: [-3565.1311, -45.4531631, 621.43158]
       Rotation: [0.18592523, -1.13752759, -0.188373342]
       Scale: [1.00000036, 0.999993503, 0.99999553]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/wooden_train.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [6, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.135473862
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*2"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*3"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    AnimationComponent:
-      AnimationPath: models/toy_train/wooden_train.glb
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 5
-  - Entity: 1077756965852254433
     TagComponent:
-      Tag: Static Collider
-    TransformComponent:
-      Translation: [-235.089142, -62.7547264, 67.6377563]
-      Rotation: [0, -0, 0]
-      Scale: [1, 1, 1]
+      Tag: toy_train_platform
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: false
+      Variables:
+        {}
+  - Entity: 13332839563017571632
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stone_floor.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: "*1"
-            OverrideNormal: true
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*2"
-            OverrideAlbedo: true
-            NormalMapPath: "*3"
-            OverrideNormal: true
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*4"
-            OverrideAlbedo: true
-            NormalMapPath: "*5"
-            OverrideNormal: true
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [16.1599998, -29.3299999, -9.84000015]
-      ModelHandle: 12396195779801463565
-      ModelPath: models/stone_floor.glb
-      AutoCalculate: true
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.endgamezone
\ No newline at end of file
+      ModelPath: models/new_model/a109082005619/scene.gltf
+      ModelUUID: 18003340254112658511
+      MaterialPaths:
+        - models/new_model/a109082005619/scene_material_1.chmat
+        - models/new_model/a109082005619/scene_material_2.chmat
+        - models/new_model/a109082005619/scene_material_3.chmat
+        - models/new_model/a109082005619/scene_material_4.chmat
+        - models/new_model/a109082005619/scene_material_5.chmat
+        - models/new_model/a109082005619/scene_material_6.chmat
+        - models/new_model/a109082005619/scene_material_7.chmat
+        - models/new_model/a109082005619/scene_material_8.chmat
+        - models/new_model/a109082005619/scene_material_9.chmat
+        - models/new_model/a109082005619/scene_material_10.chmat
+        - models/new_model/a109082005619/scene_material_14.chmat
+    TransformComponent:
+      Translation: [-984.524658, -1183.05359, -4195.12988]
+      Rotation: [0, 0.918334186, 0]
+      Scale: [0.999996781, 1, 0.999996781]
+    TagComponent:
+      Tag: Island
+    IDComponent:
+      {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/rpg_strategy_scene_mp.chscene b/game/chaineddecos/assets/scenes/rpg_strategy_scene_mp.chscene
new file mode 100644
index 000000000..decdeb767
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/rpg_strategy_scene_mp.chscene
@@ -0,0 +1,1009 @@
+Scene: Untitled Scene
+SceneType: 0
+Background:
+  Mode: 2
+  Color: [0, 123, 0, 124]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 0
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: environments/new_environment.chenv
+Lighting:
+  Direction: [1, -1, 0.25]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.185000002
+Skybox:
+  TexturePath: skyboxes/citrus_orchard_road_puresky_8k.hdr
+  Mode: 0
+  Exposure: 1.59000003
+  Brightness: -0.49000001
+  Contrast: 0.25999999
+Fog:
+  Enabled: false
+  Color: [255, 255, 255, 255]
+  Density: 0.130700007
+  Start: 0
+  End: 2001
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 13607571673009665235
+    ModelComponent:
+      ModelPath: models/new_model/a109082005619/scene.gltf
+      ModelUUID: 18003340254112658511
+      MaterialPaths:
+        - models/new_model/a109082005619/scene_material_1.chmat
+        - models/new_model/a109082005619/scene_material_2.chmat
+        - models/new_model/a109082005619/scene_material_3.chmat
+        - models/new_model/a109082005619/scene_material_4.chmat
+        - models/new_model/a109082005619/scene_material_5.chmat
+        - models/new_model/a109082005619/scene_material_6.chmat
+        - models/new_model/a109082005619/scene_material_7.chmat
+        - models/new_model/a109082005619/scene_material_8.chmat
+        - models/new_model/a109082005619/scene_material_9.chmat
+        - models/new_model/a109082005619/scene_material_10.chmat
+        - models/new_model/a109082005619/scene_material_14.chmat
+    TransformComponent:
+      Translation: [-984.524658, -1183.05359, -4195.12988]
+      Rotation: [0, 0.918334186, 0]
+      Scale: [0.999996781, 1, 0.999996781]
+    TagComponent:
+      Tag: Island
+    IDComponent:
+      {}
+  - Entity: 13569333360120375744
+    ModelComponent:
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 6503497834854385828
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-3565.1311, -45.4531631, 621.43158]
+      Rotation: [0.18592523, -1.13752759, -0.188373342]
+      Scale: [1.00000036, 0.999993503, 0.99999553]
+    TagComponent:
+      Tag: toy_train_platform
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: false
+      Variables:
+        {}
+  - Entity: 16438784108099510578
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.spawnzone
+    TransformComponent:
+      Translation: [0, 2, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SpawnPoint
+    IDComponent:
+      {}
+    SpawnComponent:
+      IsActive: true
+      IsCheckpoint: true
+      SpawnPoint: [0, 0, 0]
+      ZoneSize: [1, 1, 1]
+      RenderSpawnZoneInScene: true
+  - Entity: 5685784681561587631
+    TransformComponent:
+      Translation: [-51.6971283, 137.265976, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: ambient_sound_parkour
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/soundsurfer-parkour-262367.mp3
+      SoundUUID: 0
+      Volume: 2
+      Pitch: 3
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 1000
+      IsPlaying: false
+  - Entity: 12672394764462573772
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [428.76062, 30.1878853, 305.481506]
+      Rotation: [-1.84119403, -0, 0]
+      Scale: [3.51185083, 0.99995327, 0.99992317]
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 1096237204831260543
+    ModelComponent:
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 4537241321556691418
+      MaterialPaths:
+    TransformComponent:
+      Translation: [228.521362, 10.7833824, 119.315414]
+      Rotation: [0, 1.06864882, 0]
+      Scale: [7.04011631, 8.74738693, 19.0374699]
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [9.28319931, 7.15296078, 23.5704517]
+      Offset: [0, 0, 0]
+      Radius: 11.7852259
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 56.9000015
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 9056308513381203170
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [440.960266, 32.5502625, 581.221497]
+      Rotation: [-1.48049641, -0, 0]
+      Scale: [3.71524119, 0.99993968, 0.999904871]
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [23.1599998, 279.299988, 21.0499992]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 11812242800205282646
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [456.769592, 92.3261108, 838.863159]
+      Rotation: [-2.07865191, -0, 0]
+      Scale: [3.9020257, 0.99999398, 0.999984682]
+    TagComponent:
+      Tag: anim_mode#4_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 17604674900266290470
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [424.876801, 17.2099991, 22.4167747]
+      Rotation: [-1.61778486, -0.127626747, -0.0149760507]
+      Scale: [3.91608334, 1.36131144, 0.999961495]
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 138.598022
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 1881796579488927809
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: train_vagons
+    IDComponent:
+      {}
+  - Entity: 1409424599587247538
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [124.947281, 34.3363914, -15.4183016]
+      Rotation: [0, 1.46746063, 0]
+      Scale: [2.81766772, 1.83825684, 2.5230844]
+    TagComponent:
+      Tag: rail#3d
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [1.16999996, 0.0700000003, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 8328783461316457676
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, 150.740036, 81.6223679]
+      Rotation: [0.061792668, 0.0883243978, -0.0563300811]
+      Scale: [46.0502167, 47.2513237, 53.765667]
+    TagComponent:
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/universfield-solar-system-space-journey-153272.mp3
+      SoundUUID: 0
+      Volume: 2
+      Pitch: 1
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 10000
+      IsPlaying: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 15750778797562849502
+    ModelComponent:
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 16650958288931697221
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
+    TransformComponent:
+      Translation: [-949.601318, 51.8037796, 331.382965]
+      Rotation: [-3.14158845, -1.50888491, -3.14156556]
+      Scale: [20.9452457, 17.1169147, 17.6528263]
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [91.2528992, 16.8988438, 12.8652821]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1.95000005
+      Friction: 0.5
+      Restitution: 0.209999993
+      IsTrigger: true
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 11052707254978142499
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.cameracontroller
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 41.4000015
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [0.14984253, 0.449848115, 9.98875237]
+      Rotation: [0.0449999981, -0.0150000006, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
+    IDComponent:
+      {}
+    ShaderComponent:
+      ShaderPath: shaders/screen_falling.chshader
+      ShaderUUID: 14962409001541335283
+      Uniforms:
+        - Name: uIntensity
+          Value: 0
+        - Name: color
+          Value: 0
+      Enabled: true
+  - Entity: 13983525651637940907
+    ModelComponent:
+      ModelPath: models/stone_floor.glb
+      ModelUUID: 5231694586974801729
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-231.075317, -62.7547264, 67.6377563]
+      Rotation: [0, -0, 0]
+      Scale: [2.702842, 1, 4.74170446]
+    TagComponent:
+      Tag: floor_lol
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [449.48999, 114.440002, 440.48999]
+      Offset: [0, 0, 0]
+      Radius: 191.044159
+      Height: 12.9499998
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/stone_floor.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 7624198933911539769
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [55.4628983, 34.3363914, -15.9756889]
+      Rotation: [0, 1.55682349, 0]
+      Scale: [2.81781912, 1.83835185, 2.52317667]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ShaderComponent:
+      ShaderPath: ""
+      ShaderUUID: 0
+      Uniforms:
+        []
+      Enabled: true
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [0, 2.20000002e-05, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 1
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 13590374037801301356
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
+    TagComponent:
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 13926086152416300678
+    ModelComponent:
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 9161924301726423648
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
+    TransformComponent:
+      Translation: [60.8389587, 103.205635, 4.72679806]
+      Rotation: [0.0431710109, -0.0900942832, 0.0843906254]
+      Scale: [26.4252377, 28.1725788, 26.7647877]
+    TagComponent:
+      Tag: ghost
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [1.71000004, 2.50999999, 0.5]
+      Offset: [-0.604161263, 27.9200001, -2.00118709]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 10649013110112304897
+    ModelComponent:
+      ModelPath: models/arena.glb
+      ModelUUID: 10755992412146045657
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-1.52065945, -4.32776833, -35.4009895]
+      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [86.6819458, 89.0095215, 94.478302]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 7059041814994448465
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [369.179901, 34.9479713, -15.4183016]
+      Rotation: [-3.14159083, 1.49346161, -3.14159083]
+      Scale: [2.81770754, 1.83824468, 2.52313972]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 13125531199117277521
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [340.353027, 34.3363914, -15.4183016]
+      Rotation: [-2.64324285e-06, 1.51514268, -2.64865866e-06]
+      Scale: [2.8176837, 1.83830261, 2.52313876]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 4168243125153798027
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [304.469788, 34.3363914, -15.4183016]
+      Rotation: [-3.14159083, 1.48598051, -3.14159083]
+      Scale: [2.81769323, 1.83826065, 2.52310586]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 3802333053182103696
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [269.359863, 34.3363914, -15.4183016]
+      Rotation: [-3.14157701, 1.51824713, -3.14157701]
+      Scale: [2.81769633, 1.83829546, 2.52312613]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 17051583801901637610
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [232.729095, 34.3363914, -15.4183016]
+      Rotation: [-3.14158916, 1.47876322, -3.14158916]
+      Scale: [2.81773591, 1.83830583, 2.52309585]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 8977013579833903178
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [195.275909, 34.3363914, -15.4183016]
+      Rotation: [-5.00722963e-05, 1.52510715, -5.01285613e-05]
+      Scale: [2.81781769, 1.83833349, 2.52321935]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 2611166543281844188
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [160.559677, 34.3363914, -15.4183016]
+      Rotation: [-3.1415906, 1.3848865, -3.1415906]
+      Scale: [2.81779981, 1.83833647, 2.52321267]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 13733413758142417056
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [89.7119217, 34.3363914, -8.52000618]
+      Rotation: [-3.14159083, 1.42225266, -3.14159083]
+      Scale: [2.81781149, 1.8383373, 2.5232451]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.3900001, 6.01000023, 12.9899998]
+      Offset: [2.26999998, -0.0299999993, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 7026315036505758796
+    ModelComponent:
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+    TransformComponent:
+      Translation: [49.9999466, -7.93971395, 14.3911505]
+      Rotation: [-3.14158368, -1.12095582, -3.14159083]
+      Scale: [2.29999614, 2.70000005, 0.979452133]
+    TagComponent:
+      Tag: Entity_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [34.1756821, 8.59185219, 22.6057091]
+      Offset: [0, -9.53674316e-07, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 5712591579348364631
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
+    TransformComponent:
+      Translation: [73.4315643, -38.012413, -506.157532]
+      Rotation: [0, -0, 0]
+      Scale: [342.240997, 325.262634, 245.059052]
+    TagComponent:
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 11957251056209136150
+    ModelComponent:
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 8378150816431493396
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-118.395287, 12.3910465, 826.530884]
+      Rotation: [0, -0, 0]
+      Scale: [673.435242, 411.5466, 440.887085]
+    TagComponent:
+      Tag: island_minigames
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [1.56521797, 1.00000179, 1.90062201]
+      Offset: [0, 0, 0]
+      Radius: 0.950311005
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 20
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+  - Entity: 11958763795877422947
+    TransformComponent:
+      Translation: [-135.637207, 137.265976, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: ambient_sound
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/storegraphic-soft-wind-477404.mp3
+      SoundUUID: 0
+      Volume: 2
+      Pitch: 3
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 10000
+      IsPlaying: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/runtimescene.chscene b/game/chaineddecos/assets/scenes/runtimescene.chscene
deleted file mode 100644
index 22383cb2b..000000000
Binary files a/game/chaineddecos/assets/scenes/runtimescene.chscene and /dev/null differ
diff --git a/game/chaineddecos/assets/scenes/scene_tem.chscene b/game/chaineddecos/assets/scenes/scene_tem.chscene
deleted file mode 100644
index 42ec6344c..000000000
--- a/game/chaineddecos/assets/scenes/scene_tem.chscene
+++ /dev/null
@@ -1,508 +0,0 @@
-Scene: Untitled Scene
-Background:
-  Mode: 2
-  Color: [0, 123, 0, 124]
-  TexturePath: ""
-EnvironmentPath: d:/gitnext/chained decos/game/chaineddecos/assets/environments/new_environment.chenv
-LightDirection: [-1, -1, -1]
-LightColor: [255, 255, 255, 255]
-AmbientIntensity: 0.300000012
-Skybox:
-  TexturePath: skyboxes\Starry night preview4.png
-  Exposure: 1
-  Brightness: 0
-  Contrast: 1
-Fog:
-  Enabled: true
-  Color: [130, 130, 130, 255]
-  Density: 0.00999999978
-  Start: 10
-  End: 100
-Canvas:
-  ReferenceResolution: [1920, 1080]
-  ScaleMode: 0
-  MatchWidthOrHeight: 0.5
-Entities:
-  - Entity: 1283719283719284
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [0, 0, 0]
-      Size: [1, 1, 1]
-      AutoCalculate: true
-      ModelPath: Models\TaverGLTF.gltf
-    ModelComponent:
-      ModelPath: ""
-      Materials:
-        - Name: Material 0
-          Index: 0
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 1
-          Index: 1
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 2
-          Index: 2
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 3
-          Index: 3
-          AlbedoColor: [228, 239, 243, 2]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 4
-          Index: 4
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 5
-          Index: 5
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 6
-          Index: 6
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 7
-          Index: 7
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 8
-          Index: 8
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 9
-          Index: 9
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 10
-          Index: 10
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 11
-          Index: 11
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 12
-          Index: 12
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 13
-          Index: 13
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 14
-          Index: 14
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 15
-          Index: 15
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 16
-          Index: 16
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 17
-          Index: 17
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 18
-          Index: 18
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 19
-          Index: 19
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 20
-          Index: 20
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 21
-          Index: 21
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 22
-          Index: 22
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 23
-          Index: 23
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 24
-          Index: 24
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 25
-          Index: 25
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 26
-          Index: 26
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 27
-          Index: 27
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 28
-          Index: 28
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 29
-          Index: 29
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 30
-          Index: 30
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 31
-          Index: 31
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 32
-          Index: 32
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 33
-          Index: 33
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 34
-          Index: 34
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-  - Entity: 6428169142076434776
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [-46.7000008, 2, -3.5]
-      Rotation: [0, 90.0999985, 0]
-      Scale: [1, 1, 1]
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [0, 0, 0]
-      Size: [1, 1, 1]
-      AutoCalculate: true
-      ModelPath: D:\gitnext\Chained Decos\game\chaineddecos\assets\models\stairs.glb
-    ModelComponent:
-      ModelPath: ""
-      Materials:
-        - Name: Material 0
-          Index: 0
-          AlbedoColor: [91, 21, 21, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: true
-          Transparent: true
-          Alpha: 1
-  - Entity: 1283719283719289
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-  - Entity: 1326311650816898569
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    RigidBodyComponent:
-      Mass: 1
-      UseGravity: true
-      IsKinematic: false
-      Velocity: [0, 0, 0]
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [0, 0, 0]
-      Size: [1, 1, 1]
-      AutoCalculate: true
-      ModelPath: ""
-    NativeScriptComponent:
-      Scripts:
-        - ScriptName: PlayerController
-        - ScriptName: CameraController
-        - ScriptName: GameHUD
-        - ScriptName: SpawnZoneRespawn
-        - ScriptName: PlayerController
-    ModelComponent:
-      ModelPath: ""
-      Materials:
-        - Name: Material 0
-          Index: 0
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-  - Entity: 1283719283719287
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ModelComponent:
-      ModelPath: ""
-      Materials:
-        - Name: Material 0
-          Index: 0
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-  - Entity: 1283719283719286
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ModelComponent:
-      ModelPath: ""
-      Materials:
-        - Name: Material 0
-          Index: 0
-          AlbedoColor: [255, 255, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-  - Entity: 1283719283719285
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [0, 0, 0]
-      Size: [1, 1, 1]
-      AutoCalculate: true
-      ModelPath: Models\arena.glb
-    ModelComponent:
-      ModelPath: ""
-      Materials:
-        - Name: Material 0
-          Index: 0
-          AlbedoColor: [143, 0, 0, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 1
-          Index: 1
-          AlbedoColor: [7, 233, 255, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 2
-          Index: 2
-          AlbedoColor: [90, 84, 77, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 3
-          Index: 3
-          AlbedoColor: [91, 86, 85, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 4
-          Index: 4
-          AlbedoColor: [102, 70, 58, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 5
-          Index: 5
-          AlbedoColor: [119, 111, 102, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 6
-          Index: 6
-          AlbedoColor: [119, 111, 102, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
-        - Name: Material 7
-          Index: 7
-          AlbedoColor: [83, 57, 47, 255]
-          Metalness: 0
-          Roughness: 0.5
-          DoubleSided: false
-          Transparent: false
-          Alpha: 1
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/start_menu.chscene b/game/chaineddecos/assets/scenes/start_menu.chscene
index b5f8d639e..78650a4a2 100644
--- a/game/chaineddecos/assets/scenes/start_menu.chscene
+++ b/game/chaineddecos/assets/scenes/start_menu.chscene
@@ -1,4 +1,5 @@
-Scene: Untitled Scene
+Scene: Start Menu
+SceneType: 1
 Background:
   Mode: 0
   Color: [0, 0, 0, 255]
@@ -24,53 +25,50 @@ Fog:
   Density: 0.00100000005
   Start: 10
   End: 5000
+Grid:
+  Spacing: 1
+  SecondarySpacing: 10
+  Color:
+    r: 1
+    g: 1
+    b: 1
+    a: 0.400000006
+  FadeStart: 0
+  FadeEnd: 8000
+  PlaneSize: 15000
 DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
   DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 15051911593141375302
-    TagComponent:
-      Tag: start_menu_game_info
+  - Entity: 7901133756770750101
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/info_scene.chscene
-      Triggered: false
+    TagComponent:
+      Tag: Image
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-3.58671188, -121.63102]
-        Size: [239.569427, 60.69841]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-123.371422, -151.980225]
-        Offset Max: [116.197998, -91.2818146]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-799.295105, -440.859558]
+        OffsetMax: [-316.395416, -282.028625]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Info
-      Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
         BG Color: [40, 40, 40, 255]
         Hover Color: [60, 60, 60, 255]
         Pressed Color: [30, 30, 30, 255]
@@ -78,237 +76,305 @@ Entities:
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
         Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 6090748651460201744
-    TagComponent:
-      Tag: start_game_title
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 18
+        Text Color: [255, 255, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 9
+      Texture Path: materials/logo.png
+      Tint Color: [255, 255, 255, 255]
+      Border Color: [0, 0, 0, 0]
+  - Entity: 2918141797093251417
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: start_button_start
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        []
+    SceneTransitionComponent:
+      TargetScenePath: scenes/game_mode_selection.chscene
+      Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-495.002197, -371.998108]
-        Size: [467.287567, 134.573792]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-728.645996, -439.285004]
-        Offset Max: [-261.358429, -304.711212]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, -140]
+        OffsetMax: [180, -76]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ImageControl:
-      Texture Path: materials/b500c85b-07cb-4818-8010-b2c2eaee3e9a.jpg
-      Tint Color: [255, 255, 255, 255]
-      Border Color: [0, 0, 0, 0]
-      Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-  - Entity: 15500646445384167357
-    TagComponent:
-      Tag: start_game_info
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Bold.ttf
+        Font Size: 26
+        Text Color: [15, 24, 26, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 1
+      Label: Start
+      Interactable: true
+      Auto Size: false
+  - Entity: 3210036190791093321
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: start_button_exit
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.exitscript
     ControlComponent:
-      Rect Transform:
-        Position: [-508.789062, 468.227203]
-        Size: [378.675934, 68.6394653]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-698.127014, 433.907471]
-        Offset Max: [-319.45108, 502.546936]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, 124]
+        OffsetMax: [180, 188]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: The game is currently in development.
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: true
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [200, 70, 70, 255]
+        Pressed Color: [150, 204, 50, 255]
+        Rounding: 32
+        Border Size: 1
+        Border Color: [237, 255, 255, 28]
+        Gradient: true
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 2
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 22.5
+        Text Color: [235, 238, 242, 255]
+        Shadow: false
         Shadow Offset: 2
         Shadow Color: [0, 0, 0, 255]
-        Letter Spacing: 1.73699999
-        Line Height: 1.20000005
+        Letter Spacing: 4.3499999
+        Line Height: 3.3499999
         H Align: 1
         V Align: 1
+      Widget Type: 1
+      Label: Exit
+      Interactable: true
       Auto Size: false
-  - Entity: 12750009872668354234
-    TagComponent:
-      Tag: start_button_exit
+  - Entity: 16057840357851959455
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: start_game_info
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-9.05329895, 116.472702]
-        Size: [221.598785, 61.0771255]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-119.852692, 85.9341354]
-        Offset Max: [101.746094, 147.011261]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-835.972778, 455.235565]
+        OffsetMax: [-315.972778, 489.235565]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Exit
-      Text Style:
-        Font Name: Default
-        Font Size: 72.2519989
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [63, 40, 40, 255]
-        Hover Color: [77, 60, 60, 255]
-        Pressed Color: [53, 30, 30, 255]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
         Rounding: 0
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
-        Padding: 0
-        Hover Scale: 1.24699998
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-      Interactable: true
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 19
+        Text Color: [150, 156, 179, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.20000005
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: The game is currently in development.
       Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.exitscript
-  - Entity: 11188570711873615005
-    TagComponent:
-      Tag: start_button_start
+  - Entity: 6680430163034031464
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: start_menu_game_info
+    IDComponent:
+      {}
     SceneTransitionComponent:
-      TargetScenePath: scenes/game_mode_selection.chscene
+      TargetScenePath: scenes/info_scene.chscene
       Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-5.18938446, -237.686066]
-        Size: [241.054611, 70.8050385]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-125.71669, -273.088593]
-        Offset Max: [115.337921, -202.283554]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, 36]
+        OffsetMax: [180, 100]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Start
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 24
+        Text Color: [150, 182, 252, 255]
         Shadow: false
-        Letter Spacing: 1
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
+      Widget Type: 1
+      Label: Info
       Interactable: true
       Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-  - Entity: 13765047633248252361
-    TagComponent:
-      Tag: start_game_menu_options
+  - Entity: 9869161237812939526
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: start_game_menu_options
+    IDComponent:
+      {}
     SceneTransitionComponent:
       TargetScenePath: scenes/video_scene.chscene
       Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-7.68027496, 1.93944168]
-        Size: [213.492203, 75.6689377]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-114.426376, -35.8950272]
-        Offset Max: [99.0658264, 39.7739105]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-180, -52]
+        OffsetMax: [180, 12]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Options
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 10
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 24
+        Text Color: [235, 238, 242, 255]
         Shadow: false
-        Letter Spacing: 1
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.5
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
+      Widget Type: 1
+      Label: Options
       Interactable: true
       Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
\ No newline at end of file
+  - Entity: 3276981511984264437
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: ""
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [0, 0, 10]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: MenuCamera2D
+    IDComponent:
+      {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/test.chscene b/game/chaineddecos/assets/scenes/test.chscene
deleted file mode 100644
index 22383cb2b..000000000
Binary files a/game/chaineddecos/assets/scenes/test.chscene and /dev/null differ
diff --git a/game/chaineddecos/assets/scenes/test_first_scene.chscene b/game/chaineddecos/assets/scenes/test_first_scene.chscene
new file mode 100644
index 000000000..58d201df8
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/test_first_scene.chscene
@@ -0,0 +1,186 @@
+Scene: Untitled Scene
+Background:
+  Mode: 2
+  Color: [0, 123, 0, 124]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 0
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: environments/new_environment.chenv
+Lighting:
+  Direction: [-1, -1, -1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.300000012
+Skybox:
+  TexturePath: skyboxes/Starry night preview4.png
+  Mode: 0
+  Exposure: 1
+  Brightness: 0
+  Contrast: 1
+Fog:
+  Enabled: true
+  Color: [130, 130, 130, 255]
+  Density: 0.00999999978
+  Start: 10
+  End: 100
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawCollisionModelBox: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+Entities:
+  - Entity: 1283719283719285
+    TagComponent:
+      Tag: Arena
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    ModelComponent:
+      ModelHandle: 0
+      ModelPath: models/arena.glb
+      Materials:
+        []
+    ColliderComponent:
+      Type: 257
+      Enabled: true
+      Offset: [-43.8236694, -68.8881912, -46.1545258]
+      Size: [86.6819458, 94.478302, 89.0095215]
+      Radius: 0.5
+      Height: 2
+      ModelHandle: 0
+      ModelPath: models/arena.glb
+      AutoCalculate: true
+  - Entity: 1283719283719287
+    TagComponent:
+      Tag: Entity
+    TransformComponent:
+      Translation: [28.8506241, 16.7000008, 27.7648582]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    ModelComponent:
+      ModelHandle: 0
+      ModelPath: ""
+      Materials:
+        []
+    SpawnComponent:
+      SpawnZoneSize: [1, 1, 1]
+      SpawnTextureHandle: 0
+      SpawnTexturePath: environments/boxes/playerspawntexture.png
+      RenderSpawnZoneInScene: true
+  - Entity: 1326311650816898569
+    TagComponent:
+      Tag: Player
+    TransformComponent:
+      Translation: [0.741465449, 5.18291473, 100.064888]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    ModelComponent:
+      ModelHandle: 0
+      ModelPath: models/city/after_the_rain..._-_vr__sound.glb
+      Materials:
+        []
+    ColliderComponent:
+      Type: 258
+      Enabled: true
+      Offset: [0, 0, -0.293091357]
+      Size: [2.48000002, 5.67999983, 7.4000001]
+      Radius: 0.25
+      Height: 2
+      ModelHandle: 0
+      ModelPath: models/player_low.glb
+      AutoCalculate: true
+    RigidBodyComponent:
+      Mass: 2.9000001
+      UseGravity: true
+      IsKinematic: false
+    PlayerComponent:
+      MovementSpeed: 15
+      LookSensitivity: 0.899999976
+      JumpForce: 10
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.gamehud
+        - ClassName: chaineddecos.scripts.playercontroller
+        - ClassName: chaineddecos.scripts.playerfall
+        - ClassName: chaineddecos.scripts.spawnzone
+        - ClassName: chaineddecos.scripts.spawnzone
+  - Entity: 1283719283719289
+    TagComponent:
+      Tag: Entity
+    TransformComponent:
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+  - Entity: 6428169142076434776
+    TagComponent:
+      Tag: stairsaw
+    TransformComponent:
+      Translation: [-50.6539459, 0.631593704, 10.243227]
+      Rotation: [-3.14159083, 1.55226898, -3.14159083]
+      Scale: [0.999882996, 1, 0.97942549]
+    ModelComponent:
+      ModelHandle: 0
+      ModelPath: models/stairs.glb
+      Materials:
+        []
+    ColliderComponent:
+      Type: 257
+      Enabled: true
+      Offset: [-17.087841, -4.29592609, -11.3028545]
+      Size: [34.1756821, 8.59185219, 22.6057091]
+      Radius: 0.5
+      Height: 2
+      ModelHandle: 0
+      ModelPath: models/stairs.glb
+      AutoCalculate: true
+  - Entity: 7935884460455885952
+    TagComponent:
+      Tag: Camera
+    TransformComponent:
+      Translation: [-75.8884048, 25.9009342, 87.4832993]
+      Rotation: [-11.0000238, -57.3987541, 0]
+      Scale: [1, 1, 1]
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: true
+      OrbitDistance: 32
+      OrbitYaw: 1.80052602
+      OrbitPitch: 13.4000015
+      LookSensitivity: 0.899999976
+      TargetEntityTag: Player
+      Projection:
+        Projection: 0
+        VerticalFOV: 60
+        Near: 0.1
+        Far: 1000
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.cameracontroller
+  - Entity: 14689743047800951365
+    TagComponent:
+      Tag: SceneCamera
+    TransformComponent:
+      Translation: [42.2146225, 28.3946991, 76.4796829]
+      Rotation: [-30.3999996, 66.4000092, 0]
+      Scale: [1, 1, 1]
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+      TargetEntityTag: Player
+      Projection:
+        Projection: 0
+        VerticalFOV: 60
+        Near: 0.01
+        Far: 1000
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/test_platform_scene.chscene b/game/chaineddecos/assets/scenes/test_platform_scene.chscene
index b95f10978..4b3fc6a5a 100644
--- a/game/chaineddecos/assets/scenes/test_platform_scene.chscene
+++ b/game/chaineddecos/assets/scenes/test_platform_scene.chscene
@@ -1,4 +1,5 @@
-Scene: Untitled Scene
+Scene: Test Platform Scene
+SceneType: 0
 Background:
   Mode: 2
   Color: [0, 123, 0, 124]
@@ -9,11 +10,11 @@ Canvas:
   MatchWidthOrHeight: 0.5
 EnvironmentPath: environments/new_environment.chenv
 Lighting:
-  Direction: [0.419999987, 0.970000029, 1]
+  Direction: [0.419999987, -0.660000026, 0.670000017]
   LightColor: [255, 255, 255, 255]
   Ambient: 0.170000002
 Skybox:
-  TexturePath: skyboxes/qwantani_dusk_2_puresky_8k.hdr
+  TexturePath: skyboxes/qwantani_night_puresky_4k.hdr
   Mode: 0
   Exposure: 0.680000007
   Brightness: -0.899999976
@@ -24,1947 +25,244 @@ Fog:
   Density: 0.100000001
   Start: 6
   End: 183
+Grid:
+  Spacing: 1
+  SecondarySpacing: 10
+  Color:
+    r: 1
+    g: 1
+    b: 1
+    a: 0.400000006
+  FadeStart: 0
+  FadeEnd: 8000
+  PlaneSize: 15000
 DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
-  DrawGrid: true
+  DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 10121800663724246293
-    TagComponent:
-      Tag: cathedral
+  - Entity: 1388532700694720608
     TransformComponent:
-      Translation: [-710.380615, 254.511108, -1909.69739]
+      Translation: [-326.500214, 311.823425, 1022.66998]
       Rotation: [0, -0, 0]
       Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/building/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface2_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface3_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface4_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface5_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface6_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface8_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: -1
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 13419404670353191655
     TagComponent:
-      Tag: toy_train_platform
-    TransformComponent:
-      Translation: [-3565.1311, -45.4531631, 621.43158]
-      Rotation: [0.18592523, -1.13752759, -0.188373342]
-      Scale: [1.00000036, 0.999993503, 0.99999553]
+      Tag: SpawnZone
+    IDComponent:
+      {}
+    SpawnComponent:
+      IsActive: true
+      IsCheckpoint: true
+      SpawnPoint: [0, 0, 0]
+      ZoneSize: [2.5999999, 4.4000001, 3.0999999]
+      RenderSpawnZoneInScene: true
+  - Entity: 9960371382411008385
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/wooden_train.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [6, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.135473862
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*2"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*3"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    AnimationComponent:
-      AnimationPath: models/toy_train/wooden_train.glb
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 5
-  - Entity: 9393782307517162306
-    TagComponent:
-      Tag: island_minigames
+      ModelPath: models/city/after_the_rain..._-_vr__sound.glb
+      ModelUUID: 9063345529843979990
+      MaterialPaths:
+        []
     TransformComponent:
-      Translation: [-118.395287, 12.3910465, 826.530884]
-      Rotation: [0, -0, 0]
-      Scale: [673.435242, 411.5466, 440.887085]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/minigames/hub_for_minigames_server.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 9
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 10
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 11
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Translation: [750.026367, 29.4887199, 157.773407]
+      Rotation: [3.14158845, -1.54755747, -3.14157939]
+      Scale: [6.91140509, 5.33406591, 4.08035278]
+    TagComponent:
+      Tag: cathedral
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.782608986, 0.0434782989, -0.950311005]
-      ModelHandle: 484901959432752407
-      ModelPath: models/minigames/hub_for_minigames_server.glb
-      AutoCalculate: true
-  - Entity: 6516797172325941388
-    TagComponent:
-      Tag: buildings_6_pack
-    TransformComponent:
-      Translation: [23.264637, -27.1361389, -506.157532]
-      Rotation: [0, -0, 0]
-      Scale: [342.240997, 325.262634, 245.059052]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/city/after_the_rain..._-_vr__sound.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 909307703803186220
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/building/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface2_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface3_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface4_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface5_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface6_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface8_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-  - Entity: 6064633921243342758
-    TagComponent:
-      Tag: Entity_copy
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+        []
     TransformComponent:
-      Translation: [46.4636726, -2.98017597, 14.336463]
+      Translation: [46.4636726, -11088.8096, 14.3364639]
       Rotation: [-3.14153385, -0.624083161, -3.1415863]
       Scale: [2.29999304, 2.70000005, 0.979451716]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      ModelHandle: 10380524065091636454
-      ModelPath: models/stairs.glb
-      AutoCalculate: true
-  - Entity: 1295158128682646344
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [89.7119217, 34.3363914, -15.4183016]
-      Rotation: [-1.96055889, -0.999783337, -2.69811749]
-      Scale: [2.81780839, 1.8383373, 2.52324486]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 217210127212770073
     TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [160.559677, 34.3363914, -15.4183016]
-      Rotation: [-2.88122821, -1.07542729, -1.95391703]
-      Scale: [2.81780005, 1.83833647, 2.52321053]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 11053255314081653602
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [195.275909, 34.3363914, -15.4183016]
-      Rotation: [-2.1531477, -1.10677683, -2.63240695]
-      Scale: [2.81779408, 1.83833039, 2.52320075]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Tag: Entity_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 2562263663181998965
-    TagComponent:
-      Tag: rail#3d_copy
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 983662873606794579
     TransformComponent:
-      Translation: [232.729095, 34.3363914, -15.4183016]
-      Rotation: [3.1402328, -1.54398417, -1.52254927]
-      Scale: [2.81773686, 1.83830583, 2.52309632]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 5967097730784712040
+      Translation: [-40.4501495, 79.567894, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
     TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [269.359863, 34.3363914, -15.4183016]
-      Rotation: [3.14023447, -1.543975, -1.55569565]
-      Scale: [2.81769967, 1.83829546, 2.52312875]
+      Tag: Empty Entity
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/soundreality-wind-plain-sfx-522910.mp3
+      SoundUUID: 18016372891088584835
+      Volume: 2
+      Pitch: 3
+      Loop: true
+      PlayOnStart: false
+      Spatialized: false
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 100
+      IsPlaying: false
+  - Entity: 15849216189391956439
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 7772933172421174645
-    TagComponent:
-      Tag: rail#3d_copy
+      ModelPath: models/arena.glb
+      ModelUUID: 10755992412146045657
+      MaterialPaths:
+        []
     TransformComponent:
-      Translation: [304.469788, 34.3363914, -15.4183016]
-      Rotation: [3.14017534, -1.54393637, -1.68613875]
-      Scale: [2.81769824, 1.83826065, 2.52310705]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 8791625222606561716
+      Translation: [-18.6856194, -4.32776833, -35.4009895]
+      Rotation: [-0.0117486976, 0.0380410925, -0.00385736162]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
     TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [340.353027, 34.3363914, -15.4183016]
-      Rotation: [3.14018416, -1.54396355, -1.52885783]
-      Scale: [2.81768346, 1.83830261, 2.52313828]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Tag: Arena
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 8982711742810159238
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [369.179901, 34.9479713, -15.4183016]
-      Rotation: [3.14019299, -1.54396594, -1.55295646]
-      Scale: [2.81770563, 1.83824468, 2.52313542]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
       Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 1283719283719285
-    TagComponent:
-      Tag: Arena
-    TransformComponent:
-      Translation: [-1.52065945, -4.32776833, -35.4009895]
-      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
-      Scale: [0.99993974, 0.999890089, 0.999929249]
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 3119751222396764761
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/arena.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [143, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [7, 233, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [3, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [90, 84, 77, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [91, 86, 85, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [102, 70, 58, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [83, 57, 47, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [-43.8236694, -46.1545258, -25.5901108]
-      ModelHandle: 11089864484401044150
-      ModelPath: models/arena.glb
-      AutoCalculate: true
-  - Entity: 10653066213482940164
-    TagComponent:
-      Tag: ghost
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 9161924301726423648
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
     TransformComponent:
       Translation: [60.8389587, 88.6849136, 37.5509796]
       Rotation: [0, -0, 0]
       Scale: [26.4252186, 28.1715183, 26.7638988]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: ghost
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [1.21000004, 3.83999991, 0.449999988]
+      Offset: [0, 10.3000002, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.604161263, -0.379055023, -2.00118709]
-      Size: [1.20832253, 0.709288359, 2.00317812]
       AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
     AnimationComponent:
-      AnimationPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 5150207293164281694
-    TagComponent:
-      Tag: SceneCamera
+      GraphPath: animations/new_graph.chag
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        speed: 0
+        isMoving: 0
+  - Entity: 8266505162762917547
     TransformComponent:
-      Translation: [-143.294968, 200.081146, -337.524475]
-      Rotation: [376.001373, -3188.74268, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: false
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 1000
-      Enabled: false
-      TargetTag: Player
-      Distance: 10
-      Yaw: 0
-      Pitch: 20
-      Sensitivity: 0.899999976
-  - Entity: 1326311650816898569
+      Translation: [-148.822327, 65.1090927, 0]
+      Rotation: [0, -0, 0]
+      Scale: [2.92739296, 3.31053686, 5.81883764]
     TagComponent:
-      Tag: Player
-    TransformComponent:
-      Translation: [-288.791779, 109.51931, 731.988647]
-      Rotation: [0, -1.82386899, 0]
-      Scale: [0.999901831, 1, 0.999901831]
+      Tag: CubeWithTexture
+    PrimitiveComponent:
+      Type: 8
+      Radius: 13.1099997
+      InnerRadius: 3.5999999
+      Height: 13.25
+      Slices: 49
+      Stacks: 145
+      Dimensions: [8.60000038, 16, 10.5]
+      MeshPath: ""
+    IDComponent:
+      {}
+  - Entity: 7406597226916280637
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/player_low.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ShaderComponent:
-      ShaderPath: ""
-      Enabled: true
-      Uniforms:
+      ModelUUID: 6152005881347795059
+      MaterialPaths:
         []
-    ColliderComponent:
-      Type: 3
-      Enabled: true
-      Offset: [0, 3.0937984, 0.307002902]
-      Radius: 3.0917685
-      AutoCalculate: true
-    RigidBodyComponent:
-      Mass: 91.3000031
-      Velocity: [0, 0, 0]
-      UseGravity: true
-      IsKinematic: false
-      IsGrounded: true
-    AudioComponent:
-      SoundHandle: 0
-      SoundPath: audio/storegraphic-soft-wind-477404.mp3
-      Volume: 0.561679065
-      Pitch: 1
-      Loop: true
-      PlayOnStart: false
-      Spatialized: false
-      Position: [0, 0, 0]
-      MinDistance: 1
-      MaxDistance: 100
-    PlayerComponent:
-      MovementSpeed: 15
-      JumpForce: 10
-      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [497.515198, 35.6768875, 208.375519]
+      Rotation: [-3.14159083, -1.31772375, -3.14159083]
+      Scale: [0.999901712, 1, 0.999901712]
+    TagComponent:
+      Tag: Player
+    IDComponent:
+      {}
     ManagedScriptComponent:
       Scripts:
         - ClassName: chaineddecos.scripts.playercontroller
@@ -1974,806 +272,531 @@ Entities:
               Value: 9.80000019
             - Name: JumpForce
               Type: 1
-              Value: 32.5
+              Value: 57.0999985
             - Name: MovementSpeed
               Type: 1
               Value: 11.8999996
-        - ClassName: chaineddecos.scripts.gamehud
         - ClassName: chaineddecos.scripts.spawnzone
         - ClassName: chaineddecos.scripts.playerfall
-  - Entity: 2241149956455545874
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [55.4628983, 34.3363914, -15.9756889]
-      Rotation: [-0.0299999993, 0.0617705695, -1.59763551]
-      Scale: [2.81781125, 1.83835185, 2.52317905]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+        - ClassName: chaineddecos.scripts.cameracontroller
     ColliderComponent:
       Type: 0
+      Size: [2.29999995, 6.80000019, -2.5]
+      Offset: [0, 3.0999999, 0]
+      Radius: 6.94999981
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 6428169142076434776
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 1
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: true
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 8569528578311606949
+    ModelComponent:
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 8378150816431493396
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-118.395287, 12.3910465, 826.530884]
+      Rotation: [0, -0, 0]
+      Scale: [673.435242, 411.5466, 440.887085]
     TagComponent:
-      Tag: Entity
+      Tag: island_minigames
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 7330455815488835022
+    ModelComponent:
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+        []
     TransformComponent:
       Translation: [411.734222, 21.1899738, 188.952682]
       Rotation: [3.63230574e-05, -1.51887417, -1.12990801e-05]
       Scale: [0.999889433, 1, 0.979455113]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: Entity
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 1
-      Enabled: true
+      Size: [0.5, 0.5, 0.5]
       Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      ModelHandle: 10380524065091636454
-      ModelPath: models/stairs.glb
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
       AutoCalculate: true
-  - Entity: 5796298439135209667
-    TagComponent:
-      Tag: Camera
-    TransformComponent:
-      Translation: [103.774498, 162.792267, 161.441193]
-      Rotation: [-14.4583921, 2196.28418, 0]
-      Scale: [1, 1, 1]
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 12281907651891245889
     CameraComponent:
       Primary: true
       FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 1000000
-      Enabled: true
-      TargetTag: Player
-      Distance: 23.5166721
-      Yaw: 255.5
-      Pitch: 0
-      Sensitivity: 0.899999976
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.cameracontroller
-          Fields:
-            - Name: LookSensitivity
-              Type: 1
-              Value: 6.19999981
-  - Entity: 7094686869644715316
+      IsOrbitCamera: true
+      TargetEntityTag: Player
+      OrbitDistance: 0
+      OrbitYaw: 0
+      OrbitPitch: 0
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [165.648392, 671.06134, 166.822937]
+      Rotation: [0.698999822, -2.4989996, 0]
+      Scale: [1, 1, 1]
     TagComponent:
-      Tag: arena_two
+      Tag: Camera
+    IDComponent:
+      {}
+  - Entity: 4580184106581322309
+    ModelComponent:
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 16650958288931697221
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
     TransformComponent:
       Translation: [-949.601318, 51.8037796, 331.382965]
       Rotation: [2.86779284, 1.33893979, 2.90103149]
       Scale: [20.9453735, 17.1169147, 17.6528664]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/container_ship/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Bridge_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Bridge_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Bridge_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Hull_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Hull_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Hull_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Containers_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Containers_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Containers_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0, 0, 0]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-33.2911491, -0.000321388245, -6.43264723]
-      ModelHandle: 16079101999781436112
-      ModelPath: models/container_ship/scene.gltf
       AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
     AnimationComponent:
-      AnimationPath: models/container_ship/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 10680602693042542455
-    TagComponent:
-      Tag: Empty Entity
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 519589233602031965
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
     TransformComponent:
       Translation: [-216.192169, -6.67572021e-06, 0]
       Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
       Scale: [46.0502167, 47.251339, 53.7656708]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg
-            OverrideAlbedo: true
-            NormalMapPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    AnimationComponent:
-      AnimationPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 193077798077705471
     TagComponent:
-      Tag: rail#3d
-    TransformComponent:
-      Translation: [124.947281, 34.3363914, -15.4183016]
-      Rotation: [3.14005208, -1.54395568, -1.59915721]
-      Scale: [2.81767035, 1.83825684, 2.5230813]
+      Tag: Empty Entity
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 17788316681746480228
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 16057276512691593213
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 6503497834854385828
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-3565.1311, -45.4531631, 621.43158]
+      Rotation: [0.18592523, -1.13752759, -0.188373342]
+      Scale: [1.00000036, 0.999993503, 0.99999553]
     TagComponent:
-      Tag: Static Collider
+      Tag: toy_train_platform
+    IDComponent:
+      {}
+  - Entity: 17136403959904282428
     TransformComponent:
       Translation: [-8.81565094, 14.7408161, -39.2663612]
       Rotation: [0, -0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Static Collider
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.endgamezone
     ColliderComponent:
       Type: 0
-      Enabled: true
-      Offset: [8.60000038, 0, 0]
       Size: [19.1000004, 4.19999981, 16]
+      Offset: [8.60000038, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
       AutoCalculate: true
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.endgamezone
-  - Entity: 18441510849027507452
-    TagComponent:
-      Tag: anim_mode#2
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 12093105580418733898
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+        []
     TransformComponent:
       Translation: [424.876801, 17.5073452, 22.4167747]
       Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
       Scale: [0.999992907, 1.36125314, 0.999930501]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 17079309488884899572
-    TagComponent:
-      Tag: anim_mode#4
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 17292455411607182348
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+        []
     TransformComponent:
       Translation: [456.769592, 92.3261108, 838.863159]
       Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
       Scale: [0.999980867, 1.0000428, 1.00002789]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: anim_mode#4
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 11499449198343814881
-    TagComponent:
-      Tag: anim_mode#3
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 6815571250947141964
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+        []
     TransformComponent:
       Translation: [440.960266, 32.5502625, 581.221497]
       Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
       Scale: [0.999992847, 0.999961555, 0.999930501]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 1996324266450563914
-    TagComponent:
-      Tag: wooden_bridge
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 11670811948117573060
+    ModelComponent:
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 4537241321556691418
+      MaterialPaths:
+        []
     TransformComponent:
       Translation: [226.774567, 10.7833824, 119.315414]
       Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
       Scale: [7.04011488, 8.74738693, 19.0374851]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-4.6624608, -3.7252903e-08, -11.7852259]
-      ModelHandle: 13239793232019240734
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
       AutoCalculate: true
-  - Entity: 3962667947486927982
-    TagComponent:
-      Tag: anim_mode
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 5764371495021089224
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+        []
     TransformComponent:
       Translation: [428.76062, 30.1878853, 305.481506]
       Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
       Scale: [0.999992847, 0.999961555, 0.999930501]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 11859063027363205809
-    TagComponent:
-      Tag: rail#3d_copy_copy
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 8372797272213547214
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
     TransformComponent:
-      Translation: [394.406952, 36.0981331, -15.4183016]
-      Rotation: [3.13979626, -1.54386234, -1.49447083]
-      Scale: [2.81729794, 1.83831346, 2.52311802]
+      Translation: [23.264637, -27.1361389, -506.157532]
+      Rotation: [0, -0, 0]
+      Scale: [342.240997, 325.262634, 245.059052]
+    TagComponent:
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
+  - Entity: 1513280067487115410
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/island.glb
+      ModelUUID: 580609141673989832
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-22.9906006, -4.32776642, -2881.44678]
+      Rotation: [-0.0117486976, 0.0380410925, -0.00385736162]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: island_good
+    IDComponent:
+      {}
     ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
       Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 3336568568209062724
+    ModelComponent:
+      ModelPath: models/skeleton_animated.glb
+      ModelUUID: 7289248424465903313
+      MaterialPaths:
+        - models/skeleton_animated_material_0.chmat
+        - models/skeleton_animated_material_1.chmat
+        - models/skeleton_animated_material_2.chmat
+    TransformComponent:
+      Translation: [-378.762115, 205.69989, 185.502914]
+      Rotation: [-0.016154483, 0.863519788, -0.00596364681]
+      Scale: [0.999939144, 0.999887109, 0.999927402]
+    TagComponent:
+      Tag: object_new
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
\ No newline at end of file
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/test_platform_scene_mp.chscene b/game/chaineddecos/assets/scenes/test_platform_scene_mp.chscene
new file mode 100644
index 000000000..b30edd2d2
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/test_platform_scene_mp.chscene
@@ -0,0 +1,806 @@
+Scene: Test Platform Scene
+SceneType: 0
+Background:
+  Mode: 2
+  Color: [0, 123, 0, 124]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 0
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: environments/new_environment.chenv
+Lighting:
+  Direction: [0.419999987, -0.709999979, 1]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.170000002
+Skybox:
+  TexturePath: skyboxes/qwantani_night_puresky_4k.hdr
+  Mode: 0
+  Exposure: 0.680000007
+  Brightness: -0.899999976
+  Contrast: 0.349999994
+Fog:
+  Enabled: false
+  Color: [158, 148, 148, 255]
+  Density: 0.100000001
+  Start: 6
+  End: 183
+Grid:
+  Spacing: 1
+  SecondarySpacing: 10
+  Color:
+    r: 1
+    g: 1
+    b: 1
+    a: 0.400000006
+  FadeStart: 0
+  FadeEnd: 8000
+  PlaneSize: 15000
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 7832529233854850948
+    ModelComponent:
+      ModelPath: models/city/after_the_rain..._-_vr__sound.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [750.026367, 29.4887199, 157.773407]
+      Rotation: [3.14158845, -1.54755747, -3.14157939]
+      Scale: [6.91140509, 5.33406591, 4.08035278]
+    TagComponent:
+      Tag: cathedral
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/city/after_the_rain..._-_vr__sound.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 15311394470157577163
+    ModelComponent:
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [46.4636726, -11088.8096, 14.3364639]
+      Rotation: [-3.14153385, -0.624083161, -3.1415863]
+      Scale: [2.29999304, 2.70000005, 0.979451716]
+    TagComponent:
+      Tag: Entity_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 1
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, -500, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 4334410935198375868
+    TransformComponent:
+      Translation: [-40.4501495, 79.567894, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Empty Entity
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/soundreality-wind-plain-sfx-522910.mp3
+      SoundUUID: 18016372891088584835
+      Volume: 2
+      Pitch: 3
+      Loop: true
+      PlayOnStart: true
+      Spatialized: false
+      Position: [0, 0, 0]
+      MinDistance: 1
+      MaxDistance: 100
+      IsPlaying: false
+  - Entity: 16694767385973989412
+    ModelComponent:
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-18.6856194, -4.32776833, -35.4009895]
+      Rotation: [-0.0117486976, 0.0380410925, -0.00385736162]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 145300541806867208
+    ModelComponent:
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
+    TransformComponent:
+      Translation: [60.8389587, 88.6849136, 37.5509796]
+      Rotation: [0, -0, 0]
+      Scale: [26.4252186, 28.1715183, 26.7638988]
+    TagComponent:
+      Tag: ghost
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [1.21000004, 3.83999991, 0.449999988]
+      Offset: [0, 10.3000002, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: animations/new_graph.chag
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        speed: 0
+        isMoving: 0
+  - Entity: 4168515343886265236
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: true
+      TargetEntityTag: Player
+      OrbitDistance: 38
+      OrbitYaw: -131
+      OrbitPitch: -10
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [-38.9932404, 30.6515064, 130.721558]
+      Rotation: [-0.0510000847, 1.58099997, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SceneCamera
+    IDComponent:
+      {}
+  - Entity: 4373949329859876525
+    ModelComponent:
+      ModelPath: models/player_low.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [497.515198, 49.1926308, 208.375519]
+      Rotation: [-3.14159083, -1.31772375, -3.14159083]
+      Scale: [0.999901712, 1, 0.999901712]
+    TagComponent:
+      Tag: Player
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.playercontroller
+          Fields:
+            - Name: Gravity
+              Type: 1
+              Value: 9.80000019
+            - Name: JumpForce
+              Type: 1
+              Value: 32.5
+            - Name: MovementSpeed
+              Type: 1
+              Value: 11.8999996
+        - ClassName: chaineddecos.scripts.spawnzone
+        - ClassName: chaineddecos.scripts.playerfall
+    ColliderComponent:
+      Type: 0
+      Size: [2.29999995, 6.80000019, -2.5]
+      Offset: [0, 3.0999999, 0]
+      Radius: 6.94999981
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 1
+      Mass: 1000
+      LinearDamping: 0
+      AngularDamping: 0
+      UseGravity: true
+      IsFixedRotation: true
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: true
+      VelocityForced: true
+      IsNetworkDriven: false
+  - Entity: 13651717360814781168
+    ModelComponent:
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-118.395287, 12.3910465, 826.530884]
+      Rotation: [0, -0, 0]
+      Scale: [673.435242, 411.5466, 440.887085]
+    TagComponent:
+      Tag: island_minigames
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: false
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 6561874552696431771
+    TransformComponent:
+      Translation: [-326.500214, 311.823425, 1022.66998]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SpawnZone
+    IDComponent:
+      {}
+    SpawnComponent:
+      IsActive: true
+      IsCheckpoint: true
+      SpawnPoint: [0, 0, 0]
+      ZoneSize: [2.5999999, 4.4000001, 3.0999999]
+      RenderSpawnZoneInScene: true
+  - Entity: 5569203389476250557
+    CameraComponent:
+      Primary: false
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+    TransformComponent:
+      Translation: [0, 0, 10]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.cameracontroller
+          Fields:
+            - Name: LookSensitivity
+              Type: 1
+              Value: 6.19999981
+  - Entity: 15252557082080110936
+    ModelComponent:
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
+    TransformComponent:
+      Translation: [-949.601318, 51.8037796, 331.382965]
+      Rotation: [2.86779284, 1.33893979, 2.90103149]
+      Scale: [20.9453735, 17.1169147, 17.6528664]
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0, 0, 0]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 6136181921474755334
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
+    TagComponent:
+      Tag: Empty Entity
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 14758085073538637186
+    ModelComponent:
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-3565.1311, -45.4531631, 621.43158]
+      Rotation: [0.18592523, -1.13752759, -0.188373342]
+      Scale: [1.00000036, 0.999993503, 0.99999553]
+    TagComponent:
+      Tag: toy_train_platform
+    IDComponent:
+      {}
+    NetworkIdentityComponent:
+      NetworkID: 0
+      IsOwner: true
+      PrefabPath: ""
+      RemoteActionFlags: 0
+  - Entity: 3439276167513857483
+    TransformComponent:
+      Translation: [-8.81565094, 14.7408161, -39.2663612]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Static Collider
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.endgamezone
+    ColliderComponent:
+      Type: 0
+      Size: [19.1000004, 4.19999981, 16]
+      Offset: [8.60000038, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 12812476289974313248
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [424.876801, 17.5073452, 22.4167747]
+      Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
+      Scale: [0.999992907, 1.36125314, 0.999930501]
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 7349889034918139147
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [456.769592, 92.3261108, 838.863159]
+      Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
+      Scale: [0.999980867, 1.0000428, 1.00002789]
+    TagComponent:
+      Tag: anim_mode#4
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 108817305551730127
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [440.960266, 32.5502625, 581.221497]
+      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
+      Scale: [0.999992847, 0.999961555, 0.999930501]
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 13469759102761090476
+    ModelComponent:
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [226.774567, 10.7833824, 119.315414]
+      Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
+      Scale: [7.04011488, 8.74738693, 19.0374851]
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 4723265809859904926
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [428.76062, 30.1878853, 305.481506]
+      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
+      Scale: [0.999992847, 0.999961555, 0.999930501]
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 15100496704623056834
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
+    TransformComponent:
+      Translation: [23.264637, -27.1361389, -506.157532]
+      Rotation: [0, -0, 0]
+      Scale: [342.240997, 325.262634, 245.059052]
+    TagComponent:
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
+  - Entity: 1740168375751629983
+    ModelComponent:
+      ModelPath: models/island.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-22.9906006, -4.32776642, -2881.44678]
+      Rotation: [-0.0117486976, 0.0380410925, -0.00385736162]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: island_good
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 13567007465431139093
+    ModelComponent:
+      ModelPath: models/skeleton_animated.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-385.506042, 210.6026, 185.502914]
+      Rotation: [-0.016154483, 0.863519788, -0.00596364681]
+      Scale: [0.999939144, 0.999887109, 0.999927402]
+    TagComponent:
+      Tag: object_new
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/test_rpg.chscene b/game/chaineddecos/assets/scenes/test_rpg.chscene
index a5a1daa35..7291eb5ef 100644
--- a/game/chaineddecos/assets/scenes/test_rpg.chscene
+++ b/game/chaineddecos/assets/scenes/test_rpg.chscene
@@ -1,4 +1,5 @@
 Scene: Untitled Scene
+SceneType: 0
 Background:
   Mode: 2
   Color: [0, 123, 0, 124]
@@ -28,1930 +29,512 @@ DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
-  DrawGrid: true
+  DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 10121800663724246293
-    TagComponent:
-      Tag: cathedral
+  - Entity: 7770000000000000001
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: Chained.Hero
+    ModelComponent:
+      ModelPath: models/ghost+with+sword+3d+model.glb
+      ModelUUID: 16359669984788571615
+      MaterialPaths:
     TransformComponent:
-      Translation: [-710.380615, 254.511108, -1909.69739]
-      Rotation: [0, -0, 0]
+      Translation: [0, 5, 0]
+      Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/building/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface2_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface3_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface4_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface5_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface6_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface8_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: RPG_Hero (Ghost)
+    IDComponent:
+      {}
     AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: -1
-      IsLooping: true
-      IsPlaying: true
+      GraphPath: ""
+      GraphUUID: 0
       BlendDuration: 0
-  - Entity: 13419404670353191655
-    TagComponent:
-      Tag: toy_train_platform
-    TransformComponent:
-      Translation: [-3565.1311, -45.4531631, 621.43158]
-      Rotation: [0.18592523, -1.13752759, -0.188373342]
-      Scale: [1.00000036, 0.999993503, 0.99999553]
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 7770000000000000002
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: Chained.HeroSkill
+        - ClassName: chaineddecos.scripts.playercontroller
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/wooden_train.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [6, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.135473862
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*2"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*3"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    AnimationComponent:
-      AnimationPath: models/toy_train/wooden_train.glb
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 5
-  - Entity: 9393782307517162306
-    TagComponent:
-      Tag: island_minigames
+      ModelPath: models/pilot/wizard_tower_animated.glb
+      ModelUUID: 13486165926194482105
+      MaterialPaths:
     TransformComponent:
-      Translation: [-118.395287, 12.3910465, 826.530884]
-      Rotation: [0, -0, 0]
-      Scale: [673.435242, 411.5466, 440.887085]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/minigames/hub_for_minigames_server.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 9
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 10
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [25, 25, 25, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 11
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Translation: [5, 5, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Skill_Fireball
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [2.16411662, 5.66642523, 3.99894166]
+      Radius: 10.4223652
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.782608986, 0.0434782989, -0.950311005]
-      ModelHandle: 484901959432752407
-      ModelPath: models/minigames/hub_for_minigames_server.glb
       AutoCalculate: true
-  - Entity: 6516797172325941388
-    TagComponent:
-      Tag: buildings_6_pack
-    TransformComponent:
-      Translation: [23.264637, -27.1361389, -506.157532]
-      Rotation: [0, -0, 0]
-      Scale: [342.240997, 325.262634, 245.059052]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 11859063027363205809
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/building/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface2_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface3_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface4_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface5_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface6_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/building/textures/standardSurface8_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-  - Entity: 6064633921243342758
-    TagComponent:
-      Tag: Entity_copy
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
     TransformComponent:
-      Translation: [46.4636726, -2.98017597, 14.336463]
-      Rotation: [-3.14153385, -0.624083161, -3.1415863]
-      Scale: [2.29999304, 2.70000005, 0.979451716]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Translation: [394.406952, 36.0981331, -15.4183016]
+      Rotation: [3.13979626, -1.54386234, -1.49447083]
+      Scale: [2.81729794, 1.83831346, 2.52311802]
+    TagComponent:
+      Tag: rail#3d_copy_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      ModelHandle: 10380524065091636454
-      ModelPath: models/stairs.glb
       AutoCalculate: true
-  - Entity: 1295158128682646344
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [89.7119217, 34.3363914, -15.4183016]
-      Rotation: [-1.96055889, -0.999783337, -2.69811749]
-      Scale: [2.81780839, 1.8383373, 2.52324486]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 3962667947486927982
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [428.76062, 30.1878853, 305.481506]
+      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
+      Scale: [0.999992847, 0.999961555, 0.999930501]
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 217210127212770073
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [160.559677, 34.3363914, -15.4183016]
-      Rotation: [-2.88122821, -1.07542729, -1.95391703]
-      Scale: [2.81780005, 1.83833647, 2.52321053]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 1996324266450563914
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 4537241321556691418
+      MaterialPaths:
+    TransformComponent:
+      Translation: [226.774567, 10.7833824, 119.315414]
+      Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
+      Scale: [7.04011488, 8.74738693, 19.0374851]
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-4.6624608, -3.7252903e-08, -11.7852259]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 11053255314081653602
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [195.275909, 34.3363914, -15.4183016]
-      Rotation: [-2.1531477, -1.10677683, -2.63240695]
-      Scale: [2.81779408, 1.83833039, 2.52320075]
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      IsColliding: false
+  - Entity: 11499449198343814881
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [440.960266, 32.5502625, 581.221497]
+      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
+      Scale: [0.999992847, 0.999961555, 0.999930501]
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 2562263663181998965
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [232.729095, 34.3363914, -15.4183016]
-      Rotation: [3.1402328, -1.54398417, -1.52254927]
-      Scale: [2.81773686, 1.83830583, 2.52309632]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 17079309488884899572
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [456.769592, 92.3261108, 838.863159]
+      Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
+      Scale: [0.999980867, 1.0000428, 1.00002789]
+    TagComponent:
+      Tag: anim_mode#4
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 5967097730784712040
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [269.359863, 34.3363914, -15.4183016]
-      Rotation: [3.14023447, -1.543975, -1.55569565]
-      Scale: [2.81769967, 1.83829546, 2.52312875]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 18441510849027507452
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [424.876801, 17.5073452, 22.4167747]
+      Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
+      Scale: [0.999992907, 1.36125314, 0.999930501]
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 7772933172421174645
-    TagComponent:
-      Tag: rail#3d_copy
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 16057276512691593213
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.endgamezone
     TransformComponent:
-      Translation: [304.469788, 34.3363914, -15.4183016]
-      Rotation: [3.14017534, -1.54393637, -1.68613875]
-      Scale: [2.81769824, 1.83826065, 2.52310705]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Translation: [-8.81565094, 14.7408161, -39.2663612]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Static Collider
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [19.1000004, 4.19999981, 16]
+      Offset: [8.60000038, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 8791625222606561716
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [340.353027, 34.3363914, -15.4183016]
-      Rotation: [3.14018416, -1.54396355, -1.52885783]
-      Scale: [2.81768346, 1.83830261, 2.52313828]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 193077798077705471
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [124.947281, 34.3363914, -15.4183016]
+      Rotation: [3.14005208, -1.54395568, -1.59915721]
+      Scale: [2.81767035, 1.83825684, 2.5230813]
+    TagComponent:
+      Tag: rail#3d
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
       Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
       AutoCalculate: true
-  - Entity: 8982711742810159238
-    TagComponent:
-      Tag: rail#3d_copy
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 10680602693042542455
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
     TransformComponent:
-      Translation: [369.179901, 34.9479713, -15.4183016]
-      Rotation: [3.14019299, -1.54396594, -1.55295646]
-      Scale: [2.81770563, 1.83824468, 2.52313542]
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
+    TagComponent:
+      Tag: Empty Entity
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 7094686869644715316
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 16650958288931697221
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
+    TransformComponent:
+      Translation: [-949.601318, 51.8037796, 331.382965]
+      Rotation: [2.86779284, 1.33893979, 2.90103149]
+      Scale: [20.9453735, 17.1169147, 17.6528664]
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-33.2911491, -0.000321388245, -6.43264723]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 1283719283719285
-    TagComponent:
-      Tag: Arena
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 5796298439135209667
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.cameracontroller
+          Fields:
+            - Name: LookSensitivity
+              Type: 1
+              Value: 6.19999981
+        - ClassName: ""
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+      nearClip: 0.100000001
+      farClip: 1000
+      verticalFov: 60
+      orthographicSize: 10
     TransformComponent:
-      Translation: [-1.52065945, -4.32776833, -35.4009895]
-      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
-      Scale: [0.99993974, 0.999890089, 0.999929249]
+      Translation: [271.402954, 150.256393, 438.487244]
+      Rotation: [-0.165000379, -2.62499404, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
+    IDComponent:
+      {}
+  - Entity: 6428169142076434776
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/arena.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [143, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [7, 233, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [3, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [90, 84, 77, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [91, 86, 85, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [102, 70, 58, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [83, 57, 47, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+    TransformComponent:
+      Translation: [411.734222, 21.1899738, 188.952682]
+      Rotation: [3.63230574e-05, -1.51887417, -1.12990801e-05]
+      Scale: [0.999889433, 1, 0.979455113]
+    TagComponent:
+      Tag: Entity
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-43.8236694, -46.1545258, -25.5901108]
-      ModelHandle: 11089864484401044150
-      ModelPath: models/arena.glb
       AutoCalculate: true
-  - Entity: 10653066213482940164
-    TagComponent:
-      Tag: ghost
-    TransformComponent:
-      Translation: [60.8389587, 88.6849136, 37.5509796]
-      Rotation: [0, -0, 0]
-      Scale: [26.4252186, 28.1715183, 26.7638988]
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      IsColliding: false
+  - Entity: 2241149956455545874
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [55.4628983, 34.3363914, -15.9756889]
+      Rotation: [-0.0299999993, 0.0617705695, -1.59763551]
+      Scale: [2.81781125, 1.83835185, 2.52317905]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.604161263, -0.379055023, -2.00118709]
-      Size: [1.20832253, 0.709288359, 2.00317812]
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 5150207293164281694
-    TagComponent:
-      Tag: SceneCamera
-    TransformComponent:
-      Translation: [-143.294968, 200.081146, -337.524475]
-      Rotation: [376.001373, -3188.74268, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: false
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 1000
-      Enabled: false
-      TargetTag: Player
-      Distance: 10
-      Yaw: 0
-      Pitch: 20
-      Sensitivity: 0.899999976
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
   - Entity: 1326311650816898569
-    TagComponent:
-      Tag: Player
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.playercontroller
+          Fields:
+            - Name: Gravity
+              Type: 1
+              Value: 9.80000019
+            - Name: JumpForce
+              Type: 1
+              Value: 32.5
+            - Name: MovementSpeed
+              Type: 1
+              Value: 11.8999996
+        - ClassName: chaineddecos.scripts.gamehud
+        - ClassName: chaineddecos.scripts.spawnzone
+        - ClassName: chaineddecos.scripts.playerfall
+    ModelComponent:
+      ModelPath: models/player_low.glb
+      ModelUUID: 6152005881347795059
+      MaterialPaths:
     TransformComponent:
       Translation: [-288.791779, 109.51931, 731.988647]
       Rotation: [0, -1.82386899, 0]
       Scale: [0.999901831, 1, 0.999901831]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/player_low.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: Player
+    IDComponent:
+      {}
     ShaderComponent:
       ShaderPath: ""
-      Enabled: true
+      ShaderUUID: 0
       Uniforms:
         []
+      Enabled: true
     ColliderComponent:
       Type: 3
-      Enabled: true
+      Size: [0.5, 0.5, 0.5]
       Offset: [0, 3.0937984, 0.307002902]
       Radius: 3.0917685
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
       AutoCalculate: true
-    RigidBodyComponent:
-      Mass: 91.3000031
-      Velocity: [0, 0, 0]
-      UseGravity: true
-      IsKinematic: false
-      IsGrounded: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+    PlayerComponent:
+      MovementSpeed: 15
+      JumpForce: 10
+      LookSensitivity: 0.899999976
     AudioComponent:
-      SoundHandle: 0
       SoundPath: audio/storegraphic-soft-wind-477404.mp3
       Volume: 0.561679065
       Pitch: 1
@@ -1961,1296 +544,426 @@ Entities:
       Position: [0, 0, 0]
       MinDistance: 1
       MaxDistance: 100
-    PlayerComponent:
-      MovementSpeed: 15
-      JumpForce: 10
+      IsPlaying: false
+  - Entity: 5150207293164281694
+    CameraComponent:
+      Primary: false
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      TargetEntityTag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
       LookSensitivity: 0.899999976
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.playercontroller
-          Fields:
-            - Name: Gravity
-              Type: 1
-              Value: 9.80000019
-            - Name: JumpForce
-              Type: 1
-              Value: 32.5
-            - Name: MovementSpeed
-              Type: 1
-              Value: 11.8999996
-        - ClassName: chaineddecos.scripts.gamehud
-        - ClassName: chaineddecos.scripts.spawnzone
-        - ClassName: chaineddecos.scripts.gamehud
-        - ClassName: chaineddecos.scripts.playerfall
-        - ClassName: chaineddecos.scripts.spawnzone
-        - ClassName: ""
-  - Entity: 2241149956455545874
-    TagComponent:
-      Tag: rail#3d_copy
+      nearClip: 0.100000001
+      farClip: 1000
+      verticalFov: 60
+      orthographicSize: 10
     TransformComponent:
-      Translation: [55.4628983, 34.3363914, -15.9756889]
-      Rotation: [-0.0299999993, 0.0617705695, -1.59763551]
-      Scale: [2.81781125, 1.83835185, 2.52317905]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 6428169142076434776
+      Translation: [-143.294968, 200.081146, -337.524475]
+      Rotation: [376.001373, -3188.74268, 0]
+      Scale: [1, 1, 1]
     TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [411.734222, 21.1899738, 188.952682]
-      Rotation: [3.63230574e-05, -1.51887417, -1.12990801e-05]
-      Scale: [0.999889433, 1, 0.979455113]
+      Tag: SceneCamera
+    IDComponent:
+      {}
+  - Entity: 10653066213482940164
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    ColliderComponent:
-      Type: 1
-      Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      ModelHandle: 10380524065091636454
-      ModelPath: models/stairs.glb
-      AutoCalculate: true
-  - Entity: 5796298439135209667
-    TagComponent:
-      Tag: Camera
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 9161924301726423648
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
     TransformComponent:
-      Translation: [-174.763077, 150.565948, 397.929962]
-      Rotation: [-336.858704, 1626.69153, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: true
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 1e+09
-      Enabled: true
-      TargetTag: Player
-      Distance: 23.5166721
-      Yaw: 255.5
-      Pitch: 0
-      Sensitivity: 0.899999976
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.cameracontroller
-          Fields:
-            - Name: LookSensitivity
-              Type: 1
-              Value: 6.19999981
-        - ClassName: ""
-  - Entity: 7094686869644715316
+      Translation: [60.8389587, 88.6849136, 37.5509796]
+      Rotation: [0, -0, 0]
+      Scale: [26.4252186, 28.1715183, 26.7638988]
     TagComponent:
-      Tag: arena_two
-    TransformComponent:
-      Translation: [-949.601318, 51.8037796, 331.382965]
-      Rotation: [2.86779284, 1.33893979, 2.90103149]
-      Scale: [20.9453735, 17.1169147, 17.6528664]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/container_ship/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Bridge_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Bridge_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Bridge_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Hull_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Hull_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Hull_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Containers_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Containers_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Containers_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Tag: ghost
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [1.20832253, 0.709288359, 2.00317812]
+      Offset: [-0.604161263, -0.379055023, -2.00118709]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-33.2911491, -0.000321388245, -6.43264723]
-      ModelHandle: 16079101999781436112
-      ModelPath: models/container_ship/scene.gltf
       AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
     AnimationComponent:
-      AnimationPath: models/container_ship/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 10680602693042542455
-    TagComponent:
-      Tag: Empty Entity
-    TransformComponent:
-      Translation: [-216.192169, -6.67572021e-06, 0]
-      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
-      Scale: [46.0502167, 47.251339, 53.7656708]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg
-            OverrideAlbedo: true
-            NormalMapPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-    AnimationComponent:
-      AnimationPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
+      GraphPath: ""
+      GraphUUID: 0
       BlendDuration: 0
-  - Entity: 193077798077705471
-    TagComponent:
-      Tag: rail#3d
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 1283719283719285
+    ModelComponent:
+      ModelPath: models/arena.glb
+      ModelUUID: 10755992412146045657
+      MaterialPaths:
     TransformComponent:
-      Translation: [124.947281, 34.3363914, -15.4183016]
-      Rotation: [3.14005208, -1.54395568, -1.59915721]
-      Scale: [2.81767035, 1.83825684, 2.5230813]
+      Translation: [-1.52065945, -4.32776833, -35.4009895]
+      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-43.8236694, -46.1545258, -25.5901108]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      IsColliding: false
+  - Entity: 8982711742810159238
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [369.179901, 34.9479713, -15.4183016]
+      Rotation: [3.14019299, -1.54396594, -1.55295646]
+      Scale: [2.81770563, 1.83824468, 2.52313542]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
       Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
       AutoCalculate: true
-  - Entity: 16057276512691593213
-    TagComponent:
-      Tag: Static Collider
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 8791625222606561716
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
     TransformComponent:
-      Translation: [-8.81565094, 14.7408161, -39.2663612]
-      Rotation: [0, -0, 0]
-      Scale: [1, 1, 1]
+      Translation: [340.353027, 34.3363914, -15.4183016]
+      Rotation: [3.14018416, -1.54396355, -1.52885783]
+      Scale: [2.81768346, 1.83830261, 2.52313828]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [8.60000038, 0, 0]
-      Size: [19.1000004, 4.19999981, 16]
       AutoCalculate: true
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.endgamezone
-  - Entity: 18441510849027507452
-    TagComponent:
-      Tag: anim_mode#2
-    TransformComponent:
-      Translation: [424.876801, 17.5073452, 22.4167747]
-      Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
-      Scale: [0.999992907, 1.36125314, 0.999930501]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 7772933172421174645
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [304.469788, 34.3363914, -15.4183016]
+      Rotation: [3.14017534, -1.54393637, -1.68613875]
+      Scale: [2.81769824, 1.83826065, 2.52310705]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 17079309488884899572
-    TagComponent:
-      Tag: anim_mode#4
-    TransformComponent:
-      Translation: [456.769592, 92.3261108, 838.863159]
-      Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
-      Scale: [0.999980867, 1.0000428, 1.00002789]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 5967097730784712040
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [269.359863, 34.3363914, -15.4183016]
+      Rotation: [3.14023447, -1.543975, -1.55569565]
+      Scale: [2.81769967, 1.83829546, 2.52312875]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 11499449198343814881
-    TagComponent:
-      Tag: anim_mode#3
-    TransformComponent:
-      Translation: [440.960266, 32.5502625, 581.221497]
-      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
-      Scale: [0.999992847, 0.999961555, 0.999930501]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 2562263663181998965
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [232.729095, 34.3363914, -15.4183016]
+      Rotation: [3.1402328, -1.54398417, -1.52254927]
+      Scale: [2.81773686, 1.83830583, 2.52309632]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 1996324266450563914
-    TagComponent:
-      Tag: wooden_bridge
-    TransformComponent:
-      Translation: [226.774567, 10.7833824, 119.315414]
-      Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
-      Scale: [7.04011488, 8.74738693, 19.0374851]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 11053255314081653602
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [195.275909, 34.3363914, -15.4183016]
+      Rotation: [-2.1531477, -1.10677683, -2.63240695]
+      Scale: [2.81779408, 1.83833039, 2.52320075]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-4.6624608, -3.7252903e-08, -11.7852259]
-      ModelHandle: 13239793232019240734
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
       AutoCalculate: true
-  - Entity: 3962667947486927982
-    TagComponent:
-      Tag: anim_mode
-    TransformComponent:
-      Translation: [428.76062, 30.1878853, 305.481506]
-      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
-      Scale: [0.999992847, 0.999961555, 0.999930501]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 217210127212770073
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [160.559677, 34.3363914, -15.4183016]
+      Rotation: [-2.88122821, -1.07542729, -1.95391703]
+      Scale: [2.81780005, 1.83833647, 2.52321053]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      ModelHandle: 5132017411153023944
-      ModelPath: models/bridge.glb
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 11859063027363205809
-    TagComponent:
-      Tag: rail#3d_copy_copy
-    TransformComponent:
-      Translation: [394.406952, 36.0981331, -15.4183016]
-      Rotation: [3.13979626, -1.54386234, -1.49447083]
-      Scale: [2.81729794, 1.83831346, 2.52311802]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 1295158128682646344
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [89.7119217, 34.3363914, -15.4183016]
+      Rotation: [-1.96055889, -0.999783337, -2.69811749]
+      Scale: [2.81780839, 1.8383373, 2.52324486]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
       Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
       AutoCalculate: true
-  - Entity: 7770000000000000002
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 6064633921243342758
+    ModelComponent:
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+    TransformComponent:
+      Translation: [46.4636726, -2.98017597, 14.336463]
+      Rotation: [-3.14153385, -0.624083161, -3.1415863]
+      Scale: [2.29999304, 2.70000005, 0.979451716]
     TagComponent:
-      Tag: Skill_Fireball
+      Tag: Entity_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      IsColliding: false
+  - Entity: 6516797172325941388
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
     TransformComponent:
-      Translation: [5, 5, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
+      Translation: [23.264637, -27.1361389, -506.157532]
+      Rotation: [0, -0, 0]
+      Scale: [342.240997, 325.262634, 245.059052]
+    TagComponent:
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
+  - Entity: 9393782307517162306
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/pilot/wizard_tower_animated.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.0613496937
-            Roughness: 0.932515323
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [35, 69, 23, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.245398775
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [28, 28, 28, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [26, 48, 4, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [6, 5, 4, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [204, 10, 6, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.220858902
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 9
-          Target: 0
-          Material:
-            AlbedoColor: [11, 74, 204, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.21472393
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 10
-          Target: 0
-          Material:
-            AlbedoColor: [204, 38, 138, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.171779141
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 11
-          Target: 0
-          Material:
-            AlbedoColor: [6, 204, 5, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.147239268
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 12
-          Target: 0
-          Material:
-            AlbedoColor: [56, 65, 135, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [9, 92, 104, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.337423325
-            Roughness: 0
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 13
-          Target: 0
-          Material:
-            AlbedoColor: [77, 150, 204, 10]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0.21472393
-            Roughness: 0.171779141
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 14
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 8378150816431493396
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-118.395287, 12.3910465, 826.530884]
+      Rotation: [0, -0, 0]
+      Scale: [673.435242, 411.5466, 440.887085]
+    TagComponent:
+      Tag: island_minigames
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 3
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-0.782608986, 0.0434782989, -0.950311005]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [2.16411662, 5.66642523, 3.99894166]
-      Radius: 10.4223652
       AutoCalculate: true
-    SkillComponent:
-      Branch: 1
-      Skill Name: Fireball
-      Required Level: 1
-      Is Unlocked: false
-      Cooldown: 0
-      Max Cooldown: 3
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: CHEngine.HeroSkill
-        - ClassName: chaineddecos.scripts.playercontroller
-  - Entity: 7770000000000000001
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      IsColliding: false
+  - Entity: 13419404670353191655
+    ModelComponent:
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 6503497834854385828
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-3565.1311, -45.4531631, 621.43158]
+      Rotation: [0.18592523, -1.13752759, -0.188373342]
+      Scale: [1.00000036, 0.999993503, 0.99999553]
     TagComponent:
-      Tag: RPG_Hero (Ghost)
+      Tag: toy_train_platform
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 5
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 10121800663724246293
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
     TransformComponent:
-      Translation: [0, 5, 0]
-      Rotation: [0, 0, 0]
+      Translation: [-710.380615, 254.511108, -1909.69739]
+      Rotation: [0, -0, 0]
       Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/ghost+with+sword+3d+model.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: "*2"
-            OverrideNormal: true
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+    TagComponent:
+      Tag: cathedral
+    IDComponent:
+      {}
     AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
+      GraphPath: ""
+      GraphUUID: 0
       BlendDuration: 0
-    RPGStatsComponent:
-      Level: 1
-      Experience: 0
-      Exp To Next: 100
-      Health: 100
-      Max Health: 100
-      Mana: 50
-      Max Mana: 50
-      Strength: 10
-      Intelligence: 10
-      Dexterity: 10
-      Gold: 500
-      Skill Points: 1
-    InventoryComponent:
-      Slots: 16
-      Current Weight: 0
-      Max Weight: 100
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: CHEngine.Hero
\ No newline at end of file
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/test_rpg_mp.chscene b/game/chaineddecos/assets/scenes/test_rpg_mp.chscene
new file mode 100644
index 000000000..3cdd538b4
--- /dev/null
+++ b/game/chaineddecos/assets/scenes/test_rpg_mp.chscene
@@ -0,0 +1,937 @@
+Scene: Untitled Scene
+SceneType: 0
+Background:
+  Mode: 2
+  Color: [0, 123, 0, 124]
+  TexturePath: ""
+Canvas:
+  ReferenceResolution: [1920, 1080]
+  ScaleMode: 0
+  MatchWidthOrHeight: 0.5
+EnvironmentPath: environments/new_environment.chenv
+Lighting:
+  Direction: [-0.389999986, 0.239999995, 0.870000005]
+  LightColor: [255, 255, 255, 255]
+  Ambient: 0.170000002
+Skybox:
+  TexturePath: skyboxes/qwantani_dusk_2_puresky_8k.hdr
+  Mode: 0
+  Exposure: 1.20000005
+  Brightness: 0.100000001
+  Contrast: 1.10000002
+Fog:
+  Enabled: false
+  Color: [158, 148, 148, 255]
+  Density: 0.100000001
+  Start: 6
+  End: 183
+DebugSettings:
+  DiagnosticMode: 0
+  DrawColliders: false
+  DrawHierarchy: false
+  DrawGrid: false
+  DrawSelection: true
+  DrawLights: true
+  DrawSpawnZones: true
+  CollisionWireframeMode: 0
+Entities:
+  - Entity: 12164036714517462499
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.spawnzone
+    TransformComponent:
+      Translation: [-288.791779, 110.5, 731.988647]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SpawnPoint
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [0.5, 0.5, 0.5]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+    SpawnComponent:
+      IsActive: true
+      IsCheckpoint: true
+      SpawnPoint: [0, 0, 0]
+      ZoneSize: [2, 2, 2]
+      RenderSpawnZoneInScene: true
+  - Entity: 7770000000000000001
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: Chained.Hero
+    ModelComponent:
+      ModelPath: models/ghost+with+sword+3d+model.glb
+      ModelUUID: 16359669984788571615
+      MaterialPaths:
+    TransformComponent:
+      Translation: [0, 5, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: RPG_Hero (Ghost)
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 7770000000000000002
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: Chained.HeroSkill
+        - ClassName: chaineddecos.scripts.playercontroller
+    ModelComponent:
+      ModelPath: models/pilot/wizard_tower_animated.glb
+      ModelUUID: 13486165926194482105
+      MaterialPaths:
+    TransformComponent:
+      Translation: [5, 5, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Skill_Fireball
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [0.5, 0.5, 0.5]
+      Offset: [2.16411662, 5.66642523, 3.99894166]
+      Radius: 10.4223652
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 11859063027363205809
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [394.406952, 36.0981331, -15.4183016]
+      Rotation: [3.13979626, -1.54386234, -1.49447083]
+      Scale: [2.81729794, 1.83831346, 2.52311802]
+    TagComponent:
+      Tag: rail#3d_copy_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 3962667947486927982
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [428.76062, 30.1878853, 305.481506]
+      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
+      Scale: [0.999992847, 0.999961555, 0.999930501]
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 1996324266450563914
+    ModelComponent:
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 4537241321556691418
+      MaterialPaths:
+    TransformComponent:
+      Translation: [226.774567, 10.7833824, 119.315414]
+      Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
+      Scale: [7.04011488, 8.74738693, 19.0374851]
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-4.6624608, -3.7252903e-08, -11.7852259]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      IsColliding: false
+  - Entity: 11499449198343814881
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [440.960266, 32.5502625, 581.221497]
+      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
+      Scale: [0.999992847, 0.999961555, 0.999930501]
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 17079309488884899572
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [456.769592, 92.3261108, 838.863159]
+      Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
+      Scale: [0.999980867, 1.0000428, 1.00002789]
+    TagComponent:
+      Tag: anim_mode#4
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 18441510849027507452
+    ModelComponent:
+      ModelPath: models/bridge.glb
+      ModelUUID: 9850403329235179652
+      MaterialPaths:
+    TransformComponent:
+      Translation: [424.876801, 17.5073452, 22.4167747]
+      Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
+      Scale: [0.999992907, 1.36125314, 0.999930501]
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-9.29998016, -130.776825, -0.718267083]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 16057276512691593213
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.endgamezone
+    TransformComponent:
+      Translation: [-8.81565094, 14.7408161, -39.2663612]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Static Collider
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [19.1000004, 4.19999981, 16]
+      Offset: [8.60000038, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 193077798077705471
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [124.947281, 34.3363914, -15.4183016]
+      Rotation: [3.14005208, -1.54395568, -1.59915721]
+      Scale: [2.81767035, 1.83825684, 2.5230813]
+    TagComponent:
+      Tag: rail#3d
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 10680602693042542455
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 6922423336282928323
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
+    TransformComponent:
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
+    TagComponent:
+      Tag: Empty Entity
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 7094686869644715316
+    ModelComponent:
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 16650958288931697221
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
+    TransformComponent:
+      Translation: [-949.601318, 51.8037796, 331.382965]
+      Rotation: [2.86779284, 1.33893979, 2.90103149]
+      Scale: [20.9453735, 17.1169147, 17.6528664]
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-33.2911491, -0.000321388245, -6.43264723]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 5796298439135209667
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.cameracontroller
+          Fields:
+            - Name: LookSensitivity
+              Type: 1
+              Value: 6.19999981
+        - ClassName: ""
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      Tag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+      nearClip: 0.100000001
+      farClip: 1000
+      verticalFov: 60
+      orthographicSize: 10
+    TransformComponent:
+      Translation: [271.402954, 150.256393, 438.487244]
+      Rotation: [-0.165000379, -2.62499404, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
+    IDComponent:
+      {}
+  - Entity: 6428169142076434776
+    ModelComponent:
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+    TransformComponent:
+      Translation: [411.734222, 21.1899738, 188.952682]
+      Rotation: [3.63230574e-05, -1.51887417, -1.12990801e-05]
+      Scale: [0.999889433, 1, 0.979455113]
+    TagComponent:
+      Tag: Entity
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      IsColliding: false
+  - Entity: 2241149956455545874
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [55.4628983, 34.3363914, -15.9756889]
+      Rotation: [-0.0299999993, 0.0617705695, -1.59763551]
+      Scale: [2.81781125, 1.83835185, 2.52317905]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 5150207293164281694
+    CameraComponent:
+      Primary: false
+      FixedAspectRatio: false
+      IsOrbitCamera: false
+      Tag: Player
+      OrbitDistance: 10
+      OrbitYaw: 0
+      OrbitPitch: 20
+      LookSensitivity: 0.899999976
+      nearClip: 0.100000001
+      farClip: 1000
+      verticalFov: 60
+      orthographicSize: 10
+    TransformComponent:
+      Translation: [-143.294968, 200.081146, -337.524475]
+      Rotation: [376.001373, -3188.74268, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SceneCamera
+    IDComponent:
+      {}
+  - Entity: 10653066213482940164
+    ModelComponent:
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 9161924301726423648
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
+    TransformComponent:
+      Translation: [60.8389587, 88.6849136, 37.5509796]
+      Rotation: [0, -0, 0]
+      Scale: [26.4252186, 28.1715183, 26.7638988]
+    TagComponent:
+      Tag: ghost
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [1.20832253, 0.709288359, 2.00317812]
+      Offset: [-0.604161263, -0.379055023, -2.00118709]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 1283719283719285
+    ModelComponent:
+      ModelPath: models/arena.glb
+      ModelUUID: 10755992412146045657
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-1.52065945, -4.32776833, -35.4009895]
+      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-43.8236694, -46.1545258, -25.5901108]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      IsColliding: false
+  - Entity: 8982711742810159238
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [369.179901, 34.9479713, -15.4183016]
+      Rotation: [3.14019299, -1.54396594, -1.55295646]
+      Scale: [2.81770563, 1.83824468, 2.52313542]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 8791625222606561716
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [340.353027, 34.3363914, -15.4183016]
+      Rotation: [3.14018416, -1.54396355, -1.52885783]
+      Scale: [2.81768346, 1.83830261, 2.52313828]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 7772933172421174645
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [304.469788, 34.3363914, -15.4183016]
+      Rotation: [3.14017534, -1.54393637, -1.68613875]
+      Scale: [2.81769824, 1.83826065, 2.52310705]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 5967097730784712040
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [269.359863, 34.3363914, -15.4183016]
+      Rotation: [3.14023447, -1.543975, -1.55569565]
+      Scale: [2.81769967, 1.83829546, 2.52312875]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 2562263663181998965
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [232.729095, 34.3363914, -15.4183016]
+      Rotation: [3.1402328, -1.54398417, -1.52254927]
+      Scale: [2.81773686, 1.83830583, 2.52309632]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 11053255314081653602
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [195.275909, 34.3363914, -15.4183016]
+      Rotation: [-2.1531477, -1.10677683, -2.63240695]
+      Scale: [2.81779408, 1.83833039, 2.52320075]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 217210127212770073
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [160.559677, 34.3363914, -15.4183016]
+      Rotation: [-2.88122821, -1.07542729, -1.95391703]
+      Scale: [2.81780005, 1.83833647, 2.52321053]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 1295158128682646344
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 13349678835275148188
+      MaterialPaths:
+    TransformComponent:
+      Translation: [89.7119217, 34.3363914, -15.4183016]
+      Rotation: [-1.96055889, -0.999783337, -2.69811749]
+      Scale: [2.81780839, 1.8383373, 2.52324486]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 0
+      Size: [2.48870611, 13.512085, 4.18936396]
+      Offset: [-1.23305595, -6.83498478, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: ""
+      IsColliding: false
+  - Entity: 6064633921243342758
+    ModelComponent:
+      ModelPath: models/stairs.glb
+      ModelUUID: 2777666302803713364
+      MaterialPaths:
+    TransformComponent:
+      Translation: [46.4636726, -2.98017597, 14.336463]
+      Rotation: [-3.14153385, -0.624083161, -3.1415863]
+      Scale: [2.29999304, 2.70000005, 0.979451716]
+    TagComponent:
+      Tag: Entity_copy
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      IsColliding: false
+  - Entity: 6516797172325941388
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
+    TransformComponent:
+      Translation: [23.264637, -27.1361389, -506.157532]
+      Rotation: [0, -0, 0]
+      Scale: [342.240997, 325.262634, 245.059052]
+    TagComponent:
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
+  - Entity: 9393782307517162306
+    ModelComponent:
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 8378150816431493396
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-118.395287, 12.3910465, 826.530884]
+      Rotation: [0, -0, 0]
+      Scale: [673.435242, 411.5466, 440.887085]
+    TagComponent:
+      Tag: island_minigames
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 1
+      Size: [0.5, 0.5, 0.5]
+      Offset: [-0.782608986, 0.0434782989, -0.950311005]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      IsColliding: false
+  - Entity: 13419404670353191655
+    ModelComponent:
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 6503497834854385828
+      MaterialPaths:
+    TransformComponent:
+      Translation: [-3565.1311, -45.4531631, 621.43158]
+      Rotation: [0.18592523, -1.13752759, -0.188373342]
+      Scale: [1.00000036, 0.999993503, 0.99999553]
+    TagComponent:
+      Tag: toy_train_platform
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 5
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 10121800663724246293
+    ModelComponent:
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 891151930191489760
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
+    TransformComponent:
+      Translation: [-710.380615, 254.511108, -1909.69739]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: cathedral
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/title_image.chscene b/game/chaineddecos/assets/scenes/title_image.chscene
deleted file mode 100644
index e8a6f1487..000000000
--- a/game/chaineddecos/assets/scenes/title_image.chscene
+++ /dev/null
@@ -1,230 +0,0 @@
-Scene: Untitled
-Background:
-  Mode: 0
-  Color: [0, 0, 0, 255]
-  TexturePath: ""
-EnvironmentPath: ""
-Canvas:
-  ReferenceResolution: [1920, 1080]
-  ScaleMode: 1
-  MatchWidthOrHeight: 0.5
-Entities:
-  - Entity: 14979953434997238026
-    TagComponent:
-      ? Tag: Image
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.50999999, 0.5]
-          AnchorMax: [0.810000002, 0.670000017]
-          OffsetMin: [-525, -329]
-          OffsetMax: [-425, -289]
-          Pivot: [0.5, 1]
-          Rotation: 0
-          Scale: [1, 1]
-    ImageControl:
-      ? TexturePath: D:\gitnext\Chained Decos\game\chaineddecos\assets\materials\unnamed_1.jpg
-        Size: [411.799988, 204.300003]
-        TintColor: [248, 248, 248, 255]
-        BorderColor: [169, 157, 157, 0]
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 9.19999981
-  - Entity: 13765047633248252361
-    TagComponent:
-      ? Tag: start_game_menu_options
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-58, -55]
-          OffsetMax: [62, -15]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes\video_scene.chscene
-      Triggered: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-    ButtonControl:
-      ? Label: Options
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
-  - Entity: 11188570711873615005
-    TagComponent:
-      ? Tag: start_button_start
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-60, -120]
-          OffsetMax: [60, -80]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes\start_menu.chscene
-      Triggered: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-    ButtonControl:
-      ? Label: Start
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
-  - Entity: 12750009872668354234
-    TagComponent:
-      ? Tag: start_button_exit
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-60, 60]
-          OffsetMax: [60, 100]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    ButtonControl:
-      ? Label: Exit
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.ExitScript
-  - Entity: 15500646445384167357
-    TagComponent:
-      ? Tag: start_game_info
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.100000001, 0.850000024]
-          AnchorMax: [0.100000001, 0.850000024]
-          OffsetMin: [-66, 0]
-          OffsetMax: [234, 30]
-          Pivot: [0, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    LabelControl:
-      ? Text: The game is currently in development.
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-  - Entity: 6090748651460201744
-    TagComponent:
-      ? Tag: start_game_info_2
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.100000001, 0.899999976]
-          AnchorMax: [0.100000001, 0.899999976]
-          OffsetMin: [-68, 4]
-          OffsetMax: [282, 34]
-          Pivot: [0, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    LabelControl:
-      ? Text: Some functionality or aspects can be changed in final version.
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-  - Entity: 15051911593141375302
-    TagComponent:
-      ? Tag: start_menu_game_info
-    TransformComponent:
-      ? Translation: [0, 0, 0]
-        Rotation: [0, 0, 0]
-        Scale: [1, 1, 1]
-    ControlComponent:
-      ? ZOrder: 0
-        IsActive: true
-        RectTransform:
-          AnchorMin: [0.5, 0.5]
-          AnchorMax: [0.5, 0.5]
-          OffsetMin: [-60, 0]
-          OffsetMax: [60, 40]
-          Pivot: [0.5, 0.5]
-          Rotation: 0
-          Scale: [1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes\info_scene.chscene
-      Triggered: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SceneScript
-    ButtonControl:
-      ? Label: Info
-        TextStyle:
-          FontSize: 18
-          TextColor: [255, 255, 255, 255]
-          HAlign: 1
-          VAlign: 1
-        UIStyle:
-          BGColor: [40, 40, 40, 255]
-          HoverColor: [60, 60, 60, 255]
-          PressedColor: [30, 30, 30, 255]
-          Rounding: 4
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/untitled.chscene b/game/chaineddecos/assets/scenes/untitled.chscene
deleted file mode 100644
index 349a1127f..000000000
--- a/game/chaineddecos/assets/scenes/untitled.chscene
+++ /dev/null
@@ -1,14 +0,0 @@
-Scene: Untitled
-Skybox:
-  TexturePath: ""
-  Exposure: 1
-  Brightness: 0
-  Contrast: 1
-Entities:
-  - Entity: 6450974704076442874
-    TagComponent:
-      Tag: Default Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/untitled1.chscene b/game/chaineddecos/assets/scenes/untitled1.chscene
deleted file mode 100644
index 9c5de9246..000000000
--- a/game/chaineddecos/assets/scenes/untitled1.chscene
+++ /dev/null
@@ -1,184 +0,0 @@
-Scene: Untitled Scene
-Background:
-  Mode: 2
-  Color: [0, 123, 0, 124]
-  TexturePath: ""
-Canvas:
-  ReferenceResolution: [1920, 1080]
-  ScaleMode: 0
-  MatchWidthOrHeight: 0.5
-EnvironmentPath: engine/game/chaineddecos/assets/environments/new_environment.chenv
-Lighting:
-  Direction: [-1, -1, -1]
-  LightColor: [255, 255, 255, 255]
-  Ambient: 0.300000012
-Skybox:
-  TexturePath: skyboxes/Starry night preview4.png
-  Mode: 0
-  Exposure: 1
-  Brightness: 0
-  Contrast: 1
-Fog:
-  Enabled: true
-  Color: [130, 130, 130, 255]
-  Density: 0.00999999978
-  Start: 10
-  End: 100
-DebugSettings:
-  DiagnosticMode: 0
-  DrawColliders: false
-  DrawHierarchy: false
-  DrawCollisionModelBox: false
-  DrawGrid: false
-  DrawSelection: true
-  DrawLights: true
-  DrawSpawnZones: true
-Entities:
-  - Entity: 1283719283719285
-    TagComponent:
-      Tag: Arena
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/arena.glb
-      Materials:
-        []
-    ColliderComponent:
-      Type: 257
-      Enabled: true
-      Offset: [-43.8236694, -68.8881912, -46.1545258]
-      Size: [86.6819458, 94.478302, 89.0095215]
-      Radius: 0.5
-      Height: 2
-      ModelHandle: 0
-      ModelPath: models/arena.glb
-      AutoCalculate: true
-  - Entity: 1283719283719287
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [28.8506241, 16.7000008, 27.7648582]
-      Rotation: [0, -0, 0]
-      Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: ""
-      Materials:
-        []
-    SpawnComponent:
-      SpawnZoneSize: [1, 1, 1]
-      SpawnTextureHandle: 0
-      SpawnTexturePath: boxes/playerspawntexture.png
-      RenderSpawnZoneInScene: true
-  - Entity: 1326311650816898569
-    TagComponent:
-      Tag: Player
-    TransformComponent:
-      Translation: [0.741465449, 5.18291473, 100.064888]
-      Rotation: [0, -0, 0]
-      Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/city/after_the_rain..._-_vr__sound.glb
-      Materials:
-        []
-    ColliderComponent:
-      Type: 258
-      Enabled: true
-      Offset: [0, 0, -0.293091357]
-      Size: [2.48000002, 5.67999983, 7.4000001]
-      Radius: 0.25
-      Height: 2
-      ModelHandle: 0
-      ModelPath: models/player_low.glb
-      AutoCalculate: true
-    RigidBodyComponent:
-      Mass: 2.9000001
-      UseGravity: true
-      IsKinematic: false
-    PlayerComponent:
-      MovementSpeed: 15
-      LookSensitivity: 0.899999976
-      JumpForce: 10
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.gamehud
-        - ClassName: chaineddecos.scripts.playercontroller
-        - ClassName: chaineddecos.scripts.playerfall
-        - ClassName: chaineddecos.scripts.spawnzone
-        - ClassName: chaineddecos.scripts.spawnzone
-  - Entity: 1283719283719289
-    TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-  - Entity: 6428169142076434776
-    TagComponent:
-      Tag: stairsaw
-    TransformComponent:
-      Translation: [-50.6539459, 0.631593704, 10.243227]
-      Rotation: [-3.14159083, 1.55226898, -3.14159083]
-      Scale: [0.999882996, 1, 0.97942549]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        []
-    ColliderComponent:
-      Type: 257
-      Enabled: true
-      Offset: [-17.087841, -4.29592609, -11.3028545]
-      Size: [34.1756821, 8.59185219, 22.6057091]
-      Radius: 0.5
-      Height: 2
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      AutoCalculate: true
-  - Entity: 7935884460455885952
-    TagComponent:
-      Tag: Camera
-    TransformComponent:
-      Translation: [-75.8884048, 25.9009342, 87.4832993]
-      Rotation: [-11.0000238, -57.3987541, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: true
-      FixedAspectRatio: false
-      IsOrbitCamera: true
-      OrbitDistance: 32
-      OrbitYaw: 1.80052602
-      OrbitPitch: 13.4000015
-      LookSensitivity: 0.899999976
-      TargetEntityTag: Player
-      ProjectionType: 0
-      PerspectiveFOV: 1.04719758
-      PerspectiveNear: 0.100000001
-      PerspectiveFar: 1000
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.cameracontroller
-  - Entity: 14689743047800951365
-    TagComponent:
-      Tag: SceneCamera
-    TransformComponent:
-      Translation: [42.2146225, 28.3946991, 76.4796829]
-      Rotation: [-30.3999996, 66.4000092, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: true
-      FixedAspectRatio: false
-      IsOrbitCamera: false
-      OrbitDistance: 10
-      OrbitYaw: 0
-      OrbitPitch: 20
-      LookSensitivity: 0.899999976
-      TargetEntityTag: Player
-      ProjectionType: 0
-      PerspectiveFOV: 1.04719758
-      PerspectiveNear: 0.00999999978
-      PerspectiveFar: 1000
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/untitled100.chscene b/game/chaineddecos/assets/scenes/untitled100.chscene
index 891f680e1..5e9618eeb 100644
--- a/game/chaineddecos/assets/scenes/untitled100.chscene
+++ b/game/chaineddecos/assets/scenes/untitled100.chscene
@@ -1,4 +1,5 @@
 Scene: Untitled Scene
+SceneType: 0
 Background:
   Mode: 2
   Color: [0, 123, 0, 124]
@@ -9,2203 +10,1195 @@ Canvas:
   MatchWidthOrHeight: 0.5
 EnvironmentPath: environments/new_environment.chenv
 Lighting:
-  Direction: [0, 0, 0]
+  Direction: [1, -0.680000007, 0.25]
   LightColor: [255, 255, 255, 255]
-  Ambient: 0.0850000009
+  Ambient: 0.185000002
 Skybox:
-  TexturePath: skyboxes/qwantani_dusk_2_puresky_8k.hdr
+  TexturePath: skyboxes/citrus_orchard_road_puresky_8k.hdr
   Mode: 0
-  Exposure: 1.00999999
-  Brightness: -0.699999988
-  Contrast: 0.449999988
+  Exposure: 1.69000006
+  Brightness: 0.0299999993
+  Contrast: 0.270000011
 Fog:
   Enabled: false
   Color: [255, 255, 255, 255]
-  Density: 0.100000001
-  Start: 180
-  End: 174
+  Density: 0.130700007
+  Start: 0
+  End: 2001
+Grid:
+  Spacing: 1
+  SecondarySpacing: 10
+  Color:
+    r: 1
+    g: 1
+    b: 1
+    a: 0.400000006
+  FadeStart: 0
+  FadeEnd: 8000
+  PlaneSize: 15000
 DebugSettings:
   DiagnosticMode: 0
-  DrawColliders: true
+  DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: true
-  DrawGrid: true
+  DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 5204933504822756341
+  - Entity: 11590016068158172203
+    ModelComponent:
+      ModelPath: primitives/Hemisphere.chmesh
+      ModelUUID: 0
+      MaterialPaths:
+        - primitives/Hemisphere_material_0.chmat
+    TransformComponent:
+      Translation: [0.267148972, 121.029785, 0]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
     TagComponent:
-      Tag: Empty Entity
+      Tag: Hemisphere
+    PrimitiveComponent:
+      Type: 8
+      Radius: 4.11000013
+      InnerRadius: 0.0500000007
+      Height: 2
+      Slices: 128
+      Stacks: 128
+      Dimensions: [3.29999995, 4, 1]
+      MeshPath: primitives/Hemisphere.chmesh
+    IDComponent:
+      {}
+  - Entity: 12007264173134627407
     TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
+      Translation: [-6.22665596, 53.8681755, -2.61718202]
+      Rotation: [0, -0, 0]
       Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: ""
-      Materials:
-        []
-  - Entity: 11859063027363205809
     TagComponent:
-      Tag: rail#3d_copy_copy
+      Tag: Spot Light
+    IDComponent:
+      {}
+    LightComponent:
+      Type: 1
+      LightColor: [69, 90, 164, 255]
+      Intensity: 1020
+      Radius: 256
+      InnerCutoff: 46.5
+      OuterCutoff: 37.5
+      Shadows: true
+  - Entity: 1445999422438368680
+    ModelComponent:
+      ModelPath: models/tavern/the_thankful_glory_-_fantasy_tavern/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_52.chmat
+        - models/tavern/the_thankful_glory_-_fantasy_tavern/scene_material_54.chmat
     TransformComponent:
-      Translation: [394.406952, 36.0981331, -15.4183016]
-      Rotation: [3.13979626, -1.54386234, -1.49447083]
-      Scale: [2.81729794, 1.83831346, 2.52311802]
+      Translation: [-4424.86621, 20.0999374, -674.094482]
+      Rotation: [0, 0.918334186, 0]
+      Scale: [0.999996781, 1, 0.999996781]
+    TagComponent:
+      Tag: Island_copy
+    IDComponent:
+      {}
+  - Entity: 12670658928354375236
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-118.395287, 12.3910465, 826.530884]
+      Rotation: [0, -0, 0]
+      Scale: [673.435242, 411.5466, 440.887085]
+    TagComponent:
+      Tag: island_minigames
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [1054.073, 411.547333, 837.959717]
+      Offset: [0, 0, 0]
+      Radius: 527.036499
+      Height: 411.547333
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 3962667947486927982
-    TagComponent:
-      Tag: anim_mode
-    TransformComponent:
-      Translation: [428.76062, 30.1878853, 305.481506]
-      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
-      Scale: [0.999992847, 0.999961555, 0.999930501]
+      UseFastBuildQuality: true
+      ModelPath: models/minigames/hub_for_minigames_server.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 20
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 13171886846783738899
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/building/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/building/scene_material_0.chmat
+        - models/building/scene_material_1.chmat
+        - models/building/scene_material_2.chmat
+        - models/building/scene_material_3.chmat
+        - models/building/scene_material_4.chmat
+        - models/building/scene_material_5.chmat
+    TransformComponent:
+      Translation: [73.4315643, -5.35116577, -506.157532]
+      Rotation: [0, -0, 0]
+      Scale: [342.240997, 325.262634, 245.059052]
+    TagComponent:
+      Tag: buildings_6_pack
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [1579.57007, 532.170349, 946.736023]
+      Offset: [0, 0, 0]
+      Radius: 789.785034
+      Height: 532.170349
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      Size: [20.2556896, 277.196045, 14.2480259]
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 1996324266450563914
-    TagComponent:
-      Tag: wooden_bridge
-    TransformComponent:
-      Translation: [226.774567, 19.4414101, 119.315414]
-      Rotation: [-6.31075409e-07, 1.2072463, -6.78071274e-07]
-      Scale: [7.04011488, 8.74738693, 19.0374851]
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 5942165560960017343
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: "*1"
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [46.675705, 28.0602856, 14.3911505]
+      Rotation: [-3.14158368, -1.12095582, -3.14159083]
+      Scale: [2.29999614, 2.70000005, 0.979452133]
+    TagComponent:
+      Tag: Entity_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 1
+      Type: 3
+      Size: [34.1756821, 8.59185219, 22.6057091]
+      Offset: [0, -9.53674316e-07, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-4.6624608, -3.7252903e-08, -11.7852259]
-      ModelHandle: 21545
-      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
       AutoCalculate: false
-  - Entity: 11499449198343814881
-    TagComponent:
-      Tag: anim_mode#3
-    TransformComponent:
-      Translation: [440.960266, 32.5502625, 581.221497]
-      Rotation: [-1.59236383, 0.0545778051, 0.0118374834]
-      Scale: [0.999992847, 0.999961555, 0.999930501]
+      UseFastBuildQuality: true
+      ModelPath: models/stairs.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 16917633601931914969
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [88.9189606, 40.8054619, -8.52000618]
+      Rotation: [-3.14159083, 1.42225266, -3.14159083]
+      Scale: [2.81781149, 1.8383373, 2.5232451]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.3900001, 6.01000023, 12.9899998]
+      Offset: [2.26999998, -0.0299999993, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      Size: [20.2556896, 277.196045, 14.2480259]
       AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 17079309488884899572
-    TagComponent:
-      Tag: anim_mode#4
-    TransformComponent:
-      Translation: [456.769592, 92.3261108, 838.863159]
-      Rotation: [-1.9903754, 0.0549046658, -0.0102301203]
-      Scale: [0.999980867, 1.0000428, 1.00002789]
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 1
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 6409535225796841648
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [160.559677, 34.3363914, -15.4183016]
+      Rotation: [-3.1415906, 1.3848865, -3.1415906]
+      Scale: [2.81779981, 1.83833647, 2.52321267]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      Size: [20.2556896, 277.196045, 14.2480259]
-      AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 18441510849027507452
-    TagComponent:
-      Tag: anim_mode#2
-    TransformComponent:
-      Translation: [424.876801, 17.5073452, 22.4167747]
-      Rotation: [-1.59236383, 0.0545779206, 0.0118380217]
-      Scale: [0.999992907, 1.36125314, 0.999930501]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 7990664798689689340
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/bridge.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [195.275909, 34.3363914, -15.4183016]
+      Rotation: [-5.00722963e-05, 1.52510715, -5.01285613e-05]
+      Scale: [2.81781769, 1.83833349, 2.52321935]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-9.29998016, -130.776825, -0.718267083]
-      Size: [20.2556896, 277.196045, 14.2480259]
-      AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: ""
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 16057276512691593213
-    TagComponent:
-      Tag: Static Collider
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 2244089917022460831
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
     TransformComponent:
-      Translation: [-8.81565094, 14.7408161, -39.2663612]
-      Rotation: [0, -0, 0]
-      Scale: [1, 1, 1]
+      Translation: [232.729095, 34.3363914, -15.4183016]
+      Rotation: [-3.14158916, 1.47876322, -3.14158916]
+      Scale: [2.81773591, 1.83830583, 2.52309585]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [8.60000038, 0, 0]
-      Size: [19.1000004, 4.19999981, 16]
-      AutoCalculate: true
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.endgamezone
-  - Entity: 193077798077705471
-    TagComponent:
-      Tag: rail#3d
-    TransformComponent:
-      Translation: [124.947281, 34.3363914, -15.4183016]
-      Rotation: [3.14005208, -1.54395568, -1.59915721]
-      Scale: [2.81767035, 1.83825684, 2.5230813]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 23995614138653126
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [269.359863, 34.3363914, -15.4183016]
+      Rotation: [-3.14157701, 1.51824713, -3.14157701]
+      Scale: [2.81769633, 1.83829546, 2.52312613]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 9172781978797212155
-    TagComponent:
-      Tag: rail#3d
-    TransformComponent:
-      Translation: [224.289001, -18.0577698, -348.917694]
-      Rotation: [0.00018337823, 0.0685081109, -4.0567109e-05]
-      Scale: [417.830475, 336.553497, 246.064026]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 14342064054129842611
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/building/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/building/textures/standardSurface2_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/building/textures/standardSurface3_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/building/textures/standardSurface4_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/building/textures/standardSurface5_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/building/textures/standardSurface6_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/building/textures/standardSurface8_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.600000024
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [304.469788, 34.3363914, -15.4183016]
+      Rotation: [-3.14159083, 1.48598051, -3.14159083]
+      Scale: [2.81769323, 1.83826065, 2.52310586]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.470180094, -1.86820998e-05, -2.96693921]
-      Size: [4.61537361, 1.63612497, 3.86329746]
-      AutoCalculate: true
-  - Entity: 7094686869644715316
-    TagComponent:
-      Tag: arena_two
-    TransformComponent:
-      Translation: [-949.601318, 51.8037796, 331.382965]
-      Rotation: [2.86779284, 1.33893979, 2.90103149]
-      Scale: [20.9453735, 17.1169147, 17.6528664]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 1339661101954584875
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/container_ship/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Bridge_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Bridge_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Bridge_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [255, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Hull_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Hull_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Hull_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/container_ship/textures/Containers_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: models/container_ship/textures/Containers_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/container_ship/textures/Containers_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [340.353027, 34.3363914, -15.4183016]
+      Rotation: [-2.64324285e-06, 1.51514268, -2.64865866e-06]
+      Scale: [2.8176837, 1.83830261, 2.52313876]
+    TagComponent:
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-33.2911491, -0.000321388245, -6.43264723]
-      Size: [91.2529068, 16.8988457, 12.8652897]
-      AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: models/container_ship/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 5796298439135209667
-    TagComponent:
-      Tag: Camera
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 5877408798251489891
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
     TransformComponent:
-      Translation: [-11.533452, -177.509445, -76.3437347]
-      Rotation: [3.01941967, 0.0261799432, 3.14159274]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: true
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 1000
-      Enabled: true
-      TargetTag: Player
-      Distance: 26
-      Yaw: 178.5
-      Pitch: -7
-      Sensitivity: 0.899999976
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.cameracontroller
-  - Entity: 6428169142076434776
+      Translation: [369.179901, 34.9479713, -15.4183016]
+      Rotation: [-3.14159083, 1.49346161, -3.14159083]
+      Scale: [2.81770754, 1.83824468, 2.52313972]
     TagComponent:
-      Tag: Entity
-    TransformComponent:
-      Translation: [411.734222, 21.1899738, 188.952682]
-      Rotation: [3.63230574e-05, -1.51887417, -1.12990801e-05]
-      Scale: [0.999889433, 1, 0.979455113]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      Size: [34.1756821, 8.59185219, 22.6057091]
-      AutoCalculate: true
-  - Entity: 2241149956455545874
-    TagComponent:
-      Tag: rail#3d_copy
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 15487534608313138260
+    ModelComponent:
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
     TransformComponent:
-      Translation: [55.4628983, 34.3363914, -15.9756889]
-      Rotation: [-0.0299999993, 0.0617705695, -1.59763551]
-      Scale: [2.81781125, 1.83835185, 2.52317905]
+      Translation: [-1.52065945, 36.6722336, -35.4009895]
+      Rotation: [-0.0117486976, 0.0380410925, -0.00385736162]
+      Scale: [0.99993974, 0.999890089, 0.999929249]
+    TagComponent:
+      Tag: Arena
+    IDComponent:
+      {}
+    ColliderComponent:
+      Type: 3
+      Size: [86.6767273, 88.9997406, 94.4716187]
+      Offset: [0, 0, 0]
+      Radius: 47.2358093
+      Height: 88.9997406
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: true
+      UseFastBuildQuality: true
+      ModelPath: models/arena.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 11748288247218652087
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/mystery_skulls_ghost_lewis/scene_material_0.chmat
+    TransformComponent:
+      Translation: [101.32692, 103.205635, 4.72679806]
+      Rotation: [0.0431710109, -0.0900942832, 0.0843905658]
+      Scale: [26.4252377, 28.1725788, 26.7647877]
+    TagComponent:
+      Tag: ghost
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [1.71000004, 2.50999999, 0.5]
+      Offset: [-0.604161263, 27.9200001, -2.00118709]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 1326311650816898569
-    TagComponent:
-      Tag: Player
+      UseFastBuildQuality: true
+      ModelPath: models/mystery_skulls_ghost_lewis/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 1492113218834048066
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
     TransformComponent:
-      Translation: [-12.2089796, -181.324051, -50.5463715]
-      Rotation: [0, -1.59697628, 0]
-      Scale: [0.999942005, 1, 0.999942005]
+      Translation: [-216.192169, -6.67572021e-06, 0]
+      Rotation: [0.0617936067, 0.0883244723, -0.0563300997]
+      Scale: [46.0502167, 47.251339, 53.7656708]
+    TagComponent:
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 6316529136225387743
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/player_low.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/skeleton/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/skeleton/scene_material_0.chmat
+        - models/skeleton/scene_material_1.chmat
+        - models/skeleton/scene_material_2.chmat
+    TransformComponent:
+      Translation: [97.914856, 73.6343231, 47.0727844]
+      Rotation: [0, -0, 0]
+      Scale: [0.999903202, 1, 0.999903202]
+    TagComponent:
+      Tag: Player
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.gamehud
+        - ClassName: chaineddecos.scripts.debuginfoscript
+        - ClassName: chaineddecos.scripts.playercontroller
+        - ClassName: chaineddecos.scripts.cameracontroller
     ShaderComponent:
-      ShaderPath: ""
-      Enabled: true
+      ShaderPath: shaders/screen_falling.chshader
+      ShaderUUID: 14962409001541335283
       Uniforms:
-        []
+        - Name: uIntensity
+          Value: 7.30000019
+        - Name: color
+          Value: 6.30000019
+      Enabled: false
     ColliderComponent:
       Type: 0
+      Size: [2.88000011, 6.32000017, 1.80999994]
+      Offset: [0, 2.70000005, 0]
+      Radius: 1.92200005
+      Height: 4.5
+      Friction: 0.5
+      Restitution: 0.419999987
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.0896225, 0.00202974328, -0.293091357]
-      Size: [2.179245, 6.18353701, 1.20018852]
       AutoCalculate: true
-    RigidBodyComponent:
-      Mass: 91.3000031
-      Velocity: [0, -38.7638206, 0]
-      UseGravity: true
-      IsKinematic: false
-      IsGrounded: false
-    AudioComponent:
-      SoundHandle: 10242276551923400533
-      SoundPath: audio/storegraphic-soft-wind-477404.mp3
-      Volume: 1
-      Pitch: 1
-      Loop: true
-      PlayOnStart: false
-      Spatialized: false
-      Position: [0, 0, 0]
-      MinDistance: 1
-      MaxDistance: 100
+      UseFastBuildQuality: true
+      ModelPath: models/pilot/wizard_tower_animated.glb
+      ModelUUID: 0
+      IsColliding: false
     PlayerComponent:
       MovementSpeed: 15
-      JumpForce: 10
+      JumpForce: 27.5
       LookSensitivity: 0.899999976
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: chaineddecos.scripts.playercontroller
-          Fields:
-            - Name: Gravity
-              Type: 1
-              Value: 9.80000019
-            - Name: JumpForce
-              Type: 1
-              Value: 32.5
-            - Name: MovementSpeed
-              Type: 1
-              Value: 11.8999996
-        - ClassName: chaineddecos.scripts.gamehud
-        - ClassName: chaineddecos.scripts.spawnzone
-        - ClassName: chaineddecos.scripts.gamehud
-        - ClassName: chaineddecos.scripts.playerfall
-        - ClassName: chaineddecos.scripts.spawnzone
-    Hierarchy:
-      Parent: 0
-      Children:
+    RigidBodyComponent:
+      Type: 1
+      Mass: 10000
+      LinearDamping: 0
+      AngularDamping: 0
+      UseGravity: true
+      IsFixedRotation: true
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: true
+      VelocityForced: false
+      IsNetworkDriven: false
+    AnimationComponent:
+      GraphPath: animations/new_graph.chag
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        speed: 0
+        isMoving: 0
+  - Entity: 13740530236509915521
+    ModelComponent:
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      MaterialPaths:
         []
-  - Entity: 5150207293164281694
-    TagComponent:
-      Tag: SceneCamera
     TransformComponent:
-      Translation: [-143.294968, 200.081146, -337.524475]
-      Rotation: [376.001373, -3188.74268, 0]
-      Scale: [1, 1, 1]
-    CameraComponent:
-      Primary: false
-      FixedAspectRatio: false
-      Projection:
-        Projection: 0
-        VerticalFOV: 60.0000038
-        Near: 0.00999999978
-        Far: 1000
-      Enabled: false
-      TargetTag: Player
-      Distance: 10
-      Yaw: 0
-      Pitch: 20
-      Sensitivity: 0.899999976
-    Hierarchy:
-      Parent: 0
-      Children:
-        []
-  - Entity: 10653066213482940164
+      Translation: [59.6802216, -58.9056282, -30.9949799]
+      Rotation: [1.29481214e-05, 0.103508458, -1.30970393e-05]
+      Scale: [2.81781912, 1.83835185, 2.52317667]
     TagComponent:
-      Tag: minecrafthouse
-    TransformComponent:
-      Translation: [538.350159, 143.252487, 2173.47119]
-      Rotation: [0, -0, 0]
-      Scale: [26.4252186, 28.1715183, 26.7638988]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models_backup/mystery_skulls_ghost_lewis/textures/Ghost_texture_baseColor.png
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Tag: rail#3d_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [0, 2.20000002e-05, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.604161263, -0.379055023, -2.00118709]
-      Size: [1.20832253, 0.709288359, 2.00317812]
-      AutoCalculate: true
-    AnimationComponent:
-      AnimationPath: models_backup/mystery_skulls_ghost_lewis/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 1283719283719285
-    TagComponent:
-      Tag: Arena
-    TransformComponent:
-      Translation: [-1.52065945, -4.32776833, -35.4009895]
-      Rotation: [-0.0117500396, 0.038041085, -0.00385748385]
-      Scale: [0.99993974, 0.999890089, 0.999929249]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 1
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [4.08622913e-10, -5.17518528e-10, -5.39548996e-11]
+      IsGrounded: true
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 14453858478338423339
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/arena.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [143, 0, 0, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [7, 233, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [3, 255, 255, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [90, 84, 77, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 3
-          Target: 0
-          Material:
-            AlbedoColor: [91, 86, 85, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 4
-          Target: 0
-          Material:
-            AlbedoColor: [102, 70, 58, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 5
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 6
-          Target: 0
-          Material:
-            AlbedoColor: [119, 111, 102, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 7
-          Target: 0
-          Material:
-            AlbedoColor: [83, 57, 47, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 8
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/stone_floor.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [-231.075317, -11.3970604, 67.6377563]
+      Rotation: [0, -0, 0]
+      Scale: [2.702842, 1, 4.74170446]
+    TagComponent:
+      Tag: floor_lol
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 3
+      Size: [1032.72437, 47.5412979, 1811.74988]
+      Offset: [0, 0, 0]
+      Radius: 905.874939
+      Height: 47.5412979
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-0.482694626, -1.64976311, 21.6490402]
-      Radius: 47.239151
       AutoCalculate: true
-  - Entity: 8982711742810159238
-    TagComponent:
-      Tag: rail#3d_copy
+      UseFastBuildQuality: true
+      ModelPath: models/stone_floor.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 16870539530103641274
+    CameraComponent:
+      Primary: true
+      FixedAspectRatio: false
+      IsOrbitCamera: true
+      TargetEntityTag: Player
+      OrbitDistance: 0
+      OrbitYaw: 0
+      OrbitPitch: 0
+      LookSensitivity: 0
     TransformComponent:
-      Translation: [369.179901, 34.9479713, -15.4183016]
-      Rotation: [3.14019299, -1.54396594, -1.55295646]
-      Scale: [2.81770563, 1.83824468, 2.52313542]
+      Translation: [-21.3513527, 123.447731, 68.9470444]
+      Rotation: [-0.0149999354, -8.19599628, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: Camera
+    IDComponent:
+      {}
+    ShaderComponent:
+      ShaderPath: shaders/screen_falling.chshader
+      ShaderUUID: 14962409001541335283
+      Uniforms:
+        - Name: uIntensity
+          Value: 0
+        - Name: color
+          Value: 0
+      Enabled: true
+  - Entity: 8390095524984333165
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/container_ship/scene_material_0.chmat
+        - models/container_ship/scene_material_1.chmat
+        - models/container_ship/scene_material_2.chmat
+    TransformComponent:
+      Translation: [-949.601318, 51.8037796, 331.382965]
+      Rotation: [-3.14158845, -1.50888491, -3.14156556]
+      Scale: [20.9452457, 17.1169147, 17.6528263]
+    TagComponent:
+      Tag: arena_two
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [1911.31445, 289.256073, 227.108582]
+      Offset: [0, 0, 0]
+      Radius: 955.657227
+      Height: 289.256073
+      Friction: 0.5
+      Restitution: 0.209999993
+      IsTrigger: true
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 8791625222606561716
-    TagComponent:
-      Tag: rail#3d_copy
+      UseFastBuildQuality: true
+      ModelPath: models/container_ship/scene.gltf
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 7047182585444011406
+    ModelComponent:
+      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/pilot/animated_civilian_helicopter/scene_material_0.chmat
     TransformComponent:
-      Translation: [340.353027, 34.3363914, -15.4183016]
-      Rotation: [3.14018416, -1.54396355, -1.52885783]
-      Scale: [2.81768346, 1.83830261, 2.52313828]
+      Translation: [-216.192169, 150.740036, 81.6223679]
+      Rotation: [0.061792668, 0.0883243978, -0.0563300811]
+      Scale: [46.0502167, 47.2513237, 53.765667]
+    TagComponent:
+      Tag: Helicopter
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 7445593831016098465
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [124.947281, 38.3125763, -16.1475792]
+      Rotation: [0, 1.46746063, 0]
+      Scale: [2.81766772, 1.83825684, 2.5230844]
+    TagComponent:
+      Tag: rail#3d
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
-      Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
       Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 7772933172421174645
-    TagComponent:
-      Tag: rail#3d_copy
+      Offset: [1.16999996, 0.0700000003, -4.18938494]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
+      Enabled: true
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/toy_train/train_vagon.glb
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 5864591309551935691
     TransformComponent:
-      Translation: [304.469788, 34.3363914, -15.4183016]
-      Rotation: [3.14017534, -1.54393637, -1.68613875]
-      Scale: [2.81769824, 1.83826065, 2.52310705]
+      Translation: [0, 0, 0]
+      Rotation: [0, 0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: train_vagons
+    IDComponent:
+      {}
+  - Entity: 13731036226040607776
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [424.876801, 17.2099991, 22.4167747]
+      Rotation: [-1.61778486, -0.127626747, -0.0149760507]
+      Scale: [3.91608334, 1.36131144, 0.999961495]
+    TagComponent:
+      Tag: anim_mode#2
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [79.3229675, 377.350159, 14.2474775]
+      Offset: [0, 0, 0]
+      Radius: 188.675079
+      Height: 377.350159
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 5967097730784712040
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [269.359863, 34.3363914, -15.4183016]
-      Rotation: [3.14023447, -1.543975, -1.55569565]
-      Scale: [2.81769967, 1.83829546, 2.52312875]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 14942416490577353418
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [456.769592, 133.406036, 838.863159]
+      Rotation: [-2.07865191, -0, 0]
+      Scale: [3.9020257, 0.99999398, 0.999984622]
+    TagComponent:
+      Tag: anim_mode#4_copy
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [20.2556896, 277.196045, 14.2480259]
+      Offset: [0, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-  - Entity: 2562263663181998965
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [232.729095, 34.3363914, -15.4183016]
-      Rotation: [3.1402328, -1.54398417, -1.52254927]
-      Scale: [2.81773686, 1.83830583, 2.52309632]
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 14791108144344848822
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [440.960266, 32.5502625, 581.221497]
+      Rotation: [-1.48049641, -0, 0]
+      Scale: [3.71524119, 0.99993968, 0.999904871]
+    TagComponent:
+      Tag: anim_mode#3
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [75.254776, 277.179321, 14.2466698]
+      Offset: [0, 0, 0]
+      Radius: 138.589661
+      Height: 277.179321
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: true
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 11053255314081653602
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [195.275909, 34.3363914, -15.4183016]
-      Rotation: [-2.1531477, -1.10677683, -2.63240695]
-      Scale: [2.81779408, 1.83833039, 2.52320075]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 17254432505046772791
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [228.521362, 47.5765038, 119.315414]
+      Rotation: [0, 1.06864882, 0]
+      Scale: [7.04011631, 8.74738693, 19.0374699]
+    TagComponent:
+      Tag: wooden_bridge
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [65.3547974, 62.5697174, 448.721771]
+      Offset: [0, 0, 0]
+      Radius: 224.360886
+      Height: 62.5697174
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 217210127212770073
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [160.559677, 34.3363914, -15.4183016]
-      Rotation: [-2.88122821, -1.07542729, -1.95391703]
-      Scale: [2.81780005, 1.83833647, 2.52321053]
+      UseFastBuildQuality: true
+      ModelPath: models/wooden_bridge/wooden_bridge_roofed_bridge_cap_-24mb.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 56.9000015
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 18412229908812487111
     ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [428.76062, 30.1878853, 305.481506]
+      Rotation: [-1.84119403, -0, 0]
+      Scale: [3.51185083, 0.99995327, 0.99992317]
+    TagComponent:
+      Tag: anim_mode
+    IDComponent:
+      {}
     ColliderComponent:
-      Type: 0
+      Type: 3
+      Size: [71.134964, 277.183105, 14.2469311]
+      Offset: [0, 0, 0]
+      Radius: 138.591553
+      Height: 277.183105
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
       AutoCalculate: true
-  - Entity: 1295158128682646344
-    TagComponent:
-      Tag: rail#3d_copy
-    TransformComponent:
-      Translation: [89.7119217, 34.3363914, -15.4183016]
-      Rotation: [-1.96055889, -0.999783337, -2.69811749]
-      Scale: [2.81780839, 1.8383373, 2.52324486]
+      UseFastBuildQuality: true
+      ModelPath: models/bridge.glb
+      ModelUUID: 0
+      IsColliding: false
+    RigidBodyComponent:
+      Type: 0
+      Mass: 1
+      LinearDamping: 0.00999999978
+      AngularDamping: 0.0500000007
+      UseGravity: true
+      IsFixedRotation: false
+      Handle: 0
+      Velocity: [0, 0, 0]
+      IsGrounded: false
+      VelocityForced: false
+      IsNetworkDriven: false
+  - Entity: 13337476372258962879
     ModelComponent:
-      ModelHandle: 0
       ModelPath: models/toy_train/train_vagon.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*0"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: "*1"
-            OverrideAlbedo: true
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 0
-            Roughness: 0.823941708
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 2
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      ModelUUID: 0
+      MaterialPaths:
+        []
+    TransformComponent:
+      Translation: [394.406952, 36.0981331, -15.4183016]
+      Rotation: [0.04082435, 1.53854108, 9.24113579e-07]
+      Scale: [2.81729794, 1.83831227, 2.52311134]
+    TagComponent:
+      Tag: rail#3d_copy_copy
+    IDComponent:
+      {}
     ColliderComponent:
       Type: 0
+      Size: [2.48870611, 4.18936205, 13.512085]
+      Offset: [-1.23305595, 2.20000002e-05, -6.83498478]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-1.23305595, -6.83498478, -4.18938494]
-      Size: [2.48870611, 13.512085, 4.18936396]
-      AutoCalculate: true
-    Hierarchy:
-      Parent: 0
-      Children:
-        []
-  - Entity: 6064633921243342758
-    TagComponent:
-      Tag: Entity_copy
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: ""
+      ModelUUID: 0
+      IsColliding: false
+  - Entity: 3558725563069185150
     TransformComponent:
-      Translation: [46.4636726, -2.98017597, 14.336463]
-      Rotation: [-3.14153385, -0.624083161, -3.1415863]
-      Scale: [2.29999304, 2.70000005, 0.979451716]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/stairs.glb
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Translation: [-321.279785, 312.607849, 1022.75677]
+      Rotation: [0, -0, 0]
+      Scale: [1, 1, 1]
+    TagComponent:
+      Tag: SpawnPoint
+    IDComponent:
+      {}
+    ManagedScriptComponent:
+      Scripts:
+        - ClassName: chaineddecos.scripts.spawnzone
     ColliderComponent:
       Type: 0
+      Size: [-6.4000001, -3.5999999, 7.30000019]
+      Offset: [2.79999995, 0, 0]
+      Radius: 0.5
+      Height: 1
+      Friction: 0.5
+      Restitution: 0
+      IsTrigger: false
       Enabled: true
-      Offset: [-14.1946049, -9.53674316e-07, -8.94524384]
-      Size: [34.1756821, 8.59185219, 22.6057091]
-      AutoCalculate: true
-    Hierarchy:
-      Parent: 0
-      Children:
+      AutoCalculate: false
+      UseFastBuildQuality: true
+      ModelPath: D:/gitnext/Chained Decos/game/chaineddecos/іВВВВВВВВВВВВВВВВВВВВВВІІІІІІІІІІІІІІІФФФФФФФФВІІІІФ
+      ModelUUID: 0
+      IsColliding: false
+    SpawnComponent:
+      IsActive: true
+      IsCheckpoint: true
+      SpawnPoint: [0, 0, 0]
+      ZoneSize: [1, 1, 1]
+      RenderSpawnZoneInScene: true
+  - Entity: 2985448021998353763
+    ModelComponent:
+      ModelPath: models/toy_train/wooden_train.glb
+      ModelUUID: 0
+      MaterialPaths:
         []
-  - Entity: 10680602693042542455
-    TagComponent:
-      Tag: Empty Entity
     TransformComponent:
-      Translation: [-216.192169, -7.62939453e-06, 0]
-      Rotation: [0, -0, 0]
-      Scale: [46.0502129, 47.2513962, 53.7656746]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      Materials:
-        - Name: ""
-          Index: 0
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_baseColor.jpeg
-            OverrideAlbedo: true
-            NormalMapPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_normal.png
-            OverrideNormal: true
-            MetallicRoughnessPath: models/pilot/animated_civilian_helicopter/textures/Helicopter_metallicRoughness.png
-            OverrideMetallicRoughness: true
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
-        - Name: ""
-          Index: 1
-          Target: 0
-          Material:
-            AlbedoColor: [255, 255, 255, 255]
-            AlbedoPath: ""
-            OverrideAlbedo: false
-            NormalMapPath: ""
-            OverrideNormal: false
-            MetallicRoughnessPath: ""
-            OverrideMetallicRoughness: false
-            OcclusionMapPath: ""
-            OverrideOcclusion: false
-            EmissivePath: ""
-            EmissiveColor: [0, 0, 0, 255]
-            EmissiveIntensity: 0
-            OverrideEmissive: false
-            ShaderPath: ""
-            OverrideShader: false
-            Metalness: 1
-            Roughness: 1
-            DoubleSided: false
-            Transparent: false
-            Alpha: 1
+      Translation: [-3565.1311, -45.4531631, 621.43158]
+      Rotation: [0.18592523, -1.13752759, -0.188373342]
+      Scale: [1.00000036, 0.999993503, 0.99999553]
+    TagComponent:
+      Tag: toy_train_platform
+    IDComponent:
+      {}
     AnimationComponent:
-      AnimationPath: models/pilot/animated_civilian_helicopter/scene.gltf
-      CurrentAnimation: 0
-      IsLooping: true
-      IsPlaying: true
-      BlendDuration: 0
-  - Entity: 2728318674159281804
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 358020254249591928
+    ModelComponent:
+      ModelPath: models/new_model/a109082005619/scene.gltf
+      ModelUUID: 0
+      MaterialPaths:
+        - models/new_model/a109082005619/scene_material_1.chmat
+        - models/new_model/a109082005619/scene_material_2.chmat
+        - models/new_model/a109082005619/scene_material_3.chmat
+        - models/new_model/a109082005619/scene_material_4.chmat
+        - models/new_model/a109082005619/scene_material_5.chmat
+        - models/new_model/a109082005619/scene_material_6.chmat
+        - models/new_model/a109082005619/scene_material_7.chmat
+        - models/new_model/a109082005619/scene_material_8.chmat
+        - models/new_model/a109082005619/scene_material_9.chmat
+        - models/new_model/a109082005619/scene_material_10.chmat
+        - models/new_model/a109082005619/scene_material_14.chmat
+        - ""
+        - ""
+        - ""
+        - models/new_model/a109082005619/scene_material_14.chmat
+    TransformComponent:
+      Translation: [-984.524658, -1183.05359, -4195.12988]
+      Rotation: [0, 0.918334186, 0]
+      Scale: [0.999996781, 1, 0.999996781]
     TagComponent:
-      Tag: Empty Entity
+      Tag: Island
+    IDComponent:
+      {}
+    AnimationComponent:
+      GraphPath: ""
+      GraphUUID: 0
+      BlendDuration: 0.25
+      DefaultIsLooping: true
+      PlayOnStart: true
+      Variables:
+        {}
+  - Entity: 9140307361940725866
     TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
+      Translation: [-51.6971283, 137.265976, 0]
+      Rotation: [0, -0, 0]
       Scale: [1, 1, 1]
-    ModelComponent:
-      ModelHandle: 0
-      ModelPath: ""
-      Materials:
-        []
\ No newline at end of file
+    TagComponent:
+      Tag: storegraphic-soft-wind-477404.mp3
+    IDComponent:
+      {}
+    AudioComponent:
+      SoundPath: audio/soundsurfer-parkour-262367.mp3
+      SoundUUID: 3168299162844103994
+      Volume: 2
+      Pitch: 0.100000001
+      Loop: true
+      PlayOnStart: true
+      Spatialized: true
+      Position: [0, 0, 0]
+      MinDistance: 0
+      MaxDistance: 6000000
+      IsPlaying: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scenes/video_scene.chscene b/game/chaineddecos/assets/scenes/video_scene.chscene
index a45ed796b..ad3f06ed8 100644
--- a/game/chaineddecos/assets/scenes/video_scene.chscene
+++ b/game/chaineddecos/assets/scenes/video_scene.chscene
@@ -1,4 +1,5 @@
-Scene: Untitled Scene
+Scene: Video Scene
+SceneType: 1
 Background:
   Mode: 0
   Color: [0, 0, 0, 255]
@@ -28,139 +29,83 @@ DebugSettings:
   DiagnosticMode: 0
   DrawColliders: false
   DrawHierarchy: false
-  DrawCollisionModelBox: false
   DrawGrid: false
   DrawSelection: true
   DrawLights: true
   DrawSpawnZones: true
   CollisionWireframeMode: 0
 Entities:
-  - Entity: 17615517667390034193
-    TagComponent:
-      Tag: title_menu_video
+  - Entity: 1931546155997277511
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    ControlComponent:
-      Rect Transform:
-        Position: [-534.133667, -403.546906]
-        Size: [369.138794, 98.3673096]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-718.703064, -452.73056]
-        Offset Max: [-349.56427, -354.363251]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    LabelControl:
-      Text: Video Settings
-      Style:
-        Font Name: Default
-        Font Size: 37.5800018
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      Auto Size: false
-  - Entity: 17129118224082506760
     TagComponent:
-      Tag: resolution
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
+      Tag: anti_aliasing_title
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-523.650513, -216.814346]
-        Size: [187.000305, 47.9999695]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-617.150635, -240.814331]
-        Offset Max: [-430.15033, -192.814362]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-786.273621, 36.9348984]
+        OffsetMax: [-538.461914, 81.8333206]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ComboBoxControl:
-      Label: Resolution
-      Items:
-        - 1280x720
-        - 1440x900
-        - 1600x900
-        - 1920x1080
-      Selected Index: 0
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
       Box Style:
         BG Color: [40, 40, 40, 255]
         Hover Color: [60, 60, 60, 255]
         Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
+        Rounding: 0
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
         Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-        - ClassName: ""
-  - Entity: 2001
-    TagComponent:
-      Tag: fps_limit
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 27.5
+        Text Color: [131, 231, 255, 255]
+        Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Anti-aliasing
+      Auto Size: false
+  - Entity: 15624505708467453785
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: anti_aliasing_combobox
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-559.065735, 23.0205956]
-        Size: [100, 39.9999924]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-609.065735, 3.02060127]
-        Offset Max: [-509.065735, 43.0205917]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-714.914795, 104.574188]
+        OffsetMax: [-331.508484, 144.574188]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ComboBoxControl:
-      Label: FPS Limit
-      Items:
-        - 30
-        - 60
-        - 120
-        - 144
-        - Unlimited
-      Selected Index: 0
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
       Box Style:
         BG Color: [40, 40, 40, 255]
         Hover Color: [60, 60, 60, 255]
@@ -169,420 +114,377 @@ Entities:
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
         Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-  - Entity: 16516555726583183032
-    TagComponent:
-      Tag: option_fullscreen
-    TransformComponent:
-      Translation: [0, 0, 0]
-      Rotation: [0, 0, 0]
-      Scale: [1, 1, 1]
-    ControlComponent:
-      Rect Transform:
-        Position: [-554.809937, 168.76767]
-        Size: [99, 40.9999542]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-604.309937, 148.2677]
-        Offset Max: [-505.309937, 189.267654]
-        Pivot: [0.5, 0.5]
-        Rotation: 0
-        Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    CheckboxControl:
-      Label: Fullscreen
       Text Style:
         Font Name: Default
         Font Size: 18
-        Text Color: [255, 252, 252, 255]
+        Text Color: [255, 255, 255, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      Checked: false
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
+      Widget Type: 10
+      Label: Combo
+      Items:
+        []
+      Selected Index: 2
+  - Entity: 2514196054621993865
     ManagedScriptComponent:
       Scripts:
         - ClassName: ChainedDecos.Scripts.SettingsScript
-  - Entity: 1001
-    TagComponent:
-      Tag: option_vsync
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: btn_apply_settings
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-553.672363, 105.031769]
-        Size: [100.000061, 40.0000229]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-603.672424, 85.0317612]
-        Offset Max: [-503.672363, 125.031784]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-720.318054, 452.617249]
+        OffsetMax: [-562.318054, 502.617249]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    CheckboxControl:
-      Label: VSync
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [56, 178, 166, 255]
+        Hover Color: [82, 204, 191, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 0
+        Border Color: [255, 255, 255, 255]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 20
+        Text Color: [15, 24, 26, 255]
         Shadow: false
-        Letter Spacing: 1
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.20000005
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      Checked: false
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-  - Entity: 1003
-    TagComponent:
-      Tag: quality_preset
+      Widget Type: 1
+      Label: Apply
+      Interactable: true
+      Auto Size: false
+  - Entity: 2075080135391829995
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: back_button
+    IDComponent:
+      {}
+    Scene TransitionComponent:
+      TargetScenePath: scenes/start_menu.chscene
+      Triggered: false
     ControlComponent:
-      Rect Transform:
-        Position: [-560.747803, -145.5224]
-        Size: [100, 40.0000305]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-610.747803, -165.522415]
-        Offset Max: [-510.747803, -125.522385]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-512.766846, 447.06604]
+        OffsetMax: [-354.766846, 504.467651]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ComboBoxControl:
-      Label: Quality
-      Items:
-        - Low
-        - Medium
-        - High
-        - Ultra
-      Selected Index: 0
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [56, 178, 166, 255]
+        Pressed Color: [40, 130, 122, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 28]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1.03000009
+        Pressed Scale: 0.970000029
+        Transition Speed: 0.150000006
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 20
+        Text Color: [235, 238, 242, 255]
         Shadow: false
-        Letter Spacing: 1
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 1.20000005
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      Box Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-    Hierarchy:
-      Parent: 0
-      Children:
-        []
-  - Entity: 2002
-    TagComponent:
-      Tag: option_mipmaps
+      Widget Type: 1
+      Label: Back
+      Interactable: true
+      Auto Size: false
+  - Entity: 2188321364060672515
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: resolution
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-553.793945, 238.31041]
-        Size: [100, 55.9999695]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-603.793945, 210.310425]
-        Offset Max: [-503.793945, 266.310394]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-712.916443, -29.8665695]
+        OffsetMax: [-352.916443, 4.13343048]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    CheckboxControl:
-      Label: Generate Mipmaps
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [42, 46, 56, 255]
+        Pressed Color: [24, 26, 32, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 22]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
       Text Style:
         Font Name: Default
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [235, 238, 242, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      Checked: true
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-    Hierarchy:
-      Parent: 0
-      Children:
+      Widget Type: 10
+      Label: Resolution
+      Items:
         []
-  - Entity: 2003
-    TagComponent:
-      Tag: texture_filter
+      Selected Index: 0
+  - Entity: 8339234267797379989
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: title_menu_resolution
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-562.757568, -52.691246]
-        Size: [99.999939, 39.9999809]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-612.757568, -72.6912384]
-        Offset Max: [-512.757629, -32.6912575]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-762.002686, -110.911217]
+        OffsetMax: [-504.760132, -50.9112167]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ComboBoxControl:
-      Label: Texture Filter
-      Items:
-        - Point (No Filter)
-        - Bilinear
-        - Trilinear
-        - Anisotropic 4x
-        - Anisotropic 8x
-        - Anisotropic 16x
-      Selected Index: 0
-      Style:
-        Font Name: Default
-        Font Size: 18
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
       Box Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
+        Gradient Color: [20, 20, 20, 255]
         Padding: 4
         Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-  - Entity: 1002
-    TagComponent:
-      Tag: option_aa
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 44
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Resolution
+      Auto Size: false
+  - Entity: 2360158408147605491
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: option_vsync
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-554.529175, 300.609222]
-        Size: [99.9998474, 40]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-604.529114, 280.609222]
-        Offset Max: [-504.529266, 320.609222]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-727.719666, -232.080841]
+        OffsetMax: [-367.719666, -198.080841]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    CheckboxControl:
-      Label: Anti-aliasing
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [42, 46, 56, 255]
+        Pressed Color: [24, 26, 32, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 22]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
+        Font Name: font/gantari/static/gantari-black.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [235, 238, 242, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      Checked: true
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-  - Entity: 1004
-    TagComponent:
-      Tag: btn_apply_settings
+      Widget Type: 6
+      Label: VSync
+      Checked: false
+  - Entity: 7330382566051686589
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
+    TagComponent:
+      Tag: option_fullscreen
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-574.197998, 488.852509]
-        Size: [127.562317, 54.5918579]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-637.979187, 461.55658]
-        Offset Max: [-510.41687, 516.148438]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-727.719666, -164.175201]
+        OffsetMax: [-367.719666, -130.175201]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Apply
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [30, 33, 40, 255]
+        Hover Color: [42, 46, 56, 255]
+        Pressed Color: [24, 26, 32, 255]
+        Rounding: 8
+        Border Size: 1
+        Border Color: [255, 255, 255, 22]
+        Gradient: false
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
+        Pressed Scale: 1
+        Transition Speed: 0.150000006
       Text Style:
-        Font Name: Default
+        Font Name: font/gantari/static/gantari-black.ttf
         Font Size: 18
-        Text Color: [255, 255, 255, 255]
+        Text Color: [235, 238, 242, 255]
         Shadow: false
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
         Letter Spacing: 1
         Line Height: 1.20000005
         H Align: 1
         V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
-        Border Size: 0
-        Border Color: [255, 255, 255, 255]
-        Gradient: false
-        Padding: 4
-        Hover Scale: 1
-        Pressed Scale: 1
-        Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.SettingsScript
-  - Entity: 18170181542896433609
-    TagComponent:
-      Tag: back_button
+      Widget Type: 6
+      Label: Fullscreen
+      Checked: false
+  - Entity: 6529195123706576257
     TransformComponent:
       Translation: [0, 0, 0]
       Rotation: [0, 0, 0]
       Scale: [1, 1, 1]
-    SceneTransitionComponent:
-      TargetScenePath: scenes/start_menu.chscene
-      Triggered: false
+    TagComponent:
+      Tag: title_menu_video
+    IDComponent:
+      {}
     ControlComponent:
-      Rect Transform:
-        Position: [-400.255981, 489.61554]
-        Size: [143.835297, 54.1186218]
-        Anchor Min: [0.5, 0.5]
-        Anchor Max: [0.5, 0.5]
-        Offset Min: [-472.173645, 462.556244]
-        Offset Max: [-328.338348, 516.674866]
+      Transform:
+        AnchorMin: [0.5, 0.5]
+        AnchorMax: [0.5, 0.5]
+        OffsetMin: [-829.9245, -423.192688]
+        OffsetMax: [-309.9245, -363.192688]
         Pivot: [0.5, 0.5]
         Rotation: 0
         Scale: [1, 1]
-      Z Order: 0
-      Active: true
-      Hidden: false
-    ButtonControl:
-      Label: Back
-      Text Style:
-        Font Name: Default
-        Font Size: 37.9350014
-        Text Color: [255, 255, 255, 255]
-        Shadow: false
-        Letter Spacing: 1
-        Line Height: 1.20000005
-        H Align: 1
-        V Align: 1
-      UI Style:
-        BG Color: [40, 40, 40, 255]
-        Hover Color: [60, 60, 60, 255]
-        Pressed Color: [30, 30, 30, 255]
-        Rounding: 4
+      ZOrder: 0
+      IsActive: true
+      HiddenInHierarchy: false
+    WidgetComponent:
+      Box Style:
+        BG Color: [0, 0, 0, 0]
+        Hover Color: [0, 0, 0, 0]
+        Pressed Color: [0, 0, 0, 0]
+        Rounding: 0
         Border Size: 0
         Border Color: [255, 255, 255, 255]
         Gradient: false
-        Padding: 15.4379997
-        Hover Scale: 1.05900002
+        Gradient Color: [20, 20, 20, 255]
+        Padding: 4
+        Hover Scale: 1
         Pressed Scale: 1
         Transition Speed: 0.100000001
-      Interactable: true
-      Auto Size: false
-    ManagedScriptComponent:
-      Scripts:
-        - ClassName: ChainedDecos.Scripts.LoadSceneButton
-          Fields:
-            - Name: TargetScene
-              Type: 4
-              Value: scenes/start_menu.chscene
\ No newline at end of file
+      Text Style:
+        Font Name: font/static/Figtree-Regular.ttf
+        Font Size: 44
+        Text Color: [110, 231, 211, 255]
+        Shadow: true
+        Shadow Offset: 2
+        Shadow Color: [0, 0, 0, 255]
+        Letter Spacing: 2
+        Line Height: 1.20000005
+        H Align: 1
+        V Align: 1
+      Widget Type: 3
+      Text: Video Settings
+      Auto Size: false
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scripts/ChainedDecos.Scripts.csproj b/game/chaineddecos/assets/scripts/ChainedDecos.Scripts.csproj
new file mode 100644
index 000000000..953c7647b
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/ChainedDecos.Scripts.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <AssemblyName>ChainedDecos.Scripts</AssemblyName>
+    <RootNamespace>ChainedDecos.Scripts</RootNamespace>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <OutputPath>../bin</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="src/**/*.cs" />
+  </ItemGroup>
+
+  <!-- Reference the engine's C# API library -->
+  <ItemGroup>
+    <ProjectReference Include="../../../../engine/scripting/managed/Chained.Managed.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/game/chaineddecos/src/EndGameZone.cs b/game/chaineddecos/assets/scripts/src/gameplay/EndGameZone.cs
similarity index 76%
rename from game/chaineddecos/src/EndGameZone.cs
rename to game/chaineddecos/assets/scripts/src/gameplay/EndGameZone.cs
index b158a02e0..be5356694 100644
--- a/game/chaineddecos/src/EndGameZone.cs
+++ b/game/chaineddecos/assets/scripts/src/gameplay/EndGameZone.cs
@@ -1,5 +1,5 @@
 using System;
-using CHEngine;
+using Chained;
 
 namespace ChainedDecos.Scripts
 {
@@ -11,6 +11,9 @@ public class EndGameZone : Script
         public int BonusGold = 120;
 
         private bool m_Triggered = false;
+        // Track IDs we've already logged as ignored, to prevent per-frame log spam
+        // (Physics engines often re-fire OnCollisionEnter each tick for persistent contacts)
+        private System.Collections.Generic.HashSet<ulong> m_IgnoredIds = new();
 
         public override void OnCollisionEnter(ulong otherID)
         {
@@ -30,16 +33,13 @@ public override void OnCollisionEnter(ulong otherID)
 
             if (!hasPlayerComponent && !playerByTag)
             {
-                Log.Info($"EndGameZone: collision ignored (otherID={otherID}, tag='{otherTag}').");
+                if (m_IgnoredIds.Add(otherID)) // Add returns false if already present
+                    Log.Info($"EndGameZone: collision ignored (otherID={otherID}, tag='{otherTag}').");
                 return;
             }
 
             m_Triggered = true;
 
-            HeroProgression.CompleteLevel(LevelId);
-            HeroProgression.AddExperience(BonusExperience, "endgame bonus");
-            HeroProgression.AddGold(BonusGold, "endgame bonus");
-
             Log.Info($"EndGameZone: player detected (otherID={otherID}, tag='{otherTag}'). Loading {TargetScene}");
             Scene.LoadScene(TargetScene);
         }
@@ -55,9 +55,6 @@ public override void OnUpdate(float deltaTime)
             if (Input.IsKeyPressed(Key.F9))
             {
                 m_Triggered = true;
-                HeroProgression.CompleteLevel(LevelId + "_debug");
-                HeroProgression.AddExperience(BonusExperience, "endgame debug bonus");
-                HeroProgression.AddGold(BonusGold, "endgame debug bonus");
                 Log.Info($"EndGameZone: F9 debug trigger -> Loading {TargetScene}");
                 Scene.LoadScene(TargetScene);
             }
diff --git a/game/chaineddecos/assets/scripts/src/gameplay/SkinDatabase.cs b/game/chaineddecos/assets/scripts/src/gameplay/SkinDatabase.cs
new file mode 100644
index 000000000..0a90d4ee0
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/gameplay/SkinDatabase.cs
@@ -0,0 +1,44 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Database of available player skins (colors) for the lobby.
+    /// </summary>
+    public static class SkinDatabase
+    {
+        public static readonly Vector4[] Colors = new Vector4[]
+        {
+            new Vector4(1.0f, 1.0f, 1.0f, 1.0f),   // White
+            new Vector4(1.0f, 0.2f, 0.2f, 1.0f),   // Red
+            new Vector4(0.2f, 0.8f, 0.2f, 1.0f),   // Green
+            new Vector4(0.2f, 0.4f, 1.0f, 1.0f),   // Blue
+            new Vector4(1.0f, 0.8f, 0.0f, 1.0f),   // Yellow
+            new Vector4(0.8f, 0.2f, 1.0f, 1.0f),   // Purple
+            new Vector4(0.0f, 0.8f, 0.8f, 1.0f),   // Cyan
+            new Vector4(1.0f, 0.5f, 0.0f, 1.0f),   // Orange
+        };
+
+        public static readonly string[] Names = new string[]
+        {
+            "White", "Red", "Green", "Blue", "Yellow", "Purple", "Cyan", "Orange"
+        };
+
+        public static int SkinCount => Colors.Length;
+
+        public static Vector4 GetColor(int index)
+        {
+            if (index < 0 || index >= Colors.Length)
+                return Colors[0];
+            return Colors[index];
+        }
+
+        public static string GetName(int index)
+        {
+            if (index < 0 || index >= Names.Length)
+                return Names[0];
+            return Names[index];
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/gameplay/SpawnZone.cs b/game/chaineddecos/assets/scripts/src/gameplay/SpawnZone.cs
new file mode 100644
index 000000000..a99e5c744
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/gameplay/SpawnZone.cs
@@ -0,0 +1,141 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class SpawnZone : Script
+    {
+        private bool IsPlayerInside = false;
+
+    public override void OnUpdate(float deltaTime)
+    {
+        // Only the host runs respawn logic — clients rely on authoritative state
+        if (Network.IsClient)
+            return;
+
+        // Find the local player entity (by ownership in network, or first PlayerComponent)
+        ulong playerId = 0;
+        if (Network.IsConnected)
+        {
+            ulong[] owned = Entity.FindAllWithComponent<NetworkIdentityComponent>();
+            foreach (ulong id in owned)
+            {
+                Entity e = new Entity(id);
+                var netId = e.GetComponent<NetworkIdentityComponent>();
+                if (netId != null && netId.IsOwner)
+                {
+                    playerId = id;
+                    break;
+                }
+            }
+        }
+
+        if (playerId == 0)
+        {
+            ulong[] players = Entity.FindAllWithComponent<PlayerComponent>();
+            if (players.Length == 0)
+                return;
+            playerId = players[0];
+        }
+
+        Entity player = new Entity(playerId);
+        TransformComponent? playerTransform = player.GetComponent<TransformComponent>();
+        if (playerTransform == null)
+            return;
+
+            ulong[] spawnEntities = Entity.FindAllWithComponent<SpawnComponent>();
+            if (spawnEntities.Length == 0)
+                return;
+
+            TransformComponent? spawnTransform = Entity.GetComponent<TransformComponent>();
+            SpawnComponent? thisSpawnComp = Entity.GetComponent<SpawnComponent>();
+            if (spawnTransform == null || thisSpawnComp == null || !thisSpawnComp.IsActive)
+                return;
+
+            Vector3 zoneSize = thisSpawnComp.ZoneSize;
+            float halfX = Math.Abs(zoneSize.X) * 0.5f;
+            float halfY = Math.Abs(zoneSize.Y) * 0.5f;
+            float halfZ = Math.Abs(zoneSize.Z) * 0.5f;
+
+            if (halfX < 0.5f) halfX = 1.0f;
+            if (halfY < 0.5f) halfY = 1.0f;
+            if (halfZ < 0.5f) halfZ = 1.0f;
+
+            float dx = Math.Abs(playerTransform.Translation.X - spawnTransform.Translation.X);
+            float dy = Math.Abs(playerTransform.Translation.Y - spawnTransform.Translation.Y);
+            float dz = Math.Abs(playerTransform.Translation.Z - spawnTransform.Translation.Z);
+
+            IsPlayerInside = (dx <= halfX && dy <= halfY && dz <= halfZ);
+
+            if (IsPlayerInside)
+            {
+                foreach (ulong id in spawnEntities)
+                {
+                    Entity spawner = new Entity(id);
+                    SpawnComponent? sc = spawner.GetComponent<SpawnComponent>();
+                    if (sc != null && sc.IsActive)
+                    {
+                        sc.IsCheckpoint = (id == Entity.ID);
+                    }
+                }
+            }
+
+            // if (playerTransform.Translation.Y < -50.0f || Input.IsKeyPressed(Key.F))
+            // {
+            //     Respawn(player, spawnEntities);
+            // }
+        }
+
+        private void Respawn(Entity player, ulong[] spawnEntities)
+        {
+            foreach (ulong id in spawnEntities)
+            {
+                Entity spawner = new Entity(id);
+                SpawnComponent? spawnComp = spawner.GetComponent<SpawnComponent>();
+                if (spawnComp != null && spawnComp.IsActive && spawnComp.IsCheckpoint)
+                {
+                    TeleportTo(player, spawner, spawnComp);
+                    return;
+                }
+            }
+
+            // Fallback to first active spawn zone if no checkpoint is active
+            foreach (ulong id in spawnEntities)
+            {
+                Entity spawner = new Entity(id);
+                SpawnComponent? spawnComp = spawner.GetComponent<SpawnComponent>();
+                if (spawnComp != null && spawnComp.IsActive)
+                {
+                    TeleportTo(player, spawner, spawnComp);
+                    return;
+                }
+            }
+        }
+
+        private void TeleportTo(Entity player, Entity spawnEntity, SpawnComponent spawnComp)
+        {
+            TransformComponent? spawnTransform = spawnEntity.GetComponent<TransformComponent>();
+            TransformComponent? playerTransform = player.GetComponent<TransformComponent>();
+            RigidBodyComponent? playerRb = player.GetComponent<RigidBodyComponent>();
+
+            if (spawnTransform == null || playerTransform == null)
+                return;
+
+            Vector3 targetPos = spawnTransform.Translation + spawnComp.SpawnPoint;
+            if (Math.Abs(spawnComp.SpawnPoint.Y) < 0.01f)
+            {
+                targetPos.Y += 0.5f;
+            }
+
+            playerTransform.Translation = targetPos;
+
+            if (playerRb != null)
+            {
+                playerRb.ForceSetVelocity(Vector3.Zero);
+                playerRb.Velocity = Vector3.Zero;
+            }
+
+            Log.Info("spawnzone: Player respawned at checkpoint.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scripts/src/network/ConnectButton.cs b/game/chaineddecos/assets/scripts/src/network/ConnectButton.cs
new file mode 100644
index 000000000..eca2d2c41
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/ConnectButton.cs
@@ -0,0 +1,139 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to the "Connect to Server" button entity.
+    /// Reads IP from input_ip and port from input_port, then calls Network.ConnectTo.
+    /// Polls for connection success/failure before loading lobby.
+    /// </summary>
+    public class ConnectButton : Script
+    {
+        public string IpInputTag   = "input_ip";
+        public string PortInputTag = "input_port";
+        public string NickInputTag = "input_nick";
+        public string LobbyScene = "scenes/lobby.chscene";
+        public string DefaultIp    = "127.0.0.1";
+        public ushort DefaultPort  = 7777;
+        public float  ConnectTimeout = 15f;
+
+        private bool   m_IsConnecting = false;
+        private float  m_ConnectTimer = 0f;
+        private string m_PendingIp    = "";
+        private ushort m_PendingPort  = 0;
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+
+            // Poll connection state while connecting
+            if (m_IsConnecting)
+            {
+                m_ConnectTimer += deltaTime;
+
+                if (Network.IsFullyConnected)
+                {
+                    m_IsConnecting = false;
+                    if (btn != null) btn.Label = "Connected!";
+                    Log.Info($"[ConnectButton] Connected to {m_PendingIp}:{m_PendingPort}, loading lobby");
+                    Scene.LoadScene(LobbyScene);
+                    return;
+                }
+
+                if (m_ConnectTimer >= ConnectTimeout)
+                {
+                    m_IsConnecting = false;
+                    if (btn != null) btn.Label = "Connect to Server";
+                    Log.Warn($"[ConnectButton] Connection to {m_PendingIp}:{m_PendingPort} timed out");
+                    Network.Disconnect();
+                    ShowError($"Could not connect to {m_PendingIp}:{m_PendingPort} (Timed out)");
+                    return;
+                }
+
+                return; // wait, don't process button clicks
+            }
+
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            string ip = DefaultIp;
+            ushort port = DefaultPort;
+
+            Entity? ipEntity = Scene.FindEntityByTag(IpInputTag);
+            if (ipEntity != null && ipEntity.HasComponent<InputTextControl>())
+            {
+                InputTextControl? input = ipEntity.GetComponent<InputTextControl>();
+                if (input != null && !string.IsNullOrWhiteSpace(input.Text))
+                    ip = input.Text.Trim();
+            }
+
+            Entity? portEntity = Scene.FindEntityByTag(PortInputTag);
+            if (portEntity != null && portEntity.HasComponent<InputTextControl>())
+            {
+                InputTextControl? input = portEntity.GetComponent<InputTextControl>();
+                if (input != null && ushort.TryParse(input.Text, out ushort parsed) && parsed > 0)
+                    port = parsed;
+            }
+
+            // Smart check: If user pasted "IP:PORT" or "[IPv6]:port" into the IP field, parse both
+            if (ip.StartsWith("[") && ip.Contains("]"))
+            {
+                // Format: [IPv6]:port
+                int closeBracket = ip.IndexOf(']');
+                string ipv6Part = ip.Substring(1, closeBracket - 1).Trim();
+                string afterBracket = ip.Substring(closeBracket + 1).Trim();
+                if (afterBracket.StartsWith(":") && ushort.TryParse(afterBracket.Substring(1), out ushort extractedPort) && extractedPort > 0)
+                {
+                    port = extractedPort;
+                }
+                ip = ipv6Part;
+            }
+            else if (ip.Contains(":"))
+            {
+                // Format: IPv4:port (not IPv6 — IPv6 without brackets should be entered without port in the same field)
+                int colonIndex = ip.LastIndexOf(':');
+                string ipPart = ip.Substring(0, colonIndex).Trim();
+                string portPart = ip.Substring(colonIndex + 1).Trim();
+                if (ushort.TryParse(portPart, out ushort extractedPort) && extractedPort > 0)
+                {
+                    port = extractedPort;
+                    ip = ipPart;
+                }
+            }
+
+            Entity? nickEntity = Scene.FindEntityByTag(NickInputTag);
+            if (nickEntity != null && nickEntity.HasComponent<InputTextControl>())
+            {
+                InputTextControl? input = nickEntity.GetComponent<InputTextControl>();
+                if (input != null && !string.IsNullOrWhiteSpace(input.Text))
+                    PlayerSettings.Nickname = input.Text.Trim();
+            }
+
+            Log.Info($"[ConnectButton] Connecting to {ip}:{port}");
+            ShowError(""); // clear previous error
+            if (btn != null) btn.Label = "Connecting...";
+
+            Network.SetLocalPlayerInfo(PlayerSettings.Nickname, (byte)LobbyManager.SelectedSkinIndex);
+            Network.ConnectTo(ip, port);
+
+            m_PendingIp = ip;
+            m_PendingPort = port;
+            m_ConnectTimer = 0f;
+            m_IsConnecting = true;
+        }
+
+        private void ShowError(string message)
+        {
+            Entity? errorLabel = Scene.FindEntityByTag("label_error");
+            if (errorLabel != null && errorLabel.IsValid)
+            {
+                LabelControl? lc = errorLabel.GetComponent<LabelControl>();
+                if (lc != null)
+                {
+                    lc.Text = message;
+                }
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/DisconnectButton.cs b/game/chaineddecos/assets/scripts/src/network/DisconnectButton.cs
new file mode 100644
index 000000000..0335f5c07
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/DisconnectButton.cs
@@ -0,0 +1,24 @@
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to the "Disconnect" button entity in the lobby.
+    /// Tears down the network session and returns to the multiplayer menu.
+    /// </summary>
+    public class DisconnectButton : Script
+    {
+        public string MenuScene = "scenes/multiplayer_menu.chscene";
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            Log.Info("[DisconnectButton] Leaving session");
+            Network.Disconnect();
+            Scene.LoadScene(MenuScene);
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/HostWaitingUI.cs b/game/chaineddecos/assets/scripts/src/network/HostWaitingUI.cs
new file mode 100644
index 000000000..a7a64f98f
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/HostWaitingUI.cs
@@ -0,0 +1,47 @@
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Host waiting-room overlay: keeps the "player_count" label in sync.
+    /// The Start Game button carries its own <see cref="StartGameButton"/> script;
+    /// the selected map lives in <see cref="LobbyManager.SelectedMap"/>.
+    /// </summary>
+    public class HostWaitingUI : Script
+    {
+        private float m_RefreshTimer = 0.0f;
+
+        public override void OnCreate()
+        {
+            Log.Info("HostWaitingUI: Initialized");
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            // Update player count display
+            m_RefreshTimer += deltaTime;
+            if (m_RefreshTimer >= 0.5f)
+            {
+                m_RefreshTimer = 0.0f;
+                UpdatePlayerCount();
+            }
+        }
+
+        private void UpdatePlayerCount()
+        {
+            Entity? label = Scene.FindEntityByTag("player_count");
+            if (label != null && label.HasComponent<LabelControl>())
+            {
+                LabelControl? lbl = label.GetComponent<LabelControl>();
+                if (lbl != null)
+                {
+                    int count = Network.ClientCount;
+                    int max = Network.MaxClients > 0 ? Network.MaxClients : LobbyManager.MaxClients;
+                    lbl.Text = count == 0
+                        ? $"Waiting for players... (0/{max})"
+                        : $"{count}/{max} player(s) connected";
+                }
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/LobbyManager.cs b/game/chaineddecos/assets/scripts/src/network/LobbyManager.cs
new file mode 100644
index 000000000..12a8dc921
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/LobbyManager.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Collections.Generic;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Manages the 3D lobby: positions player avatars in slots, handles chat, and transitions to game.
+    /// Uses pre-placed avatar entities in the scene (avatar_0 .. avatar_3).
+    /// </summary>
+    public class LobbyManager : Script
+    {
+        private const int MaxAvatars = 4;
+        private const string AvatarTagPrefix = "avatar_";
+
+        public string PlayerPrefabPath = "prefab/player.chprefab";
+        public string GameScene = "scenes/rpg_strategy_scene_mp.chscene";
+
+        // Shared state from previous scenes
+        public static ushort SelectedPort = 7777;
+        public static int SelectedSkinIndex = 0;
+        public static string SelectedMap = "scenes/rpg_strategy_scene_mp.chscene";
+        public static int MaxClients = 4;
+
+        private float m_RefreshTimer = 0.0f;
+
+        // Maps networkId -> slot index (0..3)
+        private Dictionary<ulong, int> m_SlotByNetId = new Dictionary<ulong, int>();
+        // Maps slot index -> networkId (0 = empty)
+        private ulong[] m_SlotNetIds = new ulong[MaxAvatars];
+
+        public override void OnCreate()
+        {
+            Log.Info("LobbyManager: Initialized");
+
+            Network.SetPlayerPrefab(PlayerPrefabPath);
+
+            // Hide all avatar slots initially
+            for (int i = 0; i < MaxAvatars; i++)
+            {
+                SetSlotHidden(i);
+            }
+
+            if (Network.IsHost)
+            {
+                string hostName = PlayerSettings.Nickname;
+                Network.SetLocalPlayerInfo(hostName, (byte)SelectedSkinIndex);
+                Log.Info($"LobbyManager: Host ready (name='{hostName}', skin={SelectedSkinIndex})");
+            }
+            else if (Network.IsClient)
+            {
+                Network.SendPlayerInfo(PlayerSettings.Nickname, (byte)SelectedSkinIndex);
+                Log.Info($"LobbyManager: Client sent player info (name='{PlayerSettings.Nickname}', skin={SelectedSkinIndex})");
+            }
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            m_RefreshTimer += deltaTime;
+
+            if (m_RefreshTimer >= 0.5f)
+            {
+                m_RefreshTimer = 0.0f;
+                RefreshAvatars();
+            }
+
+            // Scene change is handled by NetworkSystem::CheckAndPropagateSceneChange
+            // in C++, which sets Scene.PendingScenePath after net->Update() processes
+            // the SceneChangeMessage packet. This avoids the timing issue where C# OnUpdate
+            // ran before net->Update() could process incoming packets.
+        }
+
+        private void RefreshAvatars()
+        {
+            if (!Network.IsHost && !Network.IsClient)
+                return;
+
+            string json = Network.GetPlayerListJSON();
+            if (string.IsNullOrEmpty(json) || json == "[]")
+                return;
+
+            // Parse player list JSON
+            var players = ParsePlayerList(json);
+
+            // Build set of current networkIds
+            var currentIds = new HashSet<ulong>();
+            foreach (var p in players)
+                currentIds.Add(p.NetworkID);
+
+            // Release slots for players that left
+            for (int i = 0; i < MaxAvatars; i++)
+            {
+                if (m_SlotNetIds[i] != 0 && !currentIds.Contains(m_SlotNetIds[i]))
+                {
+                    ulong leftId = m_SlotNetIds[i];
+                    m_SlotByNetId.Remove(leftId);
+                    m_SlotNetIds[i] = 0;
+                    SetSlotHidden(i);
+                    Log.Info($"LobbyManager: Freed slot {i} (netID={leftId} left)");
+                }
+            }
+
+            // Assign slots for new players
+            foreach (var p in players)
+            {
+                if (m_SlotByNetId.ContainsKey(p.NetworkID))
+                {
+                    // Already has a slot — just update color
+                    int slot = m_SlotByNetId[p.NetworkID];
+                    SetSlotColor(slot, p.SkinIndex);
+                    continue;
+                }
+
+                // Find free slot
+                int freeSlot = -1;
+                for (int i = 0; i < MaxAvatars; i++)
+                {
+                    if (m_SlotNetIds[i] == 0)
+                    {
+                        freeSlot = i;
+                        break;
+                    }
+                }
+
+                if (freeSlot < 0)
+                {
+                    Log.Warn("LobbyManager: No free avatar slots!");
+                    continue;
+                }
+
+                m_SlotNetIds[freeSlot] = p.NetworkID;
+                m_SlotByNetId[p.NetworkID] = freeSlot;
+                SetSlotPosition(freeSlot, players.IndexOf(p));
+                SetSlotColor(freeSlot, p.SkinIndex);
+                Log.Info($"LobbyManager: Assigned netID={p.NetworkID} to slot {freeSlot} (skin={p.SkinIndex})");
+            }
+        }
+
+        private void SetSlotPosition(int slot, int index)
+        {
+            Entity? avatar = Scene.FindEntityByTag(AvatarTagPrefix + slot);
+            if (avatar == null || !avatar.IsValid)
+                return;
+
+            TransformComponent? t = avatar.GetComponent<TransformComponent>();
+            if (t != null)
+            {
+                t.Translation = new Vector3(index * 2.0f, 0.5f, 0.0f);
+            }
+        }
+
+        private void SetSlotColor(int slot, int skinIndex)
+        {
+            Entity? avatar = Scene.FindEntityByTag(AvatarTagPrefix + slot);
+            if (avatar == null || !avatar.IsValid)
+                return;
+
+            // Primitive materials are now managed via Material Editor (.chmat)
+        }
+
+        private void SetSlotHidden(int slot)
+        {
+            Entity? avatar = Scene.FindEntityByTag(AvatarTagPrefix + slot);
+            if (avatar == null || !avatar.IsValid)
+                return;
+
+            TransformComponent? t = avatar.GetComponent<TransformComponent>();
+            if (t != null)
+            {
+                t.Translation = new Vector3(0, -100, 0);
+            }
+        }
+
+        private struct PlayerEntry
+        {
+            public ulong NetworkID;
+            public string Name;
+            public int SkinIndex;
+        }
+
+        private List<PlayerEntry> ParsePlayerList(string json)
+        {
+            var result = new List<PlayerEntry>();
+            int startIndex = 0;
+
+            while (startIndex < json.Length)
+            {
+                int idStart = json.IndexOf("\"id\":", startIndex);
+                if (idStart < 0) break;
+                idStart += 5;
+                while (idStart < json.Length && (json[idStart] == ' ' || json[idStart] == ':')) idStart++;
+
+                int idEnd = json.IndexOf(',', idStart);
+                if (idEnd < 0) idEnd = json.IndexOf('}', idStart);
+                if (idEnd < 0) break;
+
+                ulong networkId = 0;
+                ulong.TryParse(json.Substring(idStart, idEnd - idStart), out networkId);
+                if (networkId == 0) { startIndex = idEnd; continue; }
+
+                int nameStart = json.IndexOf("\"name\":\"", idEnd);
+                string name = "Player";
+                if (nameStart >= 0)
+                {
+                    nameStart += 8;
+                    int nameEnd = json.IndexOf('"', nameStart);
+                    if (nameEnd > nameStart)
+                        name = json.Substring(nameStart, nameEnd - nameStart);
+                }
+
+                int skinStart = json.IndexOf("\"skin\":", idEnd);
+                int skinValue = 0;
+                if (skinStart > 0 && skinStart < json.IndexOf('}', idEnd))
+                {
+                    skinStart += 7;
+                    while (skinStart < json.Length && (json[skinStart] == ' ' || json[skinStart] == ':')) skinStart++;
+                    int skinEnd = json.IndexOf(',', skinStart);
+                    if (skinEnd < 0) skinEnd = json.IndexOf('}', skinStart);
+                    if (skinEnd > skinStart)
+                        int.TryParse(json.Substring(skinStart, skinEnd - skinStart), out skinValue);
+                }
+
+                result.Add(new PlayerEntry { NetworkID = networkId, Name = name, SkinIndex = skinValue });
+                startIndex = idEnd + 1;
+            }
+
+            return result;
+        }
+
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/LobbyUI.cs b/game/chaineddecos/assets/scripts/src/network/LobbyUI.cs
new file mode 100644
index 000000000..cb4a6550f
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/LobbyUI.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Lobby UI: manages the native chat widget, skin selector and start/disconnect buttons.
+    /// Required scene entities:
+    ///   chat_messages  - LabelControl  (scrolling message history)
+    ///   chat_input     - InputTextControl (text entry field)
+    ///   btn_send_chat  - ButtonControl (Send button)
+    ///   btn_skin_N     - ButtonControl (skin colour pickers, N = 0..7)
+    /// </summary>
+    public class LobbyUI : Script
+    {
+        private const int MaxChatLines = 30;
+
+        private readonly List<string> m_ChatLines = new List<string>();
+        private string m_LastDisplayed = "";
+        private string m_LastDisplayedInfo = "";
+        private bool   m_WasEnterDown  = false;
+
+        public override void OnCreate()
+        {
+            Log.Info("LobbyUI: Initialized");
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            // 1. Scene change from host (client side)
+            if (Network.IsClient && Network.HasPendingSceneChange)
+            {
+                string path = Network.GetPendingSceneChange();
+                Network.ClearPendingSceneChange();
+                Log.Info($"LobbyUI: Scene change -> {path}");
+                Scene.LoadScene(path);
+                return;
+            }
+
+            // 2. Incoming network chat
+            if (Network.HasPendingChat)
+            {
+                string json = Network.GetPendingChatJSON();
+                Network.ClearPendingChat();
+                ParseAndAppendChat(json);
+                UpdateChatLabel();
+            }
+
+            // 2b. Server Info Label (IP & Port)
+            UpdateServerInfo();
+
+            // 3. Skin buttons - highlight selected skin
+            for (int i = 0; i < SkinDatabase.SkinCount; i++)
+            {
+                Entity? btn = Scene.FindEntityByTag($"btn_skin_{i}");
+                if (btn == null || !btn.IsValid) continue;
+                ButtonControl? bc = btn.GetComponent<ButtonControl>();
+                if (bc == null) continue;
+                bool selected = (LobbyManager.SelectedSkinIndex == i);
+                bc.Label = selected ? $">> {SkinDatabase.GetName(i)} <<" : SkinDatabase.GetName(i);
+            }
+
+            // 4. Chat input + Send button
+            Entity? sendEntity  = Scene.FindEntityByTag("btn_send_chat");
+            Entity? inputEntity = Scene.FindEntityByTag("chat_input");
+
+            if (sendEntity  != null && sendEntity.IsValid &&
+                inputEntity != null && inputEntity.IsValid)
+            {
+                ButtonControl?    send  = sendEntity.GetComponent<ButtonControl>();
+                InputTextControl? input = inputEntity.GetComponent<InputTextControl>();
+
+                if (send != null && input != null)
+                {
+                    bool enterDown   = Input.IsKeyDown(Key.Enter);
+                    bool doSend      = send.IsClicked || (enterDown && !m_WasEnterDown);
+                    m_WasEnterDown   = enterDown;
+
+                    string msg = (input.Text ?? "").Trim();
+                    if (doSend && msg.Length > 0)
+                    {
+                        Network.SendChatMessage(msg);
+                        input.Text = "";
+                    }
+                }
+            }
+            else
+            {
+                m_WasEnterDown = false;
+            }
+        }
+
+        private void ParseAndAppendChat(string json)
+        {
+            if (string.IsNullOrEmpty(json) || json == "[]") return;
+
+            int pos = 0;
+            while (pos < json.Length)
+            {
+                int sStart = json.IndexOf("\"sender\":\"", pos);
+                if (sStart < 0) break;
+                sStart += 10;
+                int sEnd = json.IndexOf('"', sStart);
+                if (sEnd < 0) break;
+                string sender = json.Substring(sStart, sEnd - sStart);
+
+                int mStart = json.IndexOf("\"message\":\"", sEnd);
+                if (mStart < 0) break;
+                mStart += 11;
+                int mEnd = json.IndexOf('"', mStart);
+                if (mEnd < 0) break;
+                string message = json.Substring(mStart, mEnd - mStart);
+
+                AppendLine($"[{sender}]: {message}");
+                pos = mEnd + 1;
+            }
+        }
+
+        private void AppendLine(string line)
+        {
+            m_ChatLines.Add(line);
+            while (m_ChatLines.Count > MaxChatLines)
+                m_ChatLines.RemoveAt(0);
+        }
+
+        private void UpdateChatLabel()
+        {
+            string text = string.Join("\n", m_ChatLines);
+            if (text == m_LastDisplayed) return;
+            m_LastDisplayed = text;
+
+            Entity? labelEntity = Scene.FindEntityByTag("chat_messages");
+            if (labelEntity == null || !labelEntity.IsValid) return;
+            LabelControl? lc = labelEntity.GetComponent<LabelControl>();
+            if (lc != null) lc.Text = text;
+        }
+
+        private void UpdateServerInfo()
+        {
+            Entity? labelEntity = Scene.FindEntityByTag("label_server_info");
+            if (labelEntity == null || !labelEntity.IsValid) return;
+            LabelControl? lc = labelEntity.GetComponent<LabelControl>();
+            if (lc == null) return;
+
+            string text;
+            if (Network.IsHost)
+            {
+                string pub = Network.GetPublicAddress();
+                bool fetching = pub == "Fetching..." || pub == string.Empty;
+                string local = Network.GetListenAddress();
+                if (string.IsNullOrEmpty(local)) local = $"127.0.0.1:{LobbyManager.SelectedPort}";
+                string upnp = Network.IsUpnpAvailable ? "UPnP: Open (Auto)" : "UPnP: Off";
+                string fw = Network.IsFirewallRuleActive ? " | FW: OK" : "";
+                string hint = !Network.IsUpnpAvailable ? " (Tip: Use Radmin VPN or Port Forwarding for Internet)" : "";
+                text = $"[HOST] Local/LAN: {local}  |  Internet (Friends): {pub}  |  {upnp}{fw}{hint}";
+                if (!fetching && text == m_LastDisplayedInfo) return;
+            }
+            else if (Network.IsClient)
+            {
+                string lan = Network.GetListenAddress();
+                if (string.IsNullOrEmpty(lan)) lan = $"Port: {LobbyManager.SelectedPort}";
+                text = $"[CLIENT] Connected | Port: {LobbyManager.SelectedPort}";
+            }
+            else
+            {
+                text = "[OFFLINE]";
+            }
+
+            if (text != m_LastDisplayedInfo)
+            {
+                m_LastDisplayedInfo = text;
+                lc.Text = text;
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/SelectMapButton.cs b/game/chaineddecos/assets/scripts/src/network/SelectMapButton.cs
new file mode 100644
index 000000000..d5e8a224c
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/SelectMapButton.cs
@@ -0,0 +1,24 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to a map-selection Button entity.
+    /// When clicked, stores the SelectedMap for LobbyManager and optionally loads the next scene.
+    /// </summary>
+    public class SelectMapButton : Script
+    {
+        public string MapScene = "scenes/rpg_strategy_scene_mp.chscene";
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            LobbyManager.SelectedMap = MapScene;
+            Log.Info($"[SelectMapButton] Selected map: {MapScene}");
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/SelectSkinButton.cs b/game/chaineddecos/assets/scripts/src/network/SelectSkinButton.cs
new file mode 100644
index 000000000..fcbc9183b
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/SelectSkinButton.cs
@@ -0,0 +1,27 @@
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to a skin swatch button in the lobby. Set <see cref="SkinIndex"/>
+    /// per button in the scene; clicking it selects that skin and tells the host.
+    /// </summary>
+    public class SelectSkinButton : Script
+    {
+        public int SkinIndex = 0;
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            LobbyManager.SelectedSkinIndex = SkinIndex;
+            // SetLocalPlayerInfo updates the host's own list entry and re-broadcasts;
+            // SendPlayerInfo is the client-side path and a no-op on the host.
+            Network.SetLocalPlayerInfo(PlayerSettings.Nickname, (byte)SkinIndex);
+            Network.SendPlayerInfo(PlayerSettings.Nickname, (byte)SkinIndex);
+            Log.Info($"[SelectSkinButton] Selected skin {SkinIndex} ({SkinDatabase.GetName(SkinIndex)})");
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/SendChatButton.cs b/game/chaineddecos/assets/scripts/src/network/SendChatButton.cs
new file mode 100644
index 000000000..4b5442b9d
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/SendChatButton.cs
@@ -0,0 +1,31 @@
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to the "Send" chat button. Reads text from the input field,
+    /// sends it, and clears the field. Enter-key sending in LobbyUI still works in parallel.
+    /// </summary>
+    public class SendChatButton : Script
+    {
+        public string ChatInputTag = "chat_input";
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            Entity? inputEntity = Scene.FindEntityByTag(ChatInputTag);
+            if (inputEntity == null)
+                return;
+
+            InputTextControl? input = inputEntity.GetComponent<InputTextControl>();
+            if (input == null || string.IsNullOrWhiteSpace(input.Text))
+                return;
+
+            Network.SendChatMessage(input.Text.Trim());
+            input.Text = "";
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/StartGameButton.cs b/game/chaineddecos/assets/scripts/src/network/StartGameButton.cs
new file mode 100644
index 000000000..b85aa3f84
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/StartGameButton.cs
@@ -0,0 +1,37 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to "Start Game" button entity.
+    /// Broadcasts scene change to all clients and loads the selected map on the host.
+    /// </summary>
+    public class StartGameButton : Script
+    {
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+
+            // Client restriction: Only the host can start the game!
+            if (Network.IsConnected && !Network.IsHost)
+            {
+                if (btn != null && btn.Label != "Waiting for Host...")
+                {
+                    btn.Label = "Waiting for Host...";
+                }
+                return;
+            }
+
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            string map = LobbyManager.SelectedMap;
+            int playerCount = Network.ClientCount;
+            Log.Info($"[StartGameButton] Host starting game with {playerCount} client(s), map: {map}");
+
+            Network.BroadcastSceneChange(map);
+            Scene.LoadScene(map);
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/network/StartServerButton.cs b/game/chaineddecos/assets/scripts/src/network/StartServerButton.cs
new file mode 100644
index 000000000..332a948f4
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/network/StartServerButton.cs
@@ -0,0 +1,64 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Attach directly to a Button entity. Reads the port from input_port
+    /// and a selected map tag, then calls Network.HostGame and loads the lobby scene.
+    /// </summary>
+    public class StartServerButton : Script
+    {
+        public string PortInputTag = "input_port";
+        public string NickInputTag = "input_nick";
+        public string MaxClientsInputTag = "input_max_clients";
+        public string LobbyScene = "scenes/lobby.chscene";
+        public string PlayerPrefabPath = "prefab/player.chprefab";
+        public ushort DefaultPort = 7777;
+        public int DefaultMaxClients = 4;
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn == null || !btn.IsClicked)
+                return;
+
+            ushort port = DefaultPort;
+
+            Entity? portEntity = Scene.FindEntityByTag(PortInputTag);
+            if (portEntity != null && portEntity.HasComponent<InputTextControl>())
+            {
+                InputTextControl? input = portEntity.GetComponent<InputTextControl>();
+                if (input != null && ushort.TryParse(input.Text, out ushort parsed) && parsed > 0)
+                    port = parsed;
+            }
+
+            Entity? nickEntity = Scene.FindEntityByTag(NickInputTag);
+            if (nickEntity != null && nickEntity.HasComponent<InputTextControl>())
+            {
+                InputTextControl? input = nickEntity.GetComponent<InputTextControl>();
+                if (input != null && !string.IsNullOrWhiteSpace(input.Text))
+                    PlayerSettings.Nickname = input.Text.Trim();
+            }
+
+            int maxClients = DefaultMaxClients;
+            Entity? maxEntity = Scene.FindEntityByTag(MaxClientsInputTag);
+            if (maxEntity != null && maxEntity.HasComponent<InputTextControl>())
+            {
+                InputTextControl? input = maxEntity.GetComponent<InputTextControl>();
+                if (input != null && int.TryParse(input.Text, out int parsedMax) && parsedMax > 0)
+                    maxClients = parsedMax;
+            }
+
+            Log.Info($"[StartServerButton] Hosting on port {port}, maxClients={maxClients}");
+            Network.SetPlayerPrefab(PlayerPrefabPath);
+            Network.SetLocalPlayerInfo(PlayerSettings.Nickname, (byte)LobbyManager.SelectedSkinIndex);
+            Network.HostGame(port, maxClients);
+
+            LobbyManager.SelectedPort = port;
+            LobbyManager.MaxClients = maxClients;
+
+            Scene.LoadScene(LobbyScene);
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/player/CameraController.cs b/game/chaineddecos/assets/scripts/src/player/CameraController.cs
new file mode 100644
index 000000000..3fa10431b
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/player/CameraController.cs
@@ -0,0 +1,145 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+public class CameraController : Script
+{
+    public float LookSensitivity = 0.5f;
+    public float Distance = 10.0f;
+    public float Pitch = 45.0f;
+    public float Yaw = 0.0f;
+    public string TargetTag = "Player";
+
+    private ulong _localPlayerId = 0;
+
+    public override void OnCreate()
+    {
+        Entity? camEntity = Scene.GetMainCamera();
+        if (camEntity == null)
+        {
+            Log.Error($"[CameraController] FAILED: No main camera found in scene!");
+            return;
+        }
+
+        CameraComponent? camera = camEntity.GetComponent<CameraComponent>();
+        if (camera == null)
+        {
+            Log.Error($"[CameraController] FAILED: Entity '{camEntity}' has no CameraComponent!");
+            return;
+        }
+
+        // One-time setup: make this the primary orbit camera
+        if (!camera.Primary)
+        {
+            Log.Warn($"[CameraController] Setting '{camEntity}' as Primary camera.");
+            camera.Primary = true;
+        }
+
+        camera.IsOrbitCamera = true;
+        camera.TargetEntityTag = TargetTag;
+        
+        // Initialize camera orbit with reasonable script defaults (Pitch=25, Distance=10)
+        camera.SetOrbit(Yaw, Pitch, Distance);
+
+        _localPlayerId = FindLocalPlayerId();
+    }
+
+    public override void OnUpdate(float deltaTime)
+    {
+        var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+        if (netComp != null && !netComp.IsOwner) return;
+
+        Entity? camEntity = Scene.GetMainCamera();
+        if (camEntity == null)
+            return;
+
+        CameraComponent? camera = camEntity.GetComponent<CameraComponent>();
+        if (camera == null)
+            return;
+
+        // Find the player entity to follow.
+        // Networked: use the entity we own (IsOwner). Offline: fall back to tag.
+        Entity? player = null;
+
+        if (Network.IsConnected)
+        {
+            _localPlayerId = FindLocalPlayerId();
+
+            if (_localPlayerId != 0)
+                player = new Entity(_localPlayerId);
+        }
+
+        if (player == null)
+            player = Scene.FindEntityByTag(TargetTag);
+
+        if (player == null)
+            return;
+
+        camera.GetOrbit(out float yaw, out float pitch, out float distance);
+
+        // Handle Input (Orbit & Zoom)
+        if (Input.IsMouseButtonDown(MouseButton.Right))
+        {
+            Vector3 mouseDelta = Input.MouseDelta;
+            yaw -= mouseDelta.X * LookSensitivity;
+            pitch -= mouseDelta.Y * LookSensitivity;
+        }
+
+        // Always clamp pitch & distance every frame to keep camera in a sane 3rd person view
+        pitch = Mathf.Clamp(pitch, -10.0f, 85.0f);
+
+        float wheel = Input.GetMouseWheelMove();
+        distance -= wheel * 2.0f;
+        distance = Mathf.Clamp(distance, 2.0f, 30.0f);
+
+        camera.SetOrbit(yaw, pitch, distance);
+    }
+    // public override void OnUpdate(float deltaTime)
+    // {
+    //     Entity? camEntity = Scene.GetMainCamera();
+    //     if (camEntity == null)
+    //         return;
+
+    //     CameraComponent? camera = camEntity.GetComponent<CameraComponent>();
+    //     if (camera == null)
+    //         return;
+
+    //     Entity? player = Scene.FindEntityByTag("Player");
+    //     if (player == null)
+    //         return;
+
+    //     camera.GetOrbit(out float yaw, out float pitch, out float distance);
+
+    //     // Handle Input (Orbit & Zoom)
+    //     if (Input.IsMouseButtonDown(MouseButton.Right))
+    //     {
+    //         Vector3 mouseDelta = Input.MouseDelta;
+    //         yaw -= mouseDelta.X * LookSensitivity;
+    //         pitch -= mouseDelta.Y * LookSensitivity;
+
+    //         // Clamp pitch
+    //         pitch = Mathf.Clamp(pitch, -10.0f, 85.0f);
+    //     }
+
+    //     float wheel = Input.GetMouseWheelMove();
+    //     distance -= wheel * 2.0f;
+    //     distance = Mathf.Clamp(distance, 0.0f, 40.0f);
+
+    //     camera.SetOrbit(yaw, pitch, distance);
+    // }
+
+    private static ulong FindLocalPlayerId()
+    {
+        var ids = Entity.FindAllWithComponent<NetworkIdentityComponent>();
+        foreach (var id in ids)
+        {
+            var entity = new Entity(id);
+            var netId = entity.GetComponent<NetworkIdentityComponent>();
+            if (netId != null && netId.IsOwner)
+                return id;
+        }
+        return 0;
+    }
+}
+}
diff --git a/game/chaineddecos/assets/scripts/src/player/PeerPlayerController.cs b/game/chaineddecos/assets/scripts/src/player/PeerPlayerController.cs
new file mode 100644
index 000000000..718eb3e56
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/player/PeerPlayerController.cs
@@ -0,0 +1,35 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Lightweight controller for peer avatars spawned from player.chprefab.
+    /// Only handles animation updates based on replicated velocity — no input.
+    /// </summary>
+    public class PeerPlayerController : Script
+    {
+        private RigidBodyComponent? _rb;
+        private AnimationComponent? _anim;
+
+        public override void OnCreate()
+        {
+            _rb = Entity.GetComponent<RigidBodyComponent>();
+            _anim = Entity.GetComponent<AnimationComponent>();
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            if (_rb == null || _anim == null) return;
+
+            // Animation driven by replicated velocity from host
+            bool isMoving = _rb.Velocity.LengthSquared() > 0.1f;
+            float speed = isMoving ? 0.5f : 0.0f;
+            bool isGrounded = _rb.IsGrounded;
+
+            _anim.SetBool("isMoving", isMoving);
+            _anim.SetBool("isGrounded", isGrounded);
+            _anim.SetFloat("speed", speed);
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/player/PlayerController.cs b/game/chaineddecos/assets/scripts/src/player/PlayerController.cs
new file mode 100644
index 000000000..7d75bc3e0
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/player/PlayerController.cs
@@ -0,0 +1,251 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class PlayerController : Script
+    {
+        private float MovementSpeed => Entity.GetComponent<PlayerComponent>()?.MovementSpeed ?? 15.0f;
+        private float JumpForce    => Entity.GetComponent<PlayerComponent>()?.JumpForce ?? 15.0f;
+        public  float Gravity;  
+        public  string MenuScene   = "scenes/start_menu.chscene";
+
+        public int IdleAnim = 0;
+        public int RunAnim = 1;
+        public int JumpAnim = 2;
+        public float CrossFadeTime = 8.5f;
+
+        private bool m_DebugLogged = false;
+        private bool m_WasConnected = false;
+        // NetworkIdentityComponent is injected by C++ after the first OnUpdate,
+        // so we allow a short grace period before enforcing the "no netId = skip" rule.
+        private int m_NetIdWaitFrames = 0;
+        private const int NetIdGraceFrames = 60;
+
+        private RigidBodyComponent? _rb;
+        private TransformComponent? _transform;
+        private AnimationComponent? _anim;
+
+        public override void OnCreate()
+        {
+            Gravity = Physics.GetGravity();
+            _rb        = Entity.GetComponent<RigidBodyComponent>();
+            _transform = Entity.GetComponent<TransformComponent>();
+            _anim      = Entity.GetComponent<AnimationComponent>();
+            Log.Info("PlayerController initialized");
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            if (!m_DebugLogged)
+            {
+                Log.Info("[PlayerController] OnUpdate FIRST CALL — IsConnected=" + Network.IsConnected +
+                         " IsHost=" + Network.IsHost + " HasNetId=" + (Entity.HasComponent<NetworkIdentityComponent>()));
+                if (Entity.HasComponent<NetworkIdentityComponent>())
+                {
+                    var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+                    if (netComp != null)
+                    {
+                        Log.Info("[PlayerController] NetID=" + netComp.NetworkID + " IsOwner=" + netComp.IsOwner);
+                    }
+                }
+                m_DebugLogged = true;
+            }
+            if (Input.IsKeyPressed(Key.Escape))
+            {
+                Log.Info($"Returning to menu: {MenuScene}");
+                if (Network.IsConnected)
+                {
+                    Network.Disconnect();
+                }
+                Scene.LoadScene(MenuScene);
+                return;
+            }
+
+            // Detect host disconnect — return to main menu
+            if (m_WasConnected && !Network.IsConnected)
+            {
+                Log.Info("[PlayerController] Host disconnected — returning to menu.");
+                Scene.LoadScene(MenuScene);
+                return;
+            }
+            if (Network.IsConnected) m_WasConnected = true;
+
+            // Retry every frame: physics body (Jolt) may not be ready immediately after prefab spawn
+            _rb        = Entity.GetComponent<RigidBodyComponent>();
+            _transform = Entity.GetComponent<TransformComponent>();
+            _anim    ??= Entity.GetComponent<AnimationComponent>();
+
+            if (_rb == null || _transform == null) return;
+
+            // ── Network awareness ──
+            var netId = Entity.GetComponent<NetworkIdentityComponent>();
+
+            // Scene-authored Player in a networked session: skip entirely.
+            // NetworkIdentityComponent is added by C++ *after* the first OnUpdate, so we
+            // give it up to NetIdGraceFrames frames to appear before enforcing this check.
+            if (Network.IsConnected && netId == null)
+            {
+                m_NetIdWaitFrames++;
+                if (m_NetIdWaitFrames > NetIdGraceFrames)
+                {
+                    return; // confirmed scene-authored entity with no network role
+                }
+                // Still waiting for C++ to attach NetworkIdentityComponent — continue as owner
+            }
+
+            // Non-owner avatars (host-driven): skip local input entirely.
+            // The host simulates physics for them; InterpolateEntities handles position.
+            if (Network.IsConnected && netId != null && !netId.IsOwner)
+            {
+                // Not our avatar — just update animation from replicated velocity
+                if (_anim != null)
+                {
+                    bool isMoving = _rb.Velocity.LengthSquared() > 0.05f || (netId.RemoteActionFlags & 0x01) != 0;
+                    bool isSprinting = (netId.RemoteActionFlags & 0x02) != 0;
+                    _anim.IsPlaying = true;
+                    _anim.SetBool("isMoving", isMoving);
+                    _anim.SetBool("isGrounded", _rb.IsGrounded);
+                    _anim.SetFloat("speed", isMoving ? (isSprinting ? 1.0f : 0.5f) : 0.0f);
+                }
+                return;
+            }
+
+            // ── Local input (owner or offline) ──
+            float speed = MovementSpeed;
+            if (Input.IsKeyDown(Key.LeftShift)) speed *= 2.0f;
+
+            // Camera-relative basis
+            var (forward, right) = GetCameraBasis();
+
+            // Input
+            var movementDir = GetMovementInput(forward, right);
+
+            // Movement & rotation
+            if (movementDir.LengthSquared() > 0.0001f)
+            {
+                movementDir = Vector3.Normalize(movementDir);
+                ApplyHorizontalMovement(movementDir, speed);
+                RotateTowardsMovement(movementDir);
+                if (m_DebugVelCounter < 30)
+                {
+                    var pos = _transform!.Translation;
+                    Log.Info("[PlayerController] Moving vel=(" + _rb.Velocity.X + "," + _rb.Velocity.Y + "," + _rb.Velocity.Z + ")" +
+                             " pos=(" + pos.X.ToString("F2") + "," + pos.Y.ToString("F2") + "," + pos.Z.ToString("F2") + ")");
+                    m_DebugVelCounter++;
+                }
+            }
+            else
+            {
+                StopHorizontalMovement();
+            }
+
+            HandleVerticalMovement(deltaTime);
+
+            // Animation
+            if (_anim != null) UpdateAnimation(movementDir);
+        }
+
+        private (Vector3 forward, Vector3 right) GetCameraBasis()
+        {
+            var forward = new Vector3(0.0f, 0.0f, -1.0f);
+            var right   = new Vector3(1.0f, 0.0f, 0.0f);
+
+            var camEntity = Scene.GetMainCamera();
+            if (camEntity != null)
+            {
+                var camera = camEntity.GetComponent<CameraComponent>();
+                if (camera != null)
+                {
+                    var camFwd = new Vector3(camera.Forward.X, 0.0f, camera.Forward.Z);
+                    if (camFwd.LengthSquared() > 0.0001f)
+                    {
+                        forward = Vector3.Normalize(camFwd);
+                        right = Vector3.Normalize(new Vector3(-forward.Z, 0.0f, forward.X));
+                    }
+                }
+            }
+            return (forward, right);
+        }
+
+        private Vector3 GetMovementInput(Vector3 forward, Vector3 right)
+        {
+            var dir = Vector3.Zero;
+            if (Input.IsKeyDown(Key.W)) dir += forward;
+            if (Input.IsKeyDown(Key.S)) dir -= forward;
+            if (Input.IsKeyDown(Key.A)) dir -= right;
+            if (Input.IsKeyDown(Key.D)) dir += right;
+            return dir;
+        }
+
+        private void ApplyHorizontalMovement(Vector3 dir, float speed)
+        {
+            if (_rb == null) return;
+            _rb.Velocity = new Vector3(
+                dir.X * speed,
+                _rb.Velocity.Y,
+                dir.Z * speed
+            );
+        }
+
+        private void StopHorizontalMovement()
+        {
+            if (_rb == null) return;
+            _rb.Velocity = new Vector3(0, _rb.Velocity.Y, 0);
+        }
+
+        private void RotateTowardsMovement(Vector3 dir)
+        {
+            if (_transform == null) return;
+            float yaw = Mathf.Atan2(dir.X, dir.Z);
+            _transform.Rotation = new Vector3(0, yaw, 0);
+        }
+
+        private void HandleVerticalMovement(float deltaTime)
+        {
+            if (_rb == null || _transform == null) return;
+
+            if (Input.IsKeyPressed(Key.Space) && _rb.IsGrounded)
+            {
+                _rb.Velocity = new Vector3(_rb.Velocity.X, JumpForce, _rb.Velocity.Z);
+            }
+
+            if (_rb.IsKinematic)
+            {
+                const float terminalVelocity = -50.0f;
+                if (!_rb.IsGrounded) _rb.Velocity = new Vector3(_rb.Velocity.X, _rb.Velocity.Y - Gravity * deltaTime, _rb.Velocity.Z);
+                if (_rb.Velocity.Y < terminalVelocity) _rb.Velocity = new Vector3(_rb.Velocity.X, terminalVelocity, _rb.Velocity.Z);
+                if (_rb.IsGrounded && _rb.Velocity.Y < 0) _rb.Velocity = new Vector3(_rb.Velocity.X, 0, _rb.Velocity.Z);
+                _transform.Translation += _rb.Velocity * deltaTime;
+            }
+        }
+
+        private int _animLogCounter = 0;
+        private int m_DebugVelCounter = 0;
+
+        private void UpdateAnimation(Vector3 movementDir)
+        {
+            if (_anim == null) { Log.Warn("[PlayerController] _anim is null!"); return; }
+
+            bool isMoving = movementDir.LengthSquared() > 0.0001f;
+            bool isSprinting = Input.IsKeyDown(Key.LeftShift);
+            float speed = isMoving ? (isSprinting ? 1.0f : 0.5f) : 0.0f;
+            bool isGrounded = _rb?.IsGrounded ?? true;
+
+            _anim.IsPlaying = true;
+
+            _anim.SetFloat("speed", speed);
+            _anim.SetBool("isMoving", isMoving);
+            _anim.SetBool("isGrounded", isGrounded);
+
+            if (_animLogCounter < 10)
+            {
+                Log.Info($"[PlayerController] UpdateAnimation #{_animLogCounter}: " +
+                    $"movementDir={movementDir.X:F3},{movementDir.Y:F3},{movementDir.Z:F3} " +
+                    $"isMoving={isMoving} speed={speed:F2} isGrounded={isGrounded} " +
+                    $"isSprinting={isSprinting} rb={(_rb != null ? "ok" : "null")}");
+                _animLogCounter++;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/game/chaineddecos/assets/scripts/src/player/PlayerFall.cs b/game/chaineddecos/assets/scripts/src/player/PlayerFall.cs
new file mode 100644
index 000000000..f1de4a3c1
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/player/PlayerFall.cs
@@ -0,0 +1,148 @@
+//========= Copyright Chained Decos, All rights reserved. ============//
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+public class PlayerFall : Script
+{
+    private Entity? m_Camera;
+    private AudioComponent? m_Audio;
+    private float m_Intensity = 0.0f;
+    private float m_LogTimer = 0.0f;
+
+    // Constants for the "natural" feel
+    private const float LIGHT_FALL_THRESHOLD = 5.0f;  // Wind feeling starts here
+    private const float HEAVY_FALL_THRESHOLD = 15.0f; // Turbulence starts here
+    private const float MAX_SHAKE_SPEED = 40.0f;      // Max intensity reached here
+
+    public override void OnCreate()
+    {
+        Log.Info("[PlayerFall] OnCreate: Initializing natural fall effect.");
+        m_Intensity = 0.0f;
+
+        // Reset shaders state
+        ulong[]? shaderEntities = Entity.FindAllWithComponent<ShaderComponent>();
+        if (shaderEntities != null)
+        {
+            foreach (ulong id in shaderEntities)
+            {
+                Entity e = new Entity(id);
+                var shader = e.GetComponent<ShaderComponent>();
+                if (shader != null)
+                {
+                    shader.Enabled = false;
+                    shader.SetFloat("uIntensity", 0.0f);
+                }
+            }
+        }
+
+        m_Camera = Scene.GetMainCamera();
+        m_Audio = Entity.GetComponent<AudioComponent>();
+        if (m_Audio != null)
+        {
+            m_Audio.Loop = true;
+            m_Audio.Volume = 0.0f;
+        }
+    }
+
+    public override void OnUpdate(float deltaTime)
+    {
+        var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+        if (netComp != null && !netComp.IsOwner) return;
+
+        RigidBodyComponent? rb = Entity.GetComponent<RigidBodyComponent>();
+        if (rb == null) return;
+
+        float fallSpeed = -rb.Velocity.Y;
+        bool isGrounded = rb.IsGrounded;
+
+        float targetIntensity = 0.0f;
+        
+        if (!isGrounded && fallSpeed > 1.5f) // Slightly lower start threshold
+        {
+            // 1. Progressive light wind (curved start)
+            // Starts very small and grows to 0.15
+            float windT = Mathf.Clamp((fallSpeed - 1.5f) / 12.0f, 0.0f, 1.0f);
+            float lightWind = (windT * windT) * 0.15f; // Quadratic ease-in for smoother start
+            
+            // 2. Heavy turbulence (only above heavy threshold)
+            float heavyTurbulence = 0.0f;
+            if (fallSpeed > HEAVY_FALL_THRESHOLD)
+            {
+                float turbT = Mathf.Clamp((fallSpeed - HEAVY_FALL_THRESHOLD) / (MAX_SHAKE_SPEED - HEAVY_FALL_THRESHOLD), 0.0f, 1.0f);
+                heavyTurbulence = turbT * 0.85f;
+            }
+            
+            targetIntensity = lightWind + heavyTurbulence;
+        }
+
+        // --- ASYMMETRIC SMOOTHING ---
+        float lerpSpeed;
+        if (isGrounded)
+        {
+            lerpSpeed = 12.0f; // Fast stop on ground
+        }
+        else if (targetIntensity > m_Intensity)
+        {
+            lerpSpeed = 1.5f;  // Very gradual build-up in air
+        }
+        else
+        {
+            lerpSpeed = 3.0f;  // Smooth fade-out in air
+        }
+
+        m_Intensity = Mathf.Lerp(m_Intensity, targetIntensity, deltaTime * lerpSpeed);
+        
+        // Snap to zero when very low
+        if (m_Intensity < 0.001f) m_Intensity = 0.0f;
+
+        if (m_Camera == null) m_Camera = Scene.GetMainCamera();
+        if (m_Camera != null)
+        {
+            var shader = m_Camera.GetComponent<ShaderComponent>();
+            if (shader != null)
+            {
+                bool shouldEnable = m_Intensity > 0.001f;
+                if (shader.Enabled != shouldEnable)
+                {
+                    shader.Enabled = shouldEnable;
+                }
+
+                if (shouldEnable)
+                {
+                    shader.SetFloat("uIntensity", m_Intensity);
+                    
+                    m_LogTimer += deltaTime;
+                    if (m_LogTimer > 1.0f)
+                    {
+                        Log.Info($"[PlayerFall] State: {(isGrounded ? "Grounded" : "Airborne")}, Speed={fallSpeed:F1}, Intensity={m_Intensity:F2}");
+                        m_LogTimer = 0.0f;
+                    }
+                }
+            }
+        }
+
+        // --- AUDIO MODULATION ---
+        if (m_Audio != null)
+        {
+            bool shouldPlay = m_Intensity > 0.01f;
+            
+            if (shouldPlay)
+            {
+                // Start sound once — guard in C++ prevents duplicates
+                if (!m_Audio.IsPlaying) m_Audio.Play();
+                
+                // Dynamically update volume on the active instance (not creating a new one)
+                m_Audio.Volume = Mathf.Clamp(m_Intensity * 2.5f, 0.0f, 1.0f);
+            }
+            else if (m_Audio.IsPlaying)
+            {
+                // Fully stop the sound when intensity drops to zero
+                m_Audio.Volume = 0.0f;
+                m_Audio.Stop();
+            }
+        }
+    }
+}
+}
diff --git a/game/chaineddecos/assets/scripts/src/player/PlayerSettings.cs b/game/chaineddecos/assets/scripts/src/player/PlayerSettings.cs
new file mode 100644
index 000000000..2fffc4580
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/player/PlayerSettings.cs
@@ -0,0 +1,14 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    /// <summary>
+    /// Global player settings shared across scenes.
+    /// Set before loading a multiplayer scene.
+    /// </summary>
+    public static class PlayerSettings
+    {
+        public static string Nickname = "Player";
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/ui/DebugInfoScript.cs b/game/chaineddecos/assets/scripts/src/ui/DebugInfoScript.cs
new file mode 100644
index 000000000..dd2431e4c
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/DebugInfoScript.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class DebugInfoScript : Script
+    {
+        public Key ToggleKey = Key.F3;
+        public Key ToggleKey2 = Key.F4;
+        private bool m_ShowDebug = false;
+
+        public override void OnUpdate(float ts)
+        {
+            var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+            if (netComp != null && !netComp.IsOwner) return;
+
+            if (Input.IsKeyPressed(ToggleKey))
+            {
+                m_ShowDebug = !m_ShowDebug;
+            }
+        }
+
+        public override void OnGUI()
+        {
+            var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+            if (netComp != null && !netComp.IsOwner) return;
+
+            if (m_ShowDebug)
+            {
+                UI.Text($"FPS: {Time.FPS}");
+                UI.Text($"DeltaTime: {Time.DeltaTime:F4}s");
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/ui/DebugLogUI.cs b/game/chaineddecos/assets/scripts/src/ui/DebugLogUI.cs
new file mode 100644
index 000000000..de4b04720
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/DebugLogUI.cs
@@ -0,0 +1,25 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class DebugLogUI : Script
+    {
+        public bool ShowLogs = true;
+
+        public override void OnUpdate(float deltaTime)
+        {
+            if (!ShowLogs) return;
+
+            var history = Log.History;
+            if (history.Count == 0) return;
+
+            // Simple on-screen log using UI.Text
+            // We draw from bottom to top or just a list
+            for (int i = 0; i < history.Count; i++)
+            {
+                UI.Text(history[i]);
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/ui/ExitScript.cs b/game/chaineddecos/assets/scripts/src/ui/ExitScript.cs
new file mode 100644
index 000000000..3e4bdebc2
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/ExitScript.cs
@@ -0,0 +1,18 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class ExitScript : Script
+    {
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn != null && btn.IsClicked)
+            {
+                Log.Info("Exit button clicked");
+                Application.Close();
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/ui/GameHUD.cs b/game/chaineddecos/assets/scripts/src/ui/GameHUD.cs
new file mode 100644
index 000000000..62612cabf
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/GameHUD.cs
@@ -0,0 +1,40 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+public class GameHUD : Script
+{
+    private float m_Timer = 0.0f;
+
+    public override void OnUpdate(float deltaTime)
+    {
+        var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+        if (netComp != null && !netComp.IsOwner) return;
+
+        m_Timer += deltaTime;
+
+        if (Input.IsKeyPressed(Key.R))
+        {
+            m_Timer = 0.0f;
+            Log.Info("timer reset via R");
+        }
+    }
+
+    public override void OnGUI()
+    {
+        var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+        if (netComp != null && !netComp.IsOwner) return;
+
+        TransformComponent? transform = Entity.GetComponent<TransformComponent>();
+        float altitude = transform != null ? transform.Translation.Y : 0.0f;
+
+        int hours = (int)(m_Timer / 3600.0f);
+        int minutes = (int)((m_Timer - hours * 3600.0f) / 60.0f);
+        int seconds = (int)(m_Timer) % 60;
+
+        UI.Text($"Altitude: {altitude:F2}");
+        UI.Text($"Time: {hours:D2}:{minutes:D2}:{seconds:D2}");
+    }
+}
+}
diff --git a/game/chaineddecos/src/GamePauseScript.cs b/game/chaineddecos/assets/scripts/src/ui/GamePauseScript.cs
similarity index 75%
rename from game/chaineddecos/src/GamePauseScript.cs
rename to game/chaineddecos/assets/scripts/src/ui/GamePauseScript.cs
index 69e5f29f6..6ebb11e4d 100644
--- a/game/chaineddecos/src/GamePauseScript.cs
+++ b/game/chaineddecos/assets/scripts/src/ui/GamePauseScript.cs
@@ -1,5 +1,5 @@
 using System;
-using CHEngine;
+using Chained;
 
 namespace ChainedDecos.Scripts
 {
@@ -12,6 +12,10 @@ public override void OnUpdate(float deltaTime)
             if (Input.IsKeyPressed(Key.Escape))
             {
                 Log.Info("Returning to main menu...");
+                if (Network.IsConnected)
+                {
+                    Network.Disconnect();
+                }
                 Scene.LoadScene(MenuScene);
             }
         }
diff --git a/game/chaineddecos/assets/scripts/src/ui/InGameChat.cs b/game/chaineddecos/assets/scripts/src/ui/InGameChat.cs
new file mode 100644
index 000000000..d6924c023
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/InGameChat.cs
@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class InGameChat : Script
+    {
+        public class ChatEntry
+        {
+            public string Sender  = "";
+            public string Message = "";
+            public float  TimeLeft = 8.0f;
+        }
+
+        public bool  IsOpen         { get; private set; } = false;
+        public int   MaxHistory     = 30;
+        public float MessageDuration = 8.0f;
+
+        // Chat window constants (relative to viewport)
+        private const float WinW       = 500.0f;
+        private const float WinH       = 240.0f;
+        private const float OverlayW   = 480.0f;
+        private const float OverlayH   = 160.0f;
+        private const float PadX       = 16.0f;
+        private const float PadY       = 16.0f;
+
+        private List<ChatEntry> m_Messages   = new List<ChatEntry>();
+        private string          m_InputText  = "";
+        private bool            m_FocusInput = false;
+
+        public override void OnUpdate(float deltaTime)
+        {
+            var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+            if (netComp != null && !netComp.IsOwner) return;
+
+            // Fetch pending network chat messages
+            if (Network.IsConnected && Network.HasPendingChat)
+            {
+                string json = Network.GetPendingChatJSON();
+                Network.ClearPendingChat();
+                ParseAndAppendChat(json);
+            }
+
+            // Decrement message display timers
+            for (int i = m_Messages.Count - 1; i >= 0; i--)
+            {
+                m_Messages[i].TimeLeft -= deltaTime;
+            }
+
+            // Toggle chat open/close
+            if (!IsOpen)
+            {
+                if (Input.IsKeyPressed(Key.T) || Input.IsKeyPressed(Key.Enter))
+                {
+                    IsOpen       = true;
+                    m_FocusInput = true;
+                    m_InputText  = "";
+                }
+            }
+            else
+            {
+                // To avoid conflict with PlayerController.cs 
+                if (Input.IsKeyPressed(Key.Delete))
+                {
+                    IsOpen      = false;
+                    m_InputText = "";
+                }
+            }
+        }
+
+        public override void OnGUI()
+        {
+            var netComp = Entity.GetComponent<NetworkIdentityComponent>();
+            if (netComp != null && !netComp.IsOwner) return;
+
+            // Get actual game viewport size each frame
+            Vector2 display = UI.GetDisplaySize();
+            float screenW = display.X;
+            float screenH = display.Y;
+
+            if (IsOpen)
+            {
+                // Full chat window — anchored bottom-left inside the game window
+                float x = PadX;
+                float y = screenH - WinH - PadY;
+
+                UI.BeginWindow("##InGameChatWindow", x, y, WinW, WinH, 0.78f);
+
+                // History
+                int start = Math.Max(0, m_Messages.Count - 12);
+                for (int i = start; i < m_Messages.Count; i++)
+                {
+                    var msg = m_Messages[i];
+                    UI.TextColored($"[{msg.Sender}]: ", 0.4f, 0.8f, 1.0f, 1.0f);
+                    UI.Text(msg.Message);
+                }
+
+                UI.SetScrollHereY(1.0f);
+
+                // Input field
+                if (m_FocusInput)
+                {
+                    UI.SetKeyboardFocusHere();
+                    m_FocusInput = false;
+                }
+
+                if (UI.InputText("##ChatInput", ref m_InputText, 256))
+                {
+                    if (!string.IsNullOrWhiteSpace(m_InputText))
+                    {
+                        Network.SendChatMessage(m_InputText.Trim());
+                    }
+                    m_InputText = "";
+                    IsOpen      = false;
+                }
+
+                UI.EndWindow();
+            }
+            else
+            {
+                // Compact overlay — recent active messages, same anchor
+                bool anyActive = false;
+                int start = Math.Max(0, m_Messages.Count - 6);
+                for (int i = start; i < m_Messages.Count; i++)
+                {
+                    if (m_Messages[i].TimeLeft > 0.0f) { anyActive = true; break; }
+                }
+
+                if (anyActive)
+                {
+                    float x = PadX;
+                    float y = screenH - OverlayH - PadY;
+
+                    UI.BeginWindow("##InGameChatOverlay", x, y, OverlayW, OverlayH, 0.0f);
+
+                    for (int i = start; i < m_Messages.Count; i++)
+                    {
+                        var msg = m_Messages[i];
+                        if (msg.TimeLeft > 0.0f)
+                        {
+                            float alpha = Math.Min(1.0f, msg.TimeLeft);
+                            UI.TextColored($"[{msg.Sender}]: {msg.Message}", 1.0f, 1.0f, 1.0f, alpha);
+                        }
+                    }
+
+                    UI.EndWindow();
+                }
+            }
+        }
+
+        private void ParseAndAppendChat(string json)
+        {
+            if (string.IsNullOrEmpty(json) || json == "[]") return;
+
+            int pos = 0;
+            while (true)
+            {
+                int sStart = json.IndexOf("\"sender\":\"", pos, StringComparison.Ordinal);
+                if (sStart < 0) break;
+                sStart += 10;
+                int sEnd = json.IndexOf('"', sStart);
+                if (sEnd < 0) break;
+                string sender = json.Substring(sStart, sEnd - sStart);
+
+                int mStart = json.IndexOf("\"message\":\"", sEnd, StringComparison.Ordinal);
+                if (mStart < 0) break;
+                mStart += 11;
+                int mEnd = json.IndexOf('"', mStart);
+                if (mEnd < 0) break;
+                string message = json.Substring(mStart, mEnd - mStart);
+
+                m_Messages.Add(new ChatEntry
+                {
+                    Sender   = sender,
+                    Message  = message,
+                    TimeLeft = MessageDuration
+                });
+
+                if (m_Messages.Count > MaxHistory)
+                    m_Messages.RemoveAt(0);
+
+                pos = mEnd + 1;
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/src/LoadSceneButton.cs b/game/chaineddecos/assets/scripts/src/ui/LoadSceneButton.cs
similarity index 81%
rename from game/chaineddecos/src/LoadSceneButton.cs
rename to game/chaineddecos/assets/scripts/src/ui/LoadSceneButton.cs
index fde057f87..689e95957 100644
--- a/game/chaineddecos/src/LoadSceneButton.cs
+++ b/game/chaineddecos/assets/scripts/src/ui/LoadSceneButton.cs
@@ -1,5 +1,5 @@
 using System;
-using CHEngine;
+using Chained;
 
 namespace ChainedDecos.Scripts
 {
@@ -16,9 +16,8 @@ public override void OnUpdate(float deltaTime)
             if (Entity.HasComponent<ButtonControl>())
             {
                 ButtonControl? btn = Entity.GetComponent<ButtonControl>();
-                if (btn != null && btn.IsPressed)
+                if (btn != null && btn.IsClicked)
                 {
-                    Log.Info($"Button pressed! Loading target scene: {TargetScene}");
                     Scene.LoadScene(TargetScene);
                 }
             }
diff --git a/game/chaineddecos/assets/scripts/src/ui/MainMenuScript.cs b/game/chaineddecos/assets/scripts/src/ui/MainMenuScript.cs
new file mode 100644
index 000000000..84e33c322
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/MainMenuScript.cs
@@ -0,0 +1,27 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class MainMenuScript : Script
+    {
+        public string TargetScene = "";
+
+        public override void OnCreate()
+        {
+            Log.Info($"MainMenuScript: Initialized, TargetScene={TargetScene}");
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn != null && btn.IsClicked)
+            {
+                if (!string.IsNullOrEmpty(TargetScene))
+                {
+                    Scene.LoadScene(TargetScene);
+                }
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/scripts/src/ui/SettingsScript.cs b/game/chaineddecos/assets/scripts/src/ui/SettingsScript.cs
new file mode 100644
index 000000000..2f758eb7b
--- /dev/null
+++ b/game/chaineddecos/assets/scripts/src/ui/SettingsScript.cs
@@ -0,0 +1,122 @@
+using System;
+using Chained;
+
+namespace ChainedDecos.Scripts
+{
+    public class SettingsScript : Script
+    {
+        private bool m_WasApplied = false;
+
+        public override void OnStart()
+        {
+            PopulateResolutions();
+            Log.Info("Resolutions populated");
+            PopulateAntiAliasing();
+            Log.Info("Anti-aliasing populated");
+        }
+
+        private void PopulateResolutions()
+        {
+            Entity? resEnt = Scene.FindEntityByTag("resolution");
+            ComboBoxControl? combo = resEnt?.GetComponent<ComboBoxControl>();
+            if (combo == null) return;
+
+            combo.ClearItems();
+            string resolutions = AppWindow.GetSupportedResolutions();
+            if (string.IsNullOrEmpty(resolutions)) return;
+
+            foreach (string res in resolutions.Split(';'))
+            {
+                if (!string.IsNullOrEmpty(res))
+                    combo.AddItem(res);
+            }
+        }
+
+        private void PopulateAntiAliasing()
+        {
+            Entity? aaEnt = Scene.FindEntityByTag("anti_aliasing_combobox");
+            ComboBoxControl? combo = aaEnt?.GetComponent<ComboBoxControl>();
+            if (combo == null) return;
+
+            combo.ClearItems();
+            combo.AddItem("None");
+            combo.AddItem("2x MSAA");
+            combo.AddItem("4x MSAA");
+            combo.AddItem("8x MSAA");
+            combo.SelectedIndex = 2;
+        }
+
+        public override void OnUpdate(float deltaTime)
+        {
+            ButtonControl? btn = Entity.GetComponent<ButtonControl>();
+            if (btn == null) return;
+
+            bool isPressed = btn.IsClicked;
+
+            if (isPressed && !m_WasApplied)
+            {
+                m_WasApplied = true;
+                ApplySettings();
+                Log.Info("Settings applied");
+            }
+            else if (!btn.IsDown)
+            {
+                m_WasApplied = false;
+            }
+        }
+
+        private void ApplySettings()
+        {
+            // 1. Resolution (ComboBox)
+            Entity? resEnt = Scene.FindEntityByTag("resolution");
+            if (resEnt != null)
+            {
+                ComboBoxControl? combo = resEnt.GetComponent<ComboBoxControl>();
+                if (combo != null && combo.ItemCount > 0)
+                {
+                    string? resStr = combo.GetItem(combo.SelectedIndex);
+                    if (!string.IsNullOrEmpty(resStr))
+                    {
+                        string[] parts = resStr.Split('x');
+                        if (parts.Length == 2 && int.TryParse(parts[0], out int w) && int.TryParse(parts[1], out int h))
+                        {
+                            AppWindow.SetSize(w, h);
+                        }
+                    }
+                }
+            }
+
+            // 2. Fullscreen (Checkbox)
+            Entity? fullEnt = Scene.FindEntityByTag("option_fullscreen");
+            if (fullEnt != null)
+            {
+                CheckboxControl? check = fullEnt.GetComponent<CheckboxControl>();
+                if (check != null)
+                    AppWindow.SetFullscreen(check.IsChecked);
+            }
+
+            // 3. VSync (Checkbox)
+            Entity? vsyncEnt = Scene.FindEntityByTag("option_vsync");
+            if (vsyncEnt != null)
+            {
+                CheckboxControl? check = vsyncEnt.GetComponent<CheckboxControl>();
+                if (check != null)
+                    AppWindow.SetVSync(check.IsChecked);
+            }
+
+            // 4. Anti-aliasing (ComboBox)
+            Entity? aaEnt = Scene.FindEntityByTag("anti_aliasing_combobox");
+            if (aaEnt != null)
+            {
+                ComboBoxControl? combo = aaEnt.GetComponent<ComboBoxControl>();
+                if (combo != null && combo.ItemCount > 0)
+                {
+                    int[] aaValues = { 0, 2, 4, 8 };
+                    int idx = combo.SelectedIndex;
+                    if (idx >= 0 && idx < aaValues.Length)
+                        AppWindow.SetAntiAliasingSamples(aaValues[idx]);
+                }
+            }
+        }
+    }
+}
diff --git a/game/chaineddecos/assets/shaders/player_effect.chshader b/game/chaineddecos/assets/shaders/player_effect.chshader
index 778a1db19..67debefdf 100644
--- a/game/chaineddecos/assets/shaders/player_effect.chshader
+++ b/game/chaineddecos/assets/shaders/player_effect.chshader
@@ -1,14 +1,7 @@
 # Player Effect Shader Metadata
-VertexShader: "player_effect.vs"
-FragmentShader: "player_effect.fs"
+VertexShader: "player_effect.vert"
+FragmentShader: "player_effect.frag"
 
 Uniforms:
-  - mvp
-  - matModel
-  - matView
-  - matProjection
-  - texture0
-  - colDiffuse
   - fallSpeed
-  - time
   - windDirection
diff --git a/game/chaineddecos/assets/shaders/player_effect.frag b/game/chaineddecos/assets/shaders/player_effect.frag
new file mode 100644
index 000000000..435cfb72e
--- /dev/null
+++ b/game/chaineddecos/assets/shaders/player_effect.frag
@@ -0,0 +1,55 @@
+#version 430 core
+
+// Input from Vertex Shader
+in vec3 fragPosition;
+in vec2 fragTexCoord;
+in vec3 fragNormal;
+in vec4 fragColor;
+in float windIntensity;
+
+// Standard Engine Uniforms
+uniform sampler2D texture0; // Albedo
+uniform vec4 colDiffuse;
+uniform int useTexture;
+uniform vec3 viewPos;
+uniform float uTime;
+
+out vec4 finalColor;
+
+void main()
+{
+    // 1. Resolve Base Color
+    vec4 texelColor = vec4(1.0);
+    if (useTexture == 1)
+    {
+        texelColor = texture(texture0, fragTexCoord);
+    }
+    
+    // Safety check for vertex color
+    vec4 vColor = (length(fragColor.rgb) > 0.001) ? fragColor : vec4(1.0);
+    vec4 baseColor = texelColor * colDiffuse * vColor;
+    
+    // 2. Apply Wind Effects
+    if (windIntensity > 0.05)
+    {
+        // Rim Glow
+        vec3 normal = normalize(fragNormal);
+        vec3 viewDir = normalize(viewPos - fragPosition);
+        float rim = 1.0 - max(dot(viewDir, normal), 0.0);
+        rim = pow(rim, 2.0) * windIntensity;
+        
+        vec3 rimColor = vec3(0.4, 0.8, 1.0) * rim * 2.0;
+        
+        // Scrolling Wind Lines
+        float lines = sin(fragTexCoord.y * 150.0 - uTime * 60.0) * 0.5 + 0.5;
+        lines *= sin(fragTexCoord.x * 40.0 + uTime * 10.0) * 0.5 + 0.5;
+        lines = pow(lines, 8.0) * windIntensity * 3.0;
+        
+        vec3 windLines = vec3(1.0) * lines; 
+        
+        baseColor.rgb += rimColor + windLines;
+        baseColor.rgb = mix(baseColor.rgb, vec3(0.0, 0.4, 0.8), windIntensity * 0.3);
+    }
+
+    finalColor = baseColor;
+}
diff --git a/game/chaineddecos/assets/shaders/player_effect.fs b/game/chaineddecos/assets/shaders/player_effect.fs
index b08ef7019..ee850d842 100644
--- a/game/chaineddecos/assets/shaders/player_effect.fs
+++ b/game/chaineddecos/assets/shaders/player_effect.fs
@@ -1,39 +1,57 @@
-#version 330 core
+#version 430 core
 
-// Input fragment attributes (from vertex shader)
+// Input from Vertex Shader
+in vec3 fragPosition;
 in vec2 fragTexCoord;
 in vec3 fragNormal;
-in vec3 fragPosition;
 in vec4 fragColor;
 in float windIntensity;
 
-// Input uniform values
-uniform sampler2D texture0;
+// Standard Engine Uniforms
+uniform sampler2D texture0; // Albedo
 uniform vec4 colDiffuse;
+uniform int useTexture;
+uniform vec3 viewPos;
+uniform float uTime;
 
-// Output fragment color
 out vec4 finalColor;
 
 void main()
 {
-    // Get color from model texture
-    vec4 texelColor = texture(texture0, fragTexCoord);
+    // 1. Resolve Base Color (Matching lighting.fs logic)
+    vec4 texelColor = vec4(1.0);
+    if (useTexture == 1)
+    {
+        texelColor = texture(texture0, fragTexCoord);
+    }
     
-    // Base color
-    vec4 baseColor = texelColor * colDiffuse * fragColor;
+    // Safety check for vertex color
+    vec4 vColor = (length(fragColor.rgb) > 0.001) ? fragColor : vec4(1.0);
+    vec4 baseColor = texelColor * colDiffuse * vColor;
     
-    // Subtle visual wind effect - light clothing illumination
-    if (windIntensity > 0.01)
+    // 2. Apply Wind Effects (Intensified)
+    if (windIntensity > 0.05)
     {
-        // Light illumination effect from movement (clothing reflects light differently under wind)
-        // Use normal to calculate wind direction
-        vec3 lightDir = normalize(vec3(1.0, -0.5, 0.5)); // Light direction
-        float windLight = max(0.0, dot(fragNormal, lightDir));
+        // Rim Glow (Fresnel-like) - Much stronger power and intensity
+        vec3 normal = normalize(fragNormal);
+        vec3 viewDir = normalize(viewPos - fragPosition);
+        float rim = 1.0 - max(dot(viewDir, normal), 0.0);
+        rim = pow(rim, 2.0) * windIntensity; // Lower power for wider glow
+        
+        vec3 rimColor = vec3(0.4, 0.8, 1.0) * rim * 2.0; // Brighter blue
         
-        // Light highlight on parts moving under wind
-        float windHighlight = windIntensity * windLight * 0.15;
-        baseColor.rgb += windHighlight * vec3(0.1, 0.1, 0.15); // Light blue tint
+        // Scrolling Wind Lines - Faster and more dense
+        float lines = sin(fragTexCoord.y * 150.0 - uTime * 60.0) * 0.5 + 0.5;
+        lines *= sin(fragTexCoord.x * 40.0 + uTime * 10.0) * 0.5 + 0.5;
+        lines = pow(lines, 8.0) * windIntensity * 3.0;
+        
+        vec3 windLines = vec3(1.0) * lines; 
+        
+        baseColor.rgb += rimColor + windLines;
+        
+        // Add a slight blue tint to the base during fall
+        baseColor.rgb = mix(baseColor.rgb, vec3(0.0, 0.4, 0.8), windIntensity * 0.3);
     }
-    
+
     finalColor = baseColor;
 }
diff --git a/game/chaineddecos/assets/shaders/player_effect.vert b/game/chaineddecos/assets/shaders/player_effect.vert
new file mode 100644
index 000000000..69f52c311
--- /dev/null
+++ b/game/chaineddecos/assets/shaders/player_effect.vert
@@ -0,0 +1,78 @@
+#version 430 core
+
+// Input vertex attributes matching engine's lighting.vert
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec2 a_TexCoord;
+layout(location = 2) in vec3 a_Normal;
+layout(location = 3) in ivec4 a_JointIDs;
+layout(location = 4) in vec4 a_Weights;
+
+// Standard Engine Uniforms
+uniform mat4 mvp;
+uniform mat4 matModel;
+uniform mat4 matView;
+uniform mat4 matProjection;
+uniform mat4 matNormal;
+uniform mat4 boneMatrices[128];
+uniform int useSkinning;
+
+// Custom Wind Effect Uniforms
+uniform float fallSpeed;
+uniform float uTime;
+uniform vec3 windDirection;
+
+// Output to Fragment Shader
+out vec3 fragPosition;
+out vec2 fragTexCoord;
+out vec3 fragNormal;
+out vec4 fragColor;
+out float windIntensity;
+
+void main()
+{
+    vec3 pos = a_Position;
+    vec3 norm = a_Normal;
+
+    // 1. Skinning Support
+    if (useSkinning == 1)
+    {
+        mat4 skinMat = 
+            a_Weights.x * boneMatrices[a_JointIDs.x] +
+            a_Weights.y * boneMatrices[a_JointIDs.y] +
+            a_Weights.z * boneMatrices[a_JointIDs.z] +
+            a_Weights.w * boneMatrices[a_JointIDs.w];
+        
+        pos = (skinMat * vec4(pos, 1.0)).xyz;
+        norm = (skinMat * vec4(norm, 0.0)).xyz;
+    }
+
+    // 2. Wind Deformation Logic
+    float fallStrength = clamp((fallSpeed - 5.0) / 35.0, 0.0, 1.0);
+    windIntensity = fallStrength;
+
+    if (fallStrength > 0.01)
+    {
+        float heightFactor = clamp(a_Position.y + 0.5, 0.0, 1.5);
+        
+        float flutter = sin(uTime * 40.0 + pos.y * 15.0) * 0.05;
+        float bigWave = sin(uTime * 15.0 + pos.z * 4.0) * 0.1;
+        
+        vec3 jitter = vec3(
+            sin(uTime * 60.0) * 0.02,
+            0.0,
+            cos(uTime * 55.0) * 0.02
+        );
+        
+        vec3 windOffset = windDirection * (bigWave + flutter) * heightFactor * fallStrength;
+        pos += windOffset + (jitter * heightFactor * fallStrength);
+        pos += windDirection * heightFactor * fallStrength * 0.2;
+    }
+
+    // 3. Final Transformations
+    fragPosition = vec3(matModel * vec4(pos, 1.0));
+    fragNormal = normalize(mat3(matNormal) * norm);
+    fragTexCoord = a_TexCoord;
+    fragColor = vec4(1.0); 
+
+    gl_Position = mvp * vec4(pos, 1.0);
+}
diff --git a/game/chaineddecos/assets/shaders/player_effect.vs b/game/chaineddecos/assets/shaders/player_effect.vs
index 95f1ed42f..1d9b5d71c 100644
--- a/game/chaineddecos/assets/shaders/player_effect.vs
+++ b/game/chaineddecos/assets/shaders/player_effect.vs
@@ -1,84 +1,84 @@
-#version 330 core
+#version 430 core
 
-// Input vertex attributes
-in vec3 vertexPosition;
-in vec2 vertexTexCoord;
-in vec3 vertexNormal;
-in vec4 vertexColor;
+// Input vertex attributes matching engine's lighting.vs
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec2 a_TexCoord;
+layout(location = 2) in vec3 a_Normal;
+layout(location = 3) in ivec4 a_JointIDs;
+layout(location = 4) in vec4 a_Weights;
 
-// Input uniform values
+// Standard Engine Uniforms
 uniform mat4 mvp;
 uniform mat4 matModel;
 uniform mat4 matView;
 uniform mat4 matProjection;
+uniform mat4 matNormal;
+uniform mat4 boneMatrices[128];
+uniform int useSkinning;
 
-// Wind effect parameters
-uniform float fallSpeed;      // Fall speed (0-60, negative velocity.y)
-uniform float time;            // Time for animation
-uniform vec3 windDirection;   // Wind direction (e.g., vec3(1.0, 0.0, 0.5))
+// Custom Wind Effect Uniforms
+uniform float fallSpeed;
+uniform float uTime;
+uniform vec3 windDirection;
 
-// Output vertex attributes (to fragment shader)
+// Output to Fragment Shader
+out vec3 fragPosition;
 out vec2 fragTexCoord;
 out vec3 fragNormal;
-out vec3 fragPosition;
 out vec4 fragColor;
-out float windIntensity;      // Pass wind intensity to fragment shader
+out float windIntensity;
 
 void main()
 {
-    vec3 pos = vertexPosition;
-    vec3 normal = vertexNormal;
-    
-    // Apply wind effect only when player is falling
-    if (fallSpeed > 0.5)  // Slightly higher threshold for activation
+    vec3 pos = a_Position;
+    vec3 norm = a_Normal;
+
+    // 1. Skinning Support
+    if (useSkinning == 1)
     {
-        // Normalize fall speed (0-1)
-        float fallStrength = clamp(fallSpeed / 40.0, 0.0, 1.0);
-        
-        // Wind intensity - subtle effect, no stretching
-        // Use square for smoother increase
-        float windStrength = fallStrength * fallStrength * 0.15; // Soft, natural effect
+        mat4 skinMat = 
+            a_Weights.x * boneMatrices[a_JointIDs.x] +
+            a_Weights.y * boneMatrices[a_JointIDs.y] +
+            a_Weights.z * boneMatrices[a_JointIDs.z] +
+            a_Weights.w * boneMatrices[a_JointIDs.w];
         
-        // Vertex height relative to model center
-        // Effect is stronger on upper parts (hood, hair, clothing)
-        float heightFactor = max(0.0, vertexPosition.y);
-        // Normalize height (assuming model height is about 2 units)
-        heightFactor = smoothstep(0.0, 1.5, heightFactor); // Smooth transition function
-        heightFactor = pow(heightFactor, 0.8); // Enhance effect on upper parts
-        
-        // Smooth wind animation - light oscillation (like natural wind gust)
-        float windWave = sin(time * 3.0 + vertexPosition.x * 0.5 + vertexPosition.z * 0.3);
-        float windWave2 = cos(time * 2.5 + vertexPosition.z * 0.4 - vertexPosition.x * 0.3);
-        
-        // Combine waves for natural movement
-        float combinedWave = (windWave * 0.6 + windWave2 * 0.4);
+        pos = (skinMat * vec4(pos, 1.0)).xyz;
+        norm = (skinMat * vec4(norm, 0.0)).xyz;
+    }
+
+    // 2. Wind Deformation Logic (Intensified)
+    // Starts reacting at 5.0, maxed out at 40.0
+    float fallStrength = clamp((fallSpeed - 5.0) / 35.0, 0.0, 1.0);
+    windIntensity = fallStrength;
+
+    if (fallStrength > 0.01)
+    {
+        // Height factor (base of model moves less)
+        float heightFactor = clamp(a_Position.y + 0.5, 0.0, 1.5);
         
-        // Light vertex position offset (horizontal only, no stretching)
-        // Effect is proportional to height - upper parts move more
-        vec3 windOffset = windDirection * combinedWave * windStrength * heightFactor;
+        // Much more aggressive vibration
+        float flutter = sin(uTime * 40.0 + pos.y * 15.0) * 0.05;
+        float bigWave = sin(uTime * 15.0 + pos.z * 4.0) * 0.1;
         
-        // Minimal horizontal offset - only light movement (like clothing sway)
-        pos.x += windOffset.x;
-        pos.z += windOffset.z;
+        // Horizontal jitter
+        vec3 jitter = vec3(
+            sin(uTime * 60.0) * 0.02,
+            0.0,
+            cos(uTime * 55.0) * 0.02
+        );
         
-        // Light normal bending for better lighting under wind
-        // This creates light reflection effect from clothing under wind
-        normal = normalize(normal + windOffset * 0.3);
+        vec3 windOffset = windDirection * (bigWave + flutter) * heightFactor * fallStrength;
+        pos += windOffset + (jitter * heightFactor * fallStrength);
         
-        // Pass wind intensity to fragment shader for visual effects
-        windIntensity = windStrength * heightFactor;
+        // Stretching along wind direction
+        pos += windDirection * heightFactor * fallStrength * 0.2;
     }
-    else
-    {
-        windIntensity = 0.0;
-    }
-    
-    // Transform position to world coordinates
+
+    // 3. Final Transformations
     fragPosition = vec3(matModel * vec4(pos, 1.0));
-    fragTexCoord = vertexTexCoord;
-    fragColor = vertexColor;
-    fragNormal = normalize(mat3(matModel) * normal);
-    
-    // Final screen position
-    gl_Position = matProjection * matView * vec4(fragPosition, 1.0);
+    fragNormal = normalize(mat3(matNormal) * norm);
+    fragTexCoord = a_TexCoord;
+    fragColor = vec4(1.0); 
+
+    gl_Position = mvp * vec4(pos, 1.0);
 }
diff --git a/game/chaineddecos/assets/shaders/screen_falling.chshader b/game/chaineddecos/assets/shaders/screen_falling.chshader
index 52f1463b2..321684591 100644
--- a/game/chaineddecos/assets/shaders/screen_falling.chshader
+++ b/game/chaineddecos/assets/shaders/screen_falling.chshader
@@ -1,7 +1,5 @@
-VertexShader: screen_falling.vs
-FragmentShader: screen_falling.fs
+VertexShader: "screen_falling.vert"
+FragmentShader: "screen_falling.frag"
 Uniforms:
-  - mvp
-  - time
-  - intensity
+  - uIntensity
   - color
diff --git a/game/chaineddecos/assets/shaders/screen_falling.chshader.meta b/game/chaineddecos/assets/shaders/screen_falling.chshader.meta
new file mode 100644
index 000000000..842ecff0f
--- /dev/null
+++ b/game/chaineddecos/assets/shaders/screen_falling.chshader.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 14962409001541335283
+Type: Shader
+ContentHash: 3715248123222052060
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/shaders/screen_falling.frag b/game/chaineddecos/assets/shaders/screen_falling.frag
new file mode 100644
index 000000000..6995d613e
--- /dev/null
+++ b/game/chaineddecos/assets/shaders/screen_falling.frag
@@ -0,0 +1,44 @@
+#version 330 core
+
+in vec2 fragTexCoord;
+out vec4 finalColor;
+
+uniform float uTime;
+uniform float uIntensity = 0.0;
+uniform sampler2D texture0;
+uniform float uExposure;
+uniform float uGamma;
+
+void main()
+{
+    vec2 uv = fragTexCoord;
+    float safeIntensity = clamp(uIntensity, 0.0, 1.0);
+
+    if (safeIntensity < 0.05)
+    {
+        vec3 color = texture(texture0, uv).rgb;
+        color *= uExposure;
+        color = pow(color, vec3(1.0 / uGamma));
+        finalColor = vec4(color, 1.0);
+        return;
+    }
+
+    // High-frequency camera shake
+    float shakeX = sin(uTime * 45.0) * cos(uTime * 20.0) * sin(uTime * 35.0);
+    float shakeY = cos(uTime * 50.0) * sin(uTime * 25.0) * cos(uTime * 40.0);
+    
+    vec2 offset = vec2(shakeX, shakeY) * safeIntensity * 0.02;
+
+    vec3 c1 = texture(texture0, uv + offset).rgb;
+    vec3 c2 = texture(texture0, uv + offset * 0.5).rgb;
+    vec3 c3 = texture(texture0, uv).rgb;
+    vec3 c4 = texture(texture0, uv - offset * 0.5).rgb;
+    vec3 c5 = texture(texture0, uv - offset).rgb;
+    
+    vec3 blurredShake = (c1 + c2 + c3 + c4 + c5) / 5.0;
+
+    blurredShake *= uExposure;
+    blurredShake = pow(blurredShake, vec3(1.0 / uGamma));
+
+    finalColor = vec4(blurredShake, 1.0);
+}
diff --git a/game/chaineddecos/assets/shaders/screen_falling.fs b/game/chaineddecos/assets/shaders/screen_falling.fs
index 6bf43ff6a..f7c83be7b 100644
--- a/game/chaineddecos/assets/shaders/screen_falling.fs
+++ b/game/chaineddecos/assets/shaders/screen_falling.fs
@@ -3,37 +3,47 @@
 in vec2 fragTexCoord;
 out vec4 finalColor;
 
-uniform float time;
-uniform float intensity; // 0.0 to 1.0
-uniform vec3 color;
-
-float random(vec2 st) {
-    return fract(sin(dot(st.xy, vec2(12.9898, 78.233))) * 43758.5453123);
-}
+uniform float uTime;
+uniform float uIntensity = 0.0; // Default to 0.0
+uniform sampler2D texture0;
+uniform float uExposure;
+uniform float uGamma;
 
 void main()
 {
-    if (intensity < 0.01) discard;
-
     vec2 uv = fragTexCoord;
+    float safeIntensity = clamp(uIntensity, 0.0, 1.0);
+
+    if (safeIntensity < 0.05) // Increased deadzone
+    {
+        vec3 color = texture(texture0, uv).rgb;
+        // Apply engine lighting settings (Exposure & Gamma)
+        color *= uExposure;
+        color = pow(color, vec3(1.0 / uGamma));
+        finalColor = vec4(color, 1.0);
+        return;
+    }
+
+    // Generate high-frequency sine waves for organic camera shake
+    float shakeX = sin(uTime * 45.0) * cos(uTime * 20.0) * sin(uTime * 35.0);
+    float shakeY = cos(uTime * 50.0) * sin(uTime * 25.0) * cos(uTime * 40.0);
     
-    // Vertical speed lines
-    float lineCount = 100.0;
-    float x = floor(uv.x * lineCount);
-    
-    // Randomize speed and offset for each line
-    float randVal = random(vec2(x, 123.0));
-    float speed = 5.0 + randVal * 10.0;
-    float offset = randVal * 10.0;
-    
-    // Calculate line pattern
-    float y = uv.y * 5.0 + time * speed + offset;
-    float line = step(0.9, fract(y * (0.5 + randVal)));
-    
-    // Fade at the edges of the screen
-    float edgeFade = smoothstep(0.0, 0.2, uv.y) * smoothstep(1.0, 0.8, uv.y);
-    
-    float alpha = line * intensity * edgeFade * (0.1 + randVal * 0.4);
+    // Max offset is 2% of the screen
+    vec2 offset = vec2(shakeX, shakeY) * safeIntensity * 0.02;
+
+    // Sample the scene with the offset and blur
+    vec3 c1 = texture(texture0, uv + offset).rgb;
+    vec3 c2 = texture(texture0, uv + offset * 0.5).rgb;
+    vec3 c3 = texture(texture0, uv).rgb;
+    vec3 c4 = texture(texture0, uv - offset * 0.5).rgb;
+    vec3 c5 = texture(texture0, uv - offset).rgb;
     
-    finalColor = vec4(color, alpha);
+    vec3 blurredShake = (c1 + c2 + c3 + c4 + c5) / 5.0;
+
+    // Apply engine lighting settings (Exposure & Gamma)
+    blurredShake *= uExposure;
+    blurredShake = pow(blurredShake, vec3(1.0 / uGamma));
+
+    finalColor = vec4(blurredShake, 1.0);
 }
+
diff --git a/game/chaineddecos/assets/shaders/screen_falling.vert b/game/chaineddecos/assets/shaders/screen_falling.vert
new file mode 100644
index 000000000..02c812abe
--- /dev/null
+++ b/game/chaineddecos/assets/shaders/screen_falling.vert
@@ -0,0 +1,17 @@
+#version 330 core
+
+// Input vertex attributes
+in vec3 vertexPosition;
+in vec2 vertexTexCoord;
+
+// Output vertex attributes
+out vec2 fragTexCoord;
+
+// Input uniform values
+uniform mat4 mvp;
+
+void main()
+{
+    fragTexCoord = vertexTexCoord;
+    gl_Position = mvp * vec4(vertexPosition, 1.0);
+}
diff --git a/game/chaineddecos/assets/skyboxes/Starry night preview4.png.meta b/game/chaineddecos/assets/skyboxes/Starry night preview4.png.meta
new file mode 100644
index 000000000..df5918242
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/Starry night preview4.png.meta	
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 7648785827999254627
+Type: Texture
+ContentHash: 18408385611243997056
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/skyboxes/citrus_orchard_road_puresky_8k.hdr.meta b/game/chaineddecos/assets/skyboxes/citrus_orchard_road_puresky_8k.hdr.meta
new file mode 100644
index 000000000..f4af3e640
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/citrus_orchard_road_puresky_8k.hdr.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 9068651692607274160
+Type: Texture
+ContentHash: 12682350818682431790
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/skyboxes/kloppenheim_02_puresky_2k.hdr.meta b/game/chaineddecos/assets/skyboxes/kloppenheim_02_puresky_2k.hdr.meta
new file mode 100644
index 000000000..1a04a39a8
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/kloppenheim_02_puresky_2k.hdr.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17891168481013453589
+Type: Texture
+ContentHash: 15880901278664403308
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/skyboxes/night_moon_1771154006486.png.meta b/game/chaineddecos/assets/skyboxes/night_moon_1771154006486.png.meta
new file mode 100644
index 000000000..3731d039e
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/night_moon_1771154006486.png.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 17297050483780196453
+Type: Texture
+ContentHash: 11733593721777850304
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/skyboxes/qwantani_dusk_2_puresky_8k.hdr.meta b/game/chaineddecos/assets/skyboxes/qwantani_dusk_2_puresky_8k.hdr.meta
new file mode 100644
index 000000000..c1d4f20af
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/qwantani_dusk_2_puresky_8k.hdr.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 2444890897583098429
+Type: Texture
+ContentHash: 4865944772119632825
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/skyboxes/qwantani_moonrise_puresky_8k.hdr.meta b/game/chaineddecos/assets/skyboxes/qwantani_moonrise_puresky_8k.hdr.meta
new file mode 100644
index 000000000..be8a6cb7b
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/qwantani_moonrise_puresky_8k.hdr.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 10185740955623857258
+Type: Texture
+ContentHash: 445111167415439505
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/assets/skyboxes/qwantani_night_puresky_4k.hdr.meta b/game/chaineddecos/assets/skyboxes/qwantani_night_puresky_4k.hdr.meta
new file mode 100644
index 000000000..7bf4d5c57
--- /dev/null
+++ b/game/chaineddecos/assets/skyboxes/qwantani_night_puresky_4k.hdr.meta
@@ -0,0 +1,5 @@
+Version: 1
+UUID: 23997202200979090
+Type: Texture
+ContentHash: 2999094062234787088
+IsGenerated: true
\ No newline at end of file
diff --git a/game/chaineddecos/scripts/ChainedDecos.Scripts.csproj b/game/chaineddecos/scripts/ChainedDecos.Scripts.csproj
deleted file mode 100644
index c739a8653..000000000
--- a/game/chaineddecos/scripts/ChainedDecos.Scripts.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <AssemblyName>ChainedDecos.Scripts</AssemblyName>
-    <RootNamespace>ChainedDecos.Scripts</RootNamespace>
-    <ImplicitUsings>disable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>bin</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-  </PropertyGroup>
-
-  <!-- Game script source files (exclude the old CHEngine.cs engine API) -->
-  <ItemGroup>
-    <Compile Include="../src/**/*.cs" />
-    <!-- Exclude the old monolithic API file – now provided by CHEngine.Managed -->
-    <Compile Remove="../src/CHEngine.cs" />
-    <Compile Remove="../src/obj/**" />
-    <Compile Remove="../src/bin/**" />
-  </ItemGroup>
-
-  <!-- Reference the engine's C# API library -->
-  <ItemGroup>
-    <ProjectReference Include="../../../scripting/managed/CHEngine.Managed.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/game/chaineddecos/scripts/game/chaineddecos/bin/ChainedDecos.Scripts.deps.json b/game/chaineddecos/scripts/game/chaineddecos/bin/ChainedDecos.Scripts.deps.json
deleted file mode 100644
index c83a12c1c..000000000
--- a/game/chaineddecos/scripts/game/chaineddecos/bin/ChainedDecos.Scripts.deps.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v9.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v9.0": {
-      "ChainedDecos.Scripts/1.0.0": {
-        "runtime": {
-          "ChainedDecos.Scripts.dll": {}
-        }
-      }
-    }
-  },
-  "libraries": {
-    "ChainedDecos.Scripts/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    }
-  }
-}
\ No newline at end of file
diff --git a/game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj b/game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj
deleted file mode 100644
index b017778a4..000000000
--- a/game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="../../src/HeroProgression.cs" Link="HeroProgression.cs" />
-    <Compile Include="HeroProgressionTests.cs" />
-    <Compile Include="TestStubs.cs" />
-  </ItemGroup>
-</Project>
diff --git a/game/chaineddecos/scripts/tests/HeroProgressionTests.cs b/game/chaineddecos/scripts/tests/HeroProgressionTests.cs
deleted file mode 100644
index 52228c987..000000000
--- a/game/chaineddecos/scripts/tests/HeroProgressionTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using ChainedDecos.Scripts;
-using Xunit;
-
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
-
-namespace ChainedDecos.Scripts.Tests;
-
-public class HeroProgressionTests
-{
-    public HeroProgressionTests()
-    {
-        HeroProgression.ResetCampaign();
-    }
-
-    [Fact]
-    public void ResetCampaign_ShouldRestoreDefaults()
-    {
-        HeroProgression.AddExperience(210, "seed");
-        HeroProgression.AddGold(250, "seed");
-        HeroProgression.UpgradeBranch(ProgressBranch.Strength);
-
-        HeroProgression.ResetCampaign();
-
-        Assert.Equal(1, HeroProgression.HeroLevel);
-        Assert.Equal(0, HeroProgression.Experience);
-        Assert.Equal(100, HeroProgression.ExperienceToNextLevel);
-        Assert.Equal(0, HeroProgression.SkillPoints);
-        Assert.Equal(0, HeroProgression.Gold);
-        Assert.Equal(0, HeroProgression.StrengthLevel);
-        Assert.Equal(0, HeroProgression.MagicLevel);
-        Assert.Equal(0, HeroProgression.EconomyLevel);
-        Assert.Equal(1, HeroProgression.WeaponTier);
-        Assert.Equal(1, HeroProgression.MagicTier);
-        Assert.Equal(0, HeroProgression.ClearedLevelsCount);
-    }
-
-    [Fact]
-    public void AddExperience_ShouldLevelUpAndGrantSkillPoint()
-    {
-        HeroProgression.AddExperience(100, "combat");
-
-        Assert.Equal(2, HeroProgression.HeroLevel);
-        Assert.Equal(0, HeroProgression.Experience);
-        Assert.Equal(160, HeroProgression.ExperienceToNextLevel);
-        Assert.Equal(1, HeroProgression.SkillPoints);
-    }
-
-    [Fact]
-    public void UpgradeBranch_ShouldRequireSkillPoints()
-    {
-        Assert.False(HeroProgression.UpgradeBranch(ProgressBranch.Strength));
-
-        HeroProgression.AddExperience(100, "combat");
-
-        Assert.True(HeroProgression.UpgradeBranch(ProgressBranch.Strength));
-        Assert.Equal(1, HeroProgression.StrengthLevel);
-        Assert.Equal(0, HeroProgression.SkillPoints);
-    }
-
-    [Fact]
-    public void UpgradeBranch_ShouldApplySelectedStrategy()
-    {
-        HeroProgression.AddExperience(100, "combat");
-
-        Assert.True(HeroProgression.UpgradeBranch(ProgressBranch.Magic));
-        Assert.Equal(1, HeroProgression.MagicLevel);
-        Assert.Equal(0, HeroProgression.StrengthLevel);
-        Assert.Equal(0, HeroProgression.EconomyLevel);
-    }
-
-    [Fact]
-    public void BuyWeaponUpgrade_ShouldSpendGoldAndIncreaseTier()
-    {
-        HeroProgression.AddGold(500, "loot");
-
-        int beforeCost = HeroProgression.GetWeaponUpgradeCost();
-        bool upgraded = HeroProgression.BuyWeaponUpgrade();
-
-        Assert.True(upgraded);
-        Assert.Equal(2, HeroProgression.WeaponTier);
-        Assert.Equal(500 - beforeCost, HeroProgression.Gold);
-        Assert.Equal(25, HeroProgression.Experience);
-    }
-
-    [Fact]
-    public void EconomyUpgrade_ShouldReduceShopCosts()
-    {
-        int baseWeaponCost = HeroProgression.GetWeaponUpgradeCost();
-        int baseMagicCost = HeroProgression.GetMagicUpgradeCost();
-
-        HeroProgression.AddExperience(100, "combat");
-        Assert.True(HeroProgression.UpgradeBranch(ProgressBranch.Economy));
-
-        int discountedWeaponCost = HeroProgression.GetWeaponUpgradeCost();
-        int discountedMagicCost = HeroProgression.GetMagicUpgradeCost();
-
-        Assert.True(discountedWeaponCost < baseWeaponCost);
-        Assert.True(discountedMagicCost < baseMagicCost);
-    }
-
-    [Fact]
-    public void CompleteLevel_ShouldRewardOnlyOnFirstClear()
-    {
-        bool first = HeroProgression.CompleteLevel("tutorial");
-        bool second = HeroProgression.CompleteLevel("tutorial");
-
-        Assert.True(first);
-        Assert.False(second);
-        Assert.Equal(1, HeroProgression.ClearedLevelsCount);
-        Assert.Equal(2, HeroProgression.HeroLevel);
-        Assert.Equal(35, HeroProgression.Experience);
-        Assert.Equal(100, HeroProgression.Gold);
-        Assert.Equal(2, HeroProgression.SkillPoints);
-    }
-}
diff --git a/game/chaineddecos/scripts/tests/TestStubs.cs b/game/chaineddecos/scripts/tests/TestStubs.cs
deleted file mode 100644
index 9fda0f245..000000000
--- a/game/chaineddecos/scripts/tests/TestStubs.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace CHEngine;
-
-public static class Log
-{
-    public static void Info(string message)
-    {
-    }
-
-    public static void Warn(string message)
-    {
-    }
-
-    public static void Error(string message)
-    {
-    }
-}
diff --git a/game/chaineddecos/src/CameraController.cs b/game/chaineddecos/src/CameraController.cs
deleted file mode 100644
index 577c4e8c4..000000000
--- a/game/chaineddecos/src/CameraController.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class CameraController : Script
-{
-    public float LookSensitivity = 0.5f;
-
-    public override void OnUpdate(float deltaTime)
-    {
-        CameraComponent? camera = Entity.GetComponent<CameraComponent>();
-        if (camera == null)
-        {
-            Log.Error($"[CameraController] FAILED: Attached to Entity '{Entity}' which has NO CameraComponent. CameraController must be on the Camera entity!");
-            return;
-        }
-
-        // Auto-configure if needed
-        if (!camera.Primary)
-        {
-             Log.Warn($"[CameraController] Camera on '{Entity}' was not Primary. Setting it to Primary now.");
-             camera.Primary = true;
-        }
-
-        Entity? player = Scene.FindEntityByTag("Player");
-        if (player == null)
-        {
-            Log.Warn("[CameraController] Player entity (tagged 'Player') not found. Camera will not orbit correctly.");
-            return;
-        }
-        
-        // Ensure orbit is enabled
-        if (!camera.IsOrbitCamera || camera.TargetEntityTag != "Player")
-        {
-            Log.Info("[CameraController] Correcting Camera orbit settings...");
-            camera.IsOrbitCamera = true;
-            camera.TargetEntityTag = "Player";
-        }
-
-        camera.GetOrbit(out float yaw, out float pitch, out float distance);
-
-        // Handle Input (Orbit & Zoom)
-        if (Input.IsMouseButtonDown(MouseButton.Right))
-        {
-            Vector3 mouseDelta = Input.MouseDelta;
-            yaw -= mouseDelta.X * LookSensitivity;
-            pitch -= mouseDelta.Y * LookSensitivity;
-
-            // Clamp pitch
-            pitch = Mathf.Clamp(pitch, -10.0f, 85.0f);
-        }
-
-        float wheel = Input.GetMouseWheelMove();
-        distance -= wheel * 2.0f;
-        distance = Mathf.Clamp(distance, 0.0f, 40.0f);
-
-        camera.SetOrbit(yaw, pitch, distance);
-    }
-}
-}
diff --git a/game/chaineddecos/src/DebugInfoScript.cs b/game/chaineddecos/src/DebugInfoScript.cs
deleted file mode 100644
index c00264362..000000000
--- a/game/chaineddecos/src/DebugInfoScript.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    public class DebugInfoScript : Script
-    {
-        public Key ToggleKey = Key.F3;
-        public Key ToggleKey2 = Key.F4;
-        private bool m_ShowDebug = false;
-
-        public override void OnUpdate(float ts)
-        {
-            if (Input.IsKeyPressed(ToggleKey))
-            {
-                m_ShowDebug = !m_ShowDebug;
-            }
-        }
-
-        public override void OnGUI()
-        {
-            if (m_ShowDebug)
-            {
-                UI.Text($"FPS: {Time.FPS}");
-                UI.Text($"DeltaTime: {Time.DeltaTime:F4}s");
-            }
-        }
-    }
-}
diff --git a/game/chaineddecos/src/ExitScript.cs b/game/chaineddecos/src/ExitScript.cs
deleted file mode 100644
index 18f67576a..000000000
--- a/game/chaineddecos/src/ExitScript.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class ExitScript : Script
-{
-    public override void OnUpdate(float deltaTime)
-    {
-        ButtonControl? btn = Entity.GetComponent<ButtonControl>();
-        if (btn != null)
-        {
-            if (btn.IsPressed)
-            {
-                Application.Close();
-            }
-        }
-    }
-}
-}
diff --git a/game/chaineddecos/src/GameHUD.cs b/game/chaineddecos/src/GameHUD.cs
deleted file mode 100644
index 95c2d2b6f..000000000
--- a/game/chaineddecos/src/GameHUD.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class GameHUD : Script
-{
-    private float m_Timer = 0.0f;
-    private int m_DebugLevelCounter = 1;
-
-    public override void OnUpdate(float deltaTime)
-    {
-        m_Timer += deltaTime;
-
-        if (Input.IsKeyPressed(Key.R))
-        {
-            m_Timer = 0.0f;
-            Log.Info("timer reset via R");
-        }
-
-        if (Input.IsKeyPressed(Key.U))
-            HeroProgression.AddExperience(45, "training");
-
-        if (Input.IsKeyPressed(Key.I))
-            HeroProgression.AddGold(35, "loot");
-
-        if (Input.IsKeyPressed(Key.D1))
-            HeroProgression.UpgradeBranch(ProgressBranch.Strength);
-
-        if (Input.IsKeyPressed(Key.D2))
-            HeroProgression.UpgradeBranch(ProgressBranch.Magic);
-
-        if (Input.IsKeyPressed(Key.D3))
-            HeroProgression.UpgradeBranch(ProgressBranch.Economy);
-
-        if (Input.IsKeyPressed(Key.Q))
-            HeroProgression.BuyWeaponUpgrade();
-
-        if (Input.IsKeyPressed(Key.E))
-            HeroProgression.BuyMagicUpgrade();
-
-        if (Input.IsKeyPressed(Key.L))
-        {
-            string levelId = $"debug_level_{m_DebugLevelCounter++}";
-            HeroProgression.CompleteLevel(levelId);
-        }
-
-        if (Input.IsKeyPressed(Key.F10))
-        {
-            HeroProgression.ResetCampaign();
-            m_DebugLevelCounter = 1;
-        }
-    }
-
-    public override void OnGUI()
-    {
-        TransformComponent? transform = Entity.GetComponent<TransformComponent>();
-        float altitude = transform != null ? transform.Translation.Y : 0.0f;
-        
-        int hours = (int)(m_Timer / 3600.0f);
-        int minutes = (int)((m_Timer - hours * 3600.0f) / 60.0f);
-        int seconds = (int)(m_Timer) % 60;
-
-        UI.Text($"Altitude: {altitude:F2}");
-        UI.Text($"Time: {hours:D2}:{minutes:D2}:{seconds:D2}");
-
-        UI.Text($"Hero Lvl {HeroProgression.HeroLevel}  XP {HeroProgression.Experience}/{HeroProgression.ExperienceToNextLevel}");
-        UI.Text($"Gold: {HeroProgression.Gold}  SP: {HeroProgression.SkillPoints}  Cleared: {HeroProgression.ClearedLevelsCount}");
-        UI.Text($"STR:{HeroProgression.StrengthLevel}  MAG:{HeroProgression.MagicLevel}  ECO:{HeroProgression.EconomyLevel}");
-        UI.Text($"Weapon Tier:{HeroProgression.WeaponTier} ({HeroProgression.GetWeaponUpgradeCost()}g)  Magic Tier:{HeroProgression.MagicTier} ({HeroProgression.GetMagicUpgradeCost()}g)");
-        UI.Text($"Bonuses -> SPD x{HeroProgression.MoveSpeedMultiplier:F2} JUMP x{HeroProgression.JumpMultiplier:F2} DMG x{HeroProgression.WeaponDamageMultiplier:F2}");
-        UI.Text($"Magic x{HeroProgression.SpellPowerMultiplier:F2}  Gold x{HeroProgression.GoldGainMultiplier:F2}  Shop x{HeroProgression.ShopDiscountMultiplier:F2}");
-        UI.Text("Keys: U XP, I Gold, 1/2/3 Branch, Q Weapon, E Magic, L Clear Level, F10 Reset");
-    }
-}
-}
diff --git a/game/chaineddecos/src/GameLogicPatterns.cs b/game/chaineddecos/src/GameLogicPatterns.cs
deleted file mode 100644
index ebdf11cee..000000000
--- a/game/chaineddecos/src/GameLogicPatterns.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    // --- 1. SINGLETON (Одинак) ---
-    // Керує загальним станом гри, рахунком та поточним режимом.
-    // Використовується як глобальна точка доступу.
-    // NOTE: See GameManager.cs for the actual implementation.
-    public class GameManagerPattern : Script
-    {
-        private static GameManagerPattern? _instance;
-        public static GameManagerPattern Instance => _instance ?? throw new Exception("GameManagerPattern not initialized.");
-
-        public int Score { get; set; } = 0;
-        public string ActiveTheme { get; set; } = "Basic";
-
-        public override void OnCreate()
-        {
-            if (_instance != null && _instance != this)
-            {
-                Log.Info("[Singleton] Duplicate GameManagerPattern detected. Ignoring.");
-                return;
-            }
-            _instance = this;
-            Log.Info("[Singleton] GameManagerPattern Initialized.");
-        }
-
-        public void ResetGame()
-        {
-            Score = 0;
-            Log.Info("[Singleton] Game Reset via GameManagerPattern.");
-        }
-    }
-
-    // --- 2. PROTOTYPE (Прототип) ---
-    // Дозволяє клонувати налаштування об'єктів (масштаб, модель) "на ходу".
-    public class CubePrototype
-    {
-        public Vector3 Scale;
-        public string ModelPath;
-
-        public CubePrototype(Vector3 scale, string modelPath)
-        {
-            Scale = scale;
-            ModelPath = modelPath;
-        }
-
-        // Повертає новий примірник прототипу (чистий C# Prototype)
-        public CubePrototype Clone() => new CubePrototype(Scale, ModelPath);
-
-        // Застосовує параметри прототипу до існуючої сутності
-        public void ApplyTo(Entity target)
-        {
-            if (target == null || !target.IsValid) return;
-
-            // 1. Масштаб
-            var transform = target.GetComponent<TransformComponent>();
-            if (transform != null) transform.Scale = Scale;
-
-            // 2. Модель (якщо є)
-            var model = target.GetComponent<ModelComponent>();
-            if (model == null && !string.IsNullOrEmpty(ModelPath))
-                model = target.AddComponent<ModelComponent>();
-            
-            if (model != null) model.ModelPath = ModelPath;
-
-            Log.Info($"[Prototype] Applied config to Entity {target.ID} (Scale: {Scale}, Model: {ModelPath})");
-        }
-    }
-
-    // --- 3. ABSTRACT FACTORY (Абстрактна фабрика) ---
-    // Інтерфейс для створення конфігурацій гри залежно від розширення/стилю.
-    // Зв'язує логіку з системними налаштуваннями (AppWindow) та сценами.
-    public interface IGameConfigFactory
-    {
-        void ConfigureWindow();
-        string GetTargetScene();
-    }
-
-    // Конкретна фабрика для "Classic" режиму (мале розширення)
-    public class ClassicConfigFactory : IGameConfigFactory
-    {
-        public void ConfigureWindow()
-        {
-            AppWindow.SetSize(1280, 720);
-            AppWindow.SetFullscreen(false);
-            AppWindow.SetVSync(true);
-            Log.Info("[Factory] Classic Mode: 720p Windowed");
-        }
-
-        public string GetTargetScene() => "scenes/untitled100.chscene";
-    }
-
-    // Конкретна фабрика для "Ultra" режиму (велике розширення, графічні налаштування)
-    public class UltraConfigFactory : IGameConfigFactory
-    {
-        public void ConfigureWindow()
-        {
-            AppWindow.SetSize(1920, 1080);
-            AppWindow.SetFullscreen(true);
-            AppWindow.SetAntialiasing(true);
-            Log.Info("[Factory] Ultra Mode: 1080p Fullscreen + AA");
-        }
-
-        public string GetTargetScene() => "scenes/test_platform_scene.chscene";
-    }
-
-    // --- usage: Скрипт-контролер для демонстрації шаблонів ---
-    public class PatternUsageController : Script
-    {
-        private IGameConfigFactory? _activeFactory;
-        private CubePrototype _smallCube = new CubePrototype(new Vector3(0.5f, 0.5f, 0.5f), "assets/models/cube.obj");
-        private CubePrototype _wallCube = new CubePrototype(new Vector3(1.0f, 5.0f, 10.0f), ""); // No model change for wall yet
-
-        public override void OnUpdate(float deltaTime) // Натискання клавіш для перевірки
-        {
-            // 1. Тест Singleton (Пробіл)
-            if (Input.IsKeyPressed(Key.Space))
-            {
-                GameManagerPattern.Instance.Score += 10;
-                Log.Info($"[Singleton Test] Score is now: {GameManagerPattern.Instance.Score}");
-            }
-
-            // 2. Тест Abstract Factory (Клавіші 1 та 2)
-            if (Input.IsKeyPressed(Key.D1)) ApplyConfig(new ClassicConfigFactory());
-            if (Input.IsKeyPressed(Key.D2)) ApplyConfig(new UltraConfigFactory());
-
-            // 3. Тест Prototype (Клавіша P - застосувати, Клавіша N - клонувати)
-            if (Input.IsKeyPressed(Key.P))
-            {
-                // Застосовуємо прототип стіни до поточного об'єкта
-                _wallCube.ApplyTo(Entity);
-            }
-
-            if (Input.IsKeyPressed(Key.N))
-            {
-                // Створюємо нову сутність як копію поточної і застосовуємо прототип "малого куба"
-                Entity? newEntity = Scene.CopyEntity(Entity);
-                if (newEntity != null)
-                {
-                    _smallCube.ApplyTo(newEntity);
-                    Log.Info($"[Prototype Test] Spawning new entity {newEntity.ID} via Prototype.");
-                }
-            }
-        }
-
-        private void ApplyConfig(IGameConfigFactory factory)
-        {
-            _activeFactory = factory;
-            _activeFactory.ConfigureWindow();
-            Log.Info($"[Factory Test] Configuration applied for: {_activeFactory.GetTargetScene()}");
-        }
-    }
-}
diff --git a/game/chaineddecos/src/GameManager.cs b/game/chaineddecos/src/GameManager.cs
deleted file mode 100644
index 0c94a0025..000000000
--- a/game/chaineddecos/src/GameManager.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    /// <summary>
-    /// Singleton pattern for managing the game state in high-level scripting.
-    /// Manages player score, game time, and global game state.
-    /// </summary>
-    public class GameManager : Script
-    {
-        private static GameManager? _instance;
-        public static GameManager Instance => _instance ?? throw new InvalidOperationException("GameManager not initialized.");
-
-        public int Score { get; private set; } = 0;
-        public float GameTime { get; private set; } = 0.0f;
-        public bool IsGameOver { get; private set; } = false;
-
-        public override void OnCreate()
-        {
-            if (_instance != null && _instance != this)
-            {
-                Log.Info("Multiple GameManager instances detected. Destroying duplicate.");
-                // In a real engine we might call Entity.Destroy() here if supported
-                return;
-            }
-            _instance = this;
-            Log.Info("GameManager Singleton initialized.");
-        }
-
-        public override void OnUpdate(float deltaTime)
-        {
-            if (!IsGameOver)
-            {
-                GameTime += deltaTime;
-            }
-        }
-
-        public void AddScore(int points)
-        {
-            Score += points;
-            Log.Info($"Score updated: {Score}");
-        }
-
-        public void EndGame()
-        {
-            IsGameOver = true;
-            Log.Info($"Game Over! Final Score: {Score}, Time: {GameTime:F2}s");
-        }
-    }
-}
diff --git a/game/chaineddecos/src/HeroBehavioralScript.cs b/game/chaineddecos/src/HeroBehavioralScript.cs
deleted file mode 100644
index 74f2efc43..000000000
--- a/game/chaineddecos/src/HeroBehavioralScript.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    // =========================================================================
-    // 1. OBSERVER (Спостерігач) - Моніторинг статусу героя
-    // =========================================================================
-    public interface IHeroObserver
-    {
-        void OnHeroStatChanged(string stat, float value);
-    }
-
-    // "Консольний інтерфейс" (Concrete Observer), який тепер виводить дані на екран
-    public class HeroHUD : IHeroObserver
-    {
-        public List<string> Notifications { get; } = new List<string>();
-
-        public void OnHeroStatChanged(string stat, float value)
-        {
-            string msg = $"[{DateTime.Now.ToString("HH:mm:ss")}] {stat} is now: {value}";
-            Log.Info($"[Observer: HUD] {msg}");
-            
-            Notifications.Add(msg);
-            if (Notifications.Count > 5) 
-                Notifications.RemoveAt(0); // Зберігаємо лише 5 останніх повідомлень
-        }
-
-        public void DrawLogs()
-        {
-            UI.Text("");
-            UI.Text("--- [ OBSERVER LIVE LOGS ] ---");
-            foreach (var msg in Notifications)
-            {
-                UI.Text(msg);
-            }
-        }
-    }
-
-    // =========================================================================
-    // 2. STATE (Стан) - Управління поведінкою в різних режимах
-    // =========================================================================
-    public interface IHeroState
-    {
-        void UpdateState(HeroBehavioralContext context, float deltaTime);
-        string GetName();
-    }
-
-    // Стан спокою
-    public class IdleState : IHeroState
-    {
-        public string GetName() => "Idle";
-        public void UpdateState(HeroBehavioralContext context, float deltaTime)
-        {
-            // Поступове відновлення енергії (умовно)
-        }
-    }
-
-    // Стан тренування
-    public class TrainingState : IHeroState
-    {
-        private float _timer = 0;
-        public string GetName() => "Training (Slow XP)";
-        public void UpdateState(HeroBehavioralContext context, float deltaTime)
-        {
-            _timer += deltaTime;
-            if (_timer >= 2.0f) // Кожні 2 секунди тренування +10 XP
-            {
-                context.AddXP(10);
-                _timer = 0;
-            }
-        }
-    }
-
-    // Стан бою (Новий)
-    public class CombatState : IHeroState
-    {
-        private float _timer = 0;
-        public string GetName() => "Combat (High XP, Drain Gold)";
-        
-        public void UpdateState(HeroBehavioralContext context, float deltaTime)
-        {
-            _timer += deltaTime;
-            if (_timer >= 1.5f) // У бою досвід росте швидше, але нищиться екіпіровка (втрата золота)
-            {
-                context.AddXP(25);
-                context.Gold -= 5;
-                context.NotifyStatChange("Gold", context.Gold);
-                _timer = 0;
-            }
-        }
-    }
-
-    // =========================================================================
-    // 3. COMMAND (Команда) - Виконання та скасування (Undo) дій
-    // =========================================================================
-    public interface IGameCommand
-    {
-        void Execute();
-        void Undo();
-    }
-
-    // Команда покупки
-    public class PurchaseCommand : IGameCommand
-    {
-        private HeroBehavioralContext _context;
-        private int _cost;
-        private string _item;
-
-        public PurchaseCommand(HeroBehavioralContext context, string item, int cost)
-        {
-            _context = context;
-            _item = item;
-            _cost = cost;
-        }
-
-        public void Execute()
-        {
-            if (_context.Gold >= _cost)
-            {
-                _context.Gold -= _cost;
-                Log.Info($"[Command] Purchased {_item}. Gold left: {_context.Gold}");
-            }
-        }
-
-        public void Undo()
-        {
-            _context.Gold += _cost;
-            Log.Info($"[Command Undo] Returned {_item}. Gold restored to: {_context.Gold}");
-        }
-    }
-
-    // Команда лікування (Нова)
-    public class HealCommand : IGameCommand
-    {
-        private HeroBehavioralContext _context;
-        private int _cost = 50;
-
-        public HealCommand(HeroBehavioralContext context) => _context = context;
-
-        public void Execute()
-        {
-            if (_context.Gold >= _cost)
-            {
-                _context.Gold -= _cost;
-                Log.Info($"[Command] Healed hero. Gold left: {_context.Gold}");
-            }
-        }
-
-        public void Undo()
-        {
-            _context.Gold += _cost;
-            Log.Info($"[Command Undo] Healing spell reverted. Gold restored: {_context.Gold}");
-        }
-    }
-
-    // =========================================================================
-    // КОНТЕКСТ ГЕРОЯ (Subject for Observer, Context for State)
-    // =========================================================================
-    public class HeroBehavioralContext
-    {
-        private List<IHeroObserver> _observers = new List<IHeroObserver>();
-        private IHeroState _currentState = new IdleState();
-        private Stack<IGameCommand> _history = new Stack<IGameCommand>();
-
-        public int Gold { get; set; } = 500;
-        public int XP { get; private set; } = 0;
-
-        public void AddObserver(IHeroObserver observer) => _observers.Add(observer);
-        
-        public void SetState(IHeroState newState)
-        {
-            Log.Info($"[State Change] Hero is now: {newState.GetName()}");
-            _currentState = newState;
-        }
-
-        public void AddXP(int amount)
-        {
-            XP += amount;
-            NotifyStatChange("XP", XP);
-        }
-
-        public void ExecuteCommand(IGameCommand cmd)
-        {
-            cmd.Execute();
-            _history.Push(cmd);
-            NotifyStatChange("Gold", Gold);
-        }
-
-        public void UndoLastAction()
-        {
-            if (_history.Count > 0)
-            {
-                _history.Pop().Undo();
-                NotifyStatChange("Gold", Gold);
-            }
-            else Log.Info("No actions to undo!");
-        }
-
-        public void Update(float deltaTime) => _currentState.UpdateState(this, deltaTime);
-
-        public void RenderUI()
-        {
-            UI.Text("=== BEHAVIORAL PATTERNS ===");
-            UI.Text($"Current State: {_currentState.GetName()}");
-            UI.Text($"Stats => XP: {XP} | Gold: {Gold}g");
-            UI.Text($"Command History Stack: {_history.Count} actions");
-            UI.Text("Controls: State -> T(Train) / I(Idle) / C(Combat)");
-            UI.Text("Controls: Cmd -> B(Buy) / H(Heal) / U(Undo) | Other -> G(+Gold)");
-            UI.Text("---------------------------------");
-
-            // Виклик відображення для Observer, якщо він підтримує GUI
-            foreach (var obs in _observers)
-            {
-                if (obs is HeroHUD hud)
-                    hud.DrawLogs();
-            }
-        }
-
-        public void NotifyStatChange(string stat, float value)
-        {
-            foreach (var obs in _observers) obs.OnHeroStatChanged(stat, value);
-        }
-    }
-
-    // =========================================================================
-    // MAIN SCRIPT
-    // =========================================================================
-    public class HeroBehavioralScript : Script
-    {
-        private HeroBehavioralContext? _hero;
-
-        public override void OnCreate()
-        {
-            Log.Info("=== BEHAVIORAL PATTERNS SYSTEM READY ===");
-            _hero = new HeroBehavioralContext();
-            
-            // Підключаємо спостерігача
-            _hero.AddObserver(new HeroHUD());
-        }
-
-        public override void OnUpdate(float deltaTime)
-        {
-            _hero?.Update(deltaTime);
-
-            // 1. Тест Станів
-            if (Input.IsKeyPressed(Key.T)) _hero?.SetState(new TrainingState());
-            if (Input.IsKeyPressed(Key.I)) _hero?.SetState(new IdleState());
-            if (Input.IsKeyPressed(Key.C)) _hero?.SetState(new CombatState()); // Новий стан
-
-            // 2. Тест Команд
-            if (Input.IsKeyPressed(Key.B)) 
-                _hero?.ExecuteCommand(new PurchaseCommand(_hero, "Mystic Scroll", 150));
-            if (Input.IsKeyPressed(Key.H)) 
-                _hero?.ExecuteCommand(new HealCommand(_hero)); // Нова команда
-
-            // 3. Тест Undo
-            if (Input.IsKeyPressed(Key.U)) // Undo
-            {
-                _hero?.UndoLastAction();
-            }
-
-            // 4. Додаткове золото для тесту
-            if (Input.IsKeyPressed(Key.G))
-            {
-                if (_hero != null)
-                {
-                    _hero.Gold += 100;
-                    _hero.NotifyStatChange("Gold", _hero.Gold);
-                }
-            }
-        }
-
-        public override void OnGUI()
-        {
-            _hero?.RenderUI();
-        }
-    }
-}
diff --git a/game/chaineddecos/src/HeroProgression.cs b/game/chaineddecos/src/HeroProgression.cs
deleted file mode 100644
index 178c59063..000000000
--- a/game/chaineddecos/src/HeroProgression.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    public enum ProgressBranch
-    {
-        Strength,
-        Magic,
-        Economy
-    }
-
-    // Strategy contract for branch-specific hero development.
-    public interface IHeroDevelopmentStrategy
-    {
-        ProgressBranch Branch { get; }
-        void Apply(HeroBuildState state);
-    }
-
-    public sealed class HeroBuildState
-    {
-        public int StrengthLevel { get; set; }
-        public int MagicLevel { get; set; }
-        public int EconomyLevel { get; set; }
-    }
-
-    public sealed class StrengthDevelopmentStrategy : IHeroDevelopmentStrategy
-    {
-        public ProgressBranch Branch => ProgressBranch.Strength;
-
-        public void Apply(HeroBuildState state)
-        {
-            state.StrengthLevel++;
-        }
-    }
-
-    public sealed class MagicDevelopmentStrategy : IHeroDevelopmentStrategy
-    {
-        public ProgressBranch Branch => ProgressBranch.Magic;
-
-        public void Apply(HeroBuildState state)
-        {
-            state.MagicLevel++;
-        }
-    }
-
-    public sealed class EconomyDevelopmentStrategy : IHeroDevelopmentStrategy
-    {
-        public ProgressBranch Branch => ProgressBranch.Economy;
-
-        public void Apply(HeroBuildState state)
-        {
-            state.EconomyLevel++;
-        }
-    }
-
-    // Global progression state shared across gameplay scripts.
-    public static class HeroProgression
-    {
-        private static readonly HashSet<string> s_CompletedLevelIds = new(StringComparer.OrdinalIgnoreCase);
-        private static readonly HeroBuildState s_BuildState = new();
-        private static readonly Dictionary<ProgressBranch, IHeroDevelopmentStrategy> s_DevelopmentStrategies =
-            new()
-            {
-                { ProgressBranch.Strength, new StrengthDevelopmentStrategy() },
-                { ProgressBranch.Magic, new MagicDevelopmentStrategy() },
-                { ProgressBranch.Economy, new EconomyDevelopmentStrategy() },
-            };
-
-        public static int HeroLevel { get; private set; } = 1;
-        public static int Experience { get; private set; } = 0;
-        public static int ExperienceToNextLevel { get; private set; } = 100;
-        public static int SkillPoints { get; private set; } = 0;
-        public static int Gold { get; private set; } = 0;
-
-        public static int StrengthLevel => s_BuildState.StrengthLevel;
-        public static int MagicLevel => s_BuildState.MagicLevel;
-        public static int EconomyLevel => s_BuildState.EconomyLevel;
-
-        public static int WeaponTier { get; private set; } = 1;
-        public static int MagicTier { get; private set; } = 1;
-
-        public static int ClearedLevelsCount => s_CompletedLevelIds.Count;
-
-        public static float MoveSpeedMultiplier => 1.0f + StrengthLevel * 0.08f;
-        public static float JumpMultiplier => 1.0f + StrengthLevel * 0.06f;
-        public static float WeaponDamageMultiplier => 1.0f + StrengthLevel * 0.10f + (WeaponTier - 1) * 0.18f;
-        public static float SpellPowerMultiplier => 1.0f + MagicLevel * 0.12f + (MagicTier - 1) * 0.20f;
-        public static float GoldGainMultiplier => 1.0f + EconomyLevel * 0.18f;
-        public static float ShopDiscountMultiplier => Math.Max(0.55f, 1.0f - EconomyLevel * 0.05f);
-
-        public static int GetWeaponUpgradeCost()
-        {
-            float baseCost = 120.0f + (WeaponTier - 1) * 90.0f;
-            return Math.Max(50, (int)Math.Round(baseCost * ShopDiscountMultiplier));
-        }
-
-        public static int GetMagicUpgradeCost()
-        {
-            float baseCost = 130.0f + (MagicTier - 1) * 95.0f;
-            return Math.Max(60, (int)Math.Round(baseCost * ShopDiscountMultiplier));
-        }
-
-        public static void ResetCampaign()
-        {
-            HeroLevel = 1;
-            Experience = 0;
-            ExperienceToNextLevel = 100;
-            SkillPoints = 0;
-            Gold = 0;
-
-            s_BuildState.StrengthLevel = 0;
-            s_BuildState.MagicLevel = 0;
-            s_BuildState.EconomyLevel = 0;
-
-            WeaponTier = 1;
-            MagicTier = 1;
-
-            s_CompletedLevelIds.Clear();
-            Log.Info("progression: Campaign reset.");
-        }
-
-        public static void AddExperience(int amount, string reason = "progress")
-        {
-            if (amount <= 0)
-            {
-                return;
-            }
-
-            Experience += amount;
-            Log.Info($"progression: +{amount} XP ({reason}). XP {Experience}/{ExperienceToNextLevel}");
-
-            while (Experience >= ExperienceToNextLevel)
-            {
-                Experience -= ExperienceToNextLevel;
-                HeroLevel++;
-                SkillPoints++;
-
-                ExperienceToNextLevel = 90 + HeroLevel * 35;
-                Log.Info($"progression: LEVEL UP -> {HeroLevel}. Skill points: {SkillPoints}");
-            }
-        }
-
-        public static void AddGold(int baseAmount, string reason = "reward")
-        {
-            if (baseAmount <= 0)
-            {
-                return;
-            }
-
-            int finalAmount = Math.Max(1, (int)Math.Round(baseAmount * GoldGainMultiplier));
-            Gold += finalAmount;
-            Log.Info($"progression: +{finalAmount} gold ({reason}). Total gold: {Gold}");
-        }
-
-        public static bool UpgradeBranch(ProgressBranch branch)
-        {
-            if (SkillPoints <= 0)
-            {
-                Log.Info($"progression: No skill points for {branch} upgrade.");
-                return false;
-            }
-
-            if (!s_DevelopmentStrategies.TryGetValue(branch, out IHeroDevelopmentStrategy? strategy))
-            {
-                Log.Warn($"progression: No strategy found for branch {branch}.");
-                return false;
-            }
-
-            SkillPoints--;
-            strategy.Apply(s_BuildState);
-
-            Log.Info($"progression: Upgraded {branch}. STR:{StrengthLevel} MAG:{MagicLevel} ECO:{EconomyLevel} | SP:{SkillPoints}");
-            return true;
-        }
-
-        public static bool BuyWeaponUpgrade()
-        {
-            int cost = GetWeaponUpgradeCost();
-            if (Gold < cost)
-            {
-                Log.Info($"progression: Need {cost} gold for weapon upgrade, have {Gold}.");
-                return false;
-            }
-
-            Gold -= cost;
-            WeaponTier++;
-            AddExperience(25, "weapon upgrade");
-            Log.Info($"progression: Weapon upgraded to tier {WeaponTier}. Gold left: {Gold}");
-            return true;
-        }
-
-        public static bool BuyMagicUpgrade()
-        {
-            int cost = GetMagicUpgradeCost();
-            if (Gold < cost)
-            {
-                Log.Info($"progression: Need {cost} gold for magic upgrade, have {Gold}.");
-                return false;
-            }
-
-            Gold -= cost;
-            MagicTier++;
-            AddExperience(25, "magic upgrade");
-            Log.Info($"progression: Magic upgraded to tier {MagicTier}. Gold left: {Gold}");
-            return true;
-        }
-
-        public static bool CompleteLevel(string levelId)
-        {
-            if (string.IsNullOrWhiteSpace(levelId))
-            {
-                levelId = $"level_{ClearedLevelsCount + 1}";
-            }
-
-            string normalized = levelId.Trim();
-            if (s_CompletedLevelIds.Contains(normalized))
-            {
-                Log.Info($"progression: Level '{normalized}' already completed.");
-                return false;
-            }
-
-            s_CompletedLevelIds.Add(normalized);
-
-            int xpReward = 120 + HeroLevel * 15;
-            int goldReward = 90 + HeroLevel * 10;
-            AddExperience(xpReward, $"clear {normalized}");
-            AddGold(goldReward, $"clear {normalized}");
-
-            // Bonus point for level completion milestones.
-            SkillPoints++;
-            Log.Info($"progression: Level '{normalized}' completed. Bonus SP +1 -> {SkillPoints}");
-
-            return true;
-        }
-    }
-}
diff --git a/game/chaineddecos/src/HeroStrategyScript.cs b/game/chaineddecos/src/HeroStrategyScript.cs
deleted file mode 100644
index 153f69f3e..000000000
--- a/game/chaineddecos/src/HeroStrategyScript.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    // =========================================================================
-    // 1. FLYWEIGHT (Легковаговик) - Глобальна база даних асетів
-    // =========================================================================
-    public class ItemData
-    {
-        public string Name { get; }
-        public string Description { get; }
-        public int BasePrice { get; }
-        public string Category { get; }
-
-        public ItemData(string name, string desc, int price, string category)
-        {
-            Name = name;
-            Description = desc;
-            BasePrice = price;
-            Category = category;
-        }
-    }
-
-    public static class GameStorage
-    {
-        private static readonly Dictionary<string, ItemData> _items = new Dictionary<string, ItemData>();
-
-        static GameStorage()
-        {
-            Register("DragonSlayer", "Massive physical damage.", 1200, "Weapon");
-            Register("ArchmageStaff", "+100% spell potency.", 1500, "Magic");
-            Register("MerchantSignet", "Unlock secret VIP prices.", 2000, "Economy");
-        }
-
-        public static void Register(string name, string desc, int price, string category) =>
-            _items[name] = new ItemData(name, desc, price, category);
-
-        public static ItemData Get(string name) =>
-            _items.TryGetValue(name, out var item) ? item : new ItemData(name, "Unknown", 9999, "None");
-            
-        public static IEnumerable<ItemData> AllItems => _items.Values;
-    }
-
-    // =========================================================================
-    // 2. DECORATOR (Декоратор) - Динамічне розширення можливостей
-    // =========================================================================
-    public interface IHero
-    {
-        string GetTitle();
-        int GetPower();
-        int GetMagic();
-        float GetTradeRatio();
-    }
-
-    public class BasicHero : IHero
-    {
-        private string _name;
-        public BasicHero(string name) => _name = name;
-        public string GetTitle() => _name;
-        public int GetPower() => 10;
-        public int GetMagic() => 5;
-        public float GetTradeRatio() => 1.0f;
-    }
-
-    public abstract class HeroDecorator : IHero
-    {
-        protected IHero _inner;
-        protected HeroDecorator(IHero inner) => _inner = inner;
-        public virtual string GetTitle() => _inner.GetTitle();
-        public virtual int GetPower() => _inner.GetPower();
-        public virtual int GetMagic() => _inner.GetMagic();
-        public virtual float GetTradeRatio() => _inner.GetTradeRatio();
-    }
-
-    public class WarriorPath : HeroDecorator
-    {
-        public WarriorPath(IHero inner) : base(inner) { }
-        public override string GetTitle() => _inner.GetTitle() + " (Warrior)";
-        public override int GetPower() => _inner.GetPower() + 50;
-    }
-
-    public class MagePath : HeroDecorator
-    {
-        public MagePath(IHero inner) : base(inner) { }
-        public override string GetTitle() => _inner.GetTitle() + " (Mage)";
-        public override int GetMagic() => _inner.GetMagic() + 50;
-    }
-
-    // =========================================================================
-    // 3. FACADE (Фасад) - Єдина точка входу в систему розвитку
-    // =========================================================================
-    public class HeroSystem
-    {
-        private IHero _hero;
-        private int _gold = 500;
-
-        public HeroSystem(string name) => _hero = BasicHeroFactory.Create(name);
-
-        public string Upgrade(string type)
-        {
-            if (type == "warrior") _hero = new WarriorPath(_hero);
-            else if (type == "mage") _hero = new MagePath(_hero);
-            return $"Hero evolved to: {_hero.GetTitle()}";
-        }
-
-        public string Purchase(string itemName)
-        {
-            var item = GameStorage.Get(itemName);
-            int price = (int)(item.BasePrice / _hero.GetTradeRatio());
-            
-            if (_gold >= price)
-            {
-                _gold -= price;
-                return $"Bought {item.Name} for {price}g.";
-            }
-            return $"Not enough gold for {item.Name}!";
-        }
-
-        public void AddGold(int amount) => _gold += amount;
-        public string GetInfo() => $"{_hero.GetTitle()} [Power:{_hero.GetPower()} Magic:{_hero.GetMagic()}] Gold:{_gold}g";
-    }
-
-    internal static class BasicHeroFactory 
-    {
-        public static IHero Create(string name) => new BasicHero(name);
-    }
-
-    // =========================================================================
-    // ГЕЙМПЛЕЙНИЙ КОНТРОЛЕР
-    // =========================================================================
-    public class HeroStrategyScript : Script
-    {
-        private HeroSystem? _heroSystem;
-        private List<string> _onScreenLogs = new List<string>();
-
-        public override void OnCreate()
-        {
-            _heroSystem = new HeroSystem("Arthur");
-            AddLog("RPG System Initialized (Facade/Decorator/Flyweight)");
-        }
-
-        private void AddLog(string msg)
-        {
-            Log.Info(msg); // Console log
-            _onScreenLogs.Add($"> {msg}");
-            if (_onScreenLogs.Count > 10) _onScreenLogs.RemoveAt(0);
-        }
-
-        public override void OnUpdate(float deltaTime)
-        {
-            if (_heroSystem == null) return;
-
-            if (Input.IsKeyPressed(Key.D1)) AddLog(_heroSystem.Upgrade("warrior"));
-            if (Input.IsKeyPressed(Key.D2)) AddLog(_heroSystem.Upgrade("mage"));
-            if (Input.IsKeyPressed(Key.G)) { _heroSystem.AddGold(100); AddLog("Looted 100 gold."); }
-            if (Input.IsKeyPressed(Key.B)) AddLog(_heroSystem.Purchase("DragonSlayer"));
-        }
-
-        public override void OnGUI()
-        {
-            if (_heroSystem == null) return;
-
-            UI.Text("--- [ HERO STATUS ] ---");
-            UI.Text(_heroSystem.GetInfo());
-            UI.Text("Controls: 1 (Warrior), 2 (Mage), G (Gold), B (Buy)");
-            
-            UI.Text("");
-            UI.Text("--- [ IN-GAME LOGS ] ---");
-            foreach (var log in _onScreenLogs)
-                UI.Text(log);
-        }
-    }
-}
diff --git a/game/chaineddecos/src/MainMenuScript.cs b/game/chaineddecos/src/MainMenuScript.cs
deleted file mode 100644
index 2e34c33ef..000000000
--- a/game/chaineddecos/src/MainMenuScript.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    public class MainMenuScript : Script
-    {
-        public string TargetScene = "scenes/untitled100.chscene";
-
-        public override void OnUpdate(float deltaTime)
-        {
-            if (Entity.HasComponent<ButtonControl>())
-            {
-                ButtonControl? btn = Entity.GetComponent<ButtonControl>();
-                if (btn?.IsPressed ?? false)
-                {
-                    Log.Info("Starting game, loading scene: " + TargetScene);
-                    Scene.LoadScene(TargetScene);
-                }
-            }
-        }
-    }
-}
diff --git a/game/chaineddecos/src/ParkourUnits.cs b/game/chaineddecos/src/ParkourUnits.cs
deleted file mode 100644
index 56ce04a0a..000000000
--- a/game/chaineddecos/src/ParkourUnits.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    /// <summary>
-    /// Prototype pattern for parkour entities.
-    /// Used for mass cloning of similar objects (e.g. traps, collectibles).
-    /// </summary>
-    public abstract class ParkourUnit
-    {
-        public string Name { get; set; } = string.Empty;
-        public float Health { get; set; } = 100.0f;
-        public float Weight { get; set; } = 1.0f;
-
-        public abstract ParkourUnit Clone();
-    }
-
-    /// <summary>
-    /// A simple hazard unit (e.g., a rotating fan or a sliding block).
-    /// </summary>
-    public class HazardUnit : ParkourUnit
-    {
-        public HazardUnit(string name, float health, float weight)
-        {
-            Name = name;
-            Health = health;
-            Weight = weight;
-        }
-
-        public override ParkourUnit Clone()
-        {
-            Log.Info($"Cloning Hazard: {Name}");
-            // Shallow clone for simple data structures, but could be deep if we had nested components.
-            return (HazardUnit)this.MemberwiseClone();
-        }
-
-        public override string ToString() => $"Hazard: {Name}, HP: {Health}, Weight: {Weight}";
-    }
-
-    /// <summary>
-    /// A script to manage hazards using Prototype.
-    /// One prototype is configured and the others are spawned via cloning.
-    /// </summary>
-    public class HazardManager : Script
-    {
-        private HazardUnit? prototype;
-
-        public override void OnCreate()
-        {
-            // Initialize prototype
-            prototype = new HazardUnit("DeathTrap_Prototype", 500, 10.0f);
-            Log.Info("Prototype 'HazardUnit' created.");
-        }
-
-        public override void OnUpdate(float deltaTime)
-        {
-            if (Input.IsKeyPressed(Key.P)) // Press 'P' to spawn hazard via cloning
-            {
-                if (prototype != null)
-                {
-                    HazardUnit clone = (HazardUnit)prototype.Clone();
-                    Log.Info($"Clonned new unit: {clone.ToString()}");
-                    // In a more complete implementation, we'd also instantiate a new Entity here.
-                }
-            }
-        }
-    }
-}
diff --git a/game/chaineddecos/src/PlayerController.cs b/game/chaineddecos/src/PlayerController.cs
deleted file mode 100644
index 271338d37..000000000
--- a/game/chaineddecos/src/PlayerController.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-// Build trigger test 2
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class PlayerController : Script
-{
-    public float MovementSpeed = 15.0f;
-    public float JumpForce    = 10.0f;
-    public float Gravity      = 20.0f;   // Units per second^2 (should match physics config)
-    public string MenuScene   = "scenes/start_menu.chscene";
-
-    public override void OnCreate()
-    {
-        Log.Info("C# PlayerController initialized!");
-    }
-
-    public override void OnUpdate(float deltaTime)
-    {
-        // Allow leaving gameplay back to menu with a single key press.
-        if (Input.IsKeyPressed(Key.Escape))
-        {
-            Log.Info("PlayerController: Escape pressed, returning to menu: " + MenuScene);
-            Scene.LoadScene(MenuScene);
-            return;
-        }
-
-        float currentSpeed = MovementSpeed * HeroProgression.MoveSpeedMultiplier;
-        float effectiveJumpForce = JumpForce * HeroProgression.JumpMultiplier;
-
-        if (Input.IsKeyDown(Key.LeftShift))
-            currentSpeed *= 2.0f;
-
-        // --- Camera-relative directions ---
-        Vector3 forward = Vector3.Zero;
-        Vector3 right   = Vector3.Zero;
-
-        Entity? camEntity = Scene.GetMainCamera();
-        if (camEntity != null)
-        {
-            CameraComponent? camera = camEntity.GetComponent<CameraComponent>();
-            if (camera != null)
-            {
-                // Flatten for XZ ground movement
-                forward = Vector3.Normalize(new Vector3(camera.Forward.X, 0.0f, camera.Forward.Z));
-                right   = Vector3.Normalize(new Vector3(camera.Right.X,   0.0f, camera.Right.Z));
-            }
-        }
-
-        // --- Input ---
-        Vector3 movementDir = Vector3.Zero;
-        if (Input.IsKeyDown(Key.W)) movementDir += forward;
-        if (Input.IsKeyDown(Key.S)) movementDir -= forward;
-        if (Input.IsKeyDown(Key.A)) movementDir -= right;
-        if (Input.IsKeyDown(Key.D)) movementDir += right;
-
-        RigidBodyComponent?  rb        = Entity.GetComponent<RigidBodyComponent>();
-        TransformComponent?  transform = Entity.GetComponent<TransformComponent>();
-        if (rb == null || transform == null) return;
-
-        bool isKinematic = rb.IsKinematic;
-        Vector3 velocity = rb.Velocity;
-
-        // --- Horizontal movement ---
-        if (movementDir.LengthSquared() > 0.0001f)
-        {
-            movementDir = Vector3.Normalize(movementDir);
-            velocity.X = movementDir.X * currentSpeed;
-            velocity.Z = movementDir.Z * currentSpeed;
-
-            // Face movement direction (Y-axis only)
-            float targetYaw = Mathf.Atan2(movementDir.X, movementDir.Z);
-            transform.Rotation = new Vector3(0, targetYaw, 0);
-        }
-        else
-        {
-            velocity.X = 0;
-            velocity.Z = 0;
-        }
-
-        // --- Jump ---
-        if (Input.IsKeyPressed(Key.Space) && rb.IsGrounded)
-        {
-            velocity.Y = effectiveJumpForce;
-            Log.Info("C# Jump triggered!");
-        }
-
-        // Only apply gravity and integration manually if Kinematic.
-        // If Dynamic, the physics engine handles these in ResolveSimulation/IntegrateVelocity.
-        if (isKinematic)
-        {
-            // Apply gravity only when not grounded
-            if (!rb.IsGrounded)
-                velocity.Y -= Gravity * deltaTime;
-
-            // Terminal velocity cap — prevents extreme penetration that multi-pass can't recover
-            const float kTerminalVelocity = -50.0f;
-            if (velocity.Y < kTerminalVelocity)
-                velocity.Y = kTerminalVelocity;
-
-            // Stop downward movement when grounded to prevent creep-through
-            if (rb.IsGrounded && velocity.Y < 0.0f)
-                velocity.Y = 0.0f;
-
-            // Manual integration for Kinematic bodies
-            transform.Translation = new Vector3(
-                transform.Translation.X + velocity.X * deltaTime,
-                transform.Translation.Y + velocity.Y * deltaTime,
-                transform.Translation.Z + velocity.Z * deltaTime
-            );
-        }
-        
-        rb.Velocity = velocity;
-
-        // --- Debug teleport ---
-        if (Input.IsKeyPressed(Key.T))
-        {
-            Entity? spawnZone = Scene.FindEntityByTag("SpawnPoint");
-            if (spawnZone != null)
-            {
-                TransformComponent? spawnTransform = spawnZone.GetComponent<TransformComponent>();
-                if (spawnTransform != null)
-                {
-                    transform.Translation = spawnTransform.Translation;
-                    Log.Info("Teleported to spawn via C#!");
-                }
-            }
-        }
-    }
-}
-}
diff --git a/game/chaineddecos/src/PlayerFall.cs b/game/chaineddecos/src/PlayerFall.cs
deleted file mode 100644
index fc663fa83..000000000
--- a/game/chaineddecos/src/PlayerFall.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//========= Copyright Chained Decos, All rights reserved. ============//
-//
-// Purpose: Handles player falling logic and environmental audio hints.
-//
-//=============================================================================//
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class PlayerFall : Script
-{
-    public override void OnUpdate(float deltaTime)
-    {
-        if (!Entity.HasComponent<RigidBodyComponent>() || !Entity.HasComponent<AudioComponent>())
-            return;
-
-        RigidBodyComponent? rb = Entity.GetComponent<RigidBodyComponent>();
-        AudioComponent? audio = Entity.GetComponent<AudioComponent>();
-
-        if (rb == null || audio == null)
-            return;
-
-        Vector3 velocity = rb.Velocity;
-        float fallSpeed = -velocity.Y;
-
-        string soundPath = audio.SoundPath;
-        if (string.IsNullOrEmpty(soundPath))
-            return;
-
-        bool isWindNeeded = (fallSpeed > 5.0f && !rb.IsGrounded);
-
-        if (isWindNeeded)
-        {
-            float targetVolume = (fallSpeed - 5.0f) / 25.0f;
-            if (targetVolume > 1.01f)
-                targetVolume = 1.0f;
-            if (targetVolume < 0.0f)
-                targetVolume = 0.0f;
-
-            audio.Volume = targetVolume;
-            audio.Loop = true;
-
-            if (!audio.IsPlaying)
-            {
-                Audio.Play(soundPath, targetVolume, 1.0f, true);
-                if (!m_WindSoundPlaying)
-                {
-                    Log.Info("playerfall: Wind sound ON");
-                    m_WindSoundPlaying = true;
-                }
-            }
-        }
-        else
-        {
-            if (audio.IsPlaying)
-            {
-                Audio.Stop(soundPath);
-            }
-            
-            if (m_WindSoundPlaying)
-            {
-                Log.Info("playerfall: Wind sound OFF");
-                m_WindSoundPlaying = false;
-            }
-        }
-    }
-
-    private bool m_WindSoundPlaying = false;
-}
-}
diff --git a/game/chaineddecos/src/SceneScript.cs b/game/chaineddecos/src/SceneScript.cs
deleted file mode 100644
index 136571a48..000000000
--- a/game/chaineddecos/src/SceneScript.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class SceneScript : Script
-{
-    public override void OnUpdate(float deltaTime)
-    {
-        ButtonControl? btn = Entity.GetComponent<ButtonControl>();
-        if (btn?.IsPressed ?? false)
-        {
-            SceneTransitionComponent? trans = Entity.GetComponent<SceneTransitionComponent>();
-            string? targetScene = trans?.TargetScene;
-            if (string.IsNullOrEmpty(targetScene))
-            {
-                targetScene = "scenes/start_menu.chscene";
-                Log.Warn("scenescript: No TargetScenePath found, using fallback: " + targetScene);
-            }
-
-            Log.Info("scenescript: Loading scene: " + targetScene);
-            Scene.LoadScene(targetScene);
-        }
-    }
-}
-}
diff --git a/game/chaineddecos/src/SettingsScript.cs b/game/chaineddecos/src/SettingsScript.cs
deleted file mode 100644
index b97e89d66..000000000
--- a/game/chaineddecos/src/SettingsScript.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-public class SettingsScript : Script
-{
-    public override void OnCreate()
-    {
-        Log.Info("settings_script: Initialized");
-    }
-
-    public override void OnUpdate(float deltaTime)
-    {
-        ButtonControl? btn = Entity.GetComponent<ButtonControl>();
-        if (btn?.IsPressed ?? false)
-        {
-            Log.Info("settings_script: Button pressed, applying settings...");
-            ApplySettings();
-        }
-    }
-
-    private void ApplySettings()
-    {
-        Log.Info("settings_script: Applying Settings...");
-
-        Entity? resEnt = Scene.FindEntityByTag("resolution");
-        Entity? fullEnt = Scene.FindEntityByTag("option_fullscreen");
-        Entity? vsyncEnt = Scene.FindEntityByTag("option_vsync");
-        Entity? aaEnt = Scene.FindEntityByTag("option_aa");
-
-        // 1. Resolution
-        if (resEnt != null)
-        {
-            ComboBoxControl? combo = resEnt.GetComponent<ComboBoxControl>();
-            if (combo != null)
-            {
-                int index = combo.SelectedIndex;
-                string? resStr = combo.GetItem(index);
-                if (!string.IsNullOrEmpty(resStr))
-                {
-                    string[] parts = resStr.Split('x');
-                    if (parts.Length == 2)
-                    {
-                        int w = int.Parse(parts[0]);
-                        int h = int.Parse(parts[1]);
-                        AppWindow.SetSize(w, h);
-                        Log.Info($"settings_script: Set Resolution to {w}x{h}");
-                    }
-                }
-            }
-        }
-
-        // 2. Fullscreen
-        if (fullEnt != null)
-        {
-            CheckboxControl? check = fullEnt.GetComponent<CheckboxControl>();
-            if (check != null)
-            {
-                bool enabled = check.IsChecked;
-                AppWindow.SetFullscreen(enabled);
-                Log.Info($"settings_script: Set Fullscreen to {enabled}");
-            }
-        }
-
-        // 3. VSync
-        if (vsyncEnt != null)
-        {
-            CheckboxControl? check = vsyncEnt.GetComponent<CheckboxControl>();
-            if (check != null)
-            {
-                bool enabled = check.IsChecked;
-                AppWindow.SetVSync(enabled);
-                Log.Info($"settings_script: Set VSync to {enabled}");
-            }
-        }
-
-        // 4. Anti-aliasing
-        if (aaEnt != null)
-        {
-            CheckboxControl? check = aaEnt.GetComponent<CheckboxControl>();
-            if (check != null)
-            {
-                bool enabled = check.IsChecked;
-                AppWindow.SetAntialiasing(enabled);
-                Log.Info($"settings_script: Set Anti-aliasing to {enabled}");
-            }
-        }
-
-        Log.Info("settings_script: Settings Applied Successfully!");
-    }
-}
-}
diff --git a/game/chaineddecos/src/SimplePatterns.cs b/game/chaineddecos/src/SimplePatterns.cs
deleted file mode 100644
index decd5605c..000000000
--- a/game/chaineddecos/src/SimplePatterns.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    // Singleton: Тільки один екземпляр на всю гру
-    public class GameController : Script
-    {
-        public static GameController? Instance;
-        public int Coins = 0;
-
-        public override void OnCreate()
-        {
-            Instance = this;
-            Log.Info("GameController: Singleton ready!");
-        }
-
-        public void AddCoin()
-        {
-            Coins++;
-            Log.Info($"Coins: {Coins}");
-        }
-    }
-
-    // Abstract Factory: Швидке створення однотипних об'єктів різних стилів
-    public abstract class ParkourStyleFactory
-    {
-        public abstract string GetObstacleName();
-    }
-
-    public class UrbanStyle : ParkourStyleFactory
-    {
-        public override string GetObstacleName() => "Metal Bench";
-    }
-
-    public class NatureStyle : ParkourStyleFactory
-    {
-        public override string GetObstacleName() => "Wood Log";
-    }
-
-    // Prototype: Копіювання об'єкта (наприклад, ворога або предмета) через один метод
-    public class SimpleUnit
-    {
-        public string Name;
-        public int HP;
-
-        public SimpleUnit(string name, int hp) { Name = name; HP = hp; }
-
-        public SimpleUnit Clone() => new SimpleUnit(this.Name, this.HP);
-        
-        public void Show() => Log.Info($"Unit: {Name}, HP: {HP}");
-    }
-
-    // Головний скрипт для використання всіх шаблонів
-    public class PatternUsage : Script
-    {
-        private ParkourStyleFactory style = new UrbanStyle();
-        private SimpleUnit prototype = new SimpleUnit("Obstacle", 100);
-
-        public override void OnUpdate(float deltaTime)
-        {
-            // Singleton
-            if (Input.IsKeyPressed(Key.Space)) GameController.Instance.AddCoin();
-
-            // Factory
-            if (Input.IsKeyPressed(Key.F)) Log.Info("Style item: " + style.GetObstacleName());
-
-            // Prototype
-            if (Input.IsKeyPressed(Key.P))
-            {
-                SimpleUnit copy = prototype.Clone();
-                copy.Show();
-            }
-        }
-    }
-}
diff --git a/game/chaineddecos/src/SpawnZone.cs b/game/chaineddecos/src/SpawnZone.cs
deleted file mode 100644
index dd77301e9..000000000
--- a/game/chaineddecos/src/SpawnZone.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using CHEngine;
-
-namespace ChainedDecos.Scripts
-{
-    public class SpawnZone : Script
-    {
-        public override void OnUpdate(float deltaTime)
-        {
-            TransformComponent? transform = Entity.GetComponent<TransformComponent>();
-            if (transform != null && transform.Translation.Y < -100.0f)
-            {
-                Respawn();
-            }
-
-            if (Input.IsKeyPressed((Key)70)) // KEY_F
-            {
-                Respawn();
-            }
-        }
-
-        private void Respawn()
-        {
-            // Find all entities with SpawnComponent instead of relying solely on a generic tag
-            ulong[] spawnEntities = Entity.FindAllWithComponent<SpawnComponent>();
-            if (spawnEntities.Length == 0)
-            {
-                // Fallback to Tag if no Component is found (for backwards compatibility)
-                Entity? fallback = Scene.FindEntityByTag("SpawnPoint");
-                if (fallback != null)
-                {
-                    TeleportTo(fallback);
-                }
-                else
-                {
-                    Log.Info("spawnzone: No spawn points found in the scene.");
-                }
-                return;
-            }
-
-            // Iterate and pick the active one (or just use the first match)
-            foreach (ulong id in spawnEntities)
-            {
-                Entity spawner = new Entity(id);
-                SpawnComponent? spawnComp = spawner.GetComponent<SpawnComponent>();
-                if (spawnComp != null && spawnComp.IsActive)
-                {
-                    TeleportTo(spawner);
-                    return;
-                }
-            }
-
-            // If none are specifically "active", just use the very first one
-            TeleportTo(new Entity(spawnEntities[0]));
-        }
-
-        private void TeleportTo(Entity spawnEntity)
-        {
-            SpawnComponent? spawnComp = spawnEntity.GetComponent<SpawnComponent>();
-            TransformComponent? spawnTransform = spawnEntity.GetComponent<TransformComponent>();
-            TransformComponent? myTransform = Entity.GetComponent<TransformComponent>();
-            RigidBodyComponent? myRb = Entity.GetComponent<RigidBodyComponent>();
-
-            if (spawnTransform != null && myTransform != null)
-            {
-                // If it has a spawn component, add its offset; otherwise just use its transform translation
-                Vector3 offset = spawnComp != null ? spawnComp.SpawnPoint : Vector3.Zero;
-                myTransform.Translation = spawnTransform.Translation + offset;
-                
-                if (myRb != null)
-                {
-                    myRb.Velocity = Vector3.Zero;
-                }
-                
-                Log.Info("spawnzone: Player respawned successfully.");
-            }
-        }
-    }
-}
-
diff --git a/game/chaineddecos/src/main.cpp b/game/chaineddecos/src/main.cpp
index ddc11c6c1..f8da41f21 100644
--- a/game/chaineddecos/src/main.cpp
+++ b/game/chaineddecos/src/main.cpp
@@ -1,26 +1,38 @@
-#include "engine/core/application.h"
-#include "engine/core/entry_point.h"
-#include "runtime/runtime_layer.h"
-#include "scripting/scriptengine.h"
+#include "engine/app/entry_point.h"
+#include "engine/core/platform.h"
+#include "engine/runtime/runtime_layer.h"
 
-namespace
+namespace Chained
 {
-constexpr const char* kProjectGame = "ChainedDecos";
-}
+	Application* CreateApplication(ApplicationCommandLineArgs args)
+	{
+		ApplicationSpecification spec;
+		spec.Name = "ChainedDecos";
+		spec.CommandLineArgs = args;
+		spec.Headless = false;
+		spec.EnableScripting = true;
+		spec.EngineRoot = Platform::GetExecutableDirectory();
+		spec.WorkingDirectory = Platform::GetExecutableDirectory().string();
 
-namespace CHEngine
-{
-Application* CreateApplication(ApplicationCommandLineArgs args)
-{
-    ApplicationSpecification spec;
-    spec.Name = kProjectGame;
-    spec.CommandLineArgs = args;
+		// Resolve project path: first CLI arg or default
+		std::filesystem::path projectPath;
+		for (int i = 0; i < args.Count; ++i)
+		{
+			std::string arg = args.Args[i];
+			if (arg.ends_with(".chproject"))
+			{
+				projectPath = arg;
+				break;
+			}
+		}
 
-    spec.InitScripting = []() { ScriptEngine::Init(); };
-    spec.ShutdownScripting = []() { ScriptEngine::Shutdown(); };
+		if (projectPath.empty() || !std::filesystem::exists(projectPath))
+		{
+			projectPath = std::filesystem::path(spec.WorkingDirectory) / (spec.Name + ".chproject");
+		}
 
-    Application* app = new Application(spec);
-    app->PushLayer(new RuntimeLayer(""));
-    return app;
-}
-} // namespace CHEngine
+		auto* app = new Application(spec);
+		app->PushLayer(std::make_unique<RuntimeLayer>(projectPath.string()));
+		return app;
+	}
+} // namespace Chained
diff --git a/game/testproject/CMakeLists.txt b/game/testproject/CMakeLists.txt
index a1f385798..f3b4e6b85 100644
--- a/game/testproject/CMakeLists.txt
+++ b/game/testproject/CMakeLists.txt
@@ -18,4 +18,4 @@ add_custom_command(TARGET TestProjectGameExe POST_BUILD
     "${CMAKE_CURRENT_SOURCE_DIR}/assets"
     "$<TARGET_FILE_DIR:TestProjectGameExe>/assets"
     COMMENT "Copying test project assets..."
-)
\ No newline at end of file
+)
diff --git a/game/testproject/src/main.cpp b/game/testproject/src/main.cpp
deleted file mode 100644
index 46013e3a7..000000000
--- a/game/testproject/src/main.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "engine/core/application.h"
-#include "engine/core/entry_point.h"
-#include "runtime/runtime_layer.h"
-
-namespace
-{
-constexpr const char* kProjectGame = "testproject";
-}
-
-namespace CHEngine
-{
-Application* CreateApplication(ApplicationCommandLineArgs args)
-{
-    ApplicationSpecification spec;
-    spec.Name = kProjectGame;
-    spec.CommandLineArgs = args;
-
-    Application* app = new Application(spec);
-    app->PushLayer(new RuntimeLayer(""));
-    return app;
-}
-} // namespace CHEngine
\ No newline at end of file
diff --git a/game/testproject/testproject.chproject b/game/testproject/testproject.chproject
index 8358ecf4d..08fc06768 100644
--- a/game/testproject/testproject.chproject
+++ b/game/testproject/testproject.chproject
@@ -5,8 +5,6 @@ Project:
   AssetDirectory: assets
   ActiveScene: assets/scenes/untitled.chscene
   Environment: ""
-  BuildScenes:
-    []
   Physics:
     Gravity: 20
     FixedTimestep: 0.0166666675
diff --git a/imgui.ini b/imgui.ini
index b55bf6a14..7d5aeb2b5 100644
--- a/imgui.ini
+++ b/imgui.ini
@@ -1,18 +1,18 @@
 [Window][Viewport]
-Pos=386,22
-Size=1029,652
+Pos=386,19
+Size=709,535
 Collapsed=0
 DockId=0x00000005,0
 
 [Window][Scene Hierarchy]
-Pos=0,22
-Size=384,457
+Pos=0,19
+Size=384,403
 Collapsed=0
 DockId=0x00000003,0
 
 [Window][Inspector]
-Pos=1417,22
-Size=503,998
+Pos=1097,19
+Size=503,881
 Collapsed=0
 DockId=0x00000008,0
 
@@ -23,20 +23,20 @@ Collapsed=0
 DockId=0x00000003,0
 
 [Window][Profiler]
-Pos=1417,22
-Size=503,998
+Pos=1097,19
+Size=503,881
 Collapsed=0
 DockId=0x00000008,1
 
 [Window][Content Browser]
-Pos=386,676
-Size=1029,344
+Pos=386,556
+Size=709,344
 Collapsed=0
 DockId=0x00000006,1
 
 [Window][Console]
-Pos=386,676
-Size=1029,344
+Pos=386,556
+Size=709,344
 Collapsed=0
 DockId=0x00000006,0
 
@@ -46,13 +46,11 @@ Size=400,400
 Collapsed=0
 
 [Window][Project Browser]
-Pos=0,0
-Size=1920,1020
+Size=1600,900
 Collapsed=0
 
 [Window][MainDockSpaceWindow]
-Pos=0,0
-Size=1920,1020
+Size=1600,900
 Collapsed=0
 
 [Window][Project Settings]
@@ -61,23 +59,34 @@ Size=150,238
 Collapsed=0
 
 [Window][World Settings]
-Pos=0,481
-Size=384,539
+Pos=0,424
+Size=384,476
 Collapsed=0
 DockId=0x00000004,0
 
 [Window][Effects & Debug]
-Pos=0,22
-Size=384,457
+Pos=0,19
+Size=384,403
 Collapsed=0
 DockId=0x00000003,2
 
 [Window][Material Editor]
-Pos=0,22
-Size=384,457
+Pos=0,19
+Size=384,403
 Collapsed=0
 DockId=0x00000003,1
 
+[Window][Project Selector]
+Pos=0,0
+Size=1600,900
+Collapsed=0
+
+[Window][Animation Graph]
+Pos=386,22
+Size=709,532
+Collapsed=0
+DockId=0x00000005,1
+
 [Table][0x412E86AF,2]
 RefScale=16
 Column 0  Width=100
@@ -143,13 +152,17 @@ RefScale=16
 Column 0  Width=100
 Column 1  Weight=1.0000
 
+[Table][0xEE81A7C9,2]
+Column 0  Weight=1.0000
+Column 1  Weight=1.0000
+
 [Docking][Data]
-DockSpace       ID=0xE1A96EC2 Window=0xF60379F8 Pos=9,73 Size=1920,998 Split=X
-  DockNode      ID=0x00000007 Parent=0xE1A96EC2 SizeRef=1415,969 Split=X
+DockSpace       ID=0xE1A96EC2 Pos=41,89 Size=1600,881 Split=X
+  DockNode      ID=0x00000007 Parent=0xE1A96EC2 SizeRef=1095,969 Split=X
     DockNode    ID=0x00000001 Parent=0x00000007 SizeRef=384,969 Split=Y Selected=0xD5148891
       DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=384,457 Selected=0xD5148891
       DockNode  ID=0x00000004 Parent=0x00000001 SizeRef=384,539 Selected=0x68441F82
-    DockNode    ID=0x00000002 Parent=0x00000007 SizeRef=1029,969 Split=Y Selected=0xC450F867
+    DockNode    ID=0x00000002 Parent=0x00000007 SizeRef=709,969 Split=Y Selected=0xC450F867
       DockNode  ID=0x00000005 Parent=0x00000002 SizeRef=1182,652 CentralNode=1 Selected=0xC450F867
       DockNode  ID=0x00000006 Parent=0x00000002 SizeRef=1182,344 Selected=0x3DF3100E
   DockNode      ID=0x00000008 Parent=0xE1A96EC2 SizeRef=503,969 Selected=0x9B5D3198
diff --git a/include/GameNetworkingSockets b/include/GameNetworkingSockets
deleted file mode 160000
index 517fff0cf..000000000
--- a/include/GameNetworkingSockets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 517fff0cf6866ba163f4f016b0ef28f365c06c05
diff --git a/include/enet b/include/enet
deleted file mode 160000
index 8647b6eae..000000000
--- a/include/enet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8647b6eaea881c86471ae29f732620d299fc20d7
diff --git a/license b/license
deleted file mode 100644
index 6d86b5900..000000000
--- a/license
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 I#Oleg
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/readme.md b/readme.md
index 4f82e554e..691548e76 100644
--- a/readme.md
+++ b/readme.md
@@ -1,14 +1,16 @@
-# Chained Decos
 
-## A 3D Parkour Game Built on Chained Engine
+# ChainedEngine
+
+## Custom C++/C# Game Engine with Editor, OpenGL Renderer, and Managed Scripting
 
 [![C++23](https://img.shields.io/badge/language-C%2B%2B23-blue?logo=c%2B%2B&logoColor=white)](https://isocpp.org/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![CI](https://img.shields.io/github/actions/workflow/status/IOleg-crypto/Chained-Decos/ci.yml?label=CI)](https://github.com/IOleg-crypto/Chained-Decos/actions/workflows/ci.yml)
-[![SDK Deploy](https://img.shields.io/github/actions/workflow/status/IOleg-crypto/Chained-Decos/deploy-sdk.yml?label=SDK%20Deploy)](https://github.com/IOleg-crypto/Chained-Decos/actions/workflows/deploy-sdk.yml)
+![Workflow Status](https://github.com/IOleg-crypto/Chained-Engine/actions/workflows/ci.yml/badge.svg?branch=opengl)
+[![Linux](https://img.shields.io/github/actions/workflow/status/IOleg-crypto/Chained-Engine/ci.yml?branch=opengl&job=Linux&label=Linux)](https://github.com/IOleg-crypto/Chained-Engine/actions/workflows/ci.yml)
+[![Windows](https://img.shields.io/github/actions/workflow/status/IOleg-crypto/Chained-Engine/ci.yml?branch=opengl&job=Windows&label=Windows)](https://github.com/IOleg-crypto/Chained-Engine/actions/workflows/ci.yml)
 [![OpenGL](https://img.shields.io/badge/graphics-OpenGL%204.3%2B-red?logo=opengl)](https://www.khronos.org/opengl/)
 
-Chained Decos is the game project built on top of Chained Engine, a modular C++23 engine with editor tooling, runtime packaging, ECS architecture, physics, and managed gameplay scripting.
+ChainedEngine is a modular C++23 game engine with editor tooling, runtime packaging, ECS architecture, physics, OpenGL 4.3+ rendering, and managed C# gameplay scripting via Coral. Ships with a parkour game **Chained Decos**.
 
 ![Game Screenshot](https://i.imgur.com/MLIxRhB.png)
 
@@ -18,517 +20,275 @@ Chained Decos is the game project built on top of Chained Engine, a modular C++2
 ## Table of Contents
 
 - [Overview](#overview)
-- [Developer Resources (Deep Dives)](#developer-resources-deep-dives)
-- [Editor and Simulation Workflow](#editor-and-simulation-workflow)
-- [Engine Feature Highlights](#engine-feature-highlights)
-- [Architecture](#architecture)
+- [Quick Start](#quick-start)
+- [Build](#build)
+- [Run](#run)
 - [Working with Projects](#working-with-projects)
 - [Project Structure](#project-structure)
 - [Dependencies](#dependencies)
 - [Prerequisites](#prerequisites)
-- [Quick Start](#quick-start)
-- [Build](#build)
-- [Run](#run)
-- [Gameplay Scripting (C#)](#gameplay-scripting-c)
-- [Assets and Resources](#assets-and-resources)
-- [Physics and Collisions](#physics-and-collisions)
-- [In-Game UI](#in-game-ui)
-- [Extending the Engine (C++)](#extending-the-engine-c)
-- [Debugging and Profiling](#debugging-and-profiling)
 - [Testing](#testing)
 - [CI/CD](#cicd)
 - [Troubleshooting](#troubleshooting)
 - [Known Issues](#known-issues)
+- [Documentation](#documentation)
 - [Contributing](#contributing)
 - [License](#license)
 
 ## Overview
 
-Chained Decos and Chained Engine currently target Windows and Linux.
-
-Main capabilities:
-
-- OpenGL 4.3+ rendering pipeline with system-specific asset loader registration.
-- ECS-driven scene model using EnTT.
-- YAML-based project and scene serialization with deep configuration support.
-- Editor workflow with hierarchy/inspector/panels and in-editor play mode.
-- Flexible bootstrapping via `ProjectLauncher` for Headless, Runtime, and Editor modes.
-- Managed C# gameplay scripting through Coral (.NET/CoreCLR host).
+Chained Decos and Chained Engine target Windows and Linux.
 
-## Developer Resources (Deep Dives)
+- OpenGL 4.3+ rendering pipeline with PBR, fog, and shadow mapping
+- ECS-driven scene model using EnTT
+- YAML-based project and scene serialization
+- Editor with hierarchy/inspector/panels and in-editor play mode
+- Managed C# gameplay scripting through Coral (.NET/CoreCLR)
+- UDP networking with client/server model, UPnP port forwarding, and encryption
+- Project export pipeline with compressed asset packs (ZSTD)
+- Visual Animation Graph system (`.chag`)
 
-For a more detailed look at specific engine systems, please refer to the following guides:
-
-*   [**Engine Architecture**](docs/ARCHITECTURE.md): Bootstrapping, system initialization (SRP), and the main loop.
-*   [**Component Reference**](docs/COMPONENTS.md): Complete list of available ECS components and their roles.
-*   [**Scripting API Guide**](docs/SCRIPTING_API.md): Detailed reference for managed C# development.
-
-## Editor and Simulation Workflow
-
-The editor is the main authoring environment for scene creation, iteration, and play-mode testing.
-
-> [!IMPORTANT]
-> Simulation controls:
->
-> - Press PLAY to enter simulation and capture cursor.
-> - Press Escape to leave simulation control and return to editor interaction.
+> **Inspiration:** ChainedEngine is inspired by [Hazel](https://github.com/TheCherno/Hazel) by TheCherno, with significant custom additions — C# scripting via Coral, Jolt physics, animation graph system, project export pipeline, and multi-platform support.
 
 ![Editor Screenshot 1](https://i.imgur.com/jey25o0.png)
 ![Editor Screenshot 2](https://i.imgur.com/VMhs9Zm.jpeg)
-![Editor Screenshot 3](https://i.imgur.com/4RpCh2P.png)
-
-> [!WARNING]
-> ChainedRuntime is a dedicated wrapper executable for loading and running your project data without the full editor UI.
-
-## Engine Feature Highlights
-
-- High-performance OpenGL renderer with custom shader workflows.
-- EnTT-based ECS architecture for scalable scene/entity management.
-- Managed C# gameplay scripting through Coral and CoreCLR.
-- BVH-assisted collision and physics systems for gameplay diagnostics.
-- YAML scene/project serialization with UUID-centered identity tracking.
-- Editor undo/redo command history for common content workflows.
-- Asset loading pipeline with dedup-oriented task handling.
-- Virtual file system support is currently planned/in-progress.
-
-## Architecture
-
-Chained Engine follows a layered architecture with a Hazel-inspired service/singleton baseline, adapted for this project's engine/editor/runtime split.
-
-Core layers:
-
-- **Engine Core**: Rendering, scene, physics, audio, assets, platform abstractions.
-- **Bootstrapping**: `ProjectLauncher` utility that handles headless/runtime/editor initialization using a data-driven approach.
-- **Editor**: Content workflows, scene inspection/manipulation, panel-based tooling.
-- **Runtime**: Lightweight executable that loads and runs a project based on its `.chproject` metadata.
-- **Scripting Bridge**: C++/C# interop through Coral.Native and managed assemblies.
-
-The game selection itself is build-time, not runtime: `CH_ACTIVE_GAME` chooses which game folder is added to the build graph, while the `.chproject` file decides what the runtime opens.
-
-## Working with Projects
-
-The engine supports multiple game projects inside the same repository. Right now, there are two:
-
-- **`chaineddecos`**: the main parkour game.
-- **`testproject`**: a lightweight sandbox project to test features safely.
-
-### Switching the Active Game
-
-To keep compile times fast, only one game project is generated in the build graph at a time. This is controlled by the `CH_ACTIVE_GAME` CMake variable.
-
-**How to switch:**
-1. **Command Line:** Run CMake with `-DCH_ACTIVE_GAME=...`.
-   ```bash
-   cmake -S . -B build/windows-ninja -DCH_ACTIVE_GAME=testproject
-   ```
-2. **VS Code:** Open the Command Palette (`Ctrl+Shift+P`), choose `CMake: Edit CMake Cache (UI)`, find `CH_ACTIVE_GAME`, change it, and save.
-
-After changing the game, just rebuild the project. The executable name and assets will automatically switch to the new game.
-
-### Creating a New Project
-
-Want to start a new game from scratch? Here is how to hook it up:
-
-1. **Create the folder structure:** Make a new directory `game/mygame`.
-2. **Add a CMake script:** Create `game/mygame/CMakeLists.txt` and use the engine's helper macro:
-   ```cmake
-   chained_add_game(MyGameTarget
-       PROJECT_GAME mygame
-       CSHARP_PROJECT "scripts/MyGame.Scripts.csproj" # Omit if you don't use C# yet
-   )
-   ```
-3. **Add the entry point:** Create `game/mygame/src/main.cpp`. The engine uses a modular `ProjectLauncher` to bootstrap the application:
-   ```cpp
-   #include "engine/core/application.h"
-   #include "engine/core/entry_point.h"
-   #include "engine/core/project_launcher.h"
-
-   namespace CHEngine {
-       Application* CreateApplication(ApplicationCommandLineArgs args) {
-           // Prepare runtime specifications from project data
-           auto details = ProjectLauncher::PrepareRuntime(args);
-           return new Application(details.Spec);
-       }
-   }
-   ```
-4. **Register it:** Open the *root* `CMakeLists.txt`, find the `if(CH_ACTIVE_GAME STREQUAL "...")` block, and add your new game to the list.
-
-## Project Structure
-
-- engine/: core engine modules (graphics, scene, physics, audio, platform, assets).
-- editor/: ChainedEditor application and editor panels/tools.
-- runtime/: ChainedRuntime application and runtime layer.
-- scripting/: script host, glue bindings, and managed build integration.
-- game/chaineddecos/: main game project, gameplay scripts under src/, and managed scripts/tests under scripts/.
-- game/testproject/: alternate standalone game project used for project switching and smaller experiments.
-- tests/: native C++ test target (EngineTests).
-- include/: third-party dependencies as git submodules.
-
-## Dependencies
-
-This repository relies on git submodules for core third-party libraries (for example EnTT, Assimp, Coral, ImGui, GLFW, GLM, yaml-cpp, GoogleTest, and others under include/).
-
-Always initialize/update submodules before configuring CMake:
-
-```bash
-git submodule update --init --recursive
-```
-
-## Prerequisites
-
-| Tool | Version | Notes |
-| :--- | :--- | :--- |
-| CMake | 3.31+ | Required by top-level CMake configuration. |
-| Compiler | C++23 | GCC 14+, Clang 18+, or MSYS2/MinGW-w64 GCC and Clang on Windows. |
-| Ninja | Latest | Recommended for fast parallel builds. |
-| .NET SDK | 9.0.x | Required for managed scripting/test workflows. |
-| Graphics Driver | OpenGL 4.3+ | Needed for editor/runtime rendering. |
-
-Linux packages used by CI (Ubuntu reference):
-
-```bash
-sudo apt-get update
-sudo apt-get install -y build-essential cmake ninja-build \
-  libgl1-mesa-dev libx11-dev libxrandr-dev libxinerama-dev \
-  libxcursor-dev libxi-dev libasound2-dev libglu1-mesa-dev \
-  pkg-config libgtk-3-dev libdrm-dev libgbm-dev \
-  xvfb libxkbcommon-x11-0 libgl1-mesa-dri mesa-utils
-```
 
 ## Quick Start
 
-1. Clone with submodules:
-
+**Clone:**
 ```bash
-git clone --recurse-submodules https://github.com/IOleg-crypto/Chained-Decos.git
-cd Chained-Decos
+git clone --recurse-submodules https://github.com/IOleg-crypto/ChainedEngine.git
+cd ChainedEngine
 git submodule update --init --recursive
 ```
 
-1. Configure (examples):
-
+**Configure + Build + Run:**
 ```bash
-# Linux (Ninja)
+# Linux
 cmake --preset linux-clang
-
-# Windows (MSYS2 GCC)
-cmake --preset windows-gcc
+cmake --build --preset linux-clang --parallel
+./build/linux-clang/bin/ChainedEditor
 
 # Windows (MSYS2 Clang)
 cmake --preset windows-clang
-```
-
-1. Build:
-
-```bash
-# Ninja presets
-cmake --build --preset linux-clang --parallel
-cmake --build --preset windows-gcc --parallel
 cmake --build --preset windows-clang --parallel
-```
+.\build\windows-clang\bin\ChainedEditor.exe
 
-1. Run editor:
-
-```bash
-# Linux
-./build/linux-clang/bin/ChainedEditor
+# Windows (MSVC Ninja)
+cmake --preset windows-msvc
+cmake --build --preset windows-msvc --parallel
 
-# Windows
-.\build\windows-gcc\bin\ChainedEditor.exe
+# Windows (VS 2026 .sln)
+cmake --preset windows-vs2026
 ```
 
-## Build
-
-CMake presets defined in CMakePresets.json:
-
-- linux-gcc
-- linux-clang
-- windows-gcc
-- windows-clang
+> **Editor play mode:** Press PLAY to enter simulation and capture cursor. Press Escape to return to editor interaction.
 
-Notes:
+## Build
 
-- BUILD_TESTS defaults to ON in presets.
-- If you switch presets or major toolchains, do a clean configure for that build directory.
-- `CH_ACTIVE_GAME` defaults to `chaineddecos` in CMakePresets.json. Set it to `testproject` when you want the alternate game.
-- Optional compiler cache support is built in through ccache/sccache integration in CI and CMake options.
-- If you use Clang on Windows and see Intellisense errors in VS Code, ensure that `.vscode/settings.json` points to the correct build directory for `clangd`:
-  ```json
-  "clangd.arguments": [
-      "--compile-commands-dir=${workspaceFolder}/build/windows-ninja"
-  ]
-  ```
+### Presets
+
+| Preset | Generator | Compiler | Use case |
+| :--- | :--- | :--- | :--- |
+| `windows-clang` | Ninja Multi-Config | Clang (MSYS2) | Primary dev |
+| `windows-msvc` | Ninja Multi-Config | MSVC (cl) | MSVC Ninja |
+| `windows-vs2026` | Visual Studio 18 2026 | MSVC | VS solution / CI |
+| `linux-clang` | Ninja Multi-Config | Clang | Linux CI |
+| `linux-gcc` | Ninja Multi-Config | GCC | Linux |
+| `windows-gcc` | Ninja Multi-Config | GCC (MinGW) | MinGW |
+
+**Key CMake variables:**
+- `CH_ACTIVE_GAME` — `chaineddecos` (default) or `testproject`. Build-time only. Switching requires reconfigure.
+- `BUILD_TESTS` — ON by default.
+- `CH_ENGINE_SHARED` — OFF by default (static engine).
+
+If you use Clang on Windows and see Intellisense errors in VS Code, ensure `.vscode/settings.json` points to the correct build dir:
+```json
+"clangd.arguments": ["--compile-commands-dir=${workspaceFolder}/build/windows-clang"]
+```
 
 ## Run
 
-Binary outputs are generated under build/{preset}/bin.
-
-Editor:
+Binaries are generated under `build/{preset}/bin/`:
 
 ```bash
-# Linux
+# Editor
 ./build/linux-clang/bin/ChainedEditor
+.\build\windows-clang\bin\ChainedEditor.exe
 
-# Windows
-.\build\windows-gcc\bin\ChainedEditor.exe
-```
-
-Runtime:
-
-```bash
-# Positional project path
+# Runtime
 ./build/linux-clang/bin/ChainedRuntime path/to/project.chproject
-
-# Or explicit flag form
-./build/linux-clang/bin/ChainedRuntime --project path/to/project.chproject
-./build/linux-clang/bin/ChainedRuntime --project path/to/project.chproject --name "My Runtime" --width 1600 --height 900
-
-# Windows example
-.\build\windows-gcc\bin\ChainedRuntime.exe --project path\to\project.chproject --name "My Runtime" --width 1600 --height 900
+.\build\windows-clang\bin\ChainedRuntime.exe --project path\to\project.chproject --name "My Runtime" --width 1600 --height 900
 ```
 
-Runtime CLI flags currently supported:
-
-- --project or -p
-- --name
-- --width
-- --height
-
-When you build the alternate game project, the executable name changes with the active target. The runtime still discovers the `.chproject` file from the executable/project directory.
-
-Editor play-mode note:
+Runtime CLI: `--project` / `-p`, `--name`, `--width`, `--height`.
 
-- Enter Play mode to capture cursor.
-- Press Escape to return control to editor interaction.
-
-## Gameplay Scripting (C#)
-
-Chained Engine uses managed C# for gameplay, powered by Coral (.NET/CoreCLR). This means you write your game logic in C# while the heavy lifting (rendering, physics) stays in C++.
-
-### Writing Your First Script
-
-Scripts live inside your game's source folder (e.g., [game/chaineddecos/src](game/chaineddecos/src)). Here is a practical example of a basic script:
-
-```csharp
-using System;
-using CHEngine;
+## Working with Projects
 
-namespace ChainedDecos
-{
-    public class PlayerController : Script
-    {
-        public float Speed = 5.0f;
-        private TransformComponent _transform;
+The engine supports multiple game projects under `game/`. Currently:
+- **`chaineddecos`** — the main parkour game
+- **`testproject`** — a lightweight sandbox for testing features
 
-        protected override void OnCreate()
-        {
-            // Called once when the Entity is initialized
-            _transform = GetComponent<TransformComponent>();
-            Log.Info("Player Controller initialized!");
-        }
+### Switching the Active Game
 
-        protected override void OnUpdate(float deltaTime)
-        {
-            // Called every frame
-            if (Input.IsKeyDown(KeyCode.W))
-            {
-                Vector3 pos = _transform.Translation;
-                pos.Z -= Speed * deltaTime;
-                _transform.Translation = pos;
-            }
-        }
-    }
-}
+```bash
+cmake -S . -B build/windows-clang -DCH_ACTIVE_GAME=testproject
 ```
 
-### Connecting the Script in the Editor
-
-Once you've written your magical gameplay code, how does the engine know about it?
+Or in VS Code: Command Palette → `CMake: Edit CMake Cache (UI)` → change `CH_ACTIVE_GAME`.
 
-1. **Build the scripts:** Either rebuild the project through CMake/Ninja, or navigate to your `.csproj` folder and run `dotnet build`.
-2. **Open the Editor** and select the Entity you want to control.
-3. **Add Component:** In the Inspector panel, click **Add Component** and choose **Managed Script Component**.
-4. **Link it:** In the `Class Name` text field, type the **fully qualified name** of your script — namespace included (for example: `ChainedDecos.PlayerController`).
-5. **Play:** Hit the Play button in the editor. The engine will instantly instantiate your C# class and execute your lifecycle methods!
+### Creating a New Project
 
-### Under the Hood: Architecture & Registration
+Use the scaffolding script:
+```bash
+python tools/create_game.py MyGame
+python tools/create_game.py MyGame --csproj assets/scripts/MyGame.Scripts.csproj
+```
 
-If you are modifying the engine itself, you will find the native-to-managed bridge here:
-- **Native Host:** [scripting/scriptengine.h](scripting/scriptengine.h) initializes Coral and loads assemblies.
-- **Interops:** Native C++ calls are exposed to C# via `script_glue.cpp`.
-- **Discovery:** At startup, `ScriptTypeRegistry::Discover()` scans the game DLL for classes deriving from `CHEngine.Script`.
-- **Lifecycle:** `SceneScripting` instantiates your script in C++, calls `__Init()` to cache delegates, and smoothly passes events from the C++ Scene to C#.
+This creates `game/mygame/` with:
+- `CMakeLists.txt` — wired into the build via auto-discovery
+- `src/main.cpp` — `CreateApplication` entry point
+- `MyGame.chproject` — project metadata
+- `assets/scripts/` — for C# scripts
 
-### Managed API Surface
+New games are auto-discovered by the root `CMakeLists.txt` — any directory under `game/` with a `CMakeLists.txt` is included when `CH_ACTIVE_GAME` matches.
 
-- [scripting/managed/src/Script.cs](scripting/managed/src/Script.cs) defines the script lifecycle base class.
-- [scripting/managed/src/Entity.cs](scripting/managed/src/Entity.cs) exposes entity/component access.
-- [scripting/managed/src/SceneAndApplication.cs](scripting/managed/src/SceneAndApplication.cs) exposes scene, audio, application, time, and window helpers.
-- [scripting/managed/src/Input.cs](scripting/managed/src/Input.cs) wraps input queries.
-- [scripting/managed/src/Log.cs](scripting/managed/src/Log.cs) wraps logging.
-- [scripting/managed/src/Math.cs](scripting/managed/src/Math.cs) provides vector and scalar helpers.
-- [scripting/managed/src/UI.cs](scripting/managed/src/UI.cs) exposes minimal UI helpers.
+### Editor‑created projects
 
-Managed artifacts are built as part of the scripting target when dotnet is available.
+The editor (**Project → New Project**) now also generates CMake build scaffolding:
 
-## Assets and Resources
+- `{project}/CMakeLists.txt` — `chained_add_game()` boilerplate
+- `{project}/src/main.cpp` — `CreateApplication` entry point
 
-All of your 3D models, textures, animations, and sound files must go into your game's `assets/` or `resources/` folder. The engine uses a unified Asset Manager to register files and assign a UUID to them so they are not loaded multiple times.
+For a standalone build, move the project directory under `game/` (e.g. `game/mygame/`) so it is auto‑discovered by the root `CMakeLists.txt`.
 
-1. **Importing:** Drag and drop your source file (e.g., `.gltf` model, `.png` texture) directly into the **Content Browser Panel** in the Editor. The system registers it.
-2. **Usage:** Select the Entity in your scene, find the relevant Component (like `MeshComponent`), and assign the newly loaded asset from the browser.
+### Project Configuration (`.chproject`)
 
-## Physics and Collisions
+Each game has a YAML metadata file defining its entry scene, physics, rendering, and window settings. See [User Guide](docs/USER_GUIDE.md) for the full reference.
 
-Chained Engine uses a built-in 3D physics simulation, which is heavily used by parkour traversal scripts in `chaineddecos`.
+## Project Structure
 
-To add physical behavior to an Entity in the Editor:
-1. Click **Add Component** and select **RigidBodyComponent**. This determines if the object falls (Dynamic) or stays still (Kinematic/Static).
-2. Add a physical shape like a **BoxColliderComponent** or **SphereColliderComponent**.
+- `engine/` — core engine modules (graphics, scene, physics, audio, platform, assets, networking)
+- `editor/` — ChainedEditor application and editor panels/tools
+- `runtime/` — ChainedRuntime application and runtime layer
+- `engine/scripting/` — script host, glue bindings, and managed build integration
+- `game/chaineddecos/` — main game project
+- `game/testproject/` — alternate sandbox project
+- `tests/` — native C++ tests (GoogleTest)
+- `thirdparty/` — third-party dependencies (git submodules)
+- `tools/` — build scripts, glue code generator, resource sync
 
-If you are writing a C# script (inherited from `CHEngine.Script`), you can hook into these collisions directly:
+## Dependencies
 
-```csharp
-protected override void OnCollisionEnter(Entity other)
-{
-    Log.Info($"Hit something: {other.Name}");
-    if (other.HasComponent<DamageZone>())
-    {
-        // Example: Handle player taking damage
-    }
-}
+| Library | Purpose |
+| :--- | :--- |
+| EnTT | ECS framework |
+| Assimp | 3D model import |
+| Coral | C#/C++ interop |
+| ImGui + ImGuizmo | Editor UI |
+| GLFW + GLAD | Window/OpenGL |
+| GLM | Math library |
+| yaml-cpp | YAML serialization |
+| GoogleTest | Unit/integration tests |
+| JoltPhysics | Physics simulation |
+| zstd + pack (cfnptr) | Asset pack compression |
+| miniaudio | Audio |
+| spdlog | Logging |
+| stb | Image loading |
+| cereal | Binary serialization |
+| reflect-cpp | Runtime reflection |
+| ENet | UDP networking |
+| libsodium | Encryption (xchacha20poly1305) |
+| miniupnpc | UPnP port forwarding |
+
+Always init submodules before building:
+```bash
+git submodule update --init --recursive
 ```
 
-## In-Game UI
-
-While the Editor UI is drawn using ImGui, the gameplay (In-Game) UI meant for players is accessed through the managed scripting wrapper.
-
-To draw simple HUDs or text menus:
-1. Override the `OnGUI` method in your C# script.
-2. Call static helpers from the `UI` class.
+## Prerequisites
 
-```csharp
-protected override void OnGUI()
-{
-    // Draw some simple text on screen
-    UI.DrawText("Stamina: 100", new Vector2(10.0f, 10.0f), Color.White);
+| Tool | Version | Notes |
+| :--- | :--- | :--- |
+| CMake | 3.31+ | Required by top-level CMakeLists |
+| Compiler | C++23 | Clang 18+, MSVC (VS2022+), or MSYS2/MinGW-w64 |
+| Ninja | Latest | Recommended for fast parallel builds |
+| .NET SDK | 10.0.x | Required for managed scripting |
+| Graphics Driver | OpenGL 4.3+ | Needed for rendering |
 
-    // Render a button and check if clicked
-    if (UI.DrawButton("Restart Parkour", new Vector2(100.0f, 200.0f)))
-    {
-        // Restart logic here
-    }
-}
+Linux packages (Ubuntu reference):
+```bash
+sudo apt-get install -y build-essential cmake ninja-build \
+  libgl1-mesa-dev libx11-dev libxrandr-dev libxinerama-dev \
+  libxcursor-dev libxi-dev libasound2-dev libglu1-mesa-dev \
+  pkg-config libgtk-3-dev libdrm-dev libgbm-dev \
+  xvfb libxkbcommon-x11-0 libgl1-mesa-dri mesa-utils
 ```
 
-## Extending the Engine (C++)
-
-Need performance that scripting can't provide, or want to create a brand new foundational Component? Here is the flow for a native ECS update:
-
-1. **Define the Data:** Add a fast `struct` in `engine/scene/components.h`. We use `EnTT`, so components are simple structs. 
-   ```cpp
-   struct ParkourStateComponent {
-       float Stamina = 100.0f;
-       bool  IsWallRunning = false;
-   };
-   ```
-2. **Support Serialization:** If you want editors to save or load it with the level, update `scene_serializer.cpp` or `yaml_extensions` so YAML knows how to read/write it.
-3. **Expose It to the Editor:** Open `editor/editor_panels.cpp` and add the `ImGui` draw logic for `ParkourStateComponent`.
-4. **Register Loaders (if needed):** If your component needs a custom asset type, register its loader in the appropriate system (e.g., `Renderer::Init()` for graphics assets) to maintain Single Responsibility Principle compliance.
-
-## Debugging and Profiling
-
-If `Chained Decos` ever suffers a frame-rate drop (a lag spike), do not optimize blindly. Use the tools:
-
-- **Built-in Editor Profiler:** Open the **Profiler** panel. It displays a breakdown (in `ms`) of where your frame time went — `Rendering`, `Physics Update`, or `Scripting Update`. Check this first.
-- **C# Debugging with CoreCLR:** Because the engine wraps .NET via Coral, you can attach a C# IDE debugger (like Visual Studio or Rider) to the running Engine/Editor process. Your breakpoints inside `OnUpdate` or `OnCreate` will pause the simulation.
-
 ## Testing
 
-There are two test layers.
-
-Native tests (GoogleTest + CTest):
+Native tests use GoogleTest + CTest, split into unit (fast, no engine runtime) and integration (full engine) targets.
 
 ```bash
-# Build native test target
-cmake --build --preset windows-gcc --target EngineTests --parallel
-
-# Windows Clang variant
-cmake --build --preset windows-clang --target EngineTests --parallel
-
-# Linux variant
-cmake --build --preset linux-clang --target EngineTests --parallel
-
-# Run native tests
-ctest --test-dir build/windows-gcc --output-on-failure
-
-# Windows Clang variant
+# Run all tests
 ctest --test-dir build/windows-clang --output-on-failure
 
-# Linux variant
-ctest --test-dir build/linux-clang --output-on-failure
-```
+# Unit tests only
+ctest --test-dir build/windows-clang -L Unit --output-on-failure
 
-Managed gameplay tests (xUnit):
-
-```bash
-dotnet restore ./game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj
-dotnet test ./game/chaineddecos/scripts/tests/ChainedDecos.Scripts.Tests.csproj -c Release --no-restore
+# Integration tests only
+ctest --test-dir build/windows-clang -L Integration --output-on-failure
 ```
 
-## CI/CD
+Managed (C#) tests require .NET SDK 10.0.x on PATH. Without it, the scripting target is silently skipped.
 
-CI workflow (.github/workflows/ci.yml):
+## CI/CD
 
-- Dispatches native builds to `.github/workflows/linux.yml` and `.github/workflows/windows.yml`.
-- Dispatches managed tests to `.github/workflows/managed.yml`.
-- Runs CTest for native tests.
-- Runs managed script tests with .NET 9.0.x.
-- Uses software rendering setup for Linux test execution (xvfb + Mesa environment variables).
+CI workflow (`.github/workflows/ci.yml`) fans out to:
+- **Format Check** (`format.yml`): `clang-format-18 --dry-run -Werror` on changed C++ files
+- **Linux Builds** (`linux.yml`): Debug + Release under `xvfb` + Mesa software rendering
+- **Windows Builds** (`windows.yml`): Debug + Release matrix (Clang, MSVC, GCC)
 
-Deploy workflow (.github/workflows/deploy-sdk.yml):
+Debug builds use `-DENABLE_SANITIZERS=ON` (ASan + UBSan). CTest output is captured as JUnit XML.
 
-- Triggered by v* tags or manual dispatch.
-- Runs managed tests.
-- Builds and packages ChainedEditor and ChainedRuntime artifacts for Linux/Windows.
+Deploy workflow (`.github/workflows/deploy-sdk.yml`): triggered by `v*` tags, packages ChainedEditor + ChainedRuntime artifacts.
 
 ## Troubleshooting
 
-Submodule errors during configure/build:
-
-```bash
-git submodule update --init --recursive
-```
-
-Generator switch conflicts:
-
-- If reusing a build directory with another generator family, reconfigure from a clean build folder for that preset.
-
-Managed build not available:
+- **Submodule errors:** `git submodule update --init --recursive`
+- **Generator conflicts:** Reconfigure from a clean build folder when switching generator families
+- **No managed build:** Ensure `dotnet` SDK 10.0.x is on PATH
+- **Linux headless:** Install packages from Prerequisites, use `xvfb` + Mesa
+- **Stale files after `CH_ACTIVE_GAME` change:** Reconfigure the build directory, don't just rebuild
 
-- Ensure dotnet SDK 9.0.x is installed and available in PATH.
-
-Headless Linux test issues:
+## Known Issues
 
-- Install the Linux packages listed in Prerequisites.
-- Use xvfb and Mesa software rendering for CI-like environments.
+- Font system needs rework for in-scene text and editor
+- Some native tests are being reworked and may be skipped in CI
+- Runtime and editor workflows are under active iteration
+- Virtual file system is planned/in-progress
+- **Runtime may have bugs and issues — known problems include font rendering, physics edge cases, and occasional crashes under specific scenarios**
 
-Changing `CH_ACTIVE_GAME` without reconfiguring the build tree can leave stale generated files behind. Reconfigure the same build directory when you switch between `chaineddecos` and `testproject`.
+## Documentation
 
-## Known Issues
+Full guides and references:
 
-- Some native test areas are currently being reworked and may be skipped or gated in CI depending on environment constraints.
-- Runtime and editor workflows are under active iteration.
-- Virtual file system support is planned/in-progress and should not be treated as fully delivered yet.
+| Document | Description |
+| :--- | :--- |
+| [User Guide](docs/USER_GUIDE.md) | Step-by-step: build, run, create scenes, write scripts, export |
+| [Engine Architecture](docs/ARCHITECTURE.md) | Bootstrapping, system initialization, main loop |
+| [Component Reference](docs/COMPONENTS.md) | All ECS components, adding new ones |
+| [Scripting API](docs/SCRIPTING_API.md) | C# API reference: lifecycle, entities, input, UI |
+| [Scripting Interop](docs/SCRIPTING_INTEROP.md) | C++/C# bridge internals |
+| [Animation Graphs](docs/ANIMATION_GRAPHS.md) | Visual animation graph system tutorial |
+| [Export Guide](docs/EXPORT.md) | Project packaging and distribution |
+| [FAQ](docs/FAQ.md) | Common patterns and solutions |
 
 ## Contributing
 
-Contributions are welcome.
-
-- Open issues for bugs/regressions.
-- Submit pull requests for fixes and improvements.
-- Platform/build workflow improvements are especially helpful.
-- Keep documentation changes in this README or in nearby code comments when the detail is local.
+- Open issues for bugs/regressions
+- Submit pull requests for fixes and improvements
+- Platform/build workflow improvements are especially helpful
 
 ## License
 
diff --git a/resources/config/shaders.yaml b/resources/config/shaders.yaml
new file mode 100644
index 000000000..cea00c85c
--- /dev/null
+++ b/resources/config/shaders.yaml
@@ -0,0 +1,13 @@
+Shaders:
+  Lighting: "engine/resources/shaders/materials/lighting.chshader"
+  Skinned: "engine/resources/shaders/materials/skinned.chshader"
+  Unlit: "engine/resources/shaders/materials/unlit.chshader"
+  Billboard: "engine/resources/shaders/materials/billboard.chshader"
+  Sprite: "engine/resources/shaders/materials/sprite.chshader"
+  ShadowDepth: "engine/resources/shaders/materials/shadow_depth.chshader"
+  Skybox: "engine/resources/shaders/env/skybox.chshader"
+  SkyboxCross: "engine/resources/shaders/env/skybox_cross.chshader"
+  SkyboxCubemap: "engine/resources/shaders/env/skybox_cubemap.chshader"
+  ColliderDebug: "engine/resources/shaders/debug/collider_debug.chshader"
+  Grid: "engine/resources/shaders/debug/grid.chshader"
+  PostProcess: "engine/resources/shaders/postfx/post_process.chshader"
diff --git a/resources/font/Figtree-Italic-VariableFont_wght.ttf b/resources/font/Figtree-Italic-VariableFont_wght.ttf
new file mode 100644
index 000000000..06d4ee3a1
Binary files /dev/null and b/resources/font/Figtree-Italic-VariableFont_wght.ttf differ
diff --git a/resources/font/Figtree-VariableFont_wght.ttf b/resources/font/Figtree-VariableFont_wght.ttf
new file mode 100644
index 000000000..f93a4b6cd
Binary files /dev/null and b/resources/font/Figtree-VariableFont_wght.ttf differ
diff --git a/resources/font/OFL.txt b/resources/font/OFL.txt
new file mode 100644
index 000000000..c10a6279e
--- /dev/null
+++ b/resources/font/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Figtree Project Authors (https://github.com/erikdkennedy/figtree)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/resources/font/README.txt b/resources/font/README.txt
new file mode 100644
index 000000000..3814098c0
--- /dev/null
+++ b/resources/font/README.txt
@@ -0,0 +1,77 @@
+Figtree Variable Font
+=====================
+
+This download contains Figtree as both variable fonts and static fonts.
+
+Figtree is a variable font with this axis:
+  wght
+
+This means all the styles are contained in these files:
+  Figtree-VariableFont_wght.ttf
+  Figtree-Italic-VariableFont_wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Figtree:
+  static/Figtree-Light.ttf
+  static/Figtree-Regular.ttf
+  static/Figtree-Medium.ttf
+  static/Figtree-SemiBold.ttf
+  static/Figtree-Bold.ttf
+  static/Figtree-ExtraBold.ttf
+  static/Figtree-Black.ttf
+  static/Figtree-LightItalic.ttf
+  static/Figtree-Italic.ttf
+  static/Figtree-MediumItalic.ttf
+  static/Figtree-SemiBoldItalic.ttf
+  static/Figtree-BoldItalic.ttf
+  static/Figtree-ExtraBoldItalic.ttf
+  static/Figtree-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.
diff --git a/resources/font/ofl.txt b/resources/font/ofl.txt
deleted file mode 100644
index 2f2516da8..000000000
--- a/resources/font/ofl.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2025 The Alan Sans Project Authors (https://github.com/alan-eu/Alan-Sans)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/resources/font/readme.txt b/resources/font/readme.txt
deleted file mode 100644
index ff276fe41..000000000
--- a/resources/font/readme.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Alan Sans Variable Font
-=======================
-
-This download contains Alan Sans as both a variable font and static fonts.
-
-Alan Sans is a variable font with this axis:
-  wght
-
-This means all the styles are contained in a single file:
-  AlanSans-VariableFont_wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Alan Sans:
-  static/AlanSans-Light.ttf
-  static/AlanSans-Regular.ttf
-  static/AlanSans-Medium.ttf
-  static/AlanSans-SemiBold.ttf
-  static/AlanSans-Bold.ttf
-  static/AlanSans-ExtraBold.ttf
-  static/AlanSans-Black.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
-  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
-  https://variablefonts.typenetwork.com
-  https://medium.com/variable-fonts
-
-In desktop apps
-
-  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
-  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
-  https://developers.google.com/fonts/docs/getting_started
-  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
-  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
-  MacOS: https://support.apple.com/en-us/HT201749
-  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
-  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
-  https://developers.google.com/fonts/docs/android
-  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-License
--------
-Please read the full license text (OFL.txt) to understand the permissions,
-restrictions and requirements for usage, redistribution, and modification.
-
-You can use them in your products & projects – print or digital,
-commercial or otherwise.
-
-This isn't legal advice, please consider consulting a lawyer and see the full
-license for all details.
diff --git a/resources/font/static/Figtree-Black.ttf b/resources/font/static/Figtree-Black.ttf
new file mode 100644
index 000000000..526fe1dda
Binary files /dev/null and b/resources/font/static/Figtree-Black.ttf differ
diff --git a/resources/font/static/Figtree-BlackItalic.ttf b/resources/font/static/Figtree-BlackItalic.ttf
new file mode 100644
index 000000000..f67766c42
Binary files /dev/null and b/resources/font/static/Figtree-BlackItalic.ttf differ
diff --git a/resources/font/static/Figtree-Bold.ttf b/resources/font/static/Figtree-Bold.ttf
new file mode 100644
index 000000000..6f8ad6404
Binary files /dev/null and b/resources/font/static/Figtree-Bold.ttf differ
diff --git a/resources/font/static/Figtree-BoldItalic.ttf b/resources/font/static/Figtree-BoldItalic.ttf
new file mode 100644
index 000000000..6b3e86cd4
Binary files /dev/null and b/resources/font/static/Figtree-BoldItalic.ttf differ
diff --git a/resources/font/static/Figtree-ExtraBold.ttf b/resources/font/static/Figtree-ExtraBold.ttf
new file mode 100644
index 000000000..8589c0440
Binary files /dev/null and b/resources/font/static/Figtree-ExtraBold.ttf differ
diff --git a/resources/font/static/Figtree-ExtraBoldItalic.ttf b/resources/font/static/Figtree-ExtraBoldItalic.ttf
new file mode 100644
index 000000000..8ad84e828
Binary files /dev/null and b/resources/font/static/Figtree-ExtraBoldItalic.ttf differ
diff --git a/resources/font/static/Figtree-Italic.ttf b/resources/font/static/Figtree-Italic.ttf
new file mode 100644
index 000000000..7ff07e582
Binary files /dev/null and b/resources/font/static/Figtree-Italic.ttf differ
diff --git a/resources/font/static/Figtree-Light.ttf b/resources/font/static/Figtree-Light.ttf
new file mode 100644
index 000000000..e23887831
Binary files /dev/null and b/resources/font/static/Figtree-Light.ttf differ
diff --git a/resources/font/static/Figtree-LightItalic.ttf b/resources/font/static/Figtree-LightItalic.ttf
new file mode 100644
index 000000000..ff188b9bd
Binary files /dev/null and b/resources/font/static/Figtree-LightItalic.ttf differ
diff --git a/resources/font/static/Figtree-Medium.ttf b/resources/font/static/Figtree-Medium.ttf
new file mode 100644
index 000000000..5b89c890b
Binary files /dev/null and b/resources/font/static/Figtree-Medium.ttf differ
diff --git a/resources/font/static/Figtree-MediumItalic.ttf b/resources/font/static/Figtree-MediumItalic.ttf
new file mode 100644
index 000000000..d612e1788
Binary files /dev/null and b/resources/font/static/Figtree-MediumItalic.ttf differ
diff --git a/resources/font/static/Figtree-Regular.ttf b/resources/font/static/Figtree-Regular.ttf
new file mode 100644
index 000000000..4b42cdb30
Binary files /dev/null and b/resources/font/static/Figtree-Regular.ttf differ
diff --git a/resources/font/static/Figtree-SemiBold.ttf b/resources/font/static/Figtree-SemiBold.ttf
new file mode 100644
index 000000000..aa2b78c2c
Binary files /dev/null and b/resources/font/static/Figtree-SemiBold.ttf differ
diff --git a/resources/font/static/Figtree-SemiBoldItalic.ttf b/resources/font/static/Figtree-SemiBoldItalic.ttf
new file mode 100644
index 000000000..fd8b3a4ee
Binary files /dev/null and b/resources/font/static/Figtree-SemiBoldItalic.ttf differ
diff --git a/resources/icons/audio.png b/resources/icons/audio.png
new file mode 100644
index 000000000..dfe82c546
--- /dev/null
+++ b/resources/icons/audio.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19a1feddddd6f40be2d6f080bdeed5e110531acaa4c6b2789ea8f55b8b44a38d
+size 22037
diff --git a/resources/shaders/collider_debug.chshader b/resources/shaders/collider_debug.chshader
deleted file mode 100644
index 1fc2a33f0..000000000
--- a/resources/shaders/collider_debug.chshader
+++ /dev/null
@@ -1,7 +0,0 @@
-VertexShader: collider_debug.vs
-FragmentShader: collider_debug.fs
-
-Uniforms:
-  - u_ViewProj
-  - u_Transform
-  - u_Color
diff --git a/resources/shaders/cubemap.chshader b/resources/shaders/cubemap.chshader
deleted file mode 100644
index d521a4d85..000000000
--- a/resources/shaders/cubemap.chshader
+++ /dev/null
@@ -1,8 +0,0 @@
-# Cubemap Conversion Shader Metadata
-VertexShader: "cubemap.vs"
-FragmentShader: "cubemap.fs"
-
-Uniforms:
-  - projection
-  - view
-  - equirectangularMap
diff --git a/resources/shaders/cubemap.fs b/resources/shaders/cubemap.fs
deleted file mode 100644
index fb1c9f69d..000000000
--- a/resources/shaders/cubemap.fs
+++ /dev/null
@@ -1,38 +0,0 @@
-#version 450 core
-
-in vec3 fragPosition;
-
-uniform sampler2D equirectangularMap;
-
-out vec4 finalColor;
-
-const vec2 invAtan = vec2(0.1591, 0.3183); // 1/(2*PI) та 1/PI
-
-vec2 SampleSphericalMap(vec3 v)
-{
-    // atan2 повертає значення від -PI до PI
-    // asin повертає від -PI/2 до PI/2
-    vec2 uv = vec2(atan(v.z, v.x), asin(v.y));
-    
-    // Перетворюємо в діапазон [0, 1]
-    uv *= invAtan;
-    uv += 0.5;
-    
-    // stb_image завантажує JPG/PNG з перевертанням по V (stbi_set_flip_vertically_on_load).
-    // Компенсуємо це тут, щоб кубмапа генерувалась правильно.
-    uv.y = 1.0 - uv.y;
-    
-    return uv;
-}
-
-void main()
-{       
-    vec3 direction = normalize(fragPosition);
-    vec2 uv = SampleSphericalMap(direction);
-    
-    // ВАЖЛИВО: textureLod замість texture прибирає шов (диру) 
-    // на межі розгортки через ігнорування mipmap-градієнтів.
-    vec3 color = textureLod(equirectangularMap, uv, 0.0).rgb;
-    
-    finalColor = vec4(color, 1.0);
-}
\ No newline at end of file
diff --git a/resources/shaders/cubemap.vs b/resources/shaders/cubemap.vs
deleted file mode 100644
index 2825be7cd..000000000
--- a/resources/shaders/cubemap.vs
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 450 core
-
-layout (location = 0) in vec3 a_Position;
-
-uniform mat4 projection;
-uniform mat4 view;
-
-out vec3 fragPosition;
-
-void main()
-{
-    fragPosition = a_Position;
-    
-    // Видаляємо трансляцію (переміщення) з матриці вигляду, 
-    // щоб скайбокс завжди "слідував" за камерою
-    mat4 viewRotationOnly = mat4(mat3(view));
-    
-    vec4 pos = projection * viewRotationOnly * vec4(a_Position, 1.0);
-    
-    // Не використовуємо .xyww тут, бо ми малюємо в пустий FBO без depth buffer.
-    // Інакше через кліппінг може відсікатися Z=1.0.
-    gl_Position = pos;
-}
\ No newline at end of file
diff --git a/resources/shaders/debug/collider_debug.chshader b/resources/shaders/debug/collider_debug.chshader
new file mode 100644
index 000000000..ec376fb8f
--- /dev/null
+++ b/resources/shaders/debug/collider_debug.chshader
@@ -0,0 +1,8 @@
+# Collider Debug Shader Metadata
+VertexShader: "collider_debug.vert"
+FragmentShader: "collider_debug.frag"
+
+Uniforms:
+  - u_ViewProj
+  - u_Transform
+  - u_Color
diff --git a/resources/shaders/collider_debug.fs b/resources/shaders/debug/collider_debug.frag
similarity index 100%
rename from resources/shaders/collider_debug.fs
rename to resources/shaders/debug/collider_debug.frag
diff --git a/resources/shaders/collider_debug.vs b/resources/shaders/debug/collider_debug.vert
similarity index 100%
rename from resources/shaders/collider_debug.vs
rename to resources/shaders/debug/collider_debug.vert
diff --git a/resources/shaders/debug/grid.chshader b/resources/shaders/debug/grid.chshader
new file mode 100644
index 000000000..0cbae24dd
--- /dev/null
+++ b/resources/shaders/debug/grid.chshader
@@ -0,0 +1,12 @@
+# Grid Shader Metadata
+VertexShader: "grid.vert"
+FragmentShader: "grid.frag"
+
+Uniforms:
+  - u_Model
+  - u_CameraPos
+  - u_GridColor
+  - u_GridSize
+  - u_SecondarySpacing
+  - u_FadeStart
+  - u_FadeEnd
diff --git a/resources/shaders/debug/grid.frag b/resources/shaders/debug/grid.frag
new file mode 100644
index 000000000..da364d801
--- /dev/null
+++ b/resources/shaders/debug/grid.frag
@@ -0,0 +1,50 @@
+#version 430 core
+
+in vec3 v_WorldPos;
+
+uniform vec3 u_CameraPos;
+uniform vec4 u_GridColor;   // rgb = color, a = base alpha
+uniform float u_GridSize;   // primary spacing
+uniform float u_SecondarySpacing; // secondary spacing (major gridlines)
+uniform float u_FadeStart;  // distance where fade begins
+uniform float u_FadeEnd;    // distance where grid is fully invisible
+
+out vec4 o_Color;
+
+float grid(vec2 coord, float spacing, float lineWidth)
+{
+    vec2 grid_coord = coord / spacing;
+    vec2 derivative = fwidth(grid_coord);
+
+    vec2 scaledLine = lineWidth * derivative;
+
+    vec2 grid_val = abs(fract(grid_coord - 0.5) - 0.5);
+
+    vec2 aa = smoothstep(scaledLine, vec2(0.0), grid_val);
+
+    return max(aa.x, aa.y);
+}
+
+void main()
+{
+    vec2 coord = v_WorldPos.xz;
+
+    float g1 = grid(coord, u_GridSize, 0.8);
+    float g2 = grid(coord, u_SecondarySpacing, 0.5);
+
+    float dist = length(v_WorldPos - u_CameraPos);
+    float fade_range = max(u_FadeEnd - u_FadeStart, 0.001);
+    float fade = 1.0 - clamp((dist - u_FadeStart) / fade_range, 0.0, 1.0);
+    fade = fade * fade;
+
+    vec3 viewDir = normalize(u_CameraPos - v_WorldPos);
+    float viewAngle = abs(viewDir.y);
+    float angleFade = smoothstep(0.0, 0.3, viewAngle);
+
+    float alpha_mask = max(g1 * 0.3, g2 * 0.6);
+    float final_alpha = alpha_mask * fade * angleFade;
+
+    if (final_alpha < 0.005) discard;
+
+    o_Color = vec4(u_GridColor.rgb, final_alpha * u_GridColor.a);
+}
diff --git a/resources/shaders/debug/grid.vert b/resources/shaders/debug/grid.vert
new file mode 100644
index 000000000..7ce0b4d6f
--- /dev/null
+++ b/resources/shaders/debug/grid.vert
@@ -0,0 +1,14 @@
+#version 430 core
+
+layout (location = 0) in vec3 a_Position;
+
+#include "../include/camera.glsl"
+uniform mat4 u_Model;
+
+out vec3 v_WorldPos;
+
+void main()
+{
+    v_WorldPos = (u_Model * vec4(a_Position, 1.0)).xyz;
+    gl_Position = u_ViewProjection * u_Model * vec4(a_Position, 1.0);
+}
diff --git a/resources/shaders/env/cubemap.chshader b/resources/shaders/env/cubemap.chshader
new file mode 100644
index 000000000..0cbbccb18
--- /dev/null
+++ b/resources/shaders/env/cubemap.chshader
@@ -0,0 +1,8 @@
+# Cubemap Conversion Shader Metadata
+VertexShader: "cubemap.vert"
+FragmentShader: "cubemap.frag"
+
+Uniforms:
+  - projection
+  - view
+  - equirectangularMap
diff --git a/resources/shaders/env/cubemap.frag b/resources/shaders/env/cubemap.frag
new file mode 100644
index 000000000..6daaa2da6
--- /dev/null
+++ b/resources/shaders/env/cubemap.frag
@@ -0,0 +1,33 @@
+#version 430 core
+
+in vec3 fragPosition;
+
+uniform sampler2D equirectangularMap;
+
+out vec4 finalColor;
+
+const vec2 invAtan = vec2(0.1591, 0.3183); // 1/(2*PI) and 1/PI
+
+vec2 SampleSphericalMap(vec3 v)
+{
+    vec2 uv = vec2(atan(v.z, v.x), asin(v.y));
+    uv *= invAtan;
+    uv += 0.5;
+    
+    // stb_image loads JPG/PNG with V-flip (stbi_set_flip_vertically_on_load).
+    // Compensate here so cubemap generates correctly.
+    uv.y = 1.0 - uv.y;
+    
+    return uv;
+}
+
+void main()
+{       
+    vec3 direction = normalize(fragPosition);
+    vec2 uv = SampleSphericalMap(direction);
+    
+    // textureLod removes seams at wrapping boundaries by ignoring mipmap gradients.
+    vec3 color = textureLod(equirectangularMap, uv, 0.0).rgb;
+    
+    finalColor = vec4(color, 1.0);
+}
diff --git a/resources/shaders/env/cubemap.vert b/resources/shaders/env/cubemap.vert
new file mode 100644
index 000000000..e836e7622
--- /dev/null
+++ b/resources/shaders/env/cubemap.vert
@@ -0,0 +1,21 @@
+#version 430 core
+
+layout (location = 0) in vec3 a_Position;
+
+uniform mat4 projection;
+uniform mat4 view;
+
+out vec3 fragPosition;
+
+void main()
+{
+    fragPosition = a_Position;
+    
+    // Remove translation from view matrix to keep skybox centered on camera
+    mat4 viewRotationOnly = mat4(mat3(view));
+    
+    vec4 pos = projection * viewRotationOnly * vec4(a_Position, 1.0);
+    
+    // We don't use .xyww here because we draw into an empty FBO without depth buffer.
+    gl_Position = pos;
+}
diff --git a/resources/shaders/env/panorama.chshader b/resources/shaders/env/panorama.chshader
new file mode 100644
index 000000000..9e4d69f1a
--- /dev/null
+++ b/resources/shaders/env/panorama.chshader
@@ -0,0 +1,11 @@
+# Panorama Shader Metadata
+VertexShader: "skybox.vert"
+FragmentShader: "skybox_panorama.frag"
+
+Uniforms:
+  - u_Projection
+  - u_View
+  - u_Panorama
+  - u_Exposure
+  - u_Brightness
+  - u_Contrast
diff --git a/resources/shaders/skybox.chshader b/resources/shaders/env/skybox.chshader
similarity index 78%
rename from resources/shaders/skybox.chshader
rename to resources/shaders/env/skybox.chshader
index dda463b8c..d38f63a52 100644
--- a/resources/shaders/skybox.chshader
+++ b/resources/shaders/env/skybox.chshader
@@ -1,6 +1,6 @@
 # Skybox Shader Metadata
-VertexShader: "skybox.vs"
-FragmentShader: "skybox.fs"
+VertexShader: "skybox.vert"
+FragmentShader: "skybox.frag"
 
 Uniforms:
   - u_Projection
diff --git a/resources/shaders/env/skybox.frag b/resources/shaders/env/skybox.frag
new file mode 100644
index 000000000..3212e90d9
--- /dev/null
+++ b/resources/shaders/env/skybox.frag
@@ -0,0 +1,68 @@
+#version 430 core
+#include "../include/color_space.glsl"
+
+in vec3 v_Position;
+
+layout(binding = 0) uniform sampler2D u_Panorama;
+
+uniform int u_IsHDR;
+uniform float u_Exposure;
+uniform float u_Brightness;
+uniform float u_Contrast;
+uniform int u_VFlipped;
+uniform vec3 u_SunDir;
+uniform int u_SunEnabled;
+uniform float u_SunIntensity;
+
+#include "../include/fog_skybox.glsl"
+
+layout(location = 0) out vec4 finalColor;
+
+vec2 SampleSpherical(vec3 dir)
+{
+    const vec2 invAtan = vec2(0.15915494309, 0.31830988618);
+    vec2 uv = vec2(atan(dir.z, dir.x), asin(clamp(dir.y, -1.0, 1.0)));
+    uv *= invAtan;
+    return uv + 0.5;
+}
+
+void main()
+{
+    vec3 direction = normalize(v_Position);
+    vec2 uv = SampleSpherical(direction);
+    if (u_VFlipped == 1) uv.y = 1.0 - uv.y;
+
+    // Filter derivative seam: across the wrap boundary (uv.x jumping 0 -> 1),
+    // derivatives jump to ~1.0 causing mipmap popping / vertical line artifact.
+    vec2 dX = dFdx(uv);
+    vec2 dY = dFdy(uv);
+    if (dX.x > 0.5) dX.x -= 1.0;
+    else if (dX.x < -0.5) dX.x += 1.0;
+    if (dY.x > 0.5) dY.x -= 1.0;
+    else if (dY.x < -0.5) dY.x += 1.0;
+
+    // Sample the panorama with filtered derivatives
+    vec3 color = textureGrad(u_Panorama, uv, dX, dY).rgb;
+
+    // Convert to Linear if LDR (PNG/JPG)
+    if (u_IsHDR == 0) color = pow(color, vec3(2.2));
+
+    // 1. Exposure & Color Correction
+    color *= u_Exposure;
+    color = color + u_Brightness;
+    color = (color - 0.5) * u_Contrast + 0.5;
+    
+    // Output straight to HDR buffer (tonemapping is in post-process)
+    vec4 background = vec4(max(color, vec3(0.0)), 1.0);
+
+    if (fogEnabled == 1) {
+        float verticalFactor = clamp(1.0 - (direction.y + 0.05) * 10.0, 0.0, 1.0);
+        float fogFactor = pow(verticalFactor, 2.0); 
+        float horizonHaze = pow(1.0 - abs(direction.y), 5.0) * 0.5;
+        fogFactor = max(fogFactor, horizonHaze);
+        fogFactor = clamp(fogFactor * clamp(fogDensity * 5.0, 0.0, 1.0), 0.0, 1.0);
+        finalColor = mix(background, fogColor, fogFactor);
+    } else {
+        finalColor = background;
+    }
+}
diff --git a/resources/shaders/env/skybox.vert b/resources/shaders/env/skybox.vert
new file mode 100644
index 000000000..705adcb54
--- /dev/null
+++ b/resources/shaders/env/skybox.vert
@@ -0,0 +1,15 @@
+#version 430 core
+
+layout(location = 0) in vec3 a_Position;
+
+out vec3 v_Position;
+
+#include "../include/camera.glsl"
+
+void main()
+{
+    v_Position = a_Position;
+    // Position is already normalized since it's a unit sphere/cube
+    gl_Position = u_Projection * mat4(mat3(u_View)) * vec4(a_Position, 1.0);
+    gl_Position = gl_Position.xyww;
+}
diff --git a/resources/shaders/env/skybox_cross.chshader b/resources/shaders/env/skybox_cross.chshader
new file mode 100644
index 000000000..0f134f62b
--- /dev/null
+++ b/resources/shaders/env/skybox_cross.chshader
@@ -0,0 +1,16 @@
+# Skybox Cross Shader Metadata
+VertexShader: "skybox_cubemap.vert"
+FragmentShader: "skybox_cross.frag"
+
+Uniforms:
+  - u_Projection
+  - u_View
+  - u_CrossMap
+  - u_IsHDR
+  - u_Exposure
+  - u_Brightness
+  - u_Contrast
+  - u_VFlipped
+  - fogEnabled
+  - fogColor
+  - fogDensity
diff --git a/resources/shaders/env/skybox_cross.frag b/resources/shaders/env/skybox_cross.frag
new file mode 100644
index 000000000..adc3d4ef9
--- /dev/null
+++ b/resources/shaders/env/skybox_cross.frag
@@ -0,0 +1,94 @@
+#version 430 core
+
+#include "../include/color_space.glsl"
+
+in vec3 v_Position;
+
+layout(binding = 0) uniform sampler2D u_CrossMap;
+
+uniform int u_IsHDR;
+uniform float u_Exposure;
+uniform float u_Brightness;
+uniform float u_Contrast;
+
+#include "../include/fog_skybox.glsl"
+
+layout(location = 0) out vec4 finalColor;
+
+vec2 DirectionToHorizontalCrossUV(vec3 direction)
+{
+    vec3 ad = abs(direction);
+    vec2 faceUV;
+    vec2 atlasCell;
+
+    if (ad.x >= ad.y && ad.x >= ad.z)
+    {
+        if (direction.x > 0.0)
+        {
+            faceUV = vec2(-direction.z, -direction.y) / ad.x;
+            atlasCell = vec2(2.0, 1.0);
+        }
+        else
+        {
+            faceUV = vec2(direction.z, -direction.y) / ad.x;
+            atlasCell = vec2(0.0, 1.0);
+        }
+    }
+    else if (ad.y >= ad.x && ad.y >= ad.z)
+    {
+        if (direction.y > 0.0)
+        {
+            faceUV = vec2(direction.x, direction.z) / ad.y;
+            atlasCell = vec2(1.0, 0.0);
+        }
+        else
+        {
+            faceUV = vec2(direction.x, -direction.z) / ad.y;
+            atlasCell = vec2(1.0, 2.0);
+        }
+    }
+    else
+    {
+        if (direction.z > 0.0)
+        {
+            faceUV = vec2(direction.x, -direction.y) / ad.z;
+            atlasCell = vec2(1.0, 1.0);
+        }
+        else
+        {
+            faceUV = vec2(-direction.x, -direction.y) / ad.z;
+            atlasCell = vec2(3.0, 1.0);
+        }
+    }
+
+    faceUV = faceUV * 0.5 + 0.5;
+    return (atlasCell + faceUV) / vec2(4.0, 3.0);
+}
+
+void main()
+{
+    vec3 direction = normalize(v_Position);
+    vec2 uv = DirectionToHorizontalCrossUV(direction);
+    vec3 color = texture(u_CrossMap, uv).rgb;
+
+    // Convert to linear if source is LDR.
+    if (u_IsHDR == 0) color = ToLinear(color);
+
+    color *= u_Exposure;
+    color += u_Brightness;
+    color = (color - 0.5) * u_Contrast + 0.5;
+
+    vec4 background = vec4(max(color, vec3(0.0)), 1.0);
+
+    if (fogEnabled == 1)
+    {
+        float horizonEffect = 1.0 - abs(direction.y);
+        horizonEffect = pow(horizonEffect, 3.0);
+        float fogFactor = clamp(horizonEffect * clamp(fogDensity * 10.0, 0.0, 1.0), 0.0, 1.0);
+        finalColor = mix(background, fogColor, fogFactor);
+    }
+    else
+    {
+        finalColor = background;
+    }
+}
diff --git a/resources/shaders/env/skybox_cubemap.chshader b/resources/shaders/env/skybox_cubemap.chshader
new file mode 100644
index 000000000..2227551bc
--- /dev/null
+++ b/resources/shaders/env/skybox_cubemap.chshader
@@ -0,0 +1,16 @@
+# Skybox Cubemap Shader Metadata
+VertexShader: "skybox_cubemap.vert"
+FragmentShader: "skybox_cubemap.frag"
+
+Uniforms:
+  - u_Projection
+  - u_View
+  - u_Cubemap
+  - u_Exposure
+  - u_Brightness
+  - u_Contrast
+  - u_IsHDR
+  - u_Time
+  - fogEnabled
+  - fogColor
+  - fogDensity
diff --git a/resources/shaders/env/skybox_cubemap.frag b/resources/shaders/env/skybox_cubemap.frag
new file mode 100644
index 000000000..330a87170
--- /dev/null
+++ b/resources/shaders/env/skybox_cubemap.frag
@@ -0,0 +1,46 @@
+#version 430 core
+#include "../include/color_space.glsl"
+
+in vec3 v_Position;
+
+uniform samplerCube u_Cubemap;
+
+uniform int u_IsHDR;
+uniform float u_Exposure;
+uniform float u_Brightness;
+uniform float u_Contrast;
+
+#include "../include/fog_skybox.glsl"
+
+layout(location = 0) out vec4 finalColor;
+
+void main()
+{
+    vec3 direction = normalize(v_Position);
+    
+    // Sample the environment cubemap
+    vec3 color = texture(u_Cubemap, direction).rgb;
+
+    // 1. Convert to Linear if LDR
+    if (u_IsHDR == 0) color = pow(color, vec3(2.2));
+
+    // 2. Exposure & Color Correction
+    color *= u_Exposure;
+    color = color + u_Brightness;
+    color = (color - 0.5) * u_Contrast + 0.5;
+
+    // Output straight to HDR buffer (tonemapping is in post-process)
+    vec4 background = vec4(max(color, vec3(0.0)), 1.0);
+
+    // 4. Unified Horizon & Ground Fog
+    if (fogEnabled == 1) {
+        float verticalFactor = clamp(1.0 - (direction.y + 0.05) * 10.0, 0.0, 1.0);
+        float fogFactor = pow(verticalFactor, 2.0); 
+        float horizonHaze = pow(1.0 - abs(direction.y), 5.0) * 0.5;
+        fogFactor = max(fogFactor, horizonHaze);
+        fogFactor = clamp(fogFactor * clamp(fogDensity * 5.0, 0.0, 1.0), 0.0, 1.0);
+        finalColor = mix(background, fogColor, fogFactor);
+    } else {
+        finalColor = background;
+    }
+}
diff --git a/resources/shaders/env/skybox_cubemap.vert b/resources/shaders/env/skybox_cubemap.vert
new file mode 100644
index 000000000..dc7874b8e
--- /dev/null
+++ b/resources/shaders/env/skybox_cubemap.vert
@@ -0,0 +1,16 @@
+#version 430 core
+
+layout (location = 0) in vec3 a_Position;
+
+out vec3 v_Position;
+
+uniform mat4 u_Projection;
+uniform mat4 u_View;
+
+void main()
+{
+    v_Position = a_Position;
+    // u_View already has translation removed in DrawSkybox
+    gl_Position = u_Projection * u_View * vec4(a_Position, 1.0);
+    gl_Position = gl_Position.xyww;
+}
diff --git a/resources/shaders/env/skybox_panorama.frag b/resources/shaders/env/skybox_panorama.frag
new file mode 100644
index 000000000..64e602fd1
--- /dev/null
+++ b/resources/shaders/env/skybox_panorama.frag
@@ -0,0 +1,78 @@
+#version 430 core
+
+// Input vertex attributes (from vertex shader)
+layout(location = 0) in vec3 fragPosition;
+
+// Input uniform values
+layout(binding = 0) uniform sampler2D environmentMap;
+uniform int doGamma;
+uniform float fragGamma;
+uniform float exposure;
+uniform float brightness;
+uniform float contrast;
+uniform float uTime;
+uniform int isHDR;
+
+#include "../include/fog_skybox.glsl"
+
+// Output fragment color
+layout(location = 0) out vec4 finalColor;
+
+// Tone mapping (ACES)
+vec3 ACES(vec3 x)
+{
+    return clamp(
+        (x * (2.51 * x + 0.03)) /
+        (x * (2.43 * x + 0.59) + 0.14),
+        0.0, 1.0
+    );
+}
+
+#define PI 3.14159265358979323846
+
+void main()
+{
+    vec3 v = normalize(fragPosition);
+    
+    // Convert Cartesian direction to equirectangular UVs
+    vec2 uv = vec2(atan(v.z, v.x) / (2.0 * PI) + 0.5, asin(clamp(v.y, -1.0, 1.0)) / PI + 0.5);
+    
+    // Filter derivative seam
+    vec2 dX = dFdx(uv);
+    vec2 dY = dFdy(uv);
+    if (dX.x > 0.5) dX.x -= 1.0;
+    else if (dX.x < -0.5) dX.x += 1.0;
+    if (dY.x > 0.5) dY.x -= 1.0;
+    else if (dY.x < -0.5) dY.x += 1.0;
+
+    // Fetch color from texture map with filtered derivatives
+    vec3 color = textureGrad(environmentMap, uv, dX, dY).rgb;
+
+    // Apply exposure, brightness, contrast
+    color *= exposure;
+    color += brightness;
+    color = (color - 0.5) * contrast + 0.5;
+
+    // HDR tone mapping
+    if (isHDR == 1)
+        color = ACES(color);
+
+    if (doGamma == 1)
+    {
+        color = pow(color, vec3(1.0 / fragGamma));
+    }
+
+    vec4 background = vec4(color, 1.0);
+
+    if (fogEnabled == 1)
+    {
+        float horizonEffect = 1.0 - abs(v.y);
+        horizonEffect = pow(horizonEffect, 3.0);
+        float fogFactor = clamp(horizonEffect * clamp(fogDensity * 10.0, 0.0, 1.0), 0.0, 1.0);
+        finalColor = mix(background, fogColor, fogFactor);
+    }
+    else
+    {
+        finalColor = background;
+    }
+}
diff --git a/resources/shaders/grid.chshader b/resources/shaders/grid.chshader
deleted file mode 100644
index 5a57667d6..000000000
--- a/resources/shaders/grid.chshader
+++ /dev/null
@@ -1,10 +0,0 @@
-# Grid Shader Metadata
-VertexShader: "grid.vs"
-FragmentShader: "grid.fs"
-
-Uniforms:
-  - mvp
-  - matModel
-  - cameraPos
-  - gridColor
-  - gridSize
diff --git a/resources/shaders/grid.fs b/resources/shaders/grid.fs
deleted file mode 100644
index 7429e5644..000000000
--- a/resources/shaders/grid.fs
+++ /dev/null
@@ -1,60 +0,0 @@
-#version 330 core
-
-// Input vertex attributes (from vertex shader)
-in vec3 fragWorldPos;
-
-// Input uniform values
-uniform mat4 mvp;
-uniform vec3 cameraPos;
-uniform vec4 gridColor;
-uniform float gridSize; // Spacing (e.g. 1.0 or 10.0)
-uniform float uTime;
-
-#include "include/fog.glsl"
-
-// Output fragment color
-out vec4 finalColor;
-
-float grid(vec2 st, float res)
-{
-    vec2 grid = fract(st / res);
-    vec2 line = step(vec2(1.0 - 0.02 / res), grid) + step(grid, vec2(0.02 / res));
-    return max(line.x, line.y);
-}
-
-// Improved grid with anti-aliasing based on screen derivatives
-float pr_grid(vec2 coord, float spacing) 
-{
-    vec2 grid = abs(fract(coord / spacing - 0.5) - 0.5) / (fwidth(coord / spacing) + 0.001);
-    float line = min(grid.x, grid.y);
-    return 1.0 - min(line, 1.0);
-}
-
-void main()
-{
-    // Access world-space XZ for tiling
-    vec2 coord = fragWorldPos.xz;
-    
-    // Primary grid (spacing from uniform)
-    float g1 = pr_grid(coord, gridSize);
-    
-    // Secondary thick grid (every 10 primary units)
-    float g2 = pr_grid(coord, gridSize * 10.0);
-    
-    // Distance from camera to this fragment
-    float dist = length(fragWorldPos - cameraPos);
-    
-    // Fade out based on distance (linear fade from 100m start to 8000m end)
-    float fade = 1.0 - clamp((dist - 100.0) / 7900.0, 0.0, 1.0);
-    // Use quadratic falloff for smoother horizon transition
-    fade = fade * fade;
-    
-    // Mix grid lines
-    float alpha = max(g1 * 0.4, g2 * 0.8);
-    
-    if (alpha * fade < 0.01) discard;
-    
-    // Use the uniform gridColor
-    vec4 result = vec4(gridColor.rgb, alpha * fade * gridColor.a);
-    finalColor = ApplyFog(result, fragWorldPos, cameraPos, uTime);
-}
diff --git a/resources/shaders/grid.vs b/resources/shaders/grid.vs
deleted file mode 100644
index 8c530c157..000000000
--- a/resources/shaders/grid.vs
+++ /dev/null
@@ -1,20 +0,0 @@
-#version 330 core
-
-// Input vertex attributes
-in vec3 vertexPosition;
-in vec2 vertexTexCoord;
-in vec3 vertexNormal;
-in vec4 vertexColor;
-
-// Input uniform values
-uniform mat4 mvp;
-uniform mat4 matModel;
-
-// Output vertex attributes (to fragment shader)
-out vec3 fragWorldPos;
-
-void main()
-{
-    fragWorldPos = (matModel * vec4(vertexPosition, 1.0)).xyz;
-    gl_Position = mvp * vec4(vertexPosition, 1.0);
-}
diff --git a/resources/shaders/include/albedo_sampling.glsl b/resources/shaders/include/albedo_sampling.glsl
new file mode 100644
index 000000000..875c2da54
--- /dev/null
+++ b/resources/shaders/include/albedo_sampling.glsl
@@ -0,0 +1,32 @@
+// Albedo/Base Color Sampling
+
+
+vec4 SampleAlbedo(in vec2 texCoord, 
+                  in vec4 colorMultiplier,
+                  in float useTexture)
+{
+    
+    vec4 baseColor = colDiffuse;
+    
+    
+    if (length(colorMultiplier.rgb) > 0.01) 
+    {
+        baseColor *= colorMultiplier;
+    }
+    
+    
+    if (useTexture == 1) 
+    {
+        vec4 sampled = texture(texture0, texCoord);
+        baseColor.rgb *= ToLinear(sampled.rgb); 
+        baseColor.a   *= sampled.a;
+    }
+    
+    return baseColor;
+}
+
+
+bool ShouldDiscardPixel(in float alpha, in float threshold)
+{
+    return alpha < threshold;
+}
diff --git a/resources/shaders/include/camera.glsl b/resources/shaders/include/camera.glsl
new file mode 100644
index 000000000..0171ef22a
--- /dev/null
+++ b/resources/shaders/include/camera.glsl
@@ -0,0 +1,6 @@
+layout (std140, binding = 0) uniform CameraData
+{
+    mat4 u_ViewProjection;
+    mat4 u_Projection;
+    mat4 u_View;
+};
diff --git a/resources/shaders/include/debug_modes.glsl b/resources/shaders/include/debug_modes.glsl
new file mode 100644
index 000000000..24c946c9e
--- /dev/null
+++ b/resources/shaders/include/debug_modes.glsl
@@ -0,0 +1,51 @@
+// Debug Visualization Modes
+
+
+const int DEBUG_MODE_DISABLED = 0;
+const int DEBUG_MODE_NORMALS = 1;
+const int DEBUG_MODE_LIGHTING_ONLY = 2;
+const int DEBUG_MODE_UNLIT_ALBEDO = 3;
+const int DEBUG_MODE_METALNESS = 4;
+const int DEBUG_MODE_ROUGHNESS = 5;
+const int DEBUG_MODE_OCCLUSION = 6;
+
+
+vec4 ApplyDebugMode(in int mode,
+                    in vec3 normal,
+                    in vec3 linearColor,
+                    in float metalness,
+                    in float roughness,
+                    in float occlusion,
+                    in float baseAlpha)
+{
+    switch(mode)
+    {
+        case DEBUG_MODE_NORMALS:
+            
+            return vec4(normal * 0.5 + 0.5, baseAlpha);
+            
+        case DEBUG_MODE_LIGHTING_ONLY:
+            
+            return vec4(0.5, 0.5, 0.5, 1.0);
+            
+        case DEBUG_MODE_UNLIT_ALBEDO:
+            
+            return vec4(linearColor, baseAlpha);
+            
+        case DEBUG_MODE_METALNESS:
+            
+            return vec4(vec3(metalness), baseAlpha);
+            
+        case DEBUG_MODE_ROUGHNESS:
+            
+            return vec4(vec3(roughness), baseAlpha);
+            
+        case DEBUG_MODE_OCCLUSION:
+            
+            return vec4(vec3(occlusion), baseAlpha);
+            
+        default:
+            
+            return vec4(linearColor, baseAlpha);
+    }
+}
diff --git a/resources/shaders/include/fog.glsl b/resources/shaders/include/fog.glsl
index ebfac5ebc..211aea071 100644
--- a/resources/shaders/include/fog.glsl
+++ b/resources/shaders/include/fog.glsl
@@ -1,65 +1,157 @@
 // ============================================================
-//  fog.glsl  –  World-space fog include
+// Fog — distance + height-based volumetric approximation
+// ============================================================
+//
+// Distance modes:
+//   0 = Linear:        fogFactor = clamp((d - start) / (end - start))
+//   1 = Exponential:   fogFactor = 1 - exp(-d * density)
+//   2 = Exp Squared:   fogFactor = 1 - exp(-(d * density)^2)
 //
-//  Usage: ApplyFog(color, fragPos, viewPos, time)
-//    color   – vec4 already-lit fragment color
-//    fragPos – vec3 fragment position in WORLD space
-//    viewPos – vec3 camera position in WORLD space
-//    time    – float uTime (seconds), used by animated modes
+// Height fog:
+//   Integrates fog density along the view ray from camera to fragment.
+//   Low camera = more fog (looking through ground-level fog layer).
+//   High camera = less fog (above the fog layer).
+//   Fragment height only matters relative to the fog layer base.
 //
-//  Fog modes (set via fogMode uniform):
-//    0 – Linear       : lerps from fogStart to fogEnd
-//    1 – Exponential  : classic exp fog
-//    2 – Exp Squared  : denser / more realistic exp fog
+// Sun scattering:
+//   Rayleigh-like phase + forward Mie lobe gives a warm
+//   glow when looking toward the sun through the fog.
 // ============================================================
 
-// --- Uniforms exposed to the renderer ---
 uniform int   fogEnabled;
-uniform int   fogMode;      // 0=Linear, 1=Exp, 2=Exp2
+uniform int   fogMode;
 uniform vec4  fogColor;
 uniform float fogDensity;
 uniform float fogStart;
 uniform float fogEnd;
+uniform float fogHeightFalloff;
+
+// ── Distance fog modes ────────────────────────────────────
+float LinearFog(float distance)
+{
+    float range = fogEnd - fogStart;
+    return clamp((distance - fogStart) / max(0.0001, range), 0.0, 1.0);
+}
+
+float ExponentialFog(float distance)
+{
+    float d = max(0.0, distance - fogStart);
+    return 1.0 - exp(-d * fogDensity);
+}
+
+float ExponentialSquaredFog(float distance)
+{
+    float d = max(0.0, distance - fogStart) * fogDensity;
+    return 1.0 - exp(-(d * d));
+}
 
-// --- Single entry point ---
-vec4 ApplyFog(vec4 color, vec3 fragPos, vec3 viewPos, float time)
+float GetDistanceFog(float distance)
 {
-    // Early-out: tuман вимкнений
-    if (fogEnabled == 0) return color;
-
-    // 1. Відстань від камери до фрагмента (обидва у World Space)
-    float dist = length(viewPos - fragPos);
-
-    // 2. Обчислення fogFactor (0 = без туману, 1 = повний туман)
-    float fogFactor = 0.0;
-
-    if (fogMode == 0) // ── Linear ─────────────────────────────
-    {
-        // fogFactor = (dist - start) / (end - start)
-        float range = fogEnd - fogStart;
-        if (range <= 0.0)
-            fogFactor = (dist > fogStart) ? 1.0 : 0.0;
-        else
-            fogFactor = (dist - fogStart) / range;
-    }
-    else if (fogMode == 1) // ── Exponential ────────────────────
-    {
-        // fogFactor = 1 - e^(-dist * density)
-        // Додаємо max(0, dist - fogStart), щоб туман не починався від самої камери
-        float d = max(0.0, dist - fogStart);
-        fogFactor = 1.0 - exp(-(d * fogDensity));
-    }
-    else if (fogMode == 2) // ── Exponential Squared ────────────
-    {
-        // fogFactor = 1 - e^(-(dist * density)^2)
-        float d = max(0.0, dist - fogStart) * fogDensity;
-        fogFactor = 1.0 - exp(-(d * d));
-    }
-
-    // 3. Обмеження [0, 1]
+    if (fogMode == 0)
+        return LinearFog(distance);
+    else if (fogMode == 1)
+        return ExponentialFog(distance);
+    else if (fogMode == 2)
+        return ExponentialSquaredFog(distance);
+    return 0.0;
+}
+
+// ── Height fog (Beer-Lambert integration) ─────────────────
+// Approximates integrated fog density along the ray from
+// camera to fragment through a height-based fog layer.
+//
+// The fog layer sits at y=0 and thins exponentially upward.
+// When both camera and fragment are above the fog layer,
+// the integral is near zero (no fog).
+// When both are inside the fog layer, it behaves like
+// distance fog scaled by the fog density at their heights.
+float HeightFogFactor(vec3 camPos, vec3 fragPos)
+{
+    float falloff = fogHeightFalloff;
+    if (falloff < 0.0001) return 0.0;
+
+    float camH = camPos.y;
+    float fragH = fragPos.y;
+
+    // If both are well above ground, minimal height fog
+    if (camH > 50.0 && fragH > 50.0) return 0.0;
+
+    // Approximate: height fog density at the midpoint height
+    float midHeight = (camH + fragH) * 0.5;
+    float densityAtMid = exp(-max(0.0, midHeight) * falloff);
+
+    // Scale by how much of the ray is "inside" the fog layer
+    // (both endpoints below or near ground = full contribution)
+    float camFactor = exp(-max(0.0, camH) * falloff);
+    float fragFactor = exp(-max(0.0, fragH) * falloff);
+    float coverage = (camFactor + fragFactor) * 0.5;
+
+    return densityAtMid * coverage;
+}
+
+// ── Sun scattering through fog ────────────────────────────
+vec3 ComputeFogScattering(vec3 viewDir, vec3 lightDir, vec3 lightColor, float sunIntensity)
+{
+    float cosTheta = dot(viewDir, normalize(lightDir));
+
+    // Rayleigh-like phase (smooth, view-angle dependent)
+    float phaseRayleigh = 0.75 * (1.0 + cosTheta * cosTheta);
+
+    // Mie forward lobe (bright glow when looking toward sun)
+    float forwardScatter = pow(max(0.0, cosTheta), 8.0) * sunIntensity;
+
+    return lightColor * (phaseRayleigh * 0.3 + forwardScatter * 0.7);
+}
+
+// ── Horizon boost ─────────────────────────────────────────
+float HorizonFogBoost(vec3 viewDir)
+{
+    float upness = abs(viewDir.y);
+    return 1.0 + (1.0 - upness) * 0.3;
+}
+
+// ══════════════════════════════════════════════════════════
+// Main apply — used by lighting.fs
+// ══════════════════════════════════════════════════════════
+vec3 ApplyLinearFog(vec3 surfaceColor, vec3 fragPos, vec3 viewPos, vec3 lightDir, vec3 lightColor)
+{
+    if (fogEnabled == 0)
+        return surfaceColor;
+
+    vec3 viewDir = normalize(viewPos - fragPos);
+    float distance = length(viewPos - fragPos);
+
+    // Distance fog
+    float distFog = GetDistanceFog(distance);
+
+    // Height fog (only adds where there's actual fog layer)
+    float heightFog = HeightFogFactor(viewPos, fragPos);
+
+    // Combine: height fog multiplies the distance fog presence,
+    // not adds to it. This prevents "white paint" on close objects.
+    float fogFactor = clamp(distFog + (1.0 - distFog) * heightFog * 0.5, 0.0, 1.0);
+
+    // Horizon boost
+    fogFactor *= HorizonFogBoost(viewDir);
     fogFactor = clamp(fogFactor, 0.0, 1.0);
 
-    // 4. Змішуємо колір об'єкта з кольором туману
-    //    mix(a, b, t) = a*(1-t) + b*t
-    return mix(color, fogColor, fogFactor);
+    // Convert fog color from sRGB to linear
+    vec3 baseFogLinear = pow(fogColor.rgb, vec3(2.2));
+
+    // Sun scattering
+    float sunIntensity = 2.0;
+    vec3 scatteredLight = ComputeFogScattering(viewDir, lightDir, lightColor, sunIntensity);
+
+    vec3 finalFogColor = baseFogLinear + scatteredLight * 0.3;
+
+    return mix(surfaceColor, finalFogColor, fogFactor);
+}
+
+// ══════════════════════════════════════════════════════════
+// Convenience wrapper — unlit / sprite / grid shaders
+// ══════════════════════════════════════════════════════════
+vec4 ApplyFog(vec4 surfaceColor, vec3 fragPos, vec3 viewPos, float uTime)
+{
+    vec3 fogRGB = ApplyLinearFog(surfaceColor.rgb, fragPos, viewPos, lightDir, lightColor.rgb);
+    return vec4(fogRGB, surfaceColor.a);
 }
diff --git a/resources/shaders/include/fog_skybox.glsl b/resources/shaders/include/fog_skybox.glsl
new file mode 100644
index 000000000..e0b49847c
--- /dev/null
+++ b/resources/shaders/include/fog_skybox.glsl
@@ -0,0 +1,10 @@
+#ifndef CH_FOG_SKYBOX_GLSL
+#define CH_FOG_SKYBOX_GLSL
+
+// Minimal fog uniforms shared by all skybox fragment shaders.
+// Skybox fog is horizon-based (not distance-based like mesh fog in fog.glsl).
+uniform int   fogEnabled;
+uniform vec4  fogColor;
+uniform float fogDensity;
+
+#endif // CH_FOG_SKYBOX_GLSL
diff --git a/resources/shaders/include/lighting.glsl b/resources/shaders/include/lighting.glsl
new file mode 100644
index 000000000..6de97b71d
--- /dev/null
+++ b/resources/shaders/include/lighting.glsl
@@ -0,0 +1,215 @@
+#ifndef CH_LIGHTING_GLSL
+#define CH_LIGHTING_GLSL
+
+#include "surface.glsl"
+
+// ============================================================
+// Light Structures & Uniforms
+// ============================================================
+
+// Generic Directional Light (can represent Sun, Moon, distant scene light)
+struct DirectionalLight
+{
+    vec3  direction;  // World-space direction pointing along the light rays
+    float intensity;  // Light intensity multiplier
+    vec4  color;      // Light RGB color + alpha
+    float ambient;    // Directional ambient floor
+};
+
+// Packed Dynamic Light (Point, Spot, or secondary Directional)
+struct Light
+{
+    vec4  color;       // 16 bytes: rgb = color, a = unused
+    vec3  position;    // 12 bytes: world-space position (Point / Spot)
+    float intensity;   //  4 bytes: light intensity multiplier
+    vec3  direction;   // 12 bytes: cone/travel direction (Spot / Directional)
+    float radius;      //  4 bytes: maximum attenuation reach distance
+    float innerCutoff; //  4 bytes: spot inner cone angle in degrees
+    float outerCutoff; //  4 bytes: spot outer cone angle in degrees
+    int   type;        //  4 bytes: 0 = Point, 1 = Spot, 2 = Directional
+    int   enabled;     //  4 bytes: 1 = active, 0 = disabled
+};
+
+// SSBO of Dynamic Scene Lights
+#define MAX_LIGHTS 256
+layout(std430, binding = 0) buffer LightData
+{
+    Light lights[];
+};
+
+// Primary Scene Directional Light
+uniform DirectionalLight u_MainLight;
+
+// Global Lighting & Scene Uniforms
+uniform vec3  lightDir;
+uniform vec4  lightColor;
+uniform float ambient;
+uniform vec4  skyAmbientColor;
+uniform vec3  viewPos;
+uniform float uTime;
+uniform int   uLightCount;
+uniform float uExposure;
+uniform float uGamma;
+uniform float uMode;
+
+// ============================================================
+// Lighting Calculation Functions
+// ============================================================
+
+const float HALF_LAMBERT_WRAP = 0.15;
+
+// ── Generic Directional Light ──────────────────────────────
+vec3 CalcDirectionalLight(in vec3 dir, in vec4 col, in float intensity, in Surface s)
+{
+    vec3 L = normalize(-dir);
+
+    // Half-Lambert wrap: smooth transition into shadow
+    float rawNdotL     = dot(s.normal, L);
+    float wrappedNdotL = clamp(rawNdotL * (1.0 - HALF_LAMBERT_WRAP) + HALF_LAMBERT_WRAP, 0.0, 1.0);
+
+    vec3 diffuse = s.diffuse * col.rgb * wrappedNdotL;
+
+    vec3 specular = vec3(0.0);
+    if (rawNdotL > 0.0)
+    {
+        vec3 H = normalize(L + s.viewDir);
+        float NdotH = max(dot(s.normal, H), 0.0);
+        float HdotV = max(dot(H, s.viewDir), 0.0);
+
+        float spec = pow(NdotH, s.shininess);
+        float fresnel = pow(1.0 - HdotV, 5.0);
+        vec3 F = s.specular + (vec3(1.0) - s.specular) * fresnel;
+
+        specular = F * col.rgb * spec;
+    }
+
+    return (diffuse + specular) * intensity;
+}
+
+vec3 CalcDirectionalLight(in DirectionalLight dLight, in Surface s)
+{
+    vec3 dir = length(dLight.direction) > 0.0001 ? normalize(dLight.direction) : vec3(0.0, -1.0, 0.0);
+    return CalcDirectionalLight(dir, dLight.color, dLight.intensity, s);
+}
+
+// ── Point Light Attenuation & Evaluation ───────────────────
+float PointLightAttenuation(in float distance, in float radius)
+{
+    if (distance >= radius) return 0.0;
+
+    float attenuation = 1.0 / (1.0 + distance * distance);
+    float fadeStart = radius * 0.8;
+    if (distance > fadeStart)
+    {
+        float t = (distance - fadeStart) / (radius - fadeStart);
+        attenuation *= 1.0 - t * t;
+    }
+    return attenuation;
+}
+
+vec3 CalcPointLight(in Light light, in Surface s)
+{
+    if (light.enabled == 0) return vec3(0.0);
+
+    vec3 lightVector = light.position - s.position;
+    float distance = length(lightVector);
+
+    float attenuation = PointLightAttenuation(distance, light.radius);
+    if (attenuation <= 0.0) return vec3(0.0);
+
+    vec3 L = normalize(lightVector);
+    float NdotL = max(dot(s.normal, L), 0.0);
+
+    vec3 diffuse = s.diffuse * light.color.rgb * NdotL;
+
+    vec3 specular = vec3(0.0);
+    if (NdotL > 0.0)
+    {
+        vec3 H = normalize(L + s.viewDir);
+        float NdotH = max(dot(s.normal, H), 0.0);
+        float HdotV = max(dot(H, s.viewDir), 0.0);
+
+        float spec = pow(NdotH, s.shininess);
+        float fresnel = pow(1.0 - HdotV, 5.0);
+        vec3 F = s.specular + (vec3(1.0) - s.specular) * fresnel;
+
+        specular = F * light.color.rgb * spec;
+    }
+
+    return (diffuse + specular) * attenuation * light.intensity;
+}
+
+// ── Spot Light Evaluation ──────────────────────────────────
+vec3 CalcSpotLight(in Light light, in Surface s)
+{
+    if (light.enabled == 0) return vec3(0.0);
+
+    vec3 lightVector = light.position - s.position;
+    float distance = length(lightVector);
+
+    float attenuation = PointLightAttenuation(distance, light.radius);
+    if (attenuation <= 0.0) return vec3(0.0);
+
+    vec3 L = normalize(lightVector);
+
+    // Spot cone attenuation
+    vec3 spotDir = normalize(light.direction);
+    float theta = dot(-L, spotDir);
+    float innerCos = cos(radians(light.innerCutoff));
+    float outerCos = cos(radians(light.outerCutoff));
+
+    if (theta <= outerCos) return vec3(0.0);
+
+    float spotIntensity = clamp((theta - outerCos) / max(0.0001, (innerCos - outerCos)), 0.0, 1.0);
+
+    float NdotL = max(dot(s.normal, L), 0.0);
+    vec3 diffuse = s.diffuse * light.color.rgb * NdotL;
+
+    vec3 specular = vec3(0.0);
+    if (NdotL > 0.0)
+    {
+        vec3 H = normalize(L + s.viewDir);
+        float NdotH = max(dot(s.normal, H), 0.0);
+        float HdotV = max(dot(H, s.viewDir), 0.0);
+
+        float spec = pow(NdotH, s.shininess);
+        float fresnel = pow(1.0 - HdotV, 5.0);
+        vec3 F = s.specular + (vec3(1.0) - s.specular) * fresnel;
+
+        specular = F * light.color.rgb * spec;
+    }
+
+    return (diffuse + specular) * attenuation * spotIntensity * light.intensity;
+}
+
+// ── Evaluate any dynamic light by its type ─────────────────
+vec3 CalcDynamicLight(in Light light, in Surface s)
+{
+    if (light.enabled == 0) return vec3(0.0);
+
+    if (light.type == 0)
+        return CalcPointLight(light, s);
+    else if (light.type == 1)
+        return CalcSpotLight(light, s);
+    else if (light.type == 2)
+    {
+        vec3 dir = length(light.direction) > 0.0001 ? normalize(light.direction) : vec3(0.0, -1.0, 0.0);
+        return CalcDirectionalLight(dir, light.color, light.intensity, s);
+    }
+    return vec3(0.0);
+}
+
+// ── Ambient & Sky Environment Lighting ─────────────────────
+vec3 CalcAmbientLighting(in Surface s, in vec4 skyAmbient, in float ambValue)
+{
+    const float MIN_AMBIENT = 0.08;
+    float effectiveAmbient = max(ambValue, MIN_AMBIENT);
+    vec3 sky = skyAmbient.rgb * skyAmbient.a;
+
+    vec3 ambientContrib = s.diffuse * (effectiveAmbient + sky) * s.occlusion;
+    ambientContrib += s.specular * sky * s.occlusion;
+
+    return ambientContrib;
+}
+
+#endif // CH_LIGHTING_GLSL
diff --git a/resources/shaders/include/lighting_directional.glsl b/resources/shaders/include/lighting_directional.glsl
index dc61303c7..7b3116784 100644
--- a/resources/shaders/include/lighting_directional.glsl
+++ b/resources/shaders/include/lighting_directional.glsl
@@ -1,17 +1,53 @@
-vec3 CalcDirectionalLight(vec3 lightDir, vec4 lightColor, vec3 normal, vec3 viewDir, vec3 diffuseColor,
-                          vec3 specularColor, float shininess)
+// ============================================================
+// Directional Light — Blinn-Phong + Schlick Fresnel
+// ============================================================
+
+// Wrap factor for half-Lambert diffuse.
+// With WRAP=0.15 the darkest surface (facing directly away from the light)
+// still receives 15% of full diffuse — preventing pitch-black shadows.
+const float WRAP = 0.15;
+
+vec3 CalcDirectionalLight(vec3 lightDir, vec4 lightColor, vec3 normal, vec3 viewDir,
+                          vec3 diffuseColor, vec3 specularColor, float shininess)
 {
     vec3 L = normalize(-lightDir);
-    float diff = max(dot(normal, L), 0.0);
-    vec3 diffuseComp = diffuseColor * lightColor.rgb * diff;
-    
-    vec3 specularComp = vec3(0.0);
-    if (diff > 0.0)
+
+    // Half-Lambert wrap: map NdotL from [-1,1] → [~0,1] with smooth rolloff.
+    // NdotL=0  (grazing) → wrappedNdotL=WRAP (still a little lit).
+    // NdotL=-1 (back face) → wrappedNdotL=0  (ambient takes over).
+    float rawNdotL     = dot(normal, L);
+    float wrappedNdotL = clamp(rawNdotL * (1.0 - WRAP) + WRAP, 0.0, 1.0);
+
+    // Diffuse: Lambertian with wrap
+    vec3 diffuse = diffuseColor * lightColor.rgb * wrappedNdotL;
+
+    vec3 specular = vec3(0.0);
+    if (rawNdotL > 0.0)
     {
         vec3 H = normalize(L + viewDir);
-        float spec = pow(max(dot(normal, H), 0.0), max(1.0, shininess));
-        specularComp = lightColor.rgb * specularColor * spec;
+        float NdotH = max(dot(normal, H), 0.0);
+        float HdotV = max(dot(H, viewDir), 0.0);
+
+        // Blinn-Phong specular
+        float spec = pow(NdotH, max(1.0, shininess));
+
+        // Schlick Fresnel: F = F0 + (1 - F0) * (1 - HdotV)^5
+        float fresnel = pow(1.0 - HdotV, 5.0);
+        vec3 F = specularColor + (vec3(1.0) - specularColor) * fresnel;
+
+        specular = F * lightColor.rgb * spec;
     }
-    
-    return diffuseComp + specularComp;
+
+    return diffuse + specular;
+}
+
+vec3 CalcDirectionalLightFromLight(Light light, vec3 normal, vec3 viewDir,
+                                  vec3 diffuseColor, vec3 specularColor, float shininess)
+{
+    if (light.enabled == 0)
+        return vec3(0.0);
+
+    vec3 lightDir = length(light.direction) > 0.0001 ? normalize(light.direction) : vec3(0.0, -1.0, 0.0);
+    vec4 lightColor = light.color * light.intensity;
+    return CalcDirectionalLight(lightDir, lightColor, normal, viewDir, diffuseColor, specularColor, shininess);
 }
diff --git a/resources/shaders/include/lighting_point.glsl b/resources/shaders/include/lighting_point.glsl
index 2b3d602f4..65967f301 100644
--- a/resources/shaders/include/lighting_point.glsl
+++ b/resources/shaders/include/lighting_point.glsl
@@ -1,31 +1,59 @@
-vec3 CalcPointLight(Light light, vec3 normal, vec3 fragPos, vec3 viewDir, vec3 diffuseColor,
-                    vec3 specularColor, float shininess)
+// ============================================================
+// Point Light — Blinn-Phong + Schlick Fresnel + Physical Attenuation
+// ============================================================
+
+// Inverse-square attenuation with smooth windowing at radius boundary.
+// Physical: intensity / d^2, with a smooth fade in the last 20% of radius.
+float PointLightAttenuation(float distance, float radius)
+{
+    if (distance >= radius) return 0.0;
+
+    float attenuation = 1.0 / (1.0 + distance * distance);
+
+    // Smooth fade in the last 20% of radius
+    float fadeStart = radius * 0.8;
+    if (distance > fadeStart)
+    {
+        float t = (distance - fadeStart) / (radius - fadeStart);
+        attenuation *= 1.0 - t * t;
+    }
+
+    return attenuation;
+}
+
+vec3 CalcPointLight(Light light, vec3 normal, vec3 fragPos, vec3 viewDir,
+                    vec3 diffuseColor, vec3 specularColor, float shininess)
 {
     if (light.enabled == 0) return vec3(0.0);
 
     vec3 lightVector = light.position - fragPos;
     float distance = length(lightVector);
-    
-    if (distance >= light.radius) return vec3(0.0);
+
+    float attenuation = PointLightAttenuation(distance, light.radius);
+    if (attenuation <= 0.0) return vec3(0.0);
 
     vec3 L = normalize(lightVector);
     float NdotL = max(dot(normal, L), 0.0);
-    
-    // Attenuation
-    float attenuation = max(0.0, 1.0 - (distance / light.radius));
-    attenuation = pow(attenuation, 1.5);
-    
-    // Diffuse
-    vec3 p_diff = diffuseColor * light.color.rgb * NdotL;
-    
-    // Specular
-    vec3 p_spec = vec3(0.0);
+
+    // Diffuse: Lambertian
+    vec3 diffuse = diffuseColor * light.color.rgb * NdotL;
+
+    vec3 specular = vec3(0.0);
     if (NdotL > 0.0)
     {
         vec3 H = normalize(L + viewDir);
-        float spec = pow(max(dot(normal, H), 0.0), max(1.0, shininess));
-        p_spec = light.color.rgb * specularColor * spec;
+        float NdotH = max(dot(normal, H), 0.0);
+        float HdotV = max(dot(H, viewDir), 0.0);
+
+        // Blinn-Phong specular
+        float spec = pow(NdotH, max(1.0, shininess));
+
+        // Schlick Fresnel
+        float fresnel = pow(1.0 - HdotV, 5.0);
+        vec3 F = specularColor + (vec3(1.0) - specularColor) * fresnel;
+
+        specular = F * light.color.rgb * spec;
     }
-    
-    return (p_diff + p_spec) * attenuation * light.intensity;
+
+    return (diffuse + specular) * attenuation * light.intensity;
 }
diff --git a/resources/shaders/include/lighting_spot.glsl b/resources/shaders/include/lighting_spot.glsl
index b6a6d827e..876064f01 100644
--- a/resources/shaders/include/lighting_spot.glsl
+++ b/resources/shaders/include/lighting_spot.glsl
@@ -1,38 +1,63 @@
-vec3 CalcSpotLight(Light light, vec3 normal, vec3 fragPos, vec3 viewDir, vec3 diffuseColor,
-                   vec3 specularColor, float shininess)
+// ============================================================
+// Spot Light — Blinn-Phong + Schlick Fresnel + Physical Attenuation
+// ============================================================
+
+float SpotLightAttenuation(float distance, float radius)
+{
+    if (distance >= radius) return 0.0;
+
+    float attenuation = 1.0 / (1.0 + distance * distance);
+
+    float fadeStart = radius * 0.8;
+    if (distance > fadeStart)
+    {
+        float t = (distance - fadeStart) / (radius - fadeStart);
+        attenuation *= 1.0 - t * t;
+    }
+
+    return attenuation;
+}
+
+vec3 CalcSpotLight(Light light, vec3 normal, vec3 fragPos, vec3 viewDir,
+                   vec3 diffuseColor, vec3 specularColor, float shininess)
 {
     if (light.enabled == 0) return vec3(0.0);
 
     vec3 lightVector = light.position - fragPos;
     float distance = length(lightVector);
 
-    if (distance >= light.radius) return vec3(0.0);
+    float attenuation = SpotLightAttenuation(distance, light.radius);
+    if (attenuation <= 0.0) return vec3(0.0);
 
     vec3 L = normalize(lightVector);
     float cosTheta = dot(L, normalize(-light.direction));
-    
-    float epsilon = cos(radians(light.innerCutoff)) - cos(radians(light.outerCutoff));
+
+    float epsilon = max(cos(radians(light.innerCutoff)) - cos(radians(light.outerCutoff)), 0.001);
     float spotIntensity = clamp((cosTheta - cos(radians(light.outerCutoff))) / epsilon, 0.0, 1.0);
 
     if (spotIntensity <= 0.0) return vec3(0.0);
 
     float NdotL = max(dot(normal, L), 0.0);
-    
-    // Attenuation
-    float attenuation = max(0.0, 1.0 - (distance / light.radius));
-    attenuation = pow(attenuation, 1.5);
-    
-    // Diffuse
-    vec3 s_diff = diffuseColor * light.color.rgb * NdotL;
-    
-    // Specular
-    vec3 s_spec = vec3(0.0);
+
+    // Diffuse: Lambertian
+    vec3 diffuse = diffuseColor * light.color.rgb * NdotL;
+
+    vec3 specular = vec3(0.0);
     if (NdotL > 0.0)
     {
         vec3 H = normalize(L + viewDir);
-        float spec = pow(max(dot(normal, H), 0.0), max(1.0, shininess));
-        s_spec = light.color.rgb * specularColor * spec;
+        float NdotH = max(dot(normal, H), 0.0);
+        float HdotV = max(dot(H, viewDir), 0.0);
+
+        // Blinn-Phong specular
+        float spec = pow(NdotH, max(1.0, shininess));
+
+        // Schlick Fresnel
+        float fresnel = pow(1.0 - HdotV, 5.0);
+        vec3 F = specularColor + (vec3(1.0) - specularColor) * fresnel;
+
+        specular = F * light.color.rgb * spec;
     }
-    
-    return (s_diff + s_spec) * attenuation * light.intensity * spotIntensity;
+
+    return (diffuse + specular) * attenuation * light.intensity * spotIntensity;
 }
diff --git a/resources/shaders/include/material_pbr.glsl b/resources/shaders/include/material_pbr.glsl
new file mode 100644
index 000000000..45482f79e
--- /dev/null
+++ b/resources/shaders/include/material_pbr.glsl
@@ -0,0 +1,44 @@
+// ============================================================
+// Material Properties — Blinn-Phong + Fresnel
+// ============================================================
+
+// ── Material property calculation ─────────────────────────
+void CalculateMaterialProperties(in vec2 texCoord,
+                                  out float metalness_out,
+                                  out float roughness_out,
+                                  out float occlusion_out)
+{
+    metalness_out = metalness;
+    roughness_out = roughness;
+    occlusion_out = 1.0;
+
+    if (useMetallicMap == 1)
+        metalness_out *= texture(texture1, texCoord).b;
+
+    if (useRoughnessMap == 1)
+        roughness_out *= texture(texture1, texCoord).g;
+
+    if (useOcclusionMap == 1)
+        occlusion_out = texture(texture4, texCoord).r;
+
+    metalness_out = clamp(metalness_out, 0.0, 1.0);
+    roughness_out = clamp(roughness_out, 0.04, 1.0);
+}
+
+// ── Specular properties (Blinn-Phong + Fresnel) ───────────
+// shininess derived from roughness (lower roughness = tighter highlight)
+// specularColor uses F0: dielectric 0.04, metals tinted by albedo
+// diffuseColor = albedo * (1 - metalness)
+void CalculateSpecularProperties(in float metalness,
+                                  in float roughness,
+                                  in vec3 baseColor,
+                                  out float shininess,
+                                  out vec3 specularColor,
+                                  out vec3 diffuseColor)
+{
+    shininess = (1.0 - roughness) * 128.0;
+    if (shininess < 1.0) shininess = 1.0;
+
+    specularColor = mix(vec3(0.04), baseColor, metalness);
+    diffuseColor  = baseColor * (1.0 - metalness);
+}
diff --git a/resources/shaders/include/normal_sampling.glsl b/resources/shaders/include/normal_sampling.glsl
new file mode 100644
index 000000000..f7508dbe2
--- /dev/null
+++ b/resources/shaders/include/normal_sampling.glsl
@@ -0,0 +1,26 @@
+// Normal Map Sampling & Calculation
+
+
+vec3 CalculateNormal(in vec3 vertexNormal,
+                     in mat3 tbn,
+                     in vec2 texCoord,
+                     in float useNormalMap)
+{
+    vec3 normal = normalize(vertexNormal);
+    
+    if (useNormalMap == 1) 
+    {
+        vec3 mapNormal = texture(texture2, texCoord).rgb;
+        mapNormal = normalize(mapNormal * 2.0 - 1.0);
+        normal = normalize(tbn * mapNormal);
+    }
+    
+    return normal;
+}
+
+
+vec4 DebugNormals(in vec3 normal, in float alpha)
+{
+    
+    return vec4(normal * 0.5 + 0.5, alpha);
+}
diff --git a/resources/shaders/include/shadow.glsl b/resources/shaders/include/shadow.glsl
new file mode 100644
index 000000000..260dccba7
--- /dev/null
+++ b/resources/shaders/include/shadow.glsl
@@ -0,0 +1,79 @@
+// shadow.glsl — Shadow mapping utilities
+//
+// How it works:
+//   1. The ShadowPass renders the scene from the light's point of view into a depth texture.
+//   2. In the lighting shader, we transform each fragment into light-space.
+//   3. We compare the fragment's depth against the shadow map depth.
+//   4. If the fragment is farther from the light than what's stored in the map, it's in shadow.
+//
+// Uniforms (set from C++):
+//   sampler2D u_ShadowMap    — the depth texture from the ShadowPass
+//   mat4      u_LightSpaceMatrix — transforms world coords to light clip space
+//   float     u_ShadowBias  — offset to prevent shadow acne (self-shadowing artifacts)
+//   int       u_ShadowsEnabled — 0 = no shadows, 1 = shadows on
+
+uniform sampler2D u_ShadowMap;
+uniform mat4 u_LightSpaceMatrix;
+uniform float u_ShadowBias;
+uniform int u_ShadowsEnabled;
+
+// Converts a world-space position to shadow map coordinates.
+// Returns vec3(x, y, z) where x,y are UV coords [0,1] and z is the depth.
+vec3 ShadowMapCoords(vec4 fragPosLightSpace)
+{
+    // Perspective divide: convert from clip space to NDC [-1, +1]
+    vec3 ndc = fragPosLightSpace.xyz / fragPosLightSpace.w;
+
+    // Transform from NDC [-1,+1] to texture coordinates [0,1]
+    // x and y become UV coords, z is the depth we compare against
+    return vec3(ndc.x * 0.5 + 0.5, ndc.y * 0.5 + 0.5, ndc.z * 0.5 + 0.5);
+}
+
+// Basic shadow test: returns 0.0 (fully in shadow) or 1.0 (fully lit).
+float ShadowCalculationBasic(vec4 fragPosLightSpace)
+{
+    if (u_ShadowsEnabled == 0) return 1.0;
+
+    vec3 coords = ShadowMapCoords(fragPosLightSpace);
+
+    // Fragments behind the light's far plane are not in shadow
+    if (coords.z > 1.0) return 1.0;
+
+    // Get the closest depth from the shadow map
+    float closestDepth = texture(u_ShadowMap, coords.xy).r;
+
+    // Current fragment's depth (with bias to prevent acne)
+    float currentDepth = coords.z - u_ShadowBias;
+
+    // Compare: is this fragment farther than what the shadow map recorded?
+    return currentDepth > closestDepth ? 0.0 : 1.0;
+}
+
+// PCF (Percentage-Closer Filtering) with a uniform 3x3 texel grid: soft edges without
+// the blotchy "disk" artifacts a Poisson kernel produces on low-resolution shadow maps.
+float ShadowCalculationPCF(vec4 fragPosLightSpace)
+{
+    if (u_ShadowsEnabled == 0) return 1.0;
+
+    vec3 coords = ShadowMapCoords(fragPosLightSpace);
+
+    // Fragments behind the light's far plane or outside frustum are not in shadow
+    if (coords.z > 1.0 || coords.x < 0.0 || coords.x > 1.0 || coords.y < 0.0 || coords.y > 1.0)
+        return 1.0;
+
+    float shadow = 0.0;
+    float currentDepth = coords.z - u_ShadowBias;
+
+    // Sample a 3x3 grid of neighbouring texels and average the results.
+    vec2 texelSize = 1.0 / vec2(textureSize(u_ShadowMap, 0));
+    for (int x = -1; x <= 1; ++x)
+    {
+        for (int y = -1; y <= 1; ++y)
+        {
+            float pcfDepth = texture(u_ShadowMap, coords.xy + vec2(x, y) * texelSize).r;
+            shadow += currentDepth > pcfDepth ? 0.0 : 1.0;
+        }
+    }
+
+    return shadow / 9.0;
+}
diff --git a/resources/shaders/include/surface.glsl b/resources/shaders/include/surface.glsl
new file mode 100644
index 000000000..7319bfa67
--- /dev/null
+++ b/resources/shaders/include/surface.glsl
@@ -0,0 +1,132 @@
+#ifndef CH_SURFACE_GLSL
+#define CH_SURFACE_GLSL
+
+#include "color_space.glsl"
+
+// ============================================================
+// Material Texture Samplers
+// ============================================================
+uniform sampler2D texture0; // Albedo / Base Color
+uniform sampler2D texture1; // Metallic (B) & Roughness (G)
+uniform sampler2D texture2; // Normal Map
+uniform sampler2D texture3; // Roughness (legacy standalone map)
+uniform sampler2D texture4; // Ambient Occlusion (R)
+uniform sampler2D texture5; // Emissive Map
+
+// ============================================================
+// Material Properties & Feature Flags
+// ============================================================
+uniform vec4  colDiffuse;
+uniform vec4  colEmissive;
+uniform float metalness;
+uniform float roughness;
+uniform float shininess;
+uniform float emissiveIntensity;
+
+uniform int useTexture;
+uniform int useNormalMap;
+uniform int useMetallicMap;
+uniform int useRoughnessMap;
+uniform int useOcclusionMap;
+uniform int useEmissiveTexture;
+
+// ============================================================
+// Surface Representation
+// ============================================================
+struct Surface
+{
+    vec3  position;   // World position
+    vec3  normal;     // World normal (perturbed by normal map if active)
+    vec3  viewDir;    // Unit vector pointing towards camera
+    vec3  albedo;     // Base diffuse color in linear space
+    vec3  diffuse;    // Diffuse reflectance: albedo * (1.0 - metalness)
+    vec3  specular;   // Specular F0 reflectance: mix(0.04, albedo, metalness)
+    float roughness;  // Surface roughness clamped to [0.04, 1.0]
+    float metalness;  // Metalness clamped to [0.0, 1.0]
+    float shininess;  // Blinn-Phong specular power derived from roughness
+    float occlusion;  // Ambient occlusion factor [0.0, 1.0]
+    vec3  emissive;   // Linear emissive color contribution
+    float alpha;      // Surface opacity [0.0, 1.0]
+};
+
+// ── Sample normal from map with TBN ────────────────────────
+vec3 SampleNormalMap(in vec3 vertexNormal, in mat3 tbn, in vec2 uv, in int hasNormalMap)
+{
+    vec3 normal = normalize(vertexNormal);
+    if (hasNormalMap == 1)
+    {
+        vec3 mapNormal = texture(texture2, uv).rgb * 2.0 - 1.0;
+        normal = normalize(tbn * mapNormal);
+    }
+    return normal;
+}
+
+// ── Construct complete Surface structure ───────────────────
+Surface CreateSurface(in vec3 worldPos,
+                      in vec3 vertexNormal,
+                      in mat3 tbn,
+                      in vec2 uv,
+                      in vec4 vertexColor,
+                      in vec3 cameraPos)
+{
+    Surface s;
+    s.position = worldPos;
+    s.viewDir  = normalize(cameraPos - worldPos);
+    s.normal   = SampleNormalMap(vertexNormal, tbn, uv, useNormalMap);
+
+    // 1. Albedo & Alpha
+    vec4 baseColor = colDiffuse;
+    if (length(vertexColor.rgb) > 0.01)
+    {
+        baseColor *= vertexColor;
+    }
+    if (useTexture == 1)
+    {
+        vec4 sampled = texture(texture0, uv);
+        baseColor.rgb *= ToLinear(sampled.rgb);
+        baseColor.a   *= sampled.a;
+    }
+    s.albedo = baseColor.rgb;
+    s.alpha  = baseColor.a;
+
+    // 2. Material factors
+    s.metalness = clamp(metalness, 0.0, 1.0);
+    s.roughness = clamp(roughness, 0.04, 1.0);
+    s.occlusion = 1.0;
+
+    if (useMetallicMap == 1)
+    {
+        vec4 mrSample = texture(texture1, uv);
+        s.metalness = clamp(s.metalness * mrSample.b, 0.0, 1.0);
+        if (useRoughnessMap == 1)
+        {
+            s.roughness = clamp(s.roughness * mrSample.g, 0.04, 1.0);
+        }
+    }
+    else if (useRoughnessMap == 1)
+    {
+        s.roughness = clamp(s.roughness * texture(texture3, uv).r, 0.04, 1.0);
+    }
+
+    if (useOcclusionMap == 1)
+    {
+        s.occlusion = texture(texture4, uv).r;
+    }
+
+    // 3. Diffuse, Specular and Shininess
+    s.diffuse   = s.albedo * (1.0 - s.metalness);
+    s.specular  = mix(vec3(0.04), s.albedo, s.metalness);
+    s.shininess = max(1.0, (1.0 - s.roughness) * 128.0);
+
+    // 4. Emissive
+    s.emissive = colEmissive.rgb;
+    if (useEmissiveTexture == 1)
+    {
+        s.emissive *= ToLinear(texture(texture5, uv).rgb);
+    }
+    s.emissive *= emissiveIntensity;
+
+    return s;
+}
+
+#endif // CH_SURFACE_GLSL
diff --git a/resources/shaders/include/tonemap.glsl b/resources/shaders/include/tonemap.glsl
new file mode 100644
index 000000000..0b11b2686
--- /dev/null
+++ b/resources/shaders/include/tonemap.glsl
@@ -0,0 +1,31 @@
+// Tonemapping & Gamma Correction
+
+
+
+vec3 Tonemap(in vec3 linearColor, in float exposure)
+{
+    
+    vec3 exposed = vec3(1.0) - exp(-linearColor * exposure);
+    return exposed;
+}
+
+
+vec3 GammaCorrect(in vec3 srgbColor)
+{
+    
+    return ToSRGB(srgbColor);
+}
+
+
+vec3 FinalizeColor(in vec3 linearColor, 
+                   in float exposure, 
+                   in float gamma)
+{
+    
+    vec3 tonemapped = Tonemap(linearColor, exposure);
+    
+    
+    vec3 output_color = GammaCorrect(tonemapped);
+    
+    return output_color;
+}
diff --git a/resources/shaders/infinite_grid.fs b/resources/shaders/infinite_grid.fs
deleted file mode 100644
index ace8c78e3..000000000
--- a/resources/shaders/infinite_grid.fs
+++ /dev/null
@@ -1,59 +0,0 @@
-#version 450 core
-
-
-layout(location = 0) in vec3 nearPoint;
-layout(location = 1) in vec3 farPoint;
-layout(location = 2) in mat4 fragView;
-layout(location = 6) in mat4 fragProj;
-
-layout(location = 0) out vec4 outColor;
-
-vec4 grid(vec3 fragPos3D, float scale, bool drawLines) {
-    vec2 coord = fragPos3D.xz * scale;
-    vec2 derivative = fwidth(coord);
-    vec2 grid = abs(fract(coord - 0.5) - 0.5) / derivative;
-    float line = min(grid.x, grid.y);
-    float minimumz = min(derivative.y, 1.0);
-    float minimumx = min(derivative.x, 1.0);
-    
-    vec4 color = vec4(1.0, 1.0, 1.0, 1.0 - min(line, 1.0));
-        
-    return color;
-}
-
-uniform float near;
-uniform float far;
-
-float computeDepth(vec3 pos) {
-    vec4 clip_space_pos = fragProj * fragView * vec4(pos.xyz, 1.0);
-    // In OpenGL, clip space z/w is [-1, 1]. gl_FragDepth expects [0, 1].
-    return ((clip_space_pos.z / clip_space_pos.w) + 1.0) * 0.5;
-}
-
-float computeLinearDepth(vec3 pos) {
-    vec4 clip_space_pos = fragProj * fragView * vec4(pos.xyz, 1.0);
-    float clip_space_depth = (clip_space_pos.z / clip_space_pos.w); // NDC depth [-1, 1]
-    float linearDepth = (2.0 * near * far) / (far + near - clip_space_depth * (far - near));
-    return linearDepth / far;
-}
-
-void main() {
-    float dy = farPoint.y - nearPoint.y;
-    // Check if ray is roughly parallel to the plane or doesn't intersect
-    if (abs(dy) < 0.0001) discard;
-
-    float t = -nearPoint.y / dy;
-    if (t <= 0.0) discard;
-
-    vec3 fragPos3D = nearPoint + t * (farPoint - nearPoint);
-
-    gl_FragDepth = computeDepth(fragPos3D);
-
-    float linearDepth = computeLinearDepth(fragPos3D);
-    float fading = max(0.0, (1.0 - linearDepth));
-
-    outColor = grid(fragPos3D, 1.0, true);
-    outColor.a *= fading;
-    
-    if (outColor.a < 0.01) discard;
-}
diff --git a/resources/shaders/infinite_grid.vs b/resources/shaders/infinite_grid.vs
deleted file mode 100644
index 48b1df485..000000000
--- a/resources/shaders/infinite_grid.vs
+++ /dev/null
@@ -1,29 +0,0 @@
-#version 450 core
-
-// Infinite Grid Vertex Shader
-
-layout(location = 0) in vec3 vertexPosition;
-
-layout(location = 0) uniform mat4 matView;
-layout(location = 1) uniform mat4 matProjection;
-
-layout(location = 0) out vec3 nearPoint;
-layout(location = 1) out vec3 farPoint;
-layout(location = 2) out mat4 fragView;
-layout(location = 6) out mat4 fragProj;
-
-vec3 UnprojectPoint(float x, float y, float z, mat4 view, mat4 projection) {
-    mat4 viewInv = inverse(view);
-    mat4 projInv = inverse(projection);
-    vec4 unprojectedPoint =  viewInv * projInv * vec4(x, y, z, 1.0);
-    return unprojectedPoint.xyz / unprojectedPoint.w;
-}
-
-void main() {
-    vec3 p = vertexPosition;
-    nearPoint = UnprojectPoint(p.x, p.y, -1.0, matView, matProjection);
-    farPoint = UnprojectPoint(p.x, p.y, 1.0, matView, matProjection);
-    fragView = matView;
-    fragProj = matProjection;
-    gl_Position = vec4(p, 1.0);
-}
diff --git a/resources/shaders/lighting.chshader b/resources/shaders/lighting.chshader
deleted file mode 100644
index b1b687c07..000000000
--- a/resources/shaders/lighting.chshader
+++ /dev/null
@@ -1,16 +0,0 @@
-# Lighting Shader Metadata
-VertexShader: "lighting.vs"
-FragmentShader: "lighting.fs"
-
-Uniforms:
-  - texture0
-  - colDiffuse
-  - useTexture
-  - shininess
-  - ambient
-  - uMode
-  - fogEnabled
-  - fogColor
-  - fogDensity
-  - fogStart
-  - fogEnd
diff --git a/resources/shaders/lighting.fs b/resources/shaders/lighting.fs
deleted file mode 100644
index 90ed9b148..000000000
--- a/resources/shaders/lighting.fs
+++ /dev/null
@@ -1,108 +0,0 @@
-#version 430 core
-
-#include "include/lighting_common.glsl"
-#include "include/lighting_directional.glsl"
-#include "include/lighting_point.glsl"
-#include "include/lighting_spot.glsl"
-#include "include/fog.glsl"
-#include "include/color_space.glsl"
-
-in vec3 fragPosition;
-in vec2 fragTexCoord;
-in vec4 fragColor;
-in vec3 fragNormal;
-in mat3 fragTBN;
-
-out vec4 finalColor;
-
-void main()
-{
-    // 1. Base Color & Diagnostics
-    vec4 baseColor = colDiffuse;
-    
-    // Fix: If fragColor (Vertex Color) is close to black, ignore it.
-    if (length(fragColor.rgb) > 0.01) baseColor *= fragColor;
-    
-    // Albedo is stored as sRGB in textures. Material colors from Assimp are already linear.
-    if (useTexture == 1) 
-    {
-        vec4 sampled = texture(texture0, fragTexCoord);
-        baseColor *= ToLinear(sampled); // sRGB texture → linear
-    }
-    // Note: no ToLinear() needed for baseColor alone — colDiffuse is already linear.
-    
-    int mode = int(uMode + 0.5);
-    if (mode == 2) baseColor = vec4(0.5, 0.5, 0.5, 1.0); // Neutral gray for lighting-only
-    if (mode == 3) { finalColor = baseColor; return; }
-    
-    // Normal Mapping
-    vec3 normal = normalize(fragNormal);
-    if (useNormalMap == 1) {
-        vec3 mapNormal = texture(texture2, fragTexCoord).rgb;
-        mapNormal = normalize(mapNormal * 2.0 - 1.0);
-        normal = normalize(fragTBN * mapNormal);
-    }
-    
-    if (mode == 1) { finalColor = vec4(normal * 0.5 + 0.5, 1.0); return; }
-
-    // PBR Properties
-    float m = metalness;
-    float r = roughness;
-    float occ = 1.0;
-
-    if (useMetallicMap == 1) m *= texture(texture1, fragTexCoord).b; // Blue channel usually
-    if (useRoughnessMap == 1) r *= texture(texture3, fragTexCoord).g; // Green channel usually
-    if (useOcclusionMap == 1) occ = texture(texture4, fragTexCoord).r;
-
-    m = clamp(m, 0.0, 1.0);
-    r = clamp(r, 0.04, 1.0);
-
-    // Map PBR to Blinn-Phong (Approximation)
-    // Roughness -> Shininess
-    float s = (1.0 - r) * 128.0;
-    if (s < 1.0) s = 1.0;
-    
-    // Metalness -> Specular Color & Diffuse
-    vec3 specColor = mix(vec3(0.04), baseColor.rgb, m);
-    vec3 diffColor = baseColor.rgb * (1.0 - m);
-
-    // 2. Main Lighting Loop
-    vec3 viewDir = normalize(viewPos - fragPosition);
-    
-    // Combine uniform ambient with sky environment color
-    vec3 skyAmbient = skyAmbientColor.rgb * skyAmbientColor.a; 
-    vec3 finalAmbient = (diffColor * ambient) + skyAmbient;
-    vec3 lighting = finalAmbient * occ;
-
-    // Directional Light
-    lighting += CalcDirectionalLight(lightDir, lightColor, normal, viewDir, diffColor, specColor, s);
-
-    // Dynamic Lights (Unified)
-    int lightCount = clamp(uLightCount, 0, MAX_LIGHTS);
-    for (int i = 0; i < lightCount; i++)
-    {
-        if (lights[i].enabled == 0) continue;
-        
-        if (lights[i].type == 0) // Point
-            lighting += CalcPointLight(lights[i], normal, fragPosition, viewDir, diffColor, specColor, s);
-        else if (lights[i].type == 1) // Spot
-            lighting += CalcSpotLight(lights[i], normal, fragPosition, viewDir, diffColor, specColor, s);
-    }
-
-    // 3. Emissive Component (Usually sRGB textures)
-    vec3 emissiveComp = ToLinear(colEmissive.rgb);
-    if (useEmissiveTexture == 1) 
-    {
-        emissiveComp *= ToLinear(texture(texture5, fragTexCoord).rgb);
-    }
-    emissiveComp *= emissiveIntensity;
-
-    // 4. Final Assembly
-    // All calculations are in Linear Space. No Tonemapping here!
-    vec3 outColor = lighting + emissiveComp;
-    
-    vec4 result = vec4(outColor, (mode == 2) ? 1.0 : baseColor.a);
-
-    // Apply Fog (expects and returns Linear)
-    finalColor = ApplyFog(result, fragPosition, viewPos, uTime);
-}
diff --git a/resources/shaders/lighting.vs b/resources/shaders/lighting.vs
deleted file mode 100644
index 1e357bb37..000000000
--- a/resources/shaders/lighting.vs
+++ /dev/null
@@ -1,57 +0,0 @@
-#version 430 core
-
-// Input vertex attributes with explicit locations matching engine's upload order
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec2 a_TexCoord;
-layout(location = 2) in vec3 a_Normal;
-layout(location = 3) in ivec4 a_JointIDs;
-layout(location = 4) in vec4 a_Weights;
-
-// Input uniform values
-uniform mat4 mvp;
-uniform mat4 matModel;
-uniform mat4 matNormal;
-uniform mat4 boneMatrices[128];
-uniform int useSkinning;
-
-// Output vertex attributes (to fragment shader)
-out vec3 fragPosition;
-out vec2 fragTexCoord;
-out vec4 fragColor;
-out vec3 fragNormal;
-out mat3 fragTBN;
-
-void main()
-{
-    vec3 vPos = a_Position;
-    vec3 vNormal = a_Normal;
-
-    if (useSkinning == 1)
-    {
-        mat4 skinMat = 
-            a_Weights.x * boneMatrices[a_JointIDs.x] +
-            a_Weights.y * boneMatrices[a_JointIDs.y] +
-            a_Weights.z * boneMatrices[a_JointIDs.z] +
-            a_Weights.w * boneMatrices[a_JointIDs.w];
-        
-        vPos = (skinMat * vec4(vPos, 1.0)).xyz;
-        vNormal = (skinMat * vec4(vNormal, 0.0)).xyz;
-    }
-
-    // Send vertex attributes to fragment shader
-    fragPosition = vec3(matModel * vec4(vPos, 1.0));
-    fragTexCoord = a_TexCoord;
-    fragColor = vec4(1.0, 1.0, 1.0, 1.0); // Static color as fallback
-
-    vec3 N = normalize(vec3(matNormal * vec4(vNormal, 0.0)));
-    
-    // Simple fallback TBN
-    vec3 up = abs(N.z) < 0.999 ? vec3(0, 0, 1) : vec3(1, 0, 0);
-    vec3 T = normalize(cross(up, N));
-    vec3 B = cross(N, T);
-    
-    fragNormal = N;
-    fragTBN = mat3(T, B, N);
-
-    gl_Position = mvp * vec4(vPos, 1.0);
-}
diff --git a/resources/shaders/materials/billboard.chshader b/resources/shaders/materials/billboard.chshader
new file mode 100644
index 000000000..9664a87e0
--- /dev/null
+++ b/resources/shaders/materials/billboard.chshader
@@ -0,0 +1,8 @@
+# Billboard Shader
+VertexShader: "billboard.vert"
+FragmentShader: "billboard.frag"
+
+Uniforms:
+  - mvp
+  - texture0
+  - colDiffuse
diff --git a/resources/shaders/materials/billboard.frag b/resources/shaders/materials/billboard.frag
new file mode 100644
index 000000000..73735bf04
--- /dev/null
+++ b/resources/shaders/materials/billboard.frag
@@ -0,0 +1,15 @@
+#version 430 core
+
+in vec2 fragTexCoord;
+in vec3 fragPosition;
+
+out vec4 finalColor;
+
+uniform sampler2D texture0;
+uniform vec4 colDiffuse;
+
+void main()
+{
+    vec4 texColor = texture(texture0, fragTexCoord);
+    finalColor = colDiffuse * texColor;
+}
diff --git a/resources/shaders/materials/billboard.vert b/resources/shaders/materials/billboard.vert
new file mode 100644
index 000000000..9f03bb02c
--- /dev/null
+++ b/resources/shaders/materials/billboard.vert
@@ -0,0 +1,17 @@
+#version 430 core
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec2 a_TexCoord;
+layout(location = 2) in vec3 a_Normal;
+
+uniform mat4 mvp;
+
+out vec2 fragTexCoord;
+out vec3 fragPosition;
+
+void main()
+{
+    fragTexCoord = a_TexCoord;
+    fragPosition = a_Position;
+    gl_Position = mvp * vec4(a_Position, 1.0);
+}
diff --git a/resources/shaders/materials/lighting.chshader b/resources/shaders/materials/lighting.chshader
new file mode 100644
index 000000000..ce2303bda
--- /dev/null
+++ b/resources/shaders/materials/lighting.chshader
@@ -0,0 +1,35 @@
+# Lighting Shader Metadata
+VertexShader: "lighting.vert"
+FragmentShader: "lighting.frag"
+
+Uniforms:
+  - Name: "colDiffuse"
+    Type: "Color"
+    Default: [1.0, 1.0, 1.0, 1.0]
+  - Name: "useTexture"
+    Type: "Float"
+    Default: 0.0
+  - Name: "shininess"
+    Type: "Float"
+    Default: 32.0
+  - Name: "uMode"
+    Type: "Float"
+    Default: 0.0
+  - Name: "ambient"
+    Type: "Color"
+    Default: [0.1, 0.1, 0.1, 1.0]
+  - Name: "fogEnabled"
+    Type: "Float"
+    Default: 1.0
+  - Name: "fogColor"
+    Type: "Color"
+    Default: [0.5, 0.6, 0.7, 1.0]
+  - Name: "fogDensity"
+    Type: "Float"
+    Default: 0.015
+  - Name: "fogStart"
+    Type: "Float"
+    Default: 10.0
+  - Name: "fogEnd"
+    Type: "Float"
+    Default: 100.0
diff --git a/resources/shaders/materials/lighting.frag b/resources/shaders/materials/lighting.frag
new file mode 100644
index 000000000..5a4ddb55c
--- /dev/null
+++ b/resources/shaders/materials/lighting.frag
@@ -0,0 +1,85 @@
+#version 430 core
+
+#include "../include/surface.glsl"
+#include "../include/lighting.glsl"
+#include "../include/shadow.glsl"
+#include "../include/fog.glsl"
+#include "../include/debug_modes.glsl"
+
+in vec3 fragPosition;
+in vec2 fragTexCoord;
+in vec4 fragColor;
+in vec3 fragNormal;
+in mat3 fragTBN;
+in vec4 fragPosLightSpace;
+
+out vec4 finalColor;
+
+void main()
+{
+    // 1. Gather all surface and material properties
+    Surface surf = CreateSurface(fragPosition, fragNormal, fragTBN, fragTexCoord, fragColor, viewPos);
+
+    // Alpha test discard
+    if (surf.alpha < 0.1)
+        discard;
+
+    int mode = int(uMode + 0.5);
+
+    // 2. Diagnostics / View modes
+    if (mode == DEBUG_MODE_NORMALS)
+    {
+        finalColor = vec4(surf.normal * 0.5 + 0.5, 1.0);
+        return;
+    }
+    else if (mode == DEBUG_MODE_UNLIT_ALBEDO)
+    {
+        vec3 unlitLinear = ApplyLinearFog(surf.albedo, surf.position, viewPos, lightDir, lightColor.rgb);
+        finalColor = vec4(unlitLinear, surf.alpha);
+        return;
+    }
+    else if (mode == DEBUG_MODE_METALNESS)
+    {
+        finalColor = vec4(vec3(surf.metalness), surf.alpha);
+        return;
+    }
+    else if (mode == DEBUG_MODE_ROUGHNESS)
+    {
+        finalColor = vec4(vec3(surf.roughness), surf.alpha);
+        return;
+    }
+    else if (mode == DEBUG_MODE_OCCLUSION)
+    {
+        finalColor = vec4(vec3(surf.occlusion), surf.alpha);
+        return;
+    }
+    else if (mode == DEBUG_MODE_LIGHTING_ONLY)
+    {
+        surf.albedo = vec3(0.5);
+        surf.diffuse = vec3(0.5);
+        surf.specular = vec3(0.04);
+        surf.shininess = 32.0;
+    }
+
+    // 3. Ambient & Sky Environment Lighting
+    vec3 accumulatedLighting = CalcAmbientLighting(surf, skyAmbientColor, ambient);
+
+    // 4. Main Directional Light (Sun, Moon, etc.) + Shadows
+    float shadow = ShadowCalculationPCF(fragPosLightSpace);
+    vec3 mainLightContrib = CalcDirectionalLight(lightDir, lightColor, 1.0, surf);
+    accumulatedLighting += mainLightContrib * shadow;
+
+    // 5. Dynamic Lights (Point, Spot, Secondary Directional from SSBO)
+    int lightCount = clamp(uLightCount, 0, MAX_LIGHTS);
+    for (int i = 0; i < lightCount; i++)
+    {
+        if (lights[i].enabled == 0) continue;
+        accumulatedLighting += CalcDynamicLight(lights[i], surf);
+    }
+
+    // 6. Emissive + Fog
+    vec3 outLinear = accumulatedLighting + surf.emissive;
+    outLinear = ApplyLinearFog(outLinear, surf.position, viewPos, lightDir, lightColor.rgb);
+
+    finalColor = vec4(outLinear, (mode == DEBUG_MODE_LIGHTING_ONLY) ? 1.0 : surf.alpha);
+}
diff --git a/resources/shaders/materials/lighting.vert b/resources/shaders/materials/lighting.vert
new file mode 100644
index 000000000..20b2fb0ea
--- /dev/null
+++ b/resources/shaders/materials/lighting.vert
@@ -0,0 +1,54 @@
+#version 430 core
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec2 a_TexCoord;
+layout(location = 2) in vec3 a_Normal;
+layout(location = 5) in vec3 a_Tangent;
+
+#include "../include/camera.glsl"
+
+uniform mat4 matModel;
+uniform mat4 matNormal;
+uniform mat4 u_LightSpaceMatrix;
+
+out vec3 fragPosition;
+out vec2 fragTexCoord;
+out vec4 fragColor;
+out vec3 fragNormal;
+out mat3 fragTBN;
+out vec4 fragPosLightSpace;
+
+void main()
+{
+    vec3 vPos = a_Position;
+    vec3 vNormal = a_Normal;
+    vec3 vTangent = a_Tangent;
+
+    fragPosition = vec3(matModel * vec4(vPos, 1.0));
+    fragTexCoord = a_TexCoord;
+    fragColor = vec4(1.0, 1.0, 1.0, 1.0);
+
+    vec3 N = normalize(vec3(matNormal * vec4(vNormal, 0.0)));
+    vec3 T;
+
+    if (length(vTangent) < 0.01)
+    {
+        vec3 up = abs(N.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(1.0, 0.0, 0.0);
+        T = normalize(cross(up, N));
+    }
+    else
+    {
+        T = normalize(vec3(matNormal * vec4(vTangent, 0.0)));
+    }
+
+    T = normalize(T - dot(T, N) * N);
+    vec3 B = cross(N, T);
+
+    fragNormal = N;
+    fragTBN = mat3(T, B, N);
+
+    // Transform vertex position to light space for shadow mapping
+    fragPosLightSpace = u_LightSpaceMatrix * vec4(fragPosition, 1.0);
+
+    gl_Position = u_ViewProjection * matModel * vec4(vPos, 1.0);
+}
diff --git a/resources/shaders/materials/nametag.chshader b/resources/shaders/materials/nametag.chshader
new file mode 100644
index 000000000..c1e270b30
--- /dev/null
+++ b/resources/shaders/materials/nametag.chshader
@@ -0,0 +1,13 @@
+# Nametag Shader Metadata
+VertexShader: "nametag.vert"
+FragmentShader: "nametag.frag"
+
+Uniforms:
+  - projection
+  - view
+  - modelPosition
+  - size
+  - textTexture
+  - textColor
+  - backgroundColor
+  - useBackground
diff --git a/resources/shaders/materials/nametag.frag b/resources/shaders/materials/nametag.frag
new file mode 100644
index 000000000..eda6c4fdb
--- /dev/null
+++ b/resources/shaders/materials/nametag.frag
@@ -0,0 +1,30 @@
+#version 430 core
+
+in vec2 TexCoords;
+
+out vec4 finalColor;
+
+uniform sampler2D textTexture;
+uniform vec4 textColor;
+uniform vec4 backgroundColor;
+uniform float useBackground;
+
+void main()
+{
+    vec4 texColor = texture(textTexture, TexCoords);
+
+    if (useBackground > 0.5)
+    {
+        vec3 bg = backgroundColor.rgb;
+        float bgAlpha = backgroundColor.a * (1.0 - texColor.a);
+        float textAlpha = texColor.a * textColor.a;
+        finalColor = vec4(
+            mix(bg, textColor.rgb, texColor.a),
+            max(bgAlpha, textAlpha)
+        );
+    }
+    else
+    {
+        finalColor = vec4(textColor.rgb, texColor.a * textColor.a);
+    }
+}
diff --git a/resources/shaders/materials/nametag.vert b/resources/shaders/materials/nametag.vert
new file mode 100644
index 000000000..4a2a2cc5a
--- /dev/null
+++ b/resources/shaders/materials/nametag.vert
@@ -0,0 +1,25 @@
+#version 430 core
+
+layout(location = 0) in vec2 in_quadVertices;
+layout(location = 1) in vec2 in_texCoords;
+
+out vec2 TexCoords;
+
+uniform mat4 projection;
+uniform mat4 view;
+uniform vec3 modelPosition;
+uniform vec2 size;
+
+void main()
+{
+    TexCoords = in_texCoords;
+
+    // Translate player position into view space
+    vec4 viewPos = view * vec4(modelPosition, 1.0);
+
+    // Offset quad vertices directly in view space (always faces camera)
+    viewPos.xy += in_quadVertices * size;
+
+    // Project to screen
+    gl_Position = projection * viewPos;
+}
diff --git a/resources/shaders/materials/nametag_text.chshader b/resources/shaders/materials/nametag_text.chshader
new file mode 100644
index 000000000..e52f09bde
--- /dev/null
+++ b/resources/shaders/materials/nametag_text.chshader
@@ -0,0 +1,8 @@
+# Nametag Text Shader Metadata
+VertexShader: "nametag_text.vert"
+FragmentShader: "nametag_text.frag"
+
+Uniforms:
+  - projection
+  - fontAtlas
+  - textColor
diff --git a/resources/shaders/materials/nametag_text.frag b/resources/shaders/materials/nametag_text.frag
new file mode 100644
index 000000000..6c423ae5a
--- /dev/null
+++ b/resources/shaders/materials/nametag_text.frag
@@ -0,0 +1,14 @@
+#version 430 core
+
+in vec2 TexCoords;
+
+out vec4 finalColor;
+
+uniform sampler2D fontAtlas;
+uniform vec4 textColor;
+
+void main()
+{
+    float alpha = texture(fontAtlas, TexCoords).a;
+    finalColor = vec4(textColor.rgb, textColor.a * alpha);
+}
diff --git a/resources/shaders/materials/nametag_text.vert b/resources/shaders/materials/nametag_text.vert
new file mode 100644
index 000000000..4824631ce
--- /dev/null
+++ b/resources/shaders/materials/nametag_text.vert
@@ -0,0 +1,14 @@
+#version 430 core
+
+layout(location = 0) in vec2 a_Position;
+layout(location = 1) in vec2 a_TexCoord;
+
+uniform mat4 projection;
+
+out vec2 TexCoords;
+
+void main()
+{
+    TexCoords = a_TexCoord;
+    gl_Position = projection * vec4(a_Position, 0.0, 1.0);
+}
diff --git a/resources/shaders/materials/shadow_depth.chshader b/resources/shaders/materials/shadow_depth.chshader
new file mode 100644
index 000000000..131f88ecd
--- /dev/null
+++ b/resources/shaders/materials/shadow_depth.chshader
@@ -0,0 +1,8 @@
+# Shadow Depth Shader Metadata
+VertexShader: "shadow_depth.vert"
+FragmentShader: "shadow_depth.frag"
+
+Uniforms:
+  - Name: "u_LightSpaceMatrix"
+    Type: "Matrix"
+    Default: [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0]
diff --git a/resources/shaders/materials/shadow_depth.frag b/resources/shaders/materials/shadow_depth.frag
new file mode 100644
index 000000000..032718a3b
--- /dev/null
+++ b/resources/shaders/materials/shadow_depth.frag
@@ -0,0 +1,6 @@
+#version 430 core
+
+void main()
+{
+    // Depth is written automatically by the hardware rasterizer.
+}
diff --git a/resources/shaders/materials/shadow_depth.vert b/resources/shaders/materials/shadow_depth.vert
new file mode 100644
index 000000000..1a796ecd2
--- /dev/null
+++ b/resources/shaders/materials/shadow_depth.vert
@@ -0,0 +1,11 @@
+#version 430 core
+
+layout(location = 0) in vec3 a_Position;
+
+uniform mat4 u_LightSpaceMatrix;
+uniform mat4 matModel;
+
+void main()
+{
+    gl_Position = u_LightSpaceMatrix * matModel * vec4(a_Position, 1.0);
+}
diff --git a/resources/shaders/materials/skinned.chshader b/resources/shaders/materials/skinned.chshader
new file mode 100644
index 000000000..ae09cc0e5
--- /dev/null
+++ b/resources/shaders/materials/skinned.chshader
@@ -0,0 +1,35 @@
+# Skinned Lighting Shader Metadata
+VertexShader: "skinned.vert"
+FragmentShader: "lighting.frag"
+
+Uniforms:
+  - Name: "colDiffuse"
+    Type: "Color"
+    Default: [1.0, 1.0, 1.0, 1.0]
+  - Name: "useTexture"
+    Type: "Float"
+    Default: 0.0
+  - Name: "shininess"
+    Type: "Float"
+    Default: 32.0
+  - Name: "uMode"
+    Type: "Float"
+    Default: 0.0
+  - Name: "ambient"
+    Type: "Color"
+    Default: [0.1, 0.1, 0.1, 1.0]
+  - Name: "fogEnabled"
+    Type: "Float"
+    Default: 1.0
+  - Name: "fogColor"
+    Type: "Color"
+    Default: [0.5, 0.6, 0.7, 1.0]
+  - Name: "fogDensity"
+    Type: "Float"
+    Default: 0.015
+  - Name: "fogStart"
+    Type: "Float"
+    Default: 10.0
+  - Name: "fogEnd"
+    Type: "Float"
+    Default: 100.0
diff --git a/resources/shaders/materials/skinned.vert b/resources/shaders/materials/skinned.vert
new file mode 100644
index 000000000..f87748678
--- /dev/null
+++ b/resources/shaders/materials/skinned.vert
@@ -0,0 +1,76 @@
+#version 430 core
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec2 a_TexCoord;
+layout(location = 2) in vec3 a_Normal;
+layout(location = 3) in ivec4 a_JointIDs;
+layout(location = 4) in vec4 a_Weights;
+layout(location = 5) in vec3 a_Tangent;
+
+#include "../include/camera.glsl"
+
+uniform mat4 matModel;
+uniform mat4 matNormal;
+uniform mat4 boneMatrices[128];
+uniform mat4 u_LightSpaceMatrix;
+
+out vec3 fragPosition;
+out vec2 fragTexCoord;
+out vec4 fragColor;
+out vec3 fragNormal;
+out mat3 fragTBN;
+out vec4 fragPosLightSpace;
+
+void main()
+{
+    vec3 vPos = a_Position;
+    vec3 vNormal = a_Normal;
+    vec3 vTangent = a_Tangent;
+
+    float totalWeight = a_Weights.x + a_Weights.y + a_Weights.z + a_Weights.w;
+    mat4 skinMat;
+    if (totalWeight < 0.001)
+    {
+        skinMat = mat4(1.0);
+    }
+    else
+    {
+        skinMat = 
+            (a_Weights.x * boneMatrices[a_JointIDs.x] +
+             a_Weights.y * boneMatrices[a_JointIDs.y] +
+             a_Weights.z * boneMatrices[a_JointIDs.z] +
+             a_Weights.w * boneMatrices[a_JointIDs.w]) / totalWeight;
+    }
+    
+    vPos = (skinMat * vec4(vPos, 1.0)).xyz;
+    vNormal = (skinMat * vec4(vNormal, 0.0)).xyz;
+    vTangent = (skinMat * vec4(vTangent, 0.0)).xyz;
+    
+    fragPosition = vec3(matModel * vec4(vPos, 1.0));
+    fragTexCoord = a_TexCoord;
+    
+    fragColor = vec4(0.0, 0.0, 0.0, 0.0); 
+
+    vec3 N = normalize(vec3(matNormal * vec4(vNormal, 0.0)));
+    vec3 T;
+        
+    if (length(vTangent) < 0.01) 
+    {
+        vec3 up = abs(N.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(1.0, 0.0, 0.0);
+        T = normalize(cross(up, N));
+    } 
+    else 
+    {
+        T = normalize(vec3(matNormal * vec4(vTangent, 0.0)));
+    }
+    
+    T = normalize(T - dot(T, N) * N);
+    vec3 B = cross(N, T);
+    
+    fragNormal = N;
+    fragTBN = mat3(T, B, N);
+
+    fragPosLightSpace = u_LightSpaceMatrix * vec4(fragPosition, 1.0);
+
+    gl_Position = u_ViewProjection * matModel * vec4(vPos, 1.0);
+}
diff --git a/resources/shaders/materials/sprite.chshader b/resources/shaders/materials/sprite.chshader
new file mode 100644
index 000000000..663bd86b9
--- /dev/null
+++ b/resources/shaders/materials/sprite.chshader
@@ -0,0 +1,16 @@
+# Sprite Shader
+VertexShader: "lighting.vert"
+FragmentShader: "sprite.frag"
+
+Uniforms:
+  - mvp
+  - matModel
+  - texture0
+  - u_Tint
+  - u_Flip
+  - fogEnabled
+  - fogColor
+  - fogDensity
+  - fogStart
+  - fogEnd
+  - uTime
diff --git a/resources/shaders/materials/sprite.frag b/resources/shaders/materials/sprite.frag
new file mode 100644
index 000000000..f13dae551
--- /dev/null
+++ b/resources/shaders/materials/sprite.frag
@@ -0,0 +1,29 @@
+#version 430 core
+
+#include "../include/lighting.glsl"
+#include "../include/fog.glsl"
+
+in vec3 fragPosition;
+in vec2 fragTexCoord;
+in vec4 fragColor;
+
+uniform sampler2D texture0;
+uniform vec4 u_Tint;
+uniform vec2 u_Flip; // x = flipX, y = flipY (1.0 = flip, 0.0 = normal)
+
+out vec4 finalColor;
+
+void main()
+{
+    vec2 uv = fragTexCoord;
+    if (u_Flip.x > 0.5) uv.x = 1.0 - uv.x;
+    if (u_Flip.y > 0.5) uv.y = 1.0 - uv.y;
+
+    vec4 texColor = texture(texture0, uv);
+    vec4 result = texColor * fragColor * u_Tint;
+
+    if (result.a < 0.01)
+        discard;
+
+    finalColor = ApplyFog(result, fragPosition, viewPos, uTime);
+}
diff --git a/resources/shaders/unlit.chshader b/resources/shaders/materials/unlit.chshader
similarity index 82%
rename from resources/shaders/unlit.chshader
rename to resources/shaders/materials/unlit.chshader
index 65e5b4974..c94522c5f 100644
--- a/resources/shaders/unlit.chshader
+++ b/resources/shaders/materials/unlit.chshader
@@ -1,6 +1,6 @@
 # KISS Unlit Shader
-VertexShader: lighting.vs
-FragmentShader: unlit.fs
+VertexShader: "lighting.vert"
+FragmentShader: "unlit.frag"
 
 Uniforms:
   - mvp
diff --git a/resources/shaders/materials/unlit.frag b/resources/shaders/materials/unlit.frag
new file mode 100644
index 000000000..9edd7db02
--- /dev/null
+++ b/resources/shaders/materials/unlit.frag
@@ -0,0 +1,29 @@
+#version 430 core
+
+#include "../include/surface.glsl"
+#include "../include/fog.glsl"
+
+in vec3 fragPosition;
+in vec2 fragTexCoord;
+in vec4 fragColor;
+
+out vec4 finalColor;
+
+void main()
+{
+    vec4 baseColor = colDiffuse * fragColor;
+    if (useTexture == 1)
+    {
+        baseColor *= texture(texture0, fragTexCoord);
+    }
+    
+    vec3 emissiveComp = colEmissive.rgb;
+    if (useEmissiveTexture == 1)
+    {
+        emissiveComp *= texture(texture1, fragTexCoord).rgb;
+    }
+    emissiveComp *= emissiveIntensity;
+
+    vec4 result = vec4(baseColor.rgb + emissiveComp, baseColor.a);
+    finalColor = ApplyFog(result, fragPosition, viewPos, uTime);
+}
diff --git a/resources/shaders/panorama.chshader b/resources/shaders/panorama.chshader
deleted file mode 100644
index 330388ab7..000000000
--- a/resources/shaders/panorama.chshader
+++ /dev/null
@@ -1,11 +0,0 @@
-# Panorama Shader Metadata
-VertexShader: "resources/shaders/skybox.vs"
-FragmentShader: "resources/shaders/skybox_panorama.fs"
-
-Uniforms:
-  - u_Projection
-  - u_View
-  - u_Panorama
-  - u_Exposure
-  - u_Brightness
-  - u_Contrast
diff --git a/resources/shaders/player_effect.fs b/resources/shaders/player_effect.fs
deleted file mode 100644
index de2a1dc05..000000000
--- a/resources/shaders/player_effect.fs
+++ /dev/null
@@ -1,40 +0,0 @@
-#version 450 core
-
-// Input fragment attributes (from vertex shader)
-layout(location = 0) in vec2 fragTexCoord;
-layout(location = 1) in vec3 fragNormal;
-layout(location = 2) in vec3 fragPosition;
-layout(location = 3) in vec4 fragColor;
-layout(location = 4) in float windIntensity;
-
-// Input uniform values
-uniform sampler2D texture0;
-uniform vec4 colDiffuse;
-
-// Output fragment color
-out vec4 finalColor;
-
-void main()
-{
-    // Get color from model texture
-    vec4 texelColor = texture(texture0, fragTexCoord);
-    
-    // Base color
-    vec4 baseColor = texelColor * colDiffuse * fragColor;
-    
-    // Subtle visual wind effect - light clothing illumination
-    if (windIntensity > 0.01)
-    {
-        // Light illumination effect from movement (clothing reflects light differently under wind)
-        // Use normal to calculate wind direction
-        vec3 lightDir = normalize(vec3(1.0, -0.5, 0.5)); // Light direction
-        float windLight = max(0.0, dot(fragNormal, lightDir));
-        
-        // Light highlight on parts moving under wind
-        float windHighlight = windIntensity * windLight * 0.15;
-        baseColor.rgb += windHighlight * vec3(0.1, 0.1, 0.15); // Light blue tint
-    }
-    
-    finalColor = baseColor;
-}
-
diff --git a/resources/shaders/player_effect.vs b/resources/shaders/player_effect.vs
deleted file mode 100644
index 9ec81422f..000000000
--- a/resources/shaders/player_effect.vs
+++ /dev/null
@@ -1,84 +0,0 @@
-#version 450 core
-
-// Input vertex attributes
-layout(location = 0) in vec3 vertexPosition;
-layout(location = 1) in vec2 vertexTexCoord;
-layout(location = 2) in vec3 vertexNormal;
-layout(location = 3) in vec4 vertexColor;
-
-// Input uniform values
-layout(location = 0) uniform mat4 mvp;
-layout(location = 1) uniform mat4 matModel;
-layout(location = 2) uniform mat4 matView;
-layout(location = 3) uniform mat4 matProjection;
-
-// Wind effect parameters
-uniform float fallSpeed;      // Fall speed (0-60, negative velocity.y)
-uniform float time;            // Time for animation
-uniform vec3 windDirection;   // Wind direction (e.g., vec3(1.0, 0.0, 0.5))
-
-// Output vertex attributes (to fragment shader)
-layout(location = 0) out vec2 fragTexCoord;
-layout(location = 1) out vec3 fragNormal;
-layout(location = 2) out vec3 fragPosition;
-layout(location = 3) out vec4 fragColor;
-layout(location = 4) out float windIntensity;      // Pass wind intensity to fragment shader
-
-void main()
-{
-    vec3 pos = vertexPosition;
-    vec3 normal = vertexNormal;
-    
-    // Apply wind effect only when player is falling
-    if (fallSpeed > 0.5)  // Slightly higher threshold for activation
-    {
-        // Normalize fall speed (0-1)
-        float fallStrength = clamp(fallSpeed / 40.0, 0.0, 1.0);
-        
-        // Wind intensity - subtle effect, no stretching
-        // Use square for smoother increase
-        float windStrength = fallStrength * fallStrength * 0.15; // Soft, natural effect
-        
-        // Vertex height relative to model center
-        // Effect is stronger on upper parts (hood, hair, clothing)
-        float heightFactor = max(0.0, vertexPosition.y);
-        // Normalize height (assuming model height is about 2 units)
-        heightFactor = smoothstep(0.0, 1.5, heightFactor); // Smooth transition function
-        heightFactor = pow(heightFactor, 0.8); // Enhance effect on upper parts
-        
-        // Smooth wind animation - light oscillation (like natural wind gust)
-        float windWave = sin(time * 3.0 + vertexPosition.x * 0.5 + vertexPosition.z * 0.3);
-        float windWave2 = cos(time * 2.5 + vertexPosition.z * 0.4 - vertexPosition.x * 0.3);
-        
-        // Combine waves for natural movement
-        float combinedWave = (windWave * 0.6 + windWave2 * 0.4);
-        
-        // Light vertex position offset (horizontal only, no stretching)
-        // Effect is proportional to height - upper parts move more
-        vec3 windOffset = windDirection * combinedWave * windStrength * heightFactor;
-        
-        // Minimal horizontal offset - only light movement (like clothing sway)
-        pos.x += windOffset.x;
-        pos.z += windOffset.z;
-        
-        // Light normal bending for better lighting under wind
-        // This creates light reflection effect from clothing under wind
-        normal = normalize(normal + windOffset * 0.3);
-        
-        // Pass wind intensity to fragment shader for visual effects
-        windIntensity = windStrength * heightFactor;
-    }
-    else
-    {
-        windIntensity = 0.0;
-    }
-    
-    // Transform position to world coordinates
-    fragPosition = vec3(matModel * vec4(pos, 1.0));
-    fragTexCoord = vertexTexCoord;
-    fragColor = vertexColor;
-    fragNormal = normalize(mat3(matModel) * normal);
-    
-    // Final screen position
-    gl_Position = matProjection * matView * vec4(fragPosition, 1.0);
-}
diff --git a/resources/shaders/post_process.chshader b/resources/shaders/post_process.chshader
deleted file mode 100644
index fcabe44f5..000000000
--- a/resources/shaders/post_process.chshader
+++ /dev/null
@@ -1,17 +0,0 @@
-# Post-Process Shader Metadata
-VertexShader: "post_process.vs"
-FragmentShader: "post_process.fs"
-
-Uniforms:
-  - texture0
-  - texture1
-  - matInverseViewProj
-  - viewPos
-  - uTime
-  - uExposure
-  - uGamma
-  - fogEnabled
-  - fogColor
-  - fogDensity
-  - fogStart
-  - fogEnd
diff --git a/resources/shaders/post_process.fs b/resources/shaders/post_process.fs
deleted file mode 100644
index 93193e30a..000000000
--- a/resources/shaders/post_process.fs
+++ /dev/null
@@ -1,63 +0,0 @@
-#version 430 core
-
-
-
-in vec2 fragTexCoord;
-out vec4 finalColor;
-
-uniform sampler2D texture0; // Color buffer
-uniform sampler2D texture1; // Depth buffer
-
-uniform mat4 matInverseViewProj;
-uniform vec3 viewPos;
-uniform float uTime;
-
-uniform float uExposure;
-uniform float uGamma;
-
-// Helper for dithering (removes banding)
-float InterleavedGradientNoise(vec2 uv)
-{
-    vec3 magic = vec3(0.06711056, 0.00583715, 52.9829189);
-    return fract(magic.z * fract(dot(uv, magic.xy)));
-}
-
-void main()
-{
-    vec4 color = texture(texture0, fragTexCoord);
-    float depth = texture(texture1, fragTexCoord).r;
-
-    // 1. Reconstruct World Position from depth
-    // map [0,1] depth to [-1,1] NDC
-    float z = depth * 2.0 - 1.0;
-    vec4 clipPos = vec4(fragTexCoord * 2.0 - 1.0, z, 1.0);
-    vec4 worldPos = matInverseViewProj * clipPos;
-    worldPos /= worldPos.w;
-
-    // 2. Fog is handled in forward passes (lighting.fs, skybox.fs, etc.)
-    // color = ApplyFog(color, worldPos.xyz, viewPos, uTime);
-
-    // 3. Tonemapping (ACES Filmic)
-    float exposure = (uExposure > 0.0) ? uExposure : 1.0;
-    vec3 outColor = color.rgb * exposure;
-    
-    // ACES Filmic Tone Mapping
-    float a = 2.51;
-    float b = 0.03;
-    float c = 2.43;
-    float d = 0.59;
-    float e = 0.14;
-    outColor = clamp((outColor * (a * outColor + b)) / (outColor * (c * outColor + d) + e), 0.0, 1.0);
-    
-    // 4. Dithering (Crucial for smooth skies/gradients)
-    // We add a tiny amount of noise to hide bit-depth transitions (Banding)
-    // Using floor(gl_FragCoord.xy) for consistent noise per-pixel
-    float dither = InterleavedGradientNoise(floor(gl_FragCoord.xy));
-    outColor += (dither - 0.5) / 255.0;
-
-    // 5. Gamma Correction
-    float gamma = (uGamma > 0.0) ? uGamma : 2.2;
-    outColor = pow(outColor, vec3(1.0 / gamma));
-
-    finalColor = vec4(outColor, color.a);
-}
diff --git a/resources/shaders/postfx/post_process.chshader b/resources/shaders/postfx/post_process.chshader
new file mode 100644
index 000000000..8511743d6
--- /dev/null
+++ b/resources/shaders/postfx/post_process.chshader
@@ -0,0 +1,17 @@
+# Post-Process Shader Metadata
+VertexShader: "post_process.vert"
+FragmentShader: "post_process.frag"
+
+Uniforms:
+  - texture0
+  - texture1
+  - matInverseViewProj
+  - viewPos
+  - uTime
+  - uExposure
+  - uGamma
+  - fogEnabled
+  - fogColor
+  - fogDensity
+  - fogStart
+  - fogEnd
diff --git a/resources/shaders/postfx/post_process.frag b/resources/shaders/postfx/post_process.frag
new file mode 100644
index 000000000..b4dcf33e1
--- /dev/null
+++ b/resources/shaders/postfx/post_process.frag
@@ -0,0 +1,54 @@
+#version 430 core
+
+in vec2 fragTexCoord;
+out vec4 finalColor;
+
+uniform sampler2D texture0; // Color buffer
+uniform sampler2D texture1; // Depth buffer
+
+uniform mat4 matInverseViewProj;
+uniform vec3 viewPos;
+uniform float uTime;
+
+uniform float uExposure;
+uniform float uGamma;
+
+// Helper for dithering (removes banding)
+float InterleavedGradientNoise(vec2 uv)
+{
+    vec3 magic = vec3(0.06711056, 0.00583715, 52.9829189);
+    return fract(magic.z * fract(dot(uv, magic.xy)));
+}
+
+void main()
+{
+    vec4 color = texture(texture0, fragTexCoord);
+    float depth = texture(texture1, fragTexCoord).r;
+
+    // 1. Reconstruct World Position from depth
+    float z = depth * 2.0 - 1.0;
+    vec4 clipPos = vec4(fragTexCoord * 2.0 - 1.0, z, 1.0);
+    vec4 worldPos = matInverseViewProj * clipPos;
+    worldPos /= worldPos.w;
+
+    // 2. Tonemapping (ACES Filmic)
+    float exposure = (uExposure > 0.0) ? uExposure : 1.0;
+    vec3 outColor = color.rgb * exposure;
+    
+    float a = 2.51;
+    float b = 0.03;
+    float c = 2.43;
+    float d = 0.59;
+    float e = 0.14;
+    outColor = clamp((outColor * (a * outColor + b)) / (outColor * (c * outColor + d) + e), 0.0, 1.0);
+    
+    // 3. Dithering (smooth gradients)
+    float dither = InterleavedGradientNoise(floor(gl_FragCoord.xy));
+    outColor += (dither - 0.5) / 255.0;
+
+    // 4. Gamma Correction
+    float gamma = (uGamma > 0.0) ? uGamma : 2.2;
+    outColor = pow(outColor, vec3(1.0 / gamma));
+
+    finalColor = vec4(outColor, color.a);
+}
diff --git a/resources/shaders/post_process.vs b/resources/shaders/postfx/post_process.vert
similarity index 100%
rename from resources/shaders/post_process.vs
rename to resources/shaders/postfx/post_process.vert
diff --git a/resources/shaders/skybox.fs b/resources/shaders/skybox.fs
deleted file mode 100644
index 808559106..000000000
--- a/resources/shaders/skybox.fs
+++ /dev/null
@@ -1,62 +0,0 @@
-#version 450 core
-#include "include/color_space.glsl"
-
-in vec3 v_Position;
-
-layout(binding = 0) uniform sampler2D u_Panorama;
-
-uniform int u_IsHDR;
-uniform float u_Exposure;
-uniform float u_Brightness;
-uniform float u_Contrast;
-uniform int u_VFlipped;
-uniform vec3 u_SunDir;
-uniform int u_SunEnabled;
-uniform float u_SunIntensity;
-
-// Fog uniforms
-uniform int fogEnabled;
-uniform vec4 fogColor;
-uniform float fogDensity;
-
-layout(location = 0) out vec4 finalColor;
-
-vec2 SampleSpherical(vec3 dir)
-{
-    const vec2 invAtan = vec2(0.1591, 0.3183);
-    vec2 uv = vec2(atan(dir.z, dir.x), asin(dir.y));
-    uv *= invAtan;
-    return uv + 0.5;
-}
-
-void main()
-{
-    vec3 direction = normalize(v_Position);
-    vec2 uv = SampleSpherical(direction);
-    if (u_VFlipped == 1) uv.y = 1.0 - uv.y;
-
-    // Sample the panorama
-    vec3 color = texture(u_Panorama, uv).rgb;
-
-    // Convert to Linear if LDR (PNG/JPG)
-    if (u_IsHDR == 0) color = pow(color, vec3(2.2));
-
-    // 1. Exposure & Color Correction
-    color *= u_Exposure;
-    color = color + u_Brightness;
-    color = (color - 0.5) * u_Contrast + 0.5;
-    
-    // Output straight to HDR buffer (tonemapping is in post-process)
-    vec4 background = vec4(max(color, vec3(0.0)), 1.0);
-
-    if (fogEnabled == 1) {
-        float verticalFactor = clamp(1.0 - (direction.y + 0.05) * 10.0, 0.0, 1.0);
-        float fogFactor = pow(verticalFactor, 2.0); 
-        float horizonHaze = pow(1.0 - abs(direction.y), 5.0) * 0.5;
-        fogFactor = max(fogFactor, horizonHaze);
-        fogFactor = clamp(fogFactor * clamp(fogDensity * 5.0, 0.0, 1.0), 0.0, 1.0);
-        finalColor = mix(background, fogColor, fogFactor);
-    } else {
-        finalColor = background;
-    }
-}
diff --git a/resources/shaders/skybox.vs b/resources/shaders/skybox.vs
deleted file mode 100644
index d6d323842..000000000
--- a/resources/shaders/skybox.vs
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 450 core
-
-layout(location = 0) in vec3 a_Position;
-
-out vec3 v_Position;
-
-uniform mat4 u_View;
-uniform mat4 u_Projection;
-
-void main()
-{
-    v_Position = a_Position;
-    // Position is already normalized since it's a unit sphere/cube
-    gl_Position = u_Projection * u_View * vec4(a_Position, 1.0);
-    gl_Position = gl_Position.xyww;
-}
diff --git a/resources/shaders/skybox_cross.chshader b/resources/shaders/skybox_cross.chshader
deleted file mode 100644
index e090920d6..000000000
--- a/resources/shaders/skybox_cross.chshader
+++ /dev/null
@@ -1,16 +0,0 @@
-# Skybox Cross Shader Metadata
-VertexShader: "skybox_cubemap.vs"
-FragmentShader: "skybox_cross.fs"
-
-Uniforms:
-  - u_Projection
-  - u_View
-  - u_CrossMap
-  - u_IsHDR
-  - u_Exposure
-  - u_Brightness
-  - u_Contrast
-  - u_VFlipped
-  - fogEnabled
-  - fogColor
-  - fogDensity
diff --git a/resources/shaders/skybox_cross.fs b/resources/shaders/skybox_cross.fs
deleted file mode 100644
index 6c6e4c52a..000000000
--- a/resources/shaders/skybox_cross.fs
+++ /dev/null
@@ -1,96 +0,0 @@
-#version 450 core
-
-#include "include/color_space.glsl"
-
-in vec3 v_Position;
-
-layout(binding = 0) uniform sampler2D u_CrossMap;
-
-uniform int u_IsHDR;
-uniform float u_Exposure;
-uniform float u_Brightness;
-uniform float u_Contrast;
-
-uniform int fogEnabled;
-uniform vec4 fogColor;
-uniform float fogDensity;
-
-layout(location = 0) out vec4 finalColor;
-
-vec2 DirectionToHorizontalCrossUV(vec3 direction)
-{
-    vec3 ad = abs(direction);
-    vec2 faceUV;
-    vec2 atlasCell;
-
-    if (ad.x >= ad.y && ad.x >= ad.z)
-    {
-        if (direction.x > 0.0)
-        {
-            faceUV = vec2(-direction.z, -direction.y) / ad.x;
-            atlasCell = vec2(2.0, 1.0);
-        }
-        else
-        {
-            faceUV = vec2(direction.z, -direction.y) / ad.x;
-            atlasCell = vec2(0.0, 1.0);
-        }
-    }
-    else if (ad.y >= ad.x && ad.y >= ad.z)
-    {
-        if (direction.y > 0.0)
-        {
-            faceUV = vec2(direction.x, direction.z) / ad.y;
-            atlasCell = vec2(1.0, 0.0);
-        }
-        else
-        {
-            faceUV = vec2(direction.x, -direction.z) / ad.y;
-            atlasCell = vec2(1.0, 2.0);
-        }
-    }
-    else
-    {
-        if (direction.z > 0.0)
-        {
-            faceUV = vec2(direction.x, -direction.y) / ad.z;
-            atlasCell = vec2(1.0, 1.0);
-        }
-        else
-        {
-            faceUV = vec2(-direction.x, -direction.y) / ad.z;
-            atlasCell = vec2(3.0, 1.0);
-        }
-    }
-
-    faceUV = faceUV * 0.5 + 0.5;
-    return (atlasCell + faceUV) / vec2(4.0, 3.0);
-}
-
-void main()
-{
-    vec3 direction = normalize(v_Position);
-    vec2 uv = DirectionToHorizontalCrossUV(direction);
-    vec3 color = texture(u_CrossMap, uv).rgb;
-
-    // Convert to linear if source is LDR.
-    if (u_IsHDR == 0) color = ToLinear(color);
-
-    color *= u_Exposure;
-    color += u_Brightness;
-    color = (color - 0.5) * u_Contrast + 0.5;
-
-    vec4 background = vec4(max(color, vec3(0.0)), 1.0);
-
-    if (fogEnabled == 1)
-    {
-        float horizonEffect = 1.0 - abs(direction.y);
-        horizonEffect = pow(horizonEffect, 3.0);
-        float fogFactor = clamp(horizonEffect * clamp(fogDensity * 10.0, 0.0, 1.0), 0.0, 1.0);
-        finalColor = mix(background, fogColor, fogFactor);
-    }
-    else
-    {
-        finalColor = background;
-    }
-}
diff --git a/resources/shaders/skybox_cubemap.chshader b/resources/shaders/skybox_cubemap.chshader
deleted file mode 100644
index 605dd86ed..000000000
--- a/resources/shaders/skybox_cubemap.chshader
+++ /dev/null
@@ -1,16 +0,0 @@
-# Skybox Cubemap Shader Metadata
-VertexShader: "skybox_cubemap.vs"
-FragmentShader: "skybox_cubemap.fs"
-
-Uniforms:
-  - u_Projection
-  - u_View
-  - u_Cubemap
-  - u_Exposure
-  - u_Brightness
-  - u_Contrast
-  - u_IsHDR
-  - u_Time
-  - fogEnabled
-  - fogColor
-  - fogDensity
diff --git a/resources/shaders/skybox_cubemap.fs b/resources/shaders/skybox_cubemap.fs
deleted file mode 100644
index eb0a8ace0..000000000
--- a/resources/shaders/skybox_cubemap.fs
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 450 core
-#include "include/color_space.glsl"
-
-in vec3 v_Position;
-
-uniform samplerCube u_Cubemap;
-
-uniform int u_IsHDR;
-uniform float u_Exposure;
-uniform float u_Brightness;
-uniform float u_Contrast;
-
-// Fog uniforms
-uniform int fogEnabled;
-uniform vec4 fogColor;
-uniform float fogDensity;
-
-layout(location = 0) out vec4 finalColor;
-
-void main()
-{
-    vec3 direction = normalize(v_Position);
-    
-    // Sample the environment cubemap
-    vec3 color = texture(u_Cubemap, direction).rgb;
-
-    // 1. Convert to Linear if LDR
-    if (u_IsHDR == 0) color = pow(color, vec3(2.2));
-
-    // 2. Exposure & Color Correction
-    color *= u_Exposure;
-    color = color + u_Brightness;
-    color = (color - 0.5) * u_Contrast + 0.5;
-
-    // Output straight to HDR buffer (tonemapping is in post-process)
-    vec4 background = vec4(max(color, vec3(0.0)), 1.0);
-
-    // 4. Unified Horizon & Ground Fog
-    if (fogEnabled == 1) {
-        float verticalFactor = clamp(1.0 - (direction.y + 0.05) * 10.0, 0.0, 1.0);
-        float fogFactor = pow(verticalFactor, 2.0); 
-        float horizonHaze = pow(1.0 - abs(direction.y), 5.0) * 0.5;
-        fogFactor = max(fogFactor, horizonHaze);
-        fogFactor = clamp(fogFactor * clamp(fogDensity * 5.0, 0.0, 1.0), 0.0, 1.0);
-        finalColor = mix(background, fogColor, fogFactor);
-    } else {
-        finalColor = background;
-    }
-}
diff --git a/resources/shaders/skybox_cubemap.vs b/resources/shaders/skybox_cubemap.vs
deleted file mode 100644
index 004860eea..000000000
--- a/resources/shaders/skybox_cubemap.vs
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 450 core
-
-layout (location = 0) in vec3 a_Position;
-
-out vec3 v_Position;
-
-uniform mat4 u_Projection;
-uniform mat4 u_View;
-
-void main()
-{
-    v_Position = a_Position;
-    // u_View already has translation removed in DrawSkybox
-    gl_Position = u_Projection * u_View * vec4(a_Position, 1.0);
-    gl_Position = gl_Position.xyww;
-}
diff --git a/resources/shaders/skybox_panorama.fs b/resources/shaders/skybox_panorama.fs
deleted file mode 100644
index e3b614de8..000000000
--- a/resources/shaders/skybox_panorama.fs
+++ /dev/null
@@ -1,103 +0,0 @@
-#version 450 core
-
-// Input vertex attributes (from vertex shader)
-layout(location = 0) in vec3 fragPosition;
-
-// Input uniform values
-layout(binding = 0) uniform sampler2D environmentMap;
-uniform int doGamma;
-uniform float fragGamma;
-uniform float exposure;
-uniform float brightness;
-uniform float contrast;
-uniform float uTime;
-uniform int isHDR;
-
-// Fog data
-uniform int fogEnabled;
-uniform vec4 fogColor;
-uniform float fogDensity;
-uniform float fogStart;
-uniform float fogEnd;
-
-// Output fragment color
-layout(location = 0) out vec4 finalColor;
-
-// Tone mapping (ACES)
-vec3 ACES(vec3 x)
-{
-    return clamp(
-        (x * (2.51 * x + 0.03)) /
-        (x * (2.43 * x + 0.59) + 0.14),
-        0.0, 1.0
-    );
-}
-
-float hash(vec3 p) {
-    p = fract(p * 0.3183099 + 0.1);
-    p *= 17.0;
-    return fract(p.x * p.y * p.z * (p.x + p.y + p.z));
-}
-
-float noise(vec3 x) {
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-    f = f * f * (3.0 - 2.0 * f);
-    return mix(mix(mix(hash(p + vec3(0, 0, 0)), hash(p + vec3(1, 0, 0)), f.x),
-                   mix(hash(p + vec3(0, 1, 0)), hash(p + vec3(1, 1, 0)), f.x), f.y),
-               mix(mix(hash(p + vec3(0, 0, 1)), hash(p + vec3(1, 0, 1)), f.x),
-                   mix(hash(p + vec3(0, 1, 1)), hash(p + vec3(1, 1, 1)), f.x), f.y), f.z);
-}
-
-#define PI 3.14159265358979323846
-
-void main()
-{
-    vec3 v = normalize(fragPosition);
-    
-    // Convert Cartesian direction to equirectangular UVs
-    vec2 uv = vec2(atan(v.z, v.x) / (2.0 * PI) + 0.5, asin(v.y) / PI + 0.5);
-    
-    // Fetch color from texture map
-    vec3 color = texture(environmentMap, uv).rgb;
-
-    // Apply exposure
-    color *= exposure;
-
-    // Apply brightness
-    color += brightness;
-
-    // Apply contrast
-    color = (color - 0.5) * contrast + 0.5;
-
-    // HDR tone mapping
-    if (isHDR == 1)
-        color = ACES(color);
-
-    if (doGamma == 1) // Apply gamma correction
-    {
-        color = pow(color, vec3(1.0/fragGamma));
-    }
-
-    vec4 background = vec4(color, 1.0);
-
-    if (fogEnabled == 1)
-    {
-        // Horizon fog
-        float horizonEffect = 1.0 - abs(v.y);
-        horizonEffect = pow(horizonEffect, 3.0);
-        
-        // Volumetric noise
-        vec3 noiseDir = v * 2.5 + vec3(uTime * 0.04, uTime * 0.01, uTime * 0.03);
-        float n = noise(noiseDir);
-        
-        float fogFactor = clamp(horizonEffect + n * 0.4, 0.0, 1.0);
-        fogFactor = mix(fogFactor, 1.0, clamp(fogDensity * 10.0, 0.0, 1.0));
-        
-        finalColor = mix(background, fogColor, fogFactor);
-    }
-    else
-    {
-        finalColor = background;
-    }
-}
diff --git a/resources/shaders/unlit.fs b/resources/shaders/unlit.fs
deleted file mode 100644
index 36c8fc0e7..000000000
--- a/resources/shaders/unlit.fs
+++ /dev/null
@@ -1,24 +0,0 @@
-#version 430
-
-#include "include/lighting_common.glsl"
-#include "include/fog.glsl"
-
-in vec3 fragPosition;
-in vec2 fragTexCoord;
-in vec4 fragColor;
-in vec3 fragNormal;
-
-out vec4 finalColor;
-
-void main()
-{
-    vec4 baseColor = colDiffuse * fragColor;
-    if (useTexture == 1) baseColor *= texture(texture0, fragTexCoord);
-    
-    vec3 emissiveComp = colEmissive.rgb;
-    if (useEmissiveTexture == 1) emissiveComp *= texture(texture1, fragTexCoord).rgb;
-    emissiveComp *= emissiveIntensity;
-
-    vec4 result = vec4(baseColor.rgb + emissiveComp, baseColor.a);
-    finalColor = ApplyFog(result, fragPosition, viewPos, uTime);
-}
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
deleted file mode 100644
index 7fc2b0b93..000000000
--- a/runtime/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-add_library(RuntimeCore STATIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/runtime_layer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/runtime_layer.cpp
-)
-
-target_link_libraries(RuntimeCore PUBLIC engine scripting)
-target_include_directories(RuntimeCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-# Set PCH for RuntimeCore
-target_precompile_headers(RuntimeCore PRIVATE 
-    <string>
-    <vector>
-    <memory>
-    <filesystem>
-    "../engine/core/application.h"
-)
-
-# Generic Runtime Executable
-add_executable(ChainedRuntime
-    runtime_generic_entry.cpp
-)
-
-target_link_libraries(ChainedRuntime PRIVATE
-    RuntimeCore
-    engine
-    scripting
-    imguilib
-)
-
-# Use centralized engine resources
-chained_add_engine_resources_copy()
-add_dependencies(ChainedRuntime EngineResources)
-
-apply_engine_optimizations(ChainedRuntime)
-
-install(TARGETS ChainedRuntime
-    RUNTIME DESTINATION bin COMPONENT Runtime
-)
diff --git a/runtime/runtime_generic_entry.cpp b/runtime/runtime_generic_entry.cpp
deleted file mode 100644
index 862682ac0..000000000
--- a/runtime/runtime_generic_entry.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "engine/core/application.h"
-#include "engine/core/entry_point.h"
-#include "engine/core/project_launcher.h"
-#include "runtime/runtime_layer.h"
-#include "scripting/scriptengine.h"
-#include <filesystem>
-
-namespace CHEngine
-{
-Application* CreateApplication(ApplicationCommandLineArgs args)
-{
-    auto details = ProjectLauncher::PrepareRuntime(args);
-    
-    details.Spec.InitScripting = []() { ScriptEngine::Init(); };
-    details.Spec.ShutdownScripting = []() { ScriptEngine::Shutdown(); };
-
-    // Create the application with orchestrated settings.
-    auto app = new Application(details.Spec);
-    
-    // The runtime layer will handle the higher-level project logic.
-    app->PushLayer(new RuntimeLayer(details.ProjectPath.string()));
-    
-    return app;
-}
-} // namespace CHEngine
diff --git a/runtime/runtime_layer.cpp b/runtime/runtime_layer.cpp
deleted file mode 100644
index 3cf03c01b..000000000
--- a/runtime/runtime_layer.cpp
+++ /dev/null
@@ -1,940 +0,0 @@
-//========= Copyright Chained Decos, All rights reserved. ============//
-//
-// Purpose: Primary gameplay runtime layer.
-//          Handles scene management, game loop, and script execution.
-//
-//=============================================================================//
-
-#include "runtime_layer.h"
-#include "engine/core/application.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/core/imgui_layer.h"
-#include "engine/core/window.h"
-#include "engine/graphics/pipeline/renderer.h"
-#include "engine/graphics/pipeline/scene_renderer.h"
-#include "engine/graphics/pipeline/ui_renderer.h"
-#include "engine/scene/components.h"
-#include "engine/scene/project.h"
-#include "engine/scene/scene_events.h"
-#include "engine/scene/scene_serializer.h"
-#include "imgui.h"
-#include "scripting/scene_scripting.h"
-#include "scripting/scriptengine.h"
-#include <algorithm>
-#include <array>
-#include <cctype>
-#include <cmath>
-#include <filesystem>
-#include <unordered_set>
-
-namespace
-{
-std::string TrimCopy(const std::string& value)
-{
-    auto begin = std::find_if_not(value.begin(), value.end(), [](unsigned char ch) { return std::isspace(ch) != 0; });
-    auto end =
-        std::find_if_not(value.rbegin(), value.rend(), [](unsigned char ch) { return std::isspace(ch) != 0; }).base();
-
-    if (begin >= end)
-    {
-        return {};
-    }
-
-    return std::string(begin, end);
-}
-
-void AppendTextStyleFontRequest(const CHEngine::TextStyle& style, std::vector<std::pair<std::string, float>>& out,
-                                std::unordered_set<std::string>& dedupe)
-{
-    std::string fontName = TrimCopy(style.FontName);
-    if (fontName.empty() || fontName == "Default")
-    {
-        return;
-    }
-
-    std::replace(fontName.begin(), fontName.end(), '\\', '/');
-    if (fontName.rfind("assets/", 0) == 0)
-    {
-        fontName = fontName.substr(7);
-    }
-
-    const float fontSize = (style.FontSize > 0.0f) ? style.FontSize : 16.0f;
-    const int roundedHalf = static_cast<int>(std::lround(fontSize * 2.0f));
-    const std::string key = fontName + "|" + std::to_string(roundedHalf);
-
-    if (!dedupe.insert(key).second)
-    {
-        return;
-    }
-
-    out.emplace_back(fontName, fontSize);
-}
-
-bool ExistsNoThrow(const std::filesystem::path& path)
-{
-    std::error_code ec;
-    return std::filesystem::exists(path, ec) && !ec;
-}
-} // namespace
-
-namespace CHEngine
-{
-RuntimeLayer::RuntimeLayer(const std::string& projectPath)
-    : Layer("RuntimeLayer"),
-      m_ProjectPath(projectPath)
-{
-    m_SceneRenderer = std::make_unique<SceneRenderer>();
-}
-
-RuntimeLayer::~RuntimeLayer()
-{
-}
-
-void RuntimeLayer::OnAttach()
-{
-    if (auto* imguiLayer = Application::Get().GetImGuiLayer())
-    {
-        ImGui::SetCurrentContext(imguiLayer->GetContext());
-    }
-
-    ImGuiIO& io = ImGui::GetIO();
-    io.FontDefault = io.Fonts->AddFontDefault();
-    CH_CORE_INFO("RuntimeLayer: Using built-in ImGui default font.");
-
-    InitProject(m_ProjectPath);
-
-    if (ImFont* projectDefaultFont = UIRenderer::Get().GetFontRegistry().EnsureDefaultProjectFont(18.0f, false))
-    {
-        io.FontDefault = projectDefaultFont;
-        CH_CORE_INFO("RuntimeLayer: Switched default UI font to project font.");
-    }
-
-    // Materialize atlas data so default and preloaded scene fonts are available from frame 1.
-    unsigned char* pixels = nullptr;
-    int width = 0;
-    int height = 0;
-    io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
-
-    // Ensure camera aspect ratio is correct on startup
-    if (m_Scene)
-    {
-        Window& window = Application::Get().GetWindow();
-        m_Scene->OnViewportResize(window.GetWidth(), window.GetHeight());
-        EnsureRuntimeFramebuffer((uint32_t)window.GetWidth(), (uint32_t)window.GetHeight());
-    }
-}
-
-void RuntimeLayer::OnDetach()
-{
-    StopCurrentScene();
-
-    m_Scene = nullptr;
-    ScriptEngine::Get().SetActiveScene(nullptr);
-    m_RuntimeStarted = false;
-    m_IsSceneLoading = false;
-    m_LoadingOverlayElapsed = 0.0f;
-}
-
-void RuntimeLayer::OnUpdate(Timestep ts)
-{
-    // Boost uploads during loading
-    auto& scriptEngine = ScriptEngine::Get();
-
-    // The scene transition and script logic will consume button states after this point.
-    // UIRenderer::DrawCanvas will handle the per-frame reset during the render pass.
-
-    std::string pendingPath;
-    if (scriptEngine.TryConsumeRequestedScene(pendingPath))
-    {
-        LoadScene(pendingPath);
-        return;
-    }
-
-    if (m_Scene && m_RuntimeStarted && !m_IsSceneLoading)
-    {
-        auto& registry = m_Scene->GetRegistry();
-        auto transitionView = registry.view<ButtonControl, SceneTransitionComponent>();
-        for (entt::entity id : transitionView)
-        {
-            auto& button = transitionView.get<ButtonControl>(id);
-            auto& transition = transitionView.get<SceneTransitionComponent>(id);
-            if (!button.PressedThisFrame || !button.IsInteractable)
-            {
-                continue;
-            }
-
-            if (transition.TargetScenePath.empty())
-            {
-                continue;
-            }
-
-            CH_CORE_INFO("RuntimeLayer: UI scene transition '{}' -> '{}'", button.Label, transition.TargetScenePath);
-            LoadScene(transition.TargetScenePath);
-            return;
-        }
-    }
-
-    if (m_Scene && m_IsSceneLoading)
-    {
-        m_LoadingOverlayElapsed += (float)ts;
-
-        if (IsSceneReadyToStart() && m_LoadingOverlayElapsed >= m_LoadingOverlayMinDuration)
-        {
-            SceneScripting::OnRuntimeStart(m_Scene.get());
-            m_Scene->OnRuntimeStart();
-            m_RuntimeStarted = true;
-            m_IsSceneLoading = false;
-            CH_CORE_INFO("RuntimeLayer: Scene assets are ready, entering runtime.");
-        }
-    }
-
-    if (m_Scene && m_RuntimeStarted)
-    {
-        if (scriptEngine.CanExecuteFrameScripts())
-        {
-            SceneScripting::Update(m_Scene.get(), ts);
-        }
-        m_Scene->OnUpdateRuntime(ts);
-    }
-
-    if (m_IsBoostingUploads)
-    {
-        m_BoostUploadsTimer -= ts;
-        if (m_BoostUploadsTimer <= 0.0f)
-        {
-            m_IsBoostingUploads = false;
-            // Limit reset removed as per user request
-        }
-    }
-}
-
-void RuntimeLayer::OnRender(Timestep ts)
-{
-    Window& window = Application::Get().GetWindow();
-    uint32_t width = (uint32_t)window.GetWidth();
-    uint32_t height = (uint32_t)window.GetHeight();
-
-    if (!m_Scene)
-    {
-        Renderer::Get().Clear({0.0f, 0.0f, 0.0f, 1.0f});
-        return;
-    }
-
-    if (width == 0 || height == 0)
-    {
-        return;
-    }
-
-    EnsureRuntimeFramebuffer(width, height);
-
-    const auto& settings = m_Scene->GetSettings();
-    glm::vec4 bgColor = {
-        settings.BackgroundColor.r / 255.0f,
-        settings.BackgroundColor.g / 255.0f,
-        settings.BackgroundColor.b / 255.0f,
-        settings.BackgroundColor.a / 255.0f
-    };
-
-    if (settings.Environment && settings.Mode != BackgroundMode::Color)
-    {
-        auto& env = settings.Environment->GetSettings();
-        if (env.Fog.Enabled)
-        {
-            bgColor = glm::vec4(env.Fog.FogColor.r / 255.0f, env.Fog.FogColor.g / 255.0f, env.Fog.FogColor.b / 255.0f,
-                                env.Fog.FogColor.a / 255.0f);
-        }
-    }
-
-    auto camera = GetActiveCamera();
-    if (camera)
-    {
-        // CH_CORE_INFO("RuntimeLayer: Rendering scene with active camera at ({}, {}, {})", camera->Position.x,
-        //              camera->Position.y, camera->Position.z);
-        float nearClip = 0.01f;
-        float farClip = 1000.0f;
-
-        Entity primaryCam = m_Scene->GetPrimaryCameraEntity();
-        if (primaryCam && primaryCam.HasComponent<CameraComponent>())
-        {
-            auto& cameraComp = primaryCam.GetComponent<CameraComponent>().Camera;
-            nearClip = cameraComp.GetPerspectiveNearClip();
-            farClip = cameraComp.GetPerspectiveFarClip();
-        }
-
-        SceneRenderOptions options;
-        options.ShowEditorIcons = false;
-
-        m_HDRFramebuffer->Bind();
-        Renderer::Get().Clear(bgColor);
-        m_SceneRenderer->RenderScene(m_Scene.get(), camera.value(), nearClip, farClip, options);
-        m_HDRFramebuffer->Unbind();
-
-        Renderer::Get().SetViewport(0, 0, (int)width, (int)height);
-        Renderer::Get().ApplyPostProcessing(m_HDRFramebuffer->GetColorAttachmentRendererID(),
-                                            m_HDRFramebuffer->GetDepthAttachmentRendererID(), camera.value());
-    }
-    else
-    {
-        static bool s_WarnedNoCamera = false;
-        if (!s_WarnedNoCamera)
-        {
-            CH_CORE_WARN("RuntimeLayer: No active camera found in scene '{}'! Clearing to background color.",
-                         m_Scene ? m_Scene->GetSettings().ScenePath : "null");
-            s_WarnedNoCamera = true;
-        }
-        Renderer::Get().Clear(bgColor);
-    }
-}
-
-void RuntimeLayer::OnImGuiRender()
-{
-    if (m_Scene)
-    {
-        ImGuiViewport* viewport = ImGui::GetMainViewport();
-        ImGui::SetNextWindowPos(viewport->WorkPos);
-        ImGui::SetNextWindowSize(viewport->WorkSize);
-        ImGui::SetNextWindowViewport(viewport->ID);
-
-        ImGuiWindowFlags flags =
-            ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoBackground |
-            ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoScrollbar |
-            ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoDocking;
-
-        // Allow inputs for runtime UI
-        flags &= ~ImGuiWindowFlags_NoInputs;
-
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, {0, 0});
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-
-        if (ImGui::Begin("RuntimeUI", nullptr, flags))
-        {
-            if (m_RuntimeStarted)
-            {
-                ImGui::SetCursorPos({10, 10});
-                ImGui::TextColored({1, 1, 0, 1}, "DEBUG: STANDALONE UI IS ACTIVE");
-                ImVec2 childSize = ImGui::GetContentRegionAvail();
-                if (ImGui::BeginChild("##RuntimeUICanvas", childSize, false,
-                                      ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar |
-                                          ImGuiWindowFlags_NoScrollWithMouse))
-                {
-                    ImVec2 canvasPos = ImGui::GetCursorScreenPos();
-                    ImVec2 canvasSize = ImGui::GetContentRegionAvail();
-                    // CH_CORE_INFO("RuntimeLayer: Drawing UI canvas at ({}, {}) with size ({}, {})",
-                    //  canvasPos.x, canvasPos.y, canvasSize.x, canvasSize.y);
-                    UIRenderer::Get().DrawCanvas(m_Scene.get(), canvasPos, canvasSize, false);
-                    SceneScripting::RenderUI(m_Scene.get());
-                }
-                ImGui::EndChild();
-            }
-        }
-        ImGui::End();
-        ImGui::PopStyleVar(2);
-
-        if (m_IsSceneLoading)
-        {
-            DrawLoadingOverlay();
-        }
-    }
-}
-
-void RuntimeLayer::OnEvent(Event& e)
-{
-    if (m_Scene && m_RuntimeStarted)
-    {
-        SceneScripting::DispatchEvent(m_Scene.get(), e);
-    }
-
-    EventDispatcher dispatcher(e);
-    dispatcher.Dispatch<WindowResizeEvent>([this](auto& ev) {
-        if (ev.GetWidth() == 0 || ev.GetHeight() == 0)
-        {
-            return false;
-        }
-
-        EnsureRuntimeFramebuffer(ev.GetWidth(), ev.GetHeight());
-        if (m_Scene)
-        {
-            m_Scene->OnViewportResize(ev.GetWidth(), ev.GetHeight());
-        }
-        return false;
-    });
-
-    dispatcher.Dispatch<SceneChangeRequestEvent>([this](auto& ev) {
-        ScriptEngine::Get().RequestLoadScene(ev.GetPath());
-        return true;
-    });
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Load a new scene from file
-//-----------------------------------------------------------------------------
-void RuntimeLayer::LoadScene(const std::string& path)
-{
-    const std::string normalizedPath = NormalizeScenePath(path);
-    if (normalizedPath.empty())
-    {
-        CH_CORE_WARN("RuntimeLayer: Ignoring empty scene path request.");
-        return;
-    }
-
-    std::filesystem::path scenePath = normalizedPath;
-    if (scenePath.is_relative() && Project::GetActive())
-    {
-        scenePath = Project::GetAssetPath(scenePath);
-    }
-
-    if (!scenePath.is_absolute())
-    {
-        std::error_code ec;
-        scenePath = std::filesystem::absolute(scenePath, ec);
-        if (ec)
-        {
-            CH_CORE_ERROR("RuntimeLayer: Failed to resolve absolute scene path '{}' ({})", normalizedPath,
-                          ec.message());
-            return;
-        }
-    }
-
-    if (!ExistsNoThrow(scenePath))
-    {
-        CH_CORE_ERROR("RuntimeLayer: Scene file not found '{}'.", scenePath.string());
-        return;
-    }
-
-    if (!TransitionToScene(scenePath))
-    {
-        CH_CORE_ERROR("RuntimeLayer: Failed to transition to scene '{}'.", scenePath.string());
-    }
-}
-
-void RuntimeLayer::LoadScene(int index)
-{
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        return;
-    }
-
-    const auto& buildScenes = project->GetConfig().BuildScenes;
-    if (index >= 0 && index < (int)buildScenes.size())
-    {
-        std::filesystem::path fullPath = Project::GetAssetPath(buildScenes[index]);
-        LoadScene(fullPath.string());
-    }
-}
-
-bool RuntimeLayer::InitProject(const std::string& projectPath)
-{
-    if (!DiscoverAndLoadProject(projectPath))
-    {
-        return false;
-    }
-
-    auto project = Project::GetActive();
-
-    // Initialize Scripting for the loaded project
-    if (!ScriptEngine::Get().ReloadAssembly())
-    {
-        CH_CORE_WARN(
-            "RuntimeLayer: Script reload failed during project initialization. Runtime continues without scripts.");
-    }
-
-    // Discover project fonts once before any scene loads.
-    UIRenderer::Get().LoadProjectFonts();
-
-    ApplyWindowConfiguration();
-    SetupBrandingAndIcon();
-
-    auto& config = project->GetConfig();
-    // Note: FPS control handled by engine main loop via Application class
-
-    LoadInitialScene();
-
-    return true;
-}
-
-bool RuntimeLayer::DiscoverAndLoadProject(const std::string& projectPath)
-{
-    std::filesystem::path discoveryPath = projectPath;
-    if (discoveryPath.empty())
-    {
-        std::filesystem::path exePath = std::filesystem::absolute(
-            std::filesystem::path(Application::Get().GetSpecification().CommandLineArgs.Args[0]));
-        discoveryPath = exePath.parent_path();
-    }
-
-    m_ProjectPath = Project::Discover(discoveryPath, Application::Get().GetSpecification().Name).string();
-
-    if (m_ProjectPath.empty())
-    {
-        return false;
-    }
-
-    auto project = Project::Load(m_ProjectPath);
-    if (!project)
-    {
-        CH_CORE_ERROR("RuntimeLayer: Failed to load project file at '{}'", m_ProjectPath);
-        return false;
-    }
-
-    CH_CORE_INFO("RuntimeLayer: Project loaded: {}", project->GetConfig().Name);
-    CH_CORE_INFO("RuntimeLayer: Project Directory: {}", project->GetProjectDirectory().string());
-    CH_CORE_INFO("RuntimeLayer: Asset Directory: {}", Project::GetAssetDirectory().string());
-
-    // CRITICAL: Load engine shaders and resources immediately after project is resolved
-    Renderer::LoadEngineResources();
-
-    return true;
-}
-
-void RuntimeLayer::ApplyWindowConfiguration()
-{
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        return;
-    }
-
-    auto& config = project->GetConfig();
-    Window& window = Application::Get().GetWindow();
-
-    bool vsync = config.Window.VSync;
-    int width = config.Window.Width;
-    int height = config.Window.Height;
-    bool fullscreen = config.Runtime.Fullscreen;
-
-    const auto& args = Application::Get().GetSpecification().CommandLineArgs;
-    for (int i = 1; i < args.Count; ++i)
-    {
-        std::string arg = args.Args[i];
-        if (arg == "--width" && i + 1 < args.Count)
-        {
-            width = std::stoi(args.Args[++i]);
-        }
-        else if (arg == "--height" && i + 1 < args.Count)
-        {
-            height = std::stoi(args.Args[++i]);
-        }
-        else if (arg == "--fullscreen")
-        {
-            fullscreen = true;
-        }
-        else if (arg == "--windowed")
-        {
-            fullscreen = false;
-        }
-        else if (arg == "--vsync" && i + 1 < args.Count)
-        {
-            vsync = (std::string(args.Args[++i]) == "on");
-        }
-    }
-
-    window.SetVSync(vsync);
-    if (width != window.GetWidth() || height != window.GetHeight())
-    {
-        window.SetSize(width, height);
-    }
-    window.SetFullscreen(fullscreen);
-}
-
-void RuntimeLayer::SetupBrandingAndIcon()
-{
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        return;
-    }
-
-    auto& config = project->GetConfig();
-    Window& window = Application::Get().GetWindow();
-    window.SetTitle(config.Name);
-
-    if (config.IconPath.empty())
-    {
-        return;
-    }
-
-    std::filesystem::path iconPath = "";
-    std::string resolved = AssetManager::Get().ResolvePath(config.IconPath);
-    if (!resolved.empty() && std::filesystem::exists(resolved))
-    {
-        iconPath = resolved;
-    }
-    else if (std::filesystem::exists(config.IconPath))
-    {
-        iconPath = config.IconPath;
-    }
-
-    if (!iconPath.empty())
-    {
-        CH_CORE_INFO("RuntimeLayer: Setting window icon: {}", iconPath.string());
-        window.SetWindowIcon(iconPath.string());
-    }
-    else
-    {
-        CH_CORE_WARN("RuntimeLayer: Failed to resolve window icon: {}", config.IconPath);
-    }
-}
-
-void RuntimeLayer::LoadInitialScene()
-{
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        return;
-    }
-
-    auto& config = project->GetConfig();
-    std::string sceneToLoad = config.StartScene;
-
-    const auto& args = Application::Get().GetSpecification().CommandLineArgs;
-    for (int i = 1; i < args.Count; ++i)
-    {
-        if (std::string(args.Args[i]) == "--scene" && i + 1 < args.Count)
-        {
-            sceneToLoad = args.Args[++i];
-            break;
-        }
-    }
-
-    if (sceneToLoad.empty())
-    {
-        sceneToLoad = config.ActiveScenePath.string();
-    }
-
-    CH_CORE_INFO("RuntimeLayer: Initial scene to load: '{}'", sceneToLoad);
-
-    if (sceneToLoad.empty())
-    {
-        std::filesystem::path scenesDir = Project::GetAssetDirectory() / "scenes";
-        if (std::filesystem::exists(scenesDir))
-        {
-            for (const auto& entry : std::filesystem::recursive_directory_iterator(scenesDir))
-            {
-                if (entry.path().extension() == ".chscene")
-                {
-                    sceneToLoad = std::filesystem::relative(entry.path(), Project::GetAssetDirectory()).string();
-                    break;
-                }
-            }
-        }
-    }
-
-    if (!sceneToLoad.empty())
-    {
-        LoadScene(sceneToLoad);
-    }
-}
-
-std::string RuntimeLayer::NormalizeScenePath(const std::string& path) const
-{
-    std::string normalized = TrimCopy(path);
-    if (normalized.empty())
-    {
-        return normalized;
-    }
-
-    std::replace(normalized.begin(), normalized.end(), '\\', '/');
-
-    while (normalized.rfind("./", 0) == 0)
-    {
-        normalized = normalized.substr(2);
-    }
-
-    if (normalized.rfind("assets/", 0) == 0)
-    {
-        normalized = normalized.substr(7);
-    }
-
-    return normalized;
-}
-
-void RuntimeLayer::StopCurrentScene()
-{
-    if (!m_Scene)
-    {
-        return;
-    }
-
-    if (m_RuntimeStarted)
-    {
-        SceneScripting::OnRuntimeStop(m_Scene.get());
-        m_Scene->OnRuntimeStop();
-    }
-
-    SceneScripting::Stop(m_Scene.get());
-}
-
-std::vector<std::pair<std::string, float>> RuntimeLayer::CollectSceneFontRequests() const
-{
-    std::vector<std::pair<std::string, float>> requests;
-    if (!m_Scene)
-    {
-        return requests;
-    }
-
-    std::unordered_set<std::string> dedupe;
-    auto& registry = m_Scene->GetRegistry();
-
-    auto buttonView = registry.view<ButtonControl>();
-    for (entt::entity id : buttonView)
-    {
-        AppendTextStyleFontRequest(buttonView.get<ButtonControl>(id).Text, requests, dedupe);
-    }
-
-    auto labelView = registry.view<LabelControl>();
-    for (entt::entity id : labelView)
-    {
-        AppendTextStyleFontRequest(labelView.get<LabelControl>(id).Style, requests, dedupe);
-    }
-
-    auto sliderView = registry.view<SliderControl>();
-    for (entt::entity id : sliderView)
-    {
-        AppendTextStyleFontRequest(sliderView.get<SliderControl>(id).Text, requests, dedupe);
-    }
-
-    auto checkboxView = registry.view<CheckboxControl>();
-    for (entt::entity id : checkboxView)
-    {
-        AppendTextStyleFontRequest(checkboxView.get<CheckboxControl>(id).Text, requests, dedupe);
-    }
-
-    auto inputTextView = registry.view<InputTextControl>();
-    for (entt::entity id : inputTextView)
-    {
-        AppendTextStyleFontRequest(inputTextView.get<InputTextControl>(id).Style, requests, dedupe);
-    }
-
-    auto comboView = registry.view<ComboBoxControl>();
-    for (entt::entity id : comboView)
-    {
-        AppendTextStyleFontRequest(comboView.get<ComboBoxControl>(id).Style, requests, dedupe);
-    }
-
-    auto progressView = registry.view<ProgressBarControl>();
-    for (entt::entity id : progressView)
-    {
-        AppendTextStyleFontRequest(progressView.get<ProgressBarControl>(id).Style, requests, dedupe);
-    }
-
-    auto radioView = registry.view<RadioButtonControl>();
-    for (entt::entity id : radioView)
-    {
-        AppendTextStyleFontRequest(radioView.get<RadioButtonControl>(id).Style, requests, dedupe);
-    }
-
-    auto dragFloatView = registry.view<DragFloatControl>();
-    for (entt::entity id : dragFloatView)
-    {
-        AppendTextStyleFontRequest(dragFloatView.get<DragFloatControl>(id).Style, requests, dedupe);
-    }
-
-    auto dragIntView = registry.view<DragIntControl>();
-    for (entt::entity id : dragIntView)
-    {
-        AppendTextStyleFontRequest(dragIntView.get<DragIntControl>(id).Style, requests, dedupe);
-    }
-
-    auto treeNodeView = registry.view<TreeNodeControl>();
-    for (entt::entity id : treeNodeView)
-    {
-        AppendTextStyleFontRequest(treeNodeView.get<TreeNodeControl>(id).Style, requests, dedupe);
-    }
-
-    auto tabItemView = registry.view<TabItemControl>();
-    for (entt::entity id : tabItemView)
-    {
-        AppendTextStyleFontRequest(tabItemView.get<TabItemControl>(id).Style, requests, dedupe);
-    }
-
-    auto collapsingHeaderView = registry.view<CollapsingHeaderControl>();
-    for (entt::entity id : collapsingHeaderView)
-    {
-        AppendTextStyleFontRequest(collapsingHeaderView.get<CollapsingHeaderControl>(id).Style, requests, dedupe);
-    }
-
-    auto plotLinesView = registry.view<PlotLinesControl>();
-    for (entt::entity id : plotLinesView)
-    {
-        AppendTextStyleFontRequest(plotLinesView.get<PlotLinesControl>(id).Style, requests, dedupe);
-    }
-
-    auto plotHistogramView = registry.view<PlotHistogramControl>();
-    for (entt::entity id : plotHistogramView)
-    {
-        AppendTextStyleFontRequest(plotHistogramView.get<PlotHistogramControl>(id).Style, requests, dedupe);
-    }
-
-    return requests;
-}
-
-void RuntimeLayer::PreloadSceneFonts(bool allowRuntimeMutation)
-{
-    auto requests = CollectSceneFontRequests();
-    if (requests.empty())
-    {
-        return;
-    }
-
-    const int loadedCount = UIRenderer::Get().GetFontRegistry().PreloadFonts(requests, allowRuntimeMutation);
-    if (loadedCount <= 0)
-    {
-        return;
-    }
-
-    CH_CORE_INFO("RuntimeLayer: Preloaded {} scene font tuple(s).", loadedCount);
-
-    if (allowRuntimeMutation && ImGui::GetFrameCount() > 0)
-    {
-        if (auto* imguiLayer = Application::Get().GetImGuiLayer())
-        {
-            if (!imguiLayer->RefreshFontAtlasTexture())
-            {
-                CH_CORE_WARN("RuntimeLayer: Scene fonts were loaded, but font atlas refresh failed.");
-            }
-        }
-    }
-}
-
-bool RuntimeLayer::TransitionToScene(const std::filesystem::path& scenePath)
-{
-    StopCurrentScene();
-
-    m_RuntimeStarted = false;
-    m_IsSceneLoading = false;
-    m_LoadingOverlayElapsed = 0.0f;
-
-    auto nextScene = std::make_shared<Scene>();
-    SceneSerializer serializer(nextScene.get());
-    if (!serializer.Deserialize(scenePath.string()))
-    {
-        m_Scene = nullptr;
-        ScriptEngine::Get().SetActiveScene(nullptr);
-        return false;
-    }
-
-    m_Scene = nextScene;
-    m_Scene->GetSettings().ScenePath = scenePath.string();
-
-    // Keep current ScriptEngine behavior intact while runtime owns transition flow.
-    ScriptEngine::Get().SetActiveScene(m_Scene.get());
-
-    Window& window = Application::Get().GetWindow();
-    m_Scene->OnViewportResize(window.GetWidth(), window.GetHeight());
-    EnsureRuntimeFramebuffer((uint32_t)window.GetWidth(), (uint32_t)window.GetHeight());
-
-    // Ensure no stale button press flags survive from before the scene transition.
-    // Scripts run in OnUpdate (before ImGui DrawCanvas which normally resets these),
-    // so without this, ExitScript or SceneScript would fire on the very first frame.
-    {
-        auto& registry = m_Scene->GetRegistry();
-        auto btnView = registry.view<ButtonControl>();
-        for (entt::entity id : btnView)
-        {
-            btnView.get<ButtonControl>(id).PressedThisFrame = false;
-        }
-
-        auto ibView = registry.view<ImageButtonControl>();
-        for (entt::entity id : ibView)
-        {
-            ibView.get<ImageButtonControl>(id).PressedThisFrame = false;
-        }
-    }
-
-    PreloadSceneFonts(ImGui::GetFrameCount() > 0);
-
-    m_IsBoostingUploads = true;
-    m_BoostUploadsTimer = 5.0f;
-    CH_CORE_INFO("RuntimeLayer: Boosting asset uploads for scene loading...");
-
-    m_IsSceneLoading = true;
-    m_LoadingOverlayElapsed = 0.0f;
-    CH_CORE_INFO("RuntimeLayer: Scene loaded, waiting for async assets before runtime start.");
-    return true;
-}
-
-std::optional<Camera3D> RuntimeLayer::GetActiveCamera()
-{
-    if (m_Scene)
-    {
-        return m_Scene->GetActiveCamera();
-    }
-    return std::nullopt;
-}
-
-void RuntimeLayer::EnsureRuntimeFramebuffer(uint32_t width, uint32_t height)
-{
-    if (width == 0 || height == 0)
-    {
-        return;
-    }
-
-    if (!m_HDRFramebuffer)
-    {
-        FramebufferSpecification hdrSpec;
-        hdrSpec.Width = width;
-        hdrSpec.Height = height;
-        hdrSpec.ColorFormat = FramebufferColorFormat::RGBA16F;
-        m_HDRFramebuffer = Framebuffer::Create(hdrSpec);
-        return;
-    }
-
-    const auto& spec = m_HDRFramebuffer->GetSpecification();
-    if (spec.Width != width || spec.Height != height)
-    {
-        m_HDRFramebuffer->Resize(width, height);
-    }
-}
-
-bool RuntimeLayer::IsSceneReadyToStart() const
-{
-    return !AssetManager::Get().HasBackgroundWork();
-}
-
-void RuntimeLayer::DrawLoadingOverlay()
-{
-    ImGuiViewport* viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(viewport->WorkPos);
-    ImGui::SetNextWindowSize(viewport->WorkSize);
-    ImGui::SetNextWindowViewport(viewport->ID);
-
-    ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                             ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDocking |
-                             ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.02f, 0.02f, 0.02f, 0.92f));
-
-    if (ImGui::Begin("##RuntimeLoadingOverlay", nullptr, flags))
-    {
-        const size_t loadingCount = AssetManager::Get().GetLoadingAssetCount();
-        const size_t pendingFinalizeCount = AssetManager::Get().GetPendingFinalizeCount();
-        const size_t totalPending = loadingCount + pendingFinalizeCount;
-
-        int dotsCount = (static_cast<int>(ImGui::GetTime() * 2.5f) % 3) + 1;
-        std::string dots(static_cast<size_t>(dotsCount), '.');
-        std::string loadingLine = "Preparing world" + dots;
-        std::string pendingLine = "Pending assets: " + std::to_string(totalPending);
-
-        ImGui::SetCursorPosY(ImGui::GetWindowHeight() * 0.45f);
-
-        const char* title = "Loading scene";
-        ImVec2 titleSize = ImGui::CalcTextSize(title);
-        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - titleSize.x) * 0.5f);
-        ImGui::TextUnformatted(title);
-
-        ImVec2 loadingSize = ImGui::CalcTextSize(loadingLine.c_str());
-        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - loadingSize.x) * 0.5f);
-        ImGui::TextUnformatted(loadingLine.c_str());
-
-        ImVec2 pendingSize = ImGui::CalcTextSize(pendingLine.c_str());
-        ImGui::SetCursorPosX((ImGui::GetWindowWidth() - pendingSize.x) * 0.5f);
-        ImGui::TextUnformatted(pendingLine.c_str());
-    }
-
-    ImGui::End();
-    ImGui::PopStyleColor();
-    ImGui::PopStyleVar();
-}
-} // namespace CHEngine
diff --git a/runtime/runtime_layer.h b/runtime/runtime_layer.h
deleted file mode 100644
index 082104249..000000000
--- a/runtime/runtime_layer.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef CH_RUNTIME_LAYER_H
-#define CH_RUNTIME_LAYER_H
-
-#include "engine/core/layer.h"
-#include "engine/graphics/api/framebuffer.h"
-#include "engine/scene/scene.h"
-#include "engine/graphics/pipeline/scene_renderer.h"
-#include <filesystem>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace CHEngine
-{
-// Runs the game/runtime experience, including scene loading and the scene renderer.
-class RuntimeLayer : public Layer
-{
-public:
-    RuntimeLayer(const std::string& projectPath = "");
-    virtual ~RuntimeLayer();
-
-    virtual void OnAttach() override;
-    virtual void OnDetach() override;
-    virtual void OnUpdate(Timestep ts) override;
-    virtual void OnRender(Timestep ts) override;
-    virtual void OnImGuiRender() override;
-    virtual void OnEvent(Event& e) override;
-
-    // Loads a scene by project-relative or absolute path.
-    void LoadScene(const std::string& path);
-    // Loads a scene by index from the active project configuration.
-    void LoadScene(int index);
-
-private:
-    bool InitProject(const std::string& projectPath);
-    bool DiscoverAndLoadProject(const std::string& projectPath);
-    void ApplyWindowConfiguration();
-    void SetupBrandingAndIcon();
-    void LoadInitialScene();
-    std::string NormalizeScenePath(const std::string& path) const;
-    bool TransitionToScene(const std::filesystem::path& scenePath);
-    void StopCurrentScene();
-    void PreloadSceneFonts(bool allowRuntimeMutation);
-    std::vector<std::pair<std::string, float>> CollectSceneFontRequests() const;
-    void EnsureRuntimeFramebuffer(uint32_t width, uint32_t height);
-    bool IsSceneReadyToStart() const;
-    void DrawLoadingOverlay();
-
-    std::optional<Camera3D> GetActiveCamera();
-
-private:
-    std::shared_ptr<Scene> m_Scene;
-    std::unique_ptr<SceneRenderer> m_SceneRenderer;
-private:
-
-    std::string m_ProjectPath;
-    float m_BoostUploadsTimer = 0.0f;
-    bool m_IsBoostingUploads = false;
-    bool m_RuntimeStarted = false;
-    bool m_IsSceneLoading = false;
-    float m_LoadingOverlayElapsed = 0.0f;
-    float m_LoadingOverlayMinDuration = 0.35f;
-
-    std::shared_ptr<Framebuffer> m_HDRFramebuffer;
-};
-} // namespace CHEngine
-
-#endif // CH_RUNTIME_LAYER_H
diff --git a/scripting/CMakeLists.txt b/scripting/CMakeLists.txt
deleted file mode 100644
index 1de3aa84d..000000000
--- a/scripting/CMakeLists.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-add_library(scripting STATIC
-    scriptengine.h
-    scriptengine.cpp
-    scriptengine_services.h
-    scriptengine_services.cpp
-    script_glue.h
-    script_glue.cpp
-    script_glue_internal.h
-    script_glue_system.cpp
-    script_glue_input.cpp
-    script_glue_scene.cpp
-    script_glue_entity.cpp
-    script_glue_camera.cpp
-    script_glue_ui.cpp
-    script_glue_gameplay.cpp
-    scene_scripting.h
-    scene_scripting.cpp
-)
-
-target_include_directories(scripting PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}
-    ${yaml-cpp_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/imgui
-    ${CMAKE_SOURCE_DIR}/include/imgui/backends
-    ${CMAKE_SOURCE_DIR}/include/entt/src
-    ${CMAKE_SOURCE_DIR}/include/coral/Coral.Native/Include
-    ${CMAKE_SOURCE_DIR}/include/glfw/include
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include/miniaudio
-)
-
-if(CH_BUILD_PRESET_NAMES_INCLUDE_DIR)
-    target_include_directories(scripting PRIVATE
-        ${CH_BUILD_PRESET_NAMES_INCLUDE_DIR}
-    )
-endif()
-
-target_link_libraries(scripting PUBLIC 
-    engine
-    yaml-cpp
-    EnTT
-    Coral.Native
-)
-
-if(COMMAND apply_engine_optimizations)
-    apply_engine_optimizations(scripting)
-endif()
-
-if(MSVC)
-    target_compile_options(scripting PRIVATE /bigobj)
-elseif(MINGW)
-    target_compile_options(scripting PRIVATE -Wa,-mbig-obj)
-endif()
-
-# ── C# Managed API Build ──────────────────────────────────────────────────
-# This builds the core engine scripting API (.dll) which the game depends on.
-
-find_program(DOTNET_EXECUTABLE dotnet)
-if(DOTNET_EXECUTABLE)
-    set(MANAGED_PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/managed/CHEngine.Managed.csproj")
-    set(MANAGED_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin")
-    set(CORAL_MANAGED_DIR "${CMAKE_BINARY_DIR}/include/coral/cmake")
-    
-    # Generate ManagedDependencies.props to provide paths to the .csproj
-    # Only regenerate if content changes using copy_if_different
-    file(RELATIVE_PATH RELATIVE_CORAL_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/managed" "${CORAL_MANAGED_DIR}")
-    file(TO_NATIVE_PATH "${RELATIVE_CORAL_MANAGED_DIR}" NATIVE_RELATIVE_CORAL_MANAGED_DIR)
-    
-    set(PROPS_CONTENT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/managed/ManagedDependencies.props")
-    set(PROPS_TEMPLATE_CONTENT "<Project>\n  <PropertyGroup>\n    <CoralManagedDir>$(MSBuildThisFileDirectory)${NATIVE_RELATIVE_CORAL_MANAGED_DIR}</CoralManagedDir>\n  </PropertyGroup>\n</Project>")
-    
-    # Write to temp file and only update if different (prevents unnecessary rebuilds)
-    file(WRITE "${CMAKE_BINARY_DIR}/.cmake_temp_props" "${PROPS_TEMPLATE_CONTENT}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/.cmake_temp_props" "${PROPS_CONTENT_FILE}")
-    
-    # Collect all C# source files and lock file for dependency tracking
-    file(GLOB_RECURSE MANAGED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/managed/src/*.cs")
-    list(APPEND MANAGED_SOURCES "${MANAGED_PROJECT_PATH}")
-    list(APPEND MANAGED_SOURCES "${PROPS_CONTENT_FILE}")
-    
-    # 1. Collect all local managed sources for dependency tracking
-    file(GLOB_RECURSE MANAGED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/managed/src/*.cs")
-    list(APPEND MANAGED_SOURCES "${MANAGED_PROJECT_PATH}")
-    list(APPEND MANAGED_SOURCES "${PROPS_CONTENT_FILE}")
-
-    set(MANAGED_DLL_OUTPUT "${MANAGED_OUTPUT_DIR}/CHEngine.Managed.dll")
-
-    add_custom_command(
-        OUTPUT "${MANAGED_DLL_OUTPUT}"
-        COMMAND ${DOTNET_EXECUTABLE} build "${MANAGED_PROJECT_PATH}" -c $<CONFIG> --output "${MANAGED_OUTPUT_DIR}" -p:CoralManagedDir="${CORAL_MANAGED_DIR}"
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/managed"
-        DEPENDS ${MANAGED_SOURCES}
-        COMMENT "Building CHEngine.Managed C# Library"
-        VERBATIM
-    )
-
-    add_custom_target(CHEngine_Managed ALL DEPENDS "${MANAGED_DLL_OUTPUT}")
-
-    if(TARGET CoralManaged)
-        add_dependencies(CHEngine_Managed CoralManaged)
-    endif()
-    
-    add_dependencies(scripting CHEngine_Managed)
-
-    # Deploy Coral.Managed files
-    set(CORAL_FILES 
-        "Coral.Managed.dll" 
-        "Coral.Managed.runtimeconfig.json"
-        "Coral.Managed.deps.json"
-        "Coral.Managed.pdb"
-    )
-
-    add_custom_command(TARGET CHEngine_Managed POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "${CMAKE_BINARY_DIR}/include/coral/cmake/Coral.Managed.dll"
-            "${CMAKE_BINARY_DIR}/include/coral/cmake/Coral.Managed.runtimeconfig.json"
-            "${CMAKE_BINARY_DIR}/include/coral/cmake/Coral.Managed.deps.json"
-            "${CMAKE_BINARY_DIR}/include/coral/cmake/Coral.Managed.pdb"
-            "${CMAKE_BINARY_DIR}/bin/"
-        COMMENT "Deploying Coral.Managed binaries"
-        VERBATIM
-    )
-else()
-    message(WARNING "dotnet executable not found! Cannot build CHEngine.Managed C# library.")
-endif()
\ No newline at end of file
diff --git a/scripting/managed/CHEngine.Managed.csproj b/scripting/managed/CHEngine.Managed.csproj
deleted file mode 100644
index 9e415f3ed..000000000
--- a/scripting/managed/CHEngine.Managed.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <AssemblyName>CHEngine.Managed</AssemblyName>
-    <RootNamespace>CHEngine</RootNamespace>
-    <ImplicitUsings>disable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>false</Optimize>
-    <!-- Output path is controlled by the CMake build system to avoid stale DLL issues -->
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    
-    <Authors>Oleg and Contributors</Authors>
-    <Description>C# Base Class Library for Chained Engine.</Description>
-    <RepositoryUrl>https://github.com/IOleg-crypto/Chained-Decos</RepositoryUrl>
-  </PropertyGroup>
-
-
-
-  <!-- Import dynamically generated properties from CMake -->
-  <Import Project="ManagedDependencies.props" Condition="Exists('ManagedDependencies.props')" />
-
-  <ItemGroup>
-    <Reference Include="Coral.Managed">
-      <HintPath>$(CoralManagedDir)/Coral.Managed.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-</Project>
diff --git a/scripting/managed/ManagedDependencies.props b/scripting/managed/ManagedDependencies.props
deleted file mode 100644
index 7de63fc5d..000000000
--- a/scripting/managed/ManagedDependencies.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <CoralManagedDir>$(MSBuildThisFileDirectory)..\..\build\windows-ninja\include\coral\cmake</CoralManagedDir>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/scripting/managed/ManagedDependencies.props.tmp b/scripting/managed/ManagedDependencies.props.tmp
deleted file mode 100644
index bfbf7d240..000000000
--- a/scripting/managed/ManagedDependencies.props.tmp
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <CoralManagedDir>$(MSBuildThisFileDirectory)..\..\..\build\windows-ninja-release\include\coral\cmake</CoralManagedDir>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/scripting/managed/src/Entity.cs b/scripting/managed/src/Entity.cs
deleted file mode 100644
index 888ca852d..000000000
--- a/scripting/managed/src/Entity.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-using Coral.Managed.Interop;
-using System.Collections.Generic;
-
-namespace CHEngine
-{
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Component — base class for all component wrappers
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Base class for managed component wrappers.</summary>
-public abstract class Component
-{
-    public Entity Entity { get; internal set; } = null!;
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Entity — wraps a native entity ID and provides component access
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Entity wrapper with a small component cache.</summary>
-public class Entity
-{
-    /// <summary>Native entity handle.</summary>
-    public ulong ID { get; private set; }
-
-    // Cache: avoids allocating a new stub on every GetComponent<T>() call
-    private readonly Dictionary<System.Type, Component> _cache = new();
-
-    internal static unsafe delegate*<ulong, NativeString, bool> Entity_HasComponent_Ptr;
-    internal static unsafe delegate*<NativeString, NativeArray<ulong>> Entity_FindAllWithComponent_Ptr;
-    internal static unsafe delegate*<ulong, NativeString, void> Entity_AddComponent_Ptr;
-#pragma warning restore 0649
-
-    /// <summary>Wraps a native entity ID.</summary>
-    public Entity(ulong id) { ID = id; }
-
-    /// <summary>True when the entity handle is valid.</summary>
-    public bool IsValid => ID != 0;
-
-    // ── Component access ──────────────────────────────────────────────────
-
-    private static unsafe bool HasComponent_Native(ulong entityID, string componentName)
-        => Entity_HasComponent_Ptr(entityID, componentName);
-
-    /// <summary>True when the component exists.</summary>
-    public bool HasComponent<T>() where T : Component, new()
-        => IsValid && HasComponent_Native(ID, typeof(T).Name);
-
-    /// <summary>Returns the component wrapper, or null.</summary>
-    public T? GetComponent<T>() where T : Component, new()
-    {
-        if (!IsValid) return null;
-
-        System.Type componentType = typeof(T);
-        if (_cache.TryGetValue(componentType, out Component? cachedComponent))
-            return (T)cachedComponent;
-
-        if (!HasComponent<T>())
-            return null;
-
-        T component = new T() { Entity = this };
-        _cache[componentType] = component;
-        return component;
-    }
-
-    /// <summary>Adds a component and returns its wrapper.</summary>
-    public T AddComponent<T>() where T : Component, new()
-    {
-        if (!IsValid) throw new System.Exception("Cannot add component to invalid entity.");
-        
-        unsafe { Entity_AddComponent_Ptr(ID, typeof(T).Name); }
-        
-        T component = new T() { Entity = this };
-        _cache[typeof(T)] = component;
-        return component;
-    }
-
-    /// <summary>Returns all entity IDs with the component.</summary>
-    public static ulong[] FindAllWithComponent<T>() where T : Component, new()
-    {
-        unsafe { return Entity_FindAllWithComponent_Ptr(typeof(T).Name).ToArray(); }
-    }
-
-    /// <summary>Clears the component cache.</summary>
-    public void InvalidateComponentCache() => _cache.Clear();
-
-    public override string ToString() => $"Entity({ID})";
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Component implementations
-// ─────────────────────────────────────────────────────────────────────────────
-
-/// <summary>Transform wrapper.</summary>
-public class TransformComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, Vector3*, void> Transform_GetTranslation_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> Transform_SetTranslation_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> Transform_GetRotation_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> Transform_SetRotation_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> Transform_GetScale_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> Transform_SetScale_Ptr;
-#pragma warning restore 0649
-
-    public Vector3 Translation
-    {
-        get { unsafe { Vector3 translation; Transform_GetTranslation_Ptr(Entity.ID, &translation); return translation; } }
-        set { unsafe { Transform_SetTranslation_Ptr(Entity.ID, &value); } }
-    }
-
-    public Vector3 Rotation
-    {
-        get { unsafe { Vector3 rotation; Transform_GetRotation_Ptr(Entity.ID, &rotation); return rotation; } }
-        set { unsafe { Transform_SetRotation_Ptr(Entity.ID, &value); } }
-    }
-
-    public Vector3 Scale
-    {
-        get { unsafe { Vector3 scale; Transform_GetScale_Ptr(Entity.ID, &scale); return scale; } }
-        set { unsafe { Transform_SetScale_Ptr(Entity.ID, &value); } }
-    }
-}
-
-/// <summary>Model/Mesh wrapper.</summary>
-public class ModelComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, NativeString> Model_GetModelPath_Ptr;
-    internal static unsafe delegate*<ulong, NativeString, void> Model_SetModelPath_Ptr;
-#pragma warning restore 0649
-
-    public string ModelPath
-    {
-        get { unsafe { string? result = Model_GetModelPath_Ptr(Entity.ID); return result ?? string.Empty; } }
-        set { unsafe { Model_SetModelPath_Ptr(Entity.ID, value); } }
-    }
-}
-
-/// <summary>Rigid-body wrapper.</summary>
-public class RigidBodyComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, Vector3*, void> RigidBody_GetVelocity_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> RigidBody_SetVelocity_Ptr;
-    internal static unsafe delegate*<ulong, bool> RigidBody_IsGrounded_Ptr;
-    internal static unsafe delegate*<ulong, bool> RigidBody_IsKinematic_Ptr;
-    internal static unsafe delegate*<ulong, bool, void> RigidBody_SetKinematic_Ptr;
-#pragma warning restore 0649
-
-    public Vector3 Velocity
-    {
-        get { unsafe { Vector3 velocity; RigidBody_GetVelocity_Ptr(Entity.ID, &velocity); return velocity; } }
-        set { unsafe { RigidBody_SetVelocity_Ptr(Entity.ID, &value); } }
-    }
-
-    public bool IsGrounded { get { unsafe { return RigidBody_IsGrounded_Ptr(Entity.ID); } } }
-
-    public bool IsKinematic
-    {
-        get { unsafe { return RigidBody_IsKinematic_Ptr(Entity.ID); } }
-        set { unsafe { RigidBody_SetKinematic_Ptr(Entity.ID, value); } }
-    }
-}
-
-/// <summary>Tag wrapper.</summary>
-public class TagComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, NativeString> TagComponent_GetTag_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe string? GetTag_Native(ulong entityID)
-    {
-        return TagComponent_GetTag_Ptr(entityID);
-    }
-
-    public string Tag => GetTag_Native(Entity.ID) ?? string.Empty;
-}
-
-/// <summary>Camera wrapper.</summary>
-public class CameraComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, Vector3*, void> Camera_GetForward_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> Camera_GetRight_Ptr;
-    internal static unsafe delegate*<ulong, float*, float*, float*, void> Camera_GetOrbit_Ptr;
-    internal static unsafe delegate*<ulong, float, float, float, void> Camera_SetOrbit_Ptr;
-    internal static unsafe delegate*<ulong, bool> Camera_GetPrimary_Ptr;
-    internal static unsafe delegate*<ulong, bool, void> Camera_SetPrimary_Ptr;
-    internal static unsafe delegate*<ulong, bool> Camera_GetIsOrbit_Ptr;
-    internal static unsafe delegate*<ulong, bool, void> Camera_SetIsOrbit_Ptr;
-    internal static unsafe delegate*<ulong, NativeString> Camera_GetTargetTag_Ptr;
-    internal static unsafe delegate*<ulong, NativeString, void> Camera_SetTargetTag_Ptr;
-#pragma warning restore 0649
-
-    private static void GetForward(ulong entityID, out Vector3 outForward)
-    {
-        unsafe { fixed (Vector3* p = &outForward) Camera_GetForward_Ptr(entityID, p); }
-    }
-
-    private static void GetRight(ulong entityID, out Vector3 outRight)
-    {
-        unsafe { fixed (Vector3* p = &outRight) Camera_GetRight_Ptr(entityID, p); }
-    }
-
-    private static void GetOrbit(ulong entityID, out float yaw, out float pitch, out float distance)
-    {
-        unsafe { fixed (float* yawPtr = &yaw, pitchPtr = &pitch, distancePtr = &distance) Camera_GetOrbit_Ptr(entityID, yawPtr, pitchPtr, distancePtr); }
-    }
-
-    private static void SetOrbit(ulong entityID, float yaw, float pitch, float distance)
-    {
-        unsafe { Camera_SetOrbit_Ptr(entityID, yaw, pitch, distance); }
-    }
-
-    public Vector3 Forward
-    {
-        get { GetForward(Entity.ID, out Vector3 forward); return forward; }
-    }
-
-    public Vector3 Right
-    {
-        get { GetRight(Entity.ID, out Vector3 right); return right; }
-    }
-
-    public void GetOrbit(out float yaw, out float pitch, out float distance)
-        => GetOrbit(Entity.ID, out yaw, out pitch, out distance);
-
-    public void SetOrbit(float yaw, float pitch, float distance)
-        => SetOrbit(Entity.ID, yaw, pitch, distance);
-
-    public bool Primary
-    {
-        get { unsafe { return Camera_GetPrimary_Ptr(Entity.ID); } }
-        set { unsafe { Camera_SetPrimary_Ptr(Entity.ID, value); } }
-    }
-
-    public bool IsOrbitCamera
-    {
-        get { unsafe { return Camera_GetIsOrbit_Ptr(Entity.ID); } }
-        set { unsafe { Camera_SetIsOrbit_Ptr(Entity.ID, value); } }
-    }
-
-    public string TargetEntityTag
-    {
-        get { unsafe { string? result = Camera_GetTargetTag_Ptr(Entity.ID); return result ?? string.Empty; } }
-        set { unsafe { Camera_SetTargetTag_Ptr(Entity.ID, value); } }
-    }
-}
-
-/// <summary>Movement-speed wrapper.</summary>
-public class PlayerComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, float> PlayerComponent_GetMovementSpeed_Ptr;
-    internal static unsafe delegate*<ulong, float, void> PlayerComponent_SetMovementSpeed_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe float GetMovementSpeed(ulong entityID) => PlayerComponent_GetMovementSpeed_Ptr(entityID);
-    private static unsafe void SetMovementSpeed(ulong entityID, float speed) => PlayerComponent_SetMovementSpeed_Ptr(entityID, speed);
-
-    public float MovementSpeed
-    {
-        get => GetMovementSpeed(Entity.ID);
-        set => SetMovementSpeed(Entity.ID, value);
-    }
-}
-
-/// <summary>Audio wrapper.</summary>
-public class AudioComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, float, void> AudioComponent_SetVolume_Ptr;
-    internal static unsafe delegate*<ulong, bool, void> AudioComponent_SetLoop_Ptr;
-    internal static unsafe delegate*<ulong, bool> AudioComponent_IsPlaying_Ptr;
-    internal static unsafe delegate*<ulong, NativeString> AudioComponent_GetSoundPath_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe void SetVolume(ulong entityID, float volume) => AudioComponent_SetVolume_Ptr(entityID, volume);
-    private static unsafe void SetLoop(ulong entityID, bool loop) => AudioComponent_SetLoop_Ptr(entityID, loop);
-    private static unsafe bool IsPlaying_Native(ulong entityID) => AudioComponent_IsPlaying_Ptr(entityID);
-    private static unsafe string? GetSoundPath(ulong entityID)
-    {
-        return AudioComponent_GetSoundPath_Ptr(entityID);
-    }
-
-    public float Volume { set => SetVolume(Entity.ID, value); }
-    public bool  Loop   { set => SetLoop(Entity.ID, value); }
-    public bool  IsPlaying  => IsPlaying_Native(Entity.ID);
-    public string SoundPath => GetSoundPath(Entity.ID) ?? string.Empty;
-}
-
-// ── UI Controls ───────────────────────────────────────────────────────────────
-
-/// <summary>Button control wrapper.</summary>
-public class ButtonControl : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, bool> ButtonControl_IsPressed_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe bool IsPressed_Native(ulong entityID) => ButtonControl_IsPressed_Ptr(entityID);
-    public bool IsPressed => IsPressed_Native(Entity.ID);
-}
-
-/// <summary>Checkbox wrapper.</summary>
-public class CheckboxControl : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, bool> CheckboxControl_GetChecked_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe bool GetChecked(ulong entityID) => CheckboxControl_GetChecked_Ptr(entityID);
-    public bool IsChecked => GetChecked(Entity.ID);
-}
-
-/// <summary>Combo box wrapper.</summary>
-public class ComboBoxControl : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, int> ComboBoxControl_GetSelectedIndex_Ptr;
-    internal static unsafe delegate*<ulong, int, NativeString> ComboBoxControl_GetItem_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe int GetSelectedIndex(ulong entityID) => ComboBoxControl_GetSelectedIndex_Ptr(entityID);
-    private static unsafe string? GetItem(ulong entityID, int index)
-    {
-        return ComboBoxControl_GetItem_Ptr(entityID, index);
-    }
-
-    public int    SelectedIndex     => GetSelectedIndex(Entity.ID);
-    public string? GetItem(int index) => GetItem(Entity.ID, index);
-}
-
-// ── Gameplay Components ────────────────────────────────────────────────────────
-
-/// <summary>Spawn point wrapper.</summary>
-public class SpawnComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, bool> SpawnComponent_IsActive_Ptr;
-    internal static unsafe delegate*<ulong, Vector3*, void> SpawnComponent_GetSpawnPoint_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe bool IsActive_Native(ulong entityID) => SpawnComponent_IsActive_Ptr(entityID);
-    private static void GetSpawnPoint(ulong entityID, out Vector3 point)
-    {
-        unsafe { fixed (Vector3* p = &point) SpawnComponent_GetSpawnPoint_Ptr(entityID, p); }
-    }
-
-    public bool IsActive => IsActive_Native(Entity.ID);
-    public Vector3 SpawnPoint
-    {
-        get { GetSpawnPoint(Entity.ID, out Vector3 spawnPoint); return spawnPoint; }
-    }
-}
-
-/// <summary>Scene transition wrapper.</summary>
-public class SceneTransitionComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, NativeString> SceneTransitionComponent_GetTargetScene_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe string? GetTargetScene(ulong entityID)
-    {
-        return SceneTransitionComponent_GetTargetScene_Ptr(entityID);
-    }
-    public string? TargetScene => GetTargetScene(Entity.ID);
-}
-
-/// <summary>RPG stats wrapper.</summary>
-public class RPGStatsComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, int> RPGStatsComponent_GetLevel_Ptr;
-    internal static unsafe delegate*<ulong, int, void> RPGStatsComponent_SetLevel_Ptr;
-    internal static unsafe delegate*<ulong, float> RPGStatsComponent_GetHealth_Ptr;
-    internal static unsafe delegate*<ulong, float, void> RPGStatsComponent_SetHealth_Ptr;
-    internal static unsafe delegate*<ulong, int> RPGStatsComponent_GetGold_Ptr;
-    internal static unsafe delegate*<ulong, int, void> RPGStatsComponent_SetGold_Ptr;
-#pragma warning restore 0649
-
-    public int Level { get { unsafe { return RPGStatsComponent_GetLevel_Ptr(Entity.ID); } } set { unsafe { RPGStatsComponent_SetLevel_Ptr(Entity.ID, value); } } }
-    public float Health { get { unsafe { return RPGStatsComponent_GetHealth_Ptr(Entity.ID); } } set { unsafe { RPGStatsComponent_SetHealth_Ptr(Entity.ID, value); } } }
-    public int Gold { get { unsafe { return RPGStatsComponent_GetGold_Ptr(Entity.ID); } } set { unsafe { RPGStatsComponent_SetGold_Ptr(Entity.ID, value); } } }
-}
-
-/// <summary>Skill wrapper.</summary>
-public class SkillComponent : Component
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<ulong, bool> SkillComponent_IsUnlocked_Ptr;
-    internal static unsafe delegate*<ulong, bool, void> SkillComponent_SetUnlocked_Ptr;
-#pragma warning restore 0649
-
-    public bool IsUnlocked { get { unsafe { return SkillComponent_IsUnlocked_Ptr(Entity.ID); } } set { unsafe { SkillComponent_SetUnlocked_Ptr(Entity.ID, value); } } }
-}
-
-/// <summary>Inventory wrapper.</summary>
-public class InventoryComponent : Component
-{
-}
-
-} // namespace CHEngine
diff --git a/scripting/managed/src/HeroSystems.cs b/scripting/managed/src/HeroSystems.cs
deleted file mode 100644
index a456de3d5..000000000
--- a/scripting/managed/src/HeroSystems.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-
-namespace CHEngine
-{
-    /// <summary>Skill tree branches.</summary>
-    public enum SkillBranch
-    {
-        Strength,
-        Magic,
-        Economy,
-        Defense
-    }
-
-    /// <summary>Hero gameplay script.</summary>
-    public class Hero : Script
-    {
-        public RPGStatsComponent Stats;
-        public InventoryComponent Inventory;
-
-        public override void OnCreate()
-        {
-            Stats = GetComponent<RPGStatsComponent>()!;
-            Inventory = GetComponent<InventoryComponent>()!;
-
-            Log.Info("Hero initialized at level " + Stats.Level);
-        }
-
-        /// <summary>Adds XP.</summary>
-        public void AddExperience(int amount)
-        {
-            // Placeholder progression logic.
-            Log.Info($"Hero gained {amount} XP");
-        }
-
-        /// <summary>Unlocks a skill if the hero can afford it.</summary>
-        public void PurchaseSkill(Entity skillEntity)
-        {
-            var skillComponent = skillEntity.GetComponent<SkillComponent>();
-            if (skillComponent != null && !skillComponent.IsUnlocked)
-            {
-                if (Stats.Gold >= 100)
-                {
-                    Stats.Gold -= 100;
-                    skillComponent.IsUnlocked = true;
-                    Log.Info("Skill purchased!");
-                }
-            }
-        }
-    }
-
-    /// <summary>Hero skill script.</summary>
-    public class HeroSkill : Script
-    {
-        public SkillComponent Skill;
-        
-        public override void OnCreate()
-        {
-            Skill = GetComponent<SkillComponent>()!;
-        }
-
-        public void Activate()
-        {
-            if (Skill.IsUnlocked)
-            {
-                Log.Info("Activating skill: " + Entity.ID);
-            }
-        }
-    }
-
-    /// <summary>Item categories.</summary>
-    public enum ItemType
-    {
-        Weapon,
-        Armor,
-        MagicItem,
-        EconomicBoost
-    }
-
-    /// <summary>Sample economy script.</summary>
-    public class EconomyManager : Script
-    {
-        private RPGStatsComponent _heroStats;
-
-        public override void OnCreate()
-        {
-            // Find the hero stats component.
-            var heroEntityIds = Entity.FindAllWithComponent<RPGStatsComponent>();
-            if (heroEntityIds.Length > 0)
-            {
-                _heroStats = new Entity(heroEntityIds[0]).GetComponent<RPGStatsComponent>()!;
-            }
-        }
-
-        /// <summary>Buys an item if there is enough gold.</summary>
-        public bool BuyItem(int cost, ItemType itemType)
-        {
-            if (_heroStats == null) return false;
-
-            if (_heroStats.Gold >= cost)
-            {
-                _heroStats.Gold -= cost;
-                Log.Info($"Purchased {itemType}! Current Gold: {_heroStats.Gold}");
-                return true;
-            }
-            
-            Log.Info("Not enough gold!");
-            return false;
-        }
-
-        /// <summary>Adds gold to the hero stats.</summary>
-        public void CollectGold(int amount)
-        {
-            if (_heroStats != null)
-            {
-                _heroStats.Gold += amount;
-                Log.Info($"Collected {amount} gold. Total: {_heroStats.Gold}");
-            }
-        }
-    }
-}
diff --git a/scripting/managed/src/Input.cs b/scripting/managed/src/Input.cs
deleted file mode 100644
index 9a17dfa1d..000000000
--- a/scripting/managed/src/Input.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Coral.Managed.Interop;
-
-namespace CHEngine
-{
-
-/// <summary>Input helpers.</summary>
-public static class Input
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<int, bool> Input_IsKeyDown_Ptr;
-    internal static unsafe delegate*<int, bool> Input_IsKeyPressed_Ptr;
-    internal static unsafe delegate*<int, bool> Input_IsKeyReleased_Ptr;
-    internal static unsafe delegate*<int, bool> Input_IsMouseButtonDown_Ptr;
-    internal static unsafe delegate*<int, bool> Input_IsMouseButtonPressed_Ptr;
-    internal static unsafe delegate*<float> Input_GetMouseWheelMove_Ptr;
-    internal static unsafe delegate*<Vector3*, void> Input_GetMouseDelta_Ptr;
-#pragma warning restore 0649
-
-    /// <summary>True while the key is held.</summary>
-    public static unsafe bool IsKeyDown(Key keyCode) => Input_IsKeyDown_Ptr((int)keyCode);
-    /// <summary>True on the press frame.</summary>
-    public static unsafe bool IsKeyPressed(Key keyCode) => Input_IsKeyPressed_Ptr((int)keyCode);
-    /// <summary>True on the release frame.</summary>
-    public static unsafe bool IsKeyReleased(Key keyCode) => Input_IsKeyReleased_Ptr((int)keyCode);
-
-    /// <summary>True while the mouse button is held.</summary>
-    public static unsafe bool IsMouseButtonDown(MouseButton button) => Input_IsMouseButtonDown_Ptr((int)button);
-    /// <summary>True on the mouse press frame.</summary>
-    public static unsafe bool IsMouseButtonPressed(MouseButton button) => Input_IsMouseButtonPressed_Ptr((int)button);
-
-    /// <summary>Mouse wheel delta for this frame.</summary>
-    public static unsafe float GetMouseWheelMove() => Input_GetMouseWheelMove_Ptr();
-
-    /// <summary>Mouse movement delta for this frame.</summary>
-    public static Vector3 MouseDelta
-    {
-        get { unsafe { Vector3 delta; Input_GetMouseDelta_Ptr(&delta); return delta; } }
-    }
-}
-
-}
-
diff --git a/scripting/managed/src/Log.cs b/scripting/managed/src/Log.cs
deleted file mode 100644
index 481d5c7ce..000000000
--- a/scripting/managed/src/Log.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Coral.Managed.Interop;
-
-namespace CHEngine
-{
-
-/// <summary>Logging helpers.</summary>
-public static class Log
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<NativeString, void> Log_Info_Ptr;
-    internal static unsafe delegate*<NativeString, void> Log_Warn_Ptr;
-    internal static unsafe delegate*<NativeString, void> Log_Error_Ptr;
-#pragma warning restore 0649
-
-    /// <summary>Logs an info message.</summary>
-    public static unsafe void Info(string message) => Log_Info_Ptr(message);
-    /// <summary>Logs a warning.</summary>
-    public static unsafe void Warn(string message) => Log_Warn_Ptr(message);
-    /// <summary>Logs an error.</summary>
-    public static unsafe void Error(string message) => Log_Error_Ptr(message);
-}
-
-}
- // namespace CHEngine
diff --git a/scripting/managed/src/Math.cs b/scripting/managed/src/Math.cs
deleted file mode 100644
index e13b9af8d..000000000
--- a/scripting/managed/src/Math.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace CHEngine
-{
-
-// ── Math ─────────────────────────────────────────────────────────────────────
-
-/// <summary>3D vector shared with native code.</summary>
-[StructLayout(LayoutKind.Sequential)]
-public struct Vector3
-{
-    public float X, Y, Z;
-
-    /// <summary>Creates a vector from X, Y, and Z.</summary>
-    public Vector3(float x, float y, float z) { X = x; Y = y; Z = z; }
-
-    public static readonly Vector3 Zero  = new Vector3(0, 0, 0);
-    public static readonly Vector3 One   = new Vector3(1, 1, 1);
-    public static readonly Vector3 Up    = new Vector3(0, 1, 0);
-
-    public static Vector3 operator +(Vector3 left, Vector3 right) => new Vector3(left.X + right.X, left.Y + right.Y, left.Z + right.Z);
-    public static Vector3 operator -(Vector3 left, Vector3 right) => new Vector3(left.X - right.X, left.Y - right.Y, left.Z - right.Z);
-    public static Vector3 operator -(Vector3 vector)              => new Vector3(-vector.X, -vector.Y, -vector.Z);
-    public static Vector3 operator *(Vector3 vector, float scalar) => new Vector3(vector.X * scalar, vector.Y * scalar, vector.Z * scalar);
-    public static Vector3 operator *(float scalar, Vector3 vector) => new Vector3(scalar * vector.X, scalar * vector.Y, scalar * vector.Z);
-    public static Vector3 operator /(Vector3 vector, float scalar) => new Vector3(vector.X / scalar, vector.Y / scalar, vector.Z / scalar);
-
-    public float LengthSquared() => X * X + Y * Y + Z * Z;
-    public float Length()        => (float)System.Math.Sqrt(LengthSquared());
-
-    /// <summary>Returns a normalized copy, or zero for tiny inputs.</summary>
-    public static Vector3 Normalize(Vector3 vector)
-    {
-        float length = vector.Length();
-        return length > 0.00001f ? vector / length : Zero;
-    }
-
-    /// <summary>Dot product.</summary>
-    public static float Dot(Vector3 left, Vector3 right) => left.X * right.X + left.Y * right.Y + left.Z * right.Z;
-
-    /// <summary>Cross product.</summary>
-    public static Vector3 Cross(Vector3 left, Vector3 right) => new Vector3(
-        left.Y * right.Z - left.Z * right.Y,
-        left.Z * right.X - left.X * right.Z,
-        left.X * right.Y - left.Y * right.X);
-
-    /// <summary>Linear interpolation.</summary>
-    public static float Lerp(float start, float end, float factor) => start + (end - start) * factor;
-
-    public override string ToString() => $"({X:F2}, {Y:F2}, {Z:F2})";
-}
-
-/// <summary>Scalar math helpers.</summary>
-public static class Mathf
-{
-    public const float PI      = (float)System.Math.PI;
-    public const float Deg2Rad = PI / 180.0f;
-    public const float Rad2Deg = 180.0f / PI;
-
-    public static float Clamp(float value, float min, float max)
-        => value < min ? min : (value > max ? max : value);
-    public static float Abs(float value) => value < 0 ? -value : value;
-    public static float Sin(float angle) => (float)System.Math.Sin(angle);
-    public static float Cos(float angle) => (float)System.Math.Cos(angle);
-    public static float Atan2(float y, float x) => (float)System.Math.Atan2(y, x);
-    public static float Sqrt(float value) => (float)System.Math.Sqrt(value);
-    public static float Lerp(float start, float end, float factor) => start + (end - start) * factor;
-}
-
-// ── Key / MouseButton enums ───────────────────────────────────────────────────
-
-/// <summary>Keyboard keys exposed to managed scripts.</summary>
-public enum Key : int
-{
-    A = 65,  B = 66,  C = 67,
-    D = 68,  E = 69,  F = 70,
-    G = 71,  H = 72,  I = 73,
-    J = 74,  K = 75,  L = 76,
-    M = 77,  N = 78,  O = 79,
-    P = 80,  Q = 81,  R = 82,
-    S = 83,  T = 84,  U = 85,
-    V = 86,  W = 87,  X = 88,
-    Y = 89,  Z = 90,
-
-    Space      = 32,
-    Enter      = 257,
-    Escape     = 256,
-    Backspace  = 259,
-    Tab        = 258,
-    LeftShift  = 340,
-    RightShift = 344,
-    LeftCtrl   = 341,
-    LeftAlt    = 342,
-
-    F1  = 290, F2  = 291, F3  = 292,
-    F4  = 293, F5  = 294, F6  = 295,
-    F7  = 296, F8  = 297, F9  = 298,
-    F10 = 299, F11 = 300, F12 = 301,
-
-    Up    = 265, Down  = 264,
-    Left  = 263, Right = 262,
-
-    D0 = 48, D1 = 49, D2 = 50,
-    D3 = 51, D4 = 52, D5 = 53,
-    D6 = 54, D7 = 55, D8 = 56,
-    D9 = 57
-}
-
-/// <summary>Mouse buttons exposed to managed scripts.</summary>
-public enum MouseButton : int
-{
-    Left   = 0,
-    Right  = 1,
-    Middle = 2
-}
-
-} // namespace CHEngine
diff --git a/scripting/managed/src/SceneAndApplication.cs b/scripting/managed/src/SceneAndApplication.cs
deleted file mode 100644
index b122a3ab0..000000000
--- a/scripting/managed/src/SceneAndApplication.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using Coral.Managed.Interop;
-
-namespace CHEngine
-{
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Scene — static API for scene / entity queries
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Scene helpers.</summary>
-public static class Scene
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<NativeString, ulong> Scene_FindEntityByTag_Ptr;
-    internal static unsafe delegate*<NativeString, void> Scene_LoadScene_Ptr;
-    internal static unsafe delegate*<ulong> Scene_GetPrimaryCameraEntity_Ptr;
-    internal static unsafe delegate*<ulong, ulong> Scene_CopyEntity_Ptr;
-#pragma warning restore 0649
-
-    private static unsafe ulong FindEntityByTag_Native(string tag) => Scene_FindEntityByTag_Ptr(tag);
-    /// <summary>Loads a scene.</summary>
-    public static unsafe void LoadScene(string path) => Scene_LoadScene_Ptr(path);
-    private static unsafe ulong GetPrimaryCameraEntity_Native() => Scene_GetPrimaryCameraEntity_Ptr();
-
-    /// <summary>Finds an entity by tag.</summary>
-    public static Entity? FindEntityByTag(string tag)
-    {
-        ulong entityId = FindEntityByTag_Native(tag);
-        return entityId != 0 ? new Entity(entityId) : null;
-    }
-
-    /// <summary>Returns the main camera entity.</summary>
-    public static Entity? GetMainCamera()
-    {
-        ulong entityId = GetPrimaryCameraEntity_Native();
-        if (entityId != 0) return new Entity(entityId);
-
-        // Fallback: first camera in the scene.
-        var entityIds = Entity.FindAllWithComponent<CameraComponent>();
-        if (entityIds.Length > 0) return new Entity(entityIds[0]);
-
-        return null;
-    }
-
-    /// <summary>Creates a deep copy of an entity.</summary>
-    public static Entity? CopyEntity(Entity entity)
-    {
-        if (entity == null || !entity.IsValid) return null;
-        ulong newId = 0;
-        unsafe { newId = Scene_CopyEntity_Ptr(entity.ID); }
-        return newId != 0 ? new Entity(newId) : null;
-    }
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Audio — static API for audio playback
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Audio helpers.</summary>
-public static class Audio
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<NativeString, float, float, bool, void> Audio_Play_Ptr;
-    internal static unsafe delegate*<NativeString, void> Audio_Stop_Ptr;
-    internal static unsafe delegate*<void> Audio_StopAll_Ptr;
-#pragma warning restore 0649
-
-    /// <summary>Plays an audio clip.</summary>
-    public static unsafe void Play(string path, float volume = 1.0f, float pitch = 1.0f, bool loop = false) => Audio_Play_Ptr(path, volume, pitch, loop);
-    /// <summary>Stops playback for one clip.</summary>
-    public static unsafe void Stop(string path) => Audio_Stop_Ptr(path);
-    /// <summary>Stops all audio.</summary>
-    public static unsafe void StopAll() => Audio_StopAll_Ptr();
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Application — static API for application control
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Application helpers.</summary>
-public static class Application
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<void> Application_Close_Ptr;
-    internal static unsafe delegate*<int> Application_GetFPS_Ptr;
-    internal static unsafe delegate*<float> Application_GetFrameTime_Ptr;
-#pragma warning restore 0649
-
-    /// <summary>Requests shutdown.</summary>
-    public static unsafe void Close() => Application_Close_Ptr();
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Time — static API for timing information
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Frame timing.</summary>
-public static class Time
-{
-    /// <summary>Current frame rate.</summary>
-    public static unsafe int FPS => Application.Application_GetFPS_Ptr();
-    /// <summary>Current frame time.</summary>
-    public static unsafe float DeltaTime => Application.Application_GetFrameTime_Ptr();
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  AppWindow — static API for window control
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Window helpers.</summary>
-public static class AppWindow
-{
-#pragma warning disable 0649
-    internal static unsafe delegate*<int, int, void> Window_SetSize_Ptr;
-    internal static unsafe delegate*<bool, void> Window_SetFullscreen_Ptr;
-    internal static unsafe delegate*<bool, void> Window_SetVSync_Ptr;
-    internal static unsafe delegate*<bool, void> Window_SetAntialiasing_Ptr;
-#pragma warning restore 0649
-
-    /// <summary>Sets the window size.</summary>
-    public static unsafe void SetSize(int width, int height) => Window_SetSize_Ptr(width, height);
-    /// <summary>Toggles fullscreen mode.</summary>
-    public static unsafe void SetFullscreen(bool enabled) => Window_SetFullscreen_Ptr(enabled);
-    /// <summary>Toggles vertical sync.</summary>
-    public static unsafe void SetVSync(bool enabled) => Window_SetVSync_Ptr(enabled);
-    /// <summary>Toggles multisampling.</summary>
-    public static unsafe void SetAntialiasing(bool enabled) => Window_SetAntialiasing_Ptr(enabled);
-}
-
-}
diff --git a/scripting/managed/src/Script.cs b/scripting/managed/src/Script.cs
deleted file mode 100644
index d4ce842be..000000000
--- a/scripting/managed/src/Script.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace CHEngine
-{
-
-// ─────────────────────────────────────────────────────────────────────────────
-//  Script — base class for all user-defined C# scripts
-// ─────────────────────────────────────────────────────────────────────────────
-/// <summary>Base class for managed scripts.</summary>
-public abstract class Script
-{
-    /// <summary>The entity this script is attached to.</summary>
-    public Entity Entity { get; private set; } = null!;
-
-    /// <summary>Returns a component from the entity.</summary>
-    public T? GetComponent<T>() where T : Component, new() => Entity.GetComponent<T>();
-    /// <summary>True when the entity has the component.</summary>
-    public bool HasComponent<T>() where T : Component, new() => Entity.HasComponent<T>();
-
-#pragma warning disable 0649
-    /// <summary>Native entry point for lifecycle pointers.</summary>
-    internal static unsafe delegate*<ulong, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, void> RegisterLifecyclePointers;
-#pragma warning restore 0649
-
-    // Explicit delegates for unmanaged function pointers (Marshal does not support generic Action<T>)
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    private delegate void OnCreateDelegate();
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    private delegate void OnStartDelegate();
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    private delegate void OnUpdateDelegate(float deltaTime);
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    private delegate void OnDestroyDelegate();
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    private delegate void OnGUIDelegate();
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    private delegate void OnCollisionEnterDelegate(ulong otherID);
-
-    // Keep delegates alive to prevent GC
-    private OnCreateDelegate? _onCreate;
-    private OnStartDelegate? _onStart;
-    private OnUpdateDelegate? _onUpdate;
-    private OnDestroyDelegate? _onDestroy;
-    private OnGUIDelegate?    _onGUI;
-    private OnCollisionEnterDelegate? _onCollisionEnter;
-
-    /// <summary>Cached lifecycle methods for a script type.</summary>
-    internal class ScriptMethods
-    {
-        public System.Reflection.MethodInfo OnCreate;
-        public System.Reflection.MethodInfo OnStart;
-        public System.Reflection.MethodInfo OnUpdate;
-        public System.Reflection.MethodInfo OnDestroy;
-        public System.Reflection.MethodInfo OnGUI;
-        public System.Reflection.MethodInfo OnCollisionEnter;
-    }
-
-    private static readonly System.Collections.Generic.Dictionary<Type, ScriptMethods> s_MethodCache = new();
-
-    /// <summary>Caches lifecycle delegates and passes them to native code.</summary>
-    internal void __Init(ulong entityID)
-    {
-        Entity = new Entity(entityID);
-        
-        var scriptType = this.GetType();
-        
-        if (!s_MethodCache.TryGetValue(scriptType, out var scriptMethods))
-        {
-            scriptMethods = new ScriptMethods
-            {
-                OnCreate = scriptType.GetMethod("OnCreate", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)!,
-                OnStart = scriptType.GetMethod("OnStart", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)!,
-                OnUpdate = scriptType.GetMethod("OnUpdate", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)!,
-                OnDestroy = scriptType.GetMethod("OnDestroy", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)!,
-                OnGUI = scriptType.GetMethod("OnGUI", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)!,
-                OnCollisionEnter = scriptType.GetMethod("OnCollisionEnter", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)!
-            };
-            s_MethodCache[scriptType] = scriptMethods;
-        }
-
-        _onCreate  = (OnCreateDelegate)Delegate.CreateDelegate(typeof(OnCreateDelegate), this, scriptMethods.OnCreate);
-        _onStart   = (OnStartDelegate)Delegate.CreateDelegate(typeof(OnStartDelegate), this, scriptMethods.OnStart);
-        _onUpdate  = (OnUpdateDelegate)Delegate.CreateDelegate(typeof(OnUpdateDelegate), this, scriptMethods.OnUpdate);
-        _onDestroy = (OnDestroyDelegate)Delegate.CreateDelegate(typeof(OnDestroyDelegate), this, scriptMethods.OnDestroy);
-        _onGUI     = (OnGUIDelegate)Delegate.CreateDelegate(typeof(OnGUIDelegate), this, scriptMethods.OnGUI);
-        _onCollisionEnter = (OnCollisionEnterDelegate)Delegate.CreateDelegate(typeof(OnCollisionEnterDelegate), this, scriptMethods.OnCollisionEnter);
-
-        Log.Info($"[C# ScriptBase] __Init cached execution for Entity ID: {entityID}, Type: {scriptType.Name}");
-
-        unsafe
-        {
-            RegisterLifecyclePointers(entityID, 
-                Marshal.GetFunctionPointerForDelegate(_onCreate),
-                Marshal.GetFunctionPointerForDelegate(_onStart),
-                Marshal.GetFunctionPointerForDelegate(_onUpdate),
-                Marshal.GetFunctionPointerForDelegate(_onDestroy),
-                Marshal.GetFunctionPointerForDelegate(_onGUI),
-                Marshal.GetFunctionPointerForDelegate(_onCollisionEnter));
-        }
-    }
-
-    /// <summary>Called once after the script is instantiated and Entity is set.</summary>
-    public virtual void OnCreate() { Log.Info($"[C# ScriptBase] OnCreate (Default) for Entity: {Entity?.ID}"); }
-
-    /// <summary>Called once on the very first Update frame (after OnCreate).</summary>
-    public virtual void OnStart() { Log.Info($"[C# ScriptBase] OnStart (Default) for Entity: {Entity?.ID}"); }
-
-    /// <summary>Called every frame while the scene is running.</summary>
-    public virtual void OnUpdate(float deltaTime) {}
-
-    /// <summary>Called for UI rendering (e.g. HUD, Debug tools).</summary>
-    public virtual void OnGUI() {}
-
-    /// <summary>Called when a physics collision starts.</summary>
-    public virtual void OnCollisionEnter(ulong otherEntityId) {}
-
-    /// <summary>Called when the script or scene is destroyed / hot-reloaded.</summary>
-    public virtual void OnDestroy() {}
-}
-
-}
diff --git a/scripting/managed/src/UI.cs b/scripting/managed/src/UI.cs
deleted file mode 100644
index fc066fa91..000000000
--- a/scripting/managed/src/UI.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Coral.Managed.Interop;
-
-namespace CHEngine
-{
-    /// <summary>UI helpers.</summary>
-    public static class UI
-    {
-#pragma warning disable 0649
-        internal static unsafe delegate*<NativeString, void> UI_Text_Ptr;
-#pragma warning restore 0649
-
-        /// <summary>Draws UI text.</summary>
-        public static unsafe void Text(string text) => UI_Text_Ptr(text);
-    }
-}
diff --git a/scripting/scene_scripting.cpp b/scripting/scene_scripting.cpp
deleted file mode 100644
index 71ca5d815..000000000
--- a/scripting/scene_scripting.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-#include "scene_scripting.h"
-#include "engine/physics/physics.h"
-#include "engine/core/profiler.h"
-#include "engine/scene/components.h"
-#include "script_glue.h"
-#include "scriptengine.h"
-#include <Coral/ManagedObject.hpp>
-#include <memory>
-
-namespace CHEngine
-{
-
-namespace
-{
-class ActiveSceneScope
-{
-public:
-    ActiveSceneScope(ScriptEngine& engine, Scene* scene)
-        : m_Engine(engine)
-    {
-        m_Engine.SetActiveScene(scene);
-    }
-
-    ~ActiveSceneScope()
-    {
-        m_Engine.SetActiveScene(nullptr);
-    }
-
-private:
-    ScriptEngine& m_Engine;
-};
-
-class PendingScriptInstanceScope
-{
-public:
-    explicit PendingScriptInstanceScope(ManagedScriptInstance* instance)
-    {
-        ScriptGlue::SetPendingScriptInstance(instance);
-    }
-
-    ~PendingScriptInstanceScope()
-    {
-        ScriptGlue::SetPendingScriptInstance(nullptr);
-    }
-};
-} // namespace
-
-void SceneScripting::OnRuntimeStart(Scene* scene)
-{
-    std::weak_ptr<entt::registry> weakRegistry = scene->GetRegistryPtr();
-    Physics::SetCollisionCallback(scene, [weakRegistry](entt::entity a, entt::entity b) {
-        auto registryPtr = weakRegistry.lock();
-        if (!registryPtr)
-        {
-            return;
-        }
-
-        auto& registry = *registryPtr;
-        if (!registry.valid(a) || !registry.valid(b))
-        {
-            return;
-        }
-
-        // Dispatch to object A
-        if (registry.all_of<ManagedScriptComponent>(a))
-        {
-            auto& msc = registry.get<ManagedScriptComponent>(a);
-            for (auto& script : msc.Scripts)
-            {
-                if (script.Instance && script.OnCollisionEnter)
-                {
-                    script.OnCollisionEnter((uint64_t)(uint32_t)b);
-                }
-            }
-        }
-
-        // Dispatch to object B
-        if (registry.all_of<ManagedScriptComponent>(b))
-        {
-            auto& msc = registry.get<ManagedScriptComponent>(b);
-            for (auto& script : msc.Scripts)
-            {
-                if (script.Instance && script.OnCollisionEnter)
-                {
-                    script.OnCollisionEnter((uint64_t)(uint32_t)a);
-                }
-            }
-        }
-    });
-}
-
-void SceneScripting::OnRuntimeStop(Scene* scene)
-{
-    Physics::SetCollisionCallback(scene, nullptr);
-}
-
-void SceneScripting::Update(Scene* scene, Timestep deltaTime)
-{
-    CH_PROFILE_FUNCTION();
-
-    auto& scriptEngine = ScriptEngine::Get();
-
-    if (!scriptEngine.CanExecuteFrameScripts())
-    {
-        static bool s_WarnedOnce = false;
-        if (!s_WarnedOnce && !scriptEngine.IsInitialized())
-        {
-            CH_CORE_WARN("SceneScripting::Update - ScriptEngine not initialized. Scripts will not be updated.");
-            s_WarnedOnce = true;
-        }
-        return;
-    }
-
-    ActiveSceneScope activeScene(scriptEngine, scene);
-
-    auto& registry = scene->GetRegistry();
-    auto view = registry.view<ManagedScriptComponent>();
-
-    // Debug log to trace total entities with ManagedScriptComponent
-    static bool s_LoggedOnce = false;
-    if (!s_LoggedOnce)
-    {
-        int count = 0;
-        for (auto e : view)
-        {
-            count++;
-        }
-        CH_CORE_INFO("SceneScripting::Update - Found {} entities with ManagedScriptComponent", count);
-        s_LoggedOnce = true;
-    }
-
-    for (auto&& [entity, msc] : view.each())
-    {
-        for (auto& script : msc.Scripts)
-        {
-            // 1. Instantiation Phase
-            if (!script.Instance && !script.ClassName.empty())
-            {
-                auto* type = scriptEngine.GetScriptClass(script.ClassName);
-                if (type)
-                {
-                    CH_CORE_INFO("SceneScripting::Update - Instantiating script '{}' for entity '{}'", script.ClassName,
-                                 (uint32_t)entity);
-                    Coral::ManagedObject* obj = nullptr;
-                    try
-                    {
-                        // First, create the instance (calls C# constructor)
-                        obj = new Coral::ManagedObject(type->CreateInstance());
-
-                        // Immediately inject the entity ID before OnCreate
-                        // Note: SetPendingScriptInstance allows the script to register its delegates
-                        PendingScriptInstanceScope pendingScriptInstance(&script);
-                        CH_CORE_INFO("ScriptEngine: Calling __Init for entity {}", (uint32_t)entity);
-                        obj->InvokeMethod("__Init", (uint64_t)(uint32_t)entity);
-                        CH_CORE_INFO("ScriptEngine: __Init call finished for entity {}", (uint32_t)entity);
-
-                        // 2. Apply persistent field values
-                        for (const auto& [fieldName, field] : script.Fields)
-                        {
-                            std::visit([&](auto&& val) { obj->SetFieldValue(fieldName, val); }, field.Value);
-                        }
-
-                        // Initialize logic
-                        if (script.OnCreate)
-                        {
-                            script.OnCreate();
-                        }
-                        else
-                        {
-                            obj->InvokeMethod("OnCreate");
-                        }
-
-                        script.Instance = obj;
-                        script.NeedsStart = true;
-                    } catch (const std::exception& e)
-                    {
-                        CH_CORE_ERROR("ScriptEngine: Exception instantiating script '{}': {}", script.ClassName,
-                                      e.what());
-                        if (obj)
-                        {
-                            delete obj;
-                        }
-                    } catch (...)
-                    {
-                        CH_CORE_ERROR("ScriptEngine: Unknown exception instantiating script '{}'", script.ClassName);
-                        if (obj)
-                        {
-                            delete obj;
-                        }
-                    }
-                }
-            }
-
-            // 2. Lifecycle Execution Phase
-            if (script.Instance)
-            {
-                auto* obj = static_cast<Coral::ManagedObject*>(script.Instance);
-                if (!obj->IsValid())
-                {
-                    continue;
-                }
-
-                try
-                {
-                    // OnStart: called once on the first frame after creation
-                    if (script.NeedsStart)
-                    {
-                        if (script.OnStart)
-                        {
-                            script.OnStart();
-                        }
-                        else
-                        {
-                            obj->InvokeMethod("OnStart");
-                        }
-
-                        script.NeedsStart = false;
-                    }
-
-                    // OnUpdate: called every frame
-                    if (script.OnUpdate)
-                    {
-                        script.OnUpdate((float)deltaTime);
-                    }
-                    else
-                    {
-                        obj->InvokeMethod("OnUpdate", (float)deltaTime);
-                    }
-                } catch (const std::exception& e)
-                {
-                    CH_CORE_ERROR("ScriptEngine: Exception in script lifecycle for '{}': {}", script.ClassName,
-                                  e.what());
-                }
-            }
-        }
-    }
-}
-
-void ManagedScriptInstance::Destroy()
-{
-    if (Instance)
-    {
-        auto* obj = static_cast<Coral::ManagedObject*>(Instance);
-        if (obj && obj->IsValid())
-        {
-            try
-            {
-                if (OnDestroy)
-                {
-                    OnDestroy();
-                }
-                else
-                {
-                    obj->InvokeMethod("OnDestroy");
-                }
-            }
-            catch (const std::exception& e)
-            {
-                CH_CORE_ERROR("ScriptEngine: Exception during OnDestroy for script '{}': {}", ClassName, e.what());
-            }
-            catch (...)
-            {
-                CH_CORE_ERROR("ScriptEngine: Unknown exception during OnDestroy for script '{}'", ClassName);
-            }
-
-            obj->Destroy();
-            delete obj;
-        }
-    }
-
-    ResetRuntimeState();
-}
-
-void ManagedScriptInstance::ResetRuntimeState()
-{
-    Instance = nullptr;
-    NeedsStart = true;
-    OnCreate = nullptr;
-    OnStart = nullptr;
-    OnUpdate = nullptr;
-    OnDestroy = nullptr;
-    OnGUI = nullptr;
-    OnCollisionEnter = nullptr;
-}
-
-void SceneScripting::Stop(Scene* scene)
-{
-    if (!scene) return;
-
-    auto& scriptEngine = ScriptEngine::Get();
-    if (!scriptEngine.IsInitialized())
-    {
-        return;
-    }
-
-    ActiveSceneScope activeScene(scriptEngine, scene);
-
-    auto view = scene->GetRegistry().view<ManagedScriptComponent>();
-    for (auto entity : view)
-    {
-        auto& msc = view.get<ManagedScriptComponent>(entity);
-        for (auto& script : msc.Scripts)
-        {
-            script.Destroy();
-        }
-    }
-}
-
-void SceneScripting::DispatchEvent(Scene* scene, Event& e)
-{
-    // Future: dispatch specialized events to C# (e.g. OnCollisionEnter)
-}
-
-void SceneScripting::RenderUI(Scene* scene)
-{
-    auto& scriptEngine = ScriptEngine::Get();
-
-    if (!scriptEngine.CanExecuteFrameScripts())
-    {
-        return;
-    }
-
-    ActiveSceneScope activeScene(scriptEngine, scene);
-
-    auto& registry = scene->GetRegistry();
-    auto view = registry.view<ManagedScriptComponent>();
-
-    for (auto&& [entity, msc] : view.each())
-    {
-        for (auto& script : msc.Scripts)
-        {
-            if (script.Instance && script.OnGUI)
-            {
-                auto* obj = static_cast<Coral::ManagedObject*>(script.Instance);
-                if (obj->IsValid())
-                {
-                    try
-                    {
-                        script.OnGUI();
-                    } catch (const std::exception& e)
-                    {
-                        CH_CORE_ERROR("ScriptEngine: Exception in OnGUI for '{}': {}", script.ClassName, e.what());
-                    }
-                }
-            }
-        }
-    }
-
-}
-
-} // namespace CHEngine
diff --git a/scripting/scene_scripting.h b/scripting/scene_scripting.h
deleted file mode 100644
index 1d90842eb..000000000
--- a/scripting/scene_scripting.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CH_SCENE_SCRIPTING_H
-#define CH_SCENE_SCRIPTING_H
-
-#include "engine/core/events.h"
-#include "engine/scene/scene.h"
-
-namespace CHEngine
-{
-class SceneScripting
-{
-public:
-    static void OnRuntimeStart(Scene* scene);
-    static void OnRuntimeStop(Scene* scene);
-    static void Update(Scene* scene, Timestep deltaTime);
-    static void Stop(Scene* scene);
-    static void DispatchEvent(Scene* scene, Event& e);
-    static void RenderUI(Scene* scene);
-};
-} // namespace CHEngine
-
-#endif // CH_SCENE_SCRIPTING_H
diff --git a/scripting/script_glue.cpp b/scripting/script_glue.cpp
deleted file mode 100644
index 3ca12d778..000000000
--- a/scripting/script_glue.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine {
-
-    void ScriptGlue::RegisterInternalCalls(Coral::ManagedAssembly& assembly) {
-        RegisterSystemGlue(assembly);
-        RegisterInputGlue(assembly);
-        RegisterSceneGlue(assembly);
-        RegisterEntityGlue(assembly);
-        RegisterCameraGlue(assembly);
-        RegisterUIGlue(assembly);
-        RegisterGameplayGlue(assembly);
-
-        assembly.UploadInternalCalls();
-    }
-
-} // namespace CHEngine
diff --git a/scripting/script_glue.h b/scripting/script_glue.h
deleted file mode 100644
index b58c761a5..000000000
--- a/scripting/script_glue.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef CH_SCRIPT_GLUE_H
-#define CH_SCRIPT_GLUE_H
-
-#include <Coral/Assembly.hpp>
-
-namespace CHEngine {
-    struct ManagedScriptInstance;
-
-    class ScriptGlue {
-    public:
-        static void RegisterInternalCalls(Coral::ManagedAssembly& assembly);
-        static void SetPendingScriptInstance(ManagedScriptInstance* instance);
-    };
-}
-
-#endif // CH_SCRIPT_GLUE_H
diff --git a/scripting/script_glue_camera.cpp b/scripting/script_glue_camera.cpp
deleted file mode 100644
index 685e8760c..000000000
--- a/scripting/script_glue_camera.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine {
-
-    // ── Camera ────────────────────────────────────────────────────────────
-    CH_SCRIPT_FUNC void Camera_GetForward(uint64_t entityID, glm::vec3* outForward) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) {
-            auto& tc = entity.GetComponent<TransformComponent>();
-            glm::quat rotation = tc.RotationQuat;
-            *outForward = rotation * glm::vec3(0.0f, 0.0f, -1.0f);
-        }
-    }
-
-    CH_SCRIPT_FUNC void Camera_GetRight(uint64_t entityID, glm::vec3* outRight) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) {
-            auto& tc = entity.GetComponent<TransformComponent>();
-            glm::quat rotation = tc.RotationQuat;
-            *outRight = rotation * glm::vec3(1.0f, 0.0f, 0.0f);
-        }
-    }
-
-    CH_SCRIPT_FUNC void Camera_GetOrbit(uint64_t entityID, float* yaw, float* pitch, float* distance) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<CameraComponent>()) {
-            auto& camera = entity.GetComponent<CameraComponent>();
-            *yaw = camera.OrbitYaw;
-            *pitch = camera.OrbitPitch;
-            *distance = camera.OrbitDistance;
-        }
-    }
-
-    CH_SCRIPT_FUNC void Camera_SetOrbit(uint64_t entityID, float yaw, float pitch, float distance) {
-        Entity entity = GetEntity(entityID);
-        Scene* scene = GetActiveScene();
-        if (entity && entity.HasComponent<CameraComponent>() && entity.HasComponent<TransformComponent>() && scene) {
-            auto& camera = entity.GetComponent<CameraComponent>();
-            camera.OrbitYaw = yaw;
-            camera.OrbitPitch = pitch;
-            camera.OrbitDistance = distance;
-
-            // Sync with TransformComponent
-            auto& tc = entity.GetComponent<TransformComponent>();
-            Entity target = scene->FindEntityByTag(camera.TargetEntityTag);
-            
-            glm::vec3 targetPos = glm::vec3(0.0f);
-            if (target && target.HasComponent<TransformComponent>()) {
-                targetPos = target.GetComponent<TransformComponent>().Translation;
-            }
-
-            // Calculate rotation from orbit angles
-            float yawRad = glm::radians(yaw);
-            float pitchRad = glm::radians(pitch);
-            glm::quat rotation = glm::quat(glm::vec3(pitchRad, yawRad, 0.0f));
-            glm::vec3 offset = rotation * glm::vec3(0.0f, 0.0f, distance);
-            
-            glm::vec3 newPos = targetPos + offset;
-            tc.SetTranslation(newPos);
-            tc.SetRotationQuat(rotation);
-        }
-    }
-
-    CH_SCRIPT_FUNC bool Camera_GetPrimary(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<CameraComponent>() ? entity.GetComponent<CameraComponent>().Primary : false;
-    }
-
-    CH_SCRIPT_FUNC void Camera_SetPrimary(uint64_t entityID, bool primary) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<CameraComponent>()) 
-            entity.GetComponent<CameraComponent>().Primary = primary;
-    }
-
-    CH_SCRIPT_FUNC bool Camera_GetIsOrbit(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<CameraComponent>() ? entity.GetComponent<CameraComponent>().IsOrbitCamera : false;
-    }
-
-    CH_SCRIPT_FUNC void Camera_SetIsOrbit(uint64_t entityID, bool isOrbit) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<CameraComponent>()) 
-            entity.GetComponent<CameraComponent>().IsOrbitCamera = isOrbit;
-    }
-
-    CH_SCRIPT_FUNC Coral::String Camera_GetTargetTag(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<CameraComponent>() ? Coral::String::New(entity.GetComponent<CameraComponent>().TargetEntityTag) : Coral::String::New("");
-    }
-
-    CH_SCRIPT_FUNC void Camera_SetTargetTag(uint64_t entityID, Coral::String tag) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<CameraComponent>()) 
-            entity.GetComponent<CameraComponent>().TargetEntityTag = (std::string)tag;
-    }
-
-    void RegisterCameraGlue(Coral::ManagedAssembly& assembly) {
-        #define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr) assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-        
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_GetForward_Ptr, Camera_GetForward);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_GetRight_Ptr, Camera_GetRight);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_GetOrbit_Ptr, Camera_GetOrbit);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_SetOrbit_Ptr, Camera_SetOrbit);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_GetPrimary_Ptr, Camera_GetPrimary);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_SetPrimary_Ptr, Camera_SetPrimary);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_GetIsOrbit_Ptr, Camera_GetIsOrbit);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_SetIsOrbit_Ptr, Camera_SetIsOrbit);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_GetTargetTag_Ptr, Camera_GetTargetTag);
-        CH_ADD_INTERNAL_CALL(CameraComponent, Camera_SetTargetTag_Ptr, Camera_SetTargetTag);
-
-        #undef CH_ADD_INTERNAL_CALL
-    } } // namespace CHEngine
-
diff --git a/scripting/script_glue_entity.cpp b/scripting/script_glue_entity.cpp
deleted file mode 100644
index 696cb286a..000000000
--- a/scripting/script_glue_entity.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine {
-
-    // ── Entity / Transform ────────────────────────────────────────────────
-    CH_SCRIPT_FUNC void Entity_GetTranslation(uint64_t entityID, glm::vec3* outTranslation) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) 
-            *outTranslation = entity.GetComponent<TransformComponent>().Translation;
-    }
-
-    CH_SCRIPT_FUNC void Entity_SetTranslation(uint64_t entityID, glm::vec3* inTranslation) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) 
-            entity.GetComponent<TransformComponent>().SetTranslation(*inTranslation);
-    }
-
-    CH_SCRIPT_FUNC void Entity_GetRotation(uint64_t entityID, glm::vec3* outRotation) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) 
-            *outRotation = entity.GetComponent<TransformComponent>().Rotation;
-    }
-
-    CH_SCRIPT_FUNC void Entity_SetRotation(uint64_t entityID, glm::vec3* inRotation) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) 
-            entity.GetComponent<TransformComponent>().SetRotation(*inRotation);
-    }
-
-    CH_SCRIPT_FUNC void Entity_GetScale(uint64_t entityID, glm::vec3* outScale) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) 
-            *outScale = entity.GetComponent<TransformComponent>().Scale;
-    }
-
-    CH_SCRIPT_FUNC void Entity_SetScale(uint64_t entityID, glm::vec3* inScale) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TransformComponent>()) 
-            entity.GetComponent<TransformComponent>().SetScale(*inScale);
-    }
-
-    CH_SCRIPT_FUNC Coral::String Entity_GetModelPath(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<ModelComponent>() ? Coral::String::New(entity.GetComponent<ModelComponent>().ModelPath) : Coral::String::New("");
-    }
-
-    CH_SCRIPT_FUNC void Entity_SetModelPath(uint64_t entityID, Coral::String inPath) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<ModelComponent>())
-            entity.GetComponent<ModelComponent>().ModelPath = (std::string)inPath;
-    }
-
-    CH_SCRIPT_FUNC void Entity_AddComponent(uint64_t entityID, Coral::String componentName) {
-        Entity entity = GetEntity(entityID);
-        if (!entity) return;
-        
-        std::string name = (std::string)componentName;
-        if (name == "TransformComponent") entity.AddComponent<TransformComponent>();
-        else if (name == "RigidBodyComponent") entity.AddComponent<RigidBodyComponent>();
-        else if (name == "ModelComponent") entity.AddComponent<ModelComponent>();
-        else if (name == "TagComponent") entity.AddComponent<TagComponent>();
-        else if (name == "AudioComponent") entity.AddComponent<AudioComponent>();
-        else if (name == "CameraComponent") entity.AddComponent<CameraComponent>();
-        else if (name == "ManagedScriptComponent") entity.AddComponent<ManagedScriptComponent>();
-    }
-
-    CH_SCRIPT_FUNC void Entity_GetVelocity(uint64_t entityID, glm::vec3* outVelocity) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<RigidBodyComponent>()) 
-            *outVelocity = entity.GetComponent<RigidBodyComponent>().Velocity;
-    }
-
-    CH_SCRIPT_FUNC void Entity_SetVelocity(uint64_t entityID, glm::vec3* inVelocity) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<RigidBodyComponent>()) 
-            entity.GetComponent<RigidBodyComponent>().Velocity = *inVelocity;
-    }
-
-    CH_SCRIPT_FUNC bool Entity_IsGrounded(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<RigidBodyComponent>() ? entity.GetComponent<RigidBodyComponent>().IsGrounded : false;
-    }
-
-    CH_SCRIPT_FUNC bool Entity_IsKinematic(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<RigidBodyComponent>() ? entity.GetComponent<RigidBodyComponent>().IsKinematic : false;
-    }
-
-    CH_SCRIPT_FUNC void Entity_SetKinematic(uint64_t entityID, bool isKinematic) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<RigidBodyComponent>())
-            entity.GetComponent<RigidBodyComponent>().IsKinematic = isKinematic;
-    }
-
-    CH_SCRIPT_FUNC bool Entity_HasComponent(uint64_t entityID, Coral::String componentName) {
-        Entity entity = GetEntity(entityID);
-        if (!entity) return false;
-        
-        std::string name = (std::string)componentName;
-        if (name == "TransformComponent") return entity.HasComponent<TransformComponent>();
-        if (name == "TagComponent")       return entity.HasComponent<TagComponent>();
-        if (name == "MeshComponent" || name == "ModelComponent") return entity.HasComponent<ModelComponent>();
-        if (name == "MaterialComponent")  return entity.HasComponent<MaterialComponent>();
-        if (name == "SpriteComponent")    return entity.HasComponent<SpriteComponent>();
-        if (name == "LightComponent")     return entity.HasComponent<LightComponent>();
-        if (name == "CameraComponent")    return entity.HasComponent<CameraComponent>();
-        if (name == "AudioComponent")     return entity.HasComponent<AudioComponent>();
-        if (name == "RigidBodyComponent") return entity.HasComponent<RigidBodyComponent>();
-        if (name == "PhysicsComponent" || name == "ColliderComponent") return entity.HasComponent<ColliderComponent>();
-        if (name == "AnimationComponent") return entity.HasComponent<AnimationComponent>();
-        if (name == "HierarchyComponent") return entity.HasComponent<HierarchyComponent>();
-        if (name == "IDComponent")        return entity.HasComponent<IDComponent>();
-        if (name == "ManagedScriptComponent") return entity.HasComponent<ManagedScriptComponent>();
-        if (name == "PlayerComponent")    return entity.HasComponent<PlayerComponent>();
-        if (name == "SpawnComponent")     return entity.HasComponent<SpawnComponent>();
-        if (name == "SceneTransitionComponent") return entity.HasComponent<SceneTransitionComponent>();
-        if (name == "ControlComponent")   return entity.HasComponent<ControlComponent>();
-        if (name.find("Control") != std::string::npos || name.find("Group") != std::string::npos) {
-             if (name == "ButtonControl")      return entity.HasComponent<ButtonControl>();
-             if (name == "PanelControl")       return entity.HasComponent<PanelControl>();
-             if (name == "LabelControl")       return entity.HasComponent<LabelControl>();
-             if (name == "ImageControl")       return entity.HasComponent<ImageControl>();
-             if (name == "CheckboxControl")    return entity.HasComponent<CheckboxControl>();
-             if (name == "ComboBoxControl")    return entity.HasComponent<ComboBoxControl>();
-             if (name == "SliderControl")      return entity.HasComponent<SliderControl>();
-             if (name == "ProgressBarControl") return entity.HasComponent<ProgressBarControl>();
-             if (name == "InputTextControl")   return entity.HasComponent<InputTextControl>();
-             if (name == "ImageButtonControl") return entity.HasComponent<ImageButtonControl>();
-             if (name == "SeparatorControl")   return entity.HasComponent<SeparatorControl>();
-             if (name == "RadioButtonControl") return entity.HasComponent<RadioButtonControl>();
-             if (name == "ColorPickerControl") return entity.HasComponent<ColorPickerControl>();
-             if (name == "DragFloatControl")   return entity.HasComponent<DragFloatControl>();
-             if (name == "DragIntControl")     return entity.HasComponent<DragIntControl>();
-             if (name == "VerticalLayoutGroup") return entity.HasComponent<VerticalLayoutGroup>();
-        }
-
-        return false;
-    }
-
-    CH_SCRIPT_FUNC Coral::Array<uint64_t> Entity_FindAllWithComponent(Coral::String componentName) {
-        Scene* scene = GetActiveScene();
-        if (!scene) return Coral::Array<uint64_t>::New(0);
-        
-        std::string name = (std::string)componentName;
-        std::vector<uint64_t> ids;
-
-        auto addToVec = [&](auto view) {
-            for (auto entity : view) ids.push_back((uint64_t)(uint32_t)entity);
-        };
-
-        if (name == "TransformComponent") addToVec(scene->GetRegistry().view<TransformComponent>());
-        else if (name == "RigidBodyComponent") addToVec(scene->GetRegistry().view<RigidBodyComponent>());
-        else if (name == "CameraComponent")    addToVec(scene->GetRegistry().view<CameraComponent>());
-        else if (name == "PlayerComponent")    addToVec(scene->GetRegistry().view<PlayerComponent>());
-        else if (name == "AudioComponent")     addToVec(scene->GetRegistry().view<AudioComponent>());
-        else if (name == "TagComponent")       addToVec(scene->GetRegistry().view<TagComponent>());
-
-        return Coral::Array<uint64_t>::New(ids);
-    }
-
-    CH_SCRIPT_FUNC Coral::String TagComponent_GetTag(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<TagComponent>()) 
-            return Coral::String::New(entity.GetComponent<TagComponent>().Tag); 
-        return Coral::String::New("");
-    }
-
-    void RegisterEntityGlue(Coral::ManagedAssembly& assembly) {
-        #define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr) assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-        
-        CH_ADD_INTERNAL_CALL(Entity, Entity_FindAllWithComponent_Ptr, Entity_FindAllWithComponent);
-        CH_ADD_INTERNAL_CALL(Entity, Entity_HasComponent_Ptr, Entity_HasComponent);
-        CH_ADD_INTERNAL_CALL(Entity, Entity_AddComponent_Ptr, Entity_AddComponent);
-        
-        CH_ADD_INTERNAL_CALL(TransformComponent, Transform_GetTranslation_Ptr, Entity_GetTranslation);
-        CH_ADD_INTERNAL_CALL(TransformComponent, Transform_SetTranslation_Ptr, Entity_SetTranslation);
-        CH_ADD_INTERNAL_CALL(TransformComponent, Transform_GetRotation_Ptr, Entity_GetRotation);
-        CH_ADD_INTERNAL_CALL(TransformComponent, Transform_SetRotation_Ptr, Entity_SetRotation);
-        CH_ADD_INTERNAL_CALL(TransformComponent, Transform_GetScale_Ptr, Entity_GetScale);
-        CH_ADD_INTERNAL_CALL(TransformComponent, Transform_SetScale_Ptr, Entity_SetScale);
-
-        CH_ADD_INTERNAL_CALL(ModelComponent, Model_GetModelPath_Ptr, Entity_GetModelPath);
-        CH_ADD_INTERNAL_CALL(ModelComponent, Model_SetModelPath_Ptr, Entity_SetModelPath);
-
-        CH_ADD_INTERNAL_CALL(RigidBodyComponent, RigidBody_GetVelocity_Ptr, Entity_GetVelocity);
-        CH_ADD_INTERNAL_CALL(RigidBodyComponent, RigidBody_SetVelocity_Ptr, Entity_SetVelocity);
-        CH_ADD_INTERNAL_CALL(RigidBodyComponent, RigidBody_IsGrounded_Ptr, Entity_IsGrounded);
-        CH_ADD_INTERNAL_CALL(RigidBodyComponent, RigidBody_IsKinematic_Ptr, Entity_IsKinematic);
-        CH_ADD_INTERNAL_CALL(RigidBodyComponent, RigidBody_SetKinematic_Ptr, Entity_SetKinematic);
-
-        CH_ADD_INTERNAL_CALL(TagComponent, TagComponent_GetTag_Ptr, TagComponent_GetTag);
-
-        #undef CH_ADD_INTERNAL_CALL
-    } } // namespace CHEngine
-
diff --git a/scripting/script_glue_gameplay.cpp b/scripting/script_glue_gameplay.cpp
deleted file mode 100644
index 9e20ba6cb..000000000
--- a/scripting/script_glue_gameplay.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine {
-
-    // ── Spawn / Transition ────────────────────────────────────────────────
-    CH_SCRIPT_FUNC bool SpawnComponent_IsActive(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<SpawnComponent>() ? entity.GetComponent<SpawnComponent>().IsActive : false;
-    }
-
-    CH_SCRIPT_FUNC void SpawnComponent_GetSpawnPoint(uint64_t entityID, glm::vec3* point) {
-        Entity entity = GetEntity(entityID);
-        if (!point) return;
-        if (entity && entity.HasComponent<SpawnComponent>())
-            *point = entity.GetComponent<SpawnComponent>().SpawnPoint;
-        else
-            *point = {0,0,0};
-    }
-
-    CH_SCRIPT_FUNC Coral::String SceneTransitionComponent_GetTargetScene(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<SceneTransitionComponent>())
-            return Coral::String::New(entity.GetComponent<SceneTransitionComponent>().TargetScenePath);
-        return Coral::String::New("");
-    }
-
-    // ── RPGStatsComponent ────────────────────────────────────────────────
-    CH_SCRIPT_FUNC int RPGStatsComponent_GetLevel(uint64_t entityID) {
-        auto e = GetEntity(entityID);
-        return e && e.HasComponent<RPGStatsComponent>() ? e.GetComponent<RPGStatsComponent>().Level : 0;
-    }
-    CH_SCRIPT_FUNC void RPGStatsComponent_SetLevel(uint64_t entityID, int val) {
-        auto e = GetEntity(entityID);
-        if (e && e.HasComponent<RPGStatsComponent>()) e.GetComponent<RPGStatsComponent>().Level = val;
-    }
-    CH_SCRIPT_FUNC float RPGStatsComponent_GetHealth(uint64_t entityID) {
-        auto e = GetEntity(entityID);
-        return e && e.HasComponent<RPGStatsComponent>() ? e.GetComponent<RPGStatsComponent>().Health : 0.0f;
-    }
-    CH_SCRIPT_FUNC void RPGStatsComponent_SetHealth(uint64_t entityID, float val) {
-        auto e = GetEntity(entityID);
-        if (e && e.HasComponent<RPGStatsComponent>()) e.GetComponent<RPGStatsComponent>().Health = val;
-    }
-    CH_SCRIPT_FUNC int RPGStatsComponent_GetGold(uint64_t entityID) {
-        auto e = GetEntity(entityID);
-        return e && e.HasComponent<RPGStatsComponent>() ? e.GetComponent<RPGStatsComponent>().Gold : 0;
-    }
-    CH_SCRIPT_FUNC void RPGStatsComponent_SetGold(uint64_t entityID, int val) {
-        auto e = GetEntity(entityID);
-        if (e && e.HasComponent<RPGStatsComponent>()) e.GetComponent<RPGStatsComponent>().Gold = val;
-    }
-
-    // ── SkillComponent ───────────────────────────────────────────────────
-    CH_SCRIPT_FUNC bool SkillComponent_IsUnlocked(uint64_t entityID) {
-        auto e = GetEntity(entityID);
-        return e && e.HasComponent<SkillComponent>() ? e.GetComponent<SkillComponent>().IsUnlocked : false;
-    }
-    CH_SCRIPT_FUNC void SkillComponent_SetUnlocked(uint64_t entityID, bool val) {
-        auto e = GetEntity(entityID);
-        if (e && e.HasComponent<SkillComponent>()) e.GetComponent<SkillComponent>().IsUnlocked = val;
-    }
-
-    // ── PlayerComponent ───────────────────────────────────────────────────
-    CH_SCRIPT_FUNC float PlayerComponent_GetMovementSpeed(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<PlayerComponent>() ? entity.GetComponent<PlayerComponent>().MovementSpeed : 0.0f;
-    }
-
-    CH_SCRIPT_FUNC void PlayerComponent_SetMovementSpeed(uint64_t entityID, float speed) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<PlayerComponent>()) 
-            entity.GetComponent<PlayerComponent>().MovementSpeed = speed;
-    }
-
-    // ── Audio ─────────────────────────────────────────────────────────────
-    CH_SCRIPT_FUNC void Audio_Play(Coral::String path, float volume, float pitch, bool loop) {
-        if (Project::GetActive() != nullptr) {
-            const std::string soundPath = (std::string)path;
-            AudioHandle handle = Audio::Get().LoadSound(soundPath);
-            if (handle != 0) {
-                Audio::Get().Play(handle, volume, pitch, loop);
-
-                if (Scene* scene = GetActiveScene()) {
-                    auto& registry = scene->GetRegistry();
-                    auto view = registry.view<AudioComponent>();
-                    for (auto entity : view) {
-                        auto& audio = view.get<AudioComponent>(entity);
-                        if (audio.SoundPath == soundPath) {
-                            audio.SoundHandle = handle;
-                            audio.IsPlaying = true;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    CH_SCRIPT_FUNC void Audio_Stop(Coral::String path) {
-        if (Project::GetActive() != nullptr) {
-            const std::string soundPath = (std::string)path;
-            Audio::Get().Stop(soundPath);
-
-            if (Scene* scene = GetActiveScene()) {
-                auto& registry = scene->GetRegistry();
-                auto view = registry.view<AudioComponent>();
-                for (auto entity : view) {
-                    auto& audio = view.get<AudioComponent>(entity);
-                    if (audio.SoundPath == soundPath) {
-                        audio.IsPlaying = false;
-                    }
-                }
-            }
-        }
-    }
-
-    CH_SCRIPT_FUNC void Audio_StopAll() {
-        if (Project::GetActive() != nullptr) {
-            Audio::Get().StopAll();
-        }
-    }
-
-    CH_SCRIPT_FUNC void AudioComponent_SetVolume(uint64_t entityID, float volume) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<AudioComponent>()) entity.GetComponent<AudioComponent>().Volume = volume;
-    }
-
-    CH_SCRIPT_FUNC void AudioComponent_SetLoop(uint64_t entityID, bool loop) {
-        Entity entity = GetEntity(entityID);
-        if (entity && entity.HasComponent<AudioComponent>()) entity.GetComponent<AudioComponent>().Loop = loop;
-    }
-
-    CH_SCRIPT_FUNC bool AudioComponent_IsPlaying(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        if (!entity || !entity.HasComponent<AudioComponent>())
-            return false;
-
-        auto& audio = entity.GetComponent<AudioComponent>();
-        return audio.IsPlaying && Audio::Get().IsPlaying(audio.SoundHandle);
-    }
-
-    CH_SCRIPT_FUNC Coral::String AudioComponent_GetSoundPath(uint64_t entityID) {
-        Entity entity = GetEntity(entityID);
-        return entity && entity.HasComponent<AudioComponent>() ? Coral::String::New(entity.GetComponent<AudioComponent>().SoundPath) : Coral::String::New("");
-    }
-
-    void RegisterGameplayGlue(Coral::ManagedAssembly& assembly) {
-        #define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr) assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-        
-        CH_ADD_INTERNAL_CALL(Audio, Audio_Play_Ptr, Audio_Play);
-        CH_ADD_INTERNAL_CALL(Audio, Audio_Stop_Ptr, Audio_Stop);
-        CH_ADD_INTERNAL_CALL(Audio, Audio_StopAll_Ptr, Audio_StopAll);
-        CH_ADD_INTERNAL_CALL(PlayerComponent, PlayerComponent_GetMovementSpeed_Ptr, PlayerComponent_GetMovementSpeed);
-        CH_ADD_INTERNAL_CALL(PlayerComponent, PlayerComponent_SetMovementSpeed_Ptr, PlayerComponent_SetMovementSpeed);
-        CH_ADD_INTERNAL_CALL(AudioComponent, AudioComponent_SetVolume_Ptr, AudioComponent_SetVolume);
-        CH_ADD_INTERNAL_CALL(AudioComponent, AudioComponent_SetLoop_Ptr, AudioComponent_SetLoop);
-        CH_ADD_INTERNAL_CALL(AudioComponent, AudioComponent_IsPlaying_Ptr, AudioComponent_IsPlaying);
-        CH_ADD_INTERNAL_CALL(AudioComponent, AudioComponent_GetSoundPath_Ptr, AudioComponent_GetSoundPath);
-        CH_ADD_INTERNAL_CALL(SpawnComponent, SpawnComponent_IsActive_Ptr, SpawnComponent_IsActive);
-        CH_ADD_INTERNAL_CALL(SpawnComponent, SpawnComponent_GetSpawnPoint_Ptr, SpawnComponent_GetSpawnPoint);
-        CH_ADD_INTERNAL_CALL(SceneTransitionComponent, SceneTransitionComponent_GetTargetScene_Ptr, SceneTransitionComponent_GetTargetScene);
-        
-        // RPG
-        CH_ADD_INTERNAL_CALL(RPGStatsComponent, RPGStatsComponent_GetLevel_Ptr, RPGStatsComponent_GetLevel);
-        CH_ADD_INTERNAL_CALL(RPGStatsComponent, RPGStatsComponent_SetLevel_Ptr, RPGStatsComponent_SetLevel);
-        CH_ADD_INTERNAL_CALL(RPGStatsComponent, RPGStatsComponent_GetHealth_Ptr, RPGStatsComponent_GetHealth);
-        CH_ADD_INTERNAL_CALL(RPGStatsComponent, RPGStatsComponent_SetHealth_Ptr, RPGStatsComponent_SetHealth);
-        CH_ADD_INTERNAL_CALL(RPGStatsComponent, RPGStatsComponent_GetGold_Ptr, RPGStatsComponent_GetGold);
-        CH_ADD_INTERNAL_CALL(RPGStatsComponent, RPGStatsComponent_SetGold_Ptr, RPGStatsComponent_SetGold);
-
-        CH_ADD_INTERNAL_CALL(SkillComponent, SkillComponent_IsUnlocked_Ptr, SkillComponent_IsUnlocked);
-        CH_ADD_INTERNAL_CALL(SkillComponent, SkillComponent_SetUnlocked_Ptr, SkillComponent_SetUnlocked);
-
-        #undef CH_ADD_INTERNAL_CALL
-    }
-
-} // namespace CHEngine
diff --git a/scripting/script_glue_input.cpp b/scripting/script_glue_input.cpp
deleted file mode 100644
index 55b21799b..000000000
--- a/scripting/script_glue_input.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine
-{
-
-CH_SCRIPT_FUNC bool Input_IsKeyDown(int keyCode)
-{
-    return Input::IsKeyDown(keyCode);
-}
-CH_SCRIPT_FUNC bool Input_IsKeyPressed(int keyCode)
-{
-    return Input::IsKeyPressed(keyCode);
-}
-CH_SCRIPT_FUNC bool Input_IsKeyReleased(int keyCode)
-{
-    return Input::IsKeyReleased(keyCode);
-}
-CH_SCRIPT_FUNC bool Input_IsMouseButtonDown(int button)
-{
-    return Input::IsMouseButtonDown(button);
-}
-CH_SCRIPT_FUNC bool Input_IsMouseButtonPressed(int button)
-{
-    return Input::IsMouseButtonPressed(button);
-}
-
-CH_SCRIPT_FUNC void Input_GetMouseDelta(glm::vec3* outDelta)
-{
-    glm::vec2 delta = Input::GetMouseDelta();
-    *outDelta = {delta.x, delta.y, 0.0f};
-}
-CH_SCRIPT_FUNC float Input_GetMouseWheelMove()
-{
-    return Input::GetMouseWheelMove();
-}
-
-void RegisterInputGlue(Coral::ManagedAssembly& assembly) {
-#define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr)                                                            \
-    assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-
-    CH_ADD_INTERNAL_CALL(Input, Input_IsKeyDown_Ptr, Input_IsKeyDown);
-    CH_ADD_INTERNAL_CALL(Input, Input_IsKeyPressed_Ptr, Input_IsKeyPressed);
-    CH_ADD_INTERNAL_CALL(Input, Input_IsKeyReleased_Ptr, Input_IsKeyReleased);
-    CH_ADD_INTERNAL_CALL(Input, Input_IsMouseButtonDown_Ptr, Input_IsMouseButtonDown);
-    CH_ADD_INTERNAL_CALL(Input, Input_IsMouseButtonPressed_Ptr, Input_IsMouseButtonPressed);
-    CH_ADD_INTERNAL_CALL(Input, Input_GetMouseDelta_Ptr, Input_GetMouseDelta);
-    CH_ADD_INTERNAL_CALL(Input, Input_GetMouseWheelMove_Ptr, Input_GetMouseWheelMove);
-
-#undef CH_ADD_INTERNAL_CALL
-} } // namespace CHEngine
-
diff --git a/scripting/script_glue_internal.h b/scripting/script_glue_internal.h
deleted file mode 100644
index bd0582457..000000000
--- a/scripting/script_glue_internal.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef CH_SCRIPT_GLUE_INTERNAL_H
-#define CH_SCRIPT_GLUE_INTERNAL_H
-
-#include "engine/core/assets/asset_manager.h"
-#include "engine/audio/audio.h"
-#include "engine/audio/audio.h"
-#include "engine/core/application.h"
-#include "engine/core/input.h"
-#include "engine/core/log.h"
-#include "engine/scene/components.h"
-#include "engine/scene/entity.h"
-#include "engine/scene/project.h"
-#include "engine/scene/scene.h"
-#include "script_glue.h"
-#include "scriptengine.h"
-#include <Coral/Array.hpp>
-#include <Coral/String.hpp>
-#include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <imgui.h>
-
-// Macro to mark functions for InternalCall (formerly P/Invoke)
-#define CH_SCRIPT_FUNC static
-
-namespace CHEngine
-{
-
-// Internal helper to get active scene safely
-inline Scene* GetActiveScene()
-{
-    return ScriptEngine::Get().GetActiveScene();
-}
-
-// Internal helper to get entity safely
-inline Entity GetEntity(uint64_t entityID)
-{
-    Scene* scene = GetActiveScene();
-    if (!scene)
-    {
-        return {};
-    }
-    return Entity((entt::entity)(uint32_t)entityID, &scene->GetRegistry());
-}
-
-// Module registration functions (to be called by ScriptGlue::RegisterInternalCalls)
-void RegisterSystemGlue(Coral::ManagedAssembly& assembly);
-void RegisterInputGlue(Coral::ManagedAssembly& assembly);
-void RegisterSceneGlue(Coral::ManagedAssembly& assembly);
-void RegisterEntityGlue(Coral::ManagedAssembly& assembly);
-void RegisterCameraGlue(Coral::ManagedAssembly& assembly);
-void RegisterUIGlue(Coral::ManagedAssembly& assembly);
-void RegisterGameplayGlue(Coral::ManagedAssembly& assembly);
-
-} // namespace CHEngine
-
-#endif // CH_SCRIPT_GLUE_INTERNAL_H
diff --git a/scripting/script_glue_scene.cpp b/scripting/script_glue_scene.cpp
deleted file mode 100644
index e516d7ff7..000000000
--- a/scripting/script_glue_scene.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine
-{
-
-CH_SCRIPT_FUNC uint64_t Scene_FindEntityByTag(Coral::String tag)
-{
-    auto* scene = GetActiveScene();
-    if (scene)
-    {
-        auto entity = scene->FindEntityByTag((std::string)tag);
-        return entity ? (uint64_t)(uint32_t)entity : 0;
-    }
-    return 0;
-}
-
-CH_SCRIPT_FUNC uint64_t Scene_CopyEntity(uint64_t entityID)
-{
-    auto* scene = GetActiveScene();
-    if (scene)
-    {
-        auto entity = scene->CopyEntity((entt::entity)(uint32_t)entityID);
-        return entity ? (uint64_t)(uint32_t)entity : 0;
-    }
-    return 0;
-}
-
-CH_SCRIPT_FUNC void Scene_LoadScene(Coral::String path)
-{
-    ScriptEngine::Get().RequestLoadScene((std::string)path);
-}
-
-CH_SCRIPT_FUNC uint64_t Scene_GetPrimaryCameraEntity()
-{
-    auto* scene = GetActiveScene();
-    if (!scene)
-    {
-        return 0;
-    }
-    Entity entity = scene->GetPrimaryCameraEntity();
-    return entity ? (uint64_t)(uint32_t)entity : 0;
-}
-
-void RegisterSceneGlue(Coral::ManagedAssembly& assembly) {
-#define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr)                                                            \
-    assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-
-    CH_ADD_INTERNAL_CALL(Scene, Scene_FindEntityByTag_Ptr, Scene_FindEntityByTag);
-    CH_ADD_INTERNAL_CALL(Scene, Scene_LoadScene_Ptr, Scene_LoadScene);
-    CH_ADD_INTERNAL_CALL(Scene, Scene_GetPrimaryCameraEntity_Ptr, Scene_GetPrimaryCameraEntity);
-    CH_ADD_INTERNAL_CALL(Scene, Scene_CopyEntity_Ptr, Scene_CopyEntity);
-
-#undef CH_ADD_INTERNAL_CALL
-} } // namespace CHEngine
-
diff --git a/scripting/script_glue_system.cpp b/scripting/script_glue_system.cpp
deleted file mode 100644
index 570bab654..000000000
--- a/scripting/script_glue_system.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine
-{
-
-// ── Logging ──────────────────────────────────────────────────────────
-CH_SCRIPT_FUNC void Log_Info(Coral::String message)
-{
-    CH_CORE_INFO("[C#] {}", (std::string)message);
-}
-CH_SCRIPT_FUNC void Log_Warn(Coral::String message)
-{
-    CH_CORE_WARN("[C#] {}", (std::string)message);
-}
-CH_SCRIPT_FUNC void Log_Error(Coral::String message)
-{
-    CH_CORE_ERROR("[C#] {}", (std::string)message);
-}
-
-// ── Application / Window ─────────────────────────────────────────────
-CH_SCRIPT_FUNC void Application_Close()
-{
-    Application::Get().Close();
-}
-CH_SCRIPT_FUNC int Application_GetFPS()
-{
-    return (int)(1.0f / Application::Get().GetFrameTime());
-}
-CH_SCRIPT_FUNC float Application_GetFrameTime()
-{
-    return Application::Get().GetFrameTime();
-}
-CH_SCRIPT_FUNC void Window_SetSize(int w, int h)
-{
-    Application::Get().GetWindow().SetSize(w, h);
-}
-CH_SCRIPT_FUNC void Window_SetFullscreen(bool enabled)
-{
-    Application::Get().GetWindow().SetFullscreen(enabled);
-}
-CH_SCRIPT_FUNC void Window_SetVSync(bool enabled)
-{
-    Application::Get().GetWindow().SetVSync(enabled);
-}
-CH_SCRIPT_FUNC void Window_SetAntialiasing(bool enabled)
-{
-    Application::Get().GetWindow().SetAntialiasing(enabled);
-}
-
-ManagedScriptInstance* s_PendingScriptInstance = nullptr;
-
-void ScriptGlue::SetPendingScriptInstance(ManagedScriptInstance* instance)
-{
-    s_PendingScriptInstance = instance;
-}
-
-CH_SCRIPT_FUNC void RegisterLifecyclePointers(uint64_t entityID, void* onCreate, void* onStart, void* onUpdate,
-                                              void* onDestroy, void* onGUI, void* onCollisionEnter)
-{
-    if (s_PendingScriptInstance)
-    {
-        s_PendingScriptInstance->OnCreate = (void (*)())onCreate;
-        s_PendingScriptInstance->OnStart = (void (*)())onStart;
-        s_PendingScriptInstance->OnUpdate = (void (*)(float))onUpdate;
-        s_PendingScriptInstance->OnDestroy = (void (*)())onDestroy;
-        s_PendingScriptInstance->OnGUI = (void (*)())onGUI;
-        s_PendingScriptInstance->OnCollisionEnter = (void (*)(uint64_t))onCollisionEnter;
-    }
-}
-
-void RegisterSystemGlue(Coral::ManagedAssembly& assembly) {
-#define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr)                                                            \
-    assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-
-    CH_ADD_INTERNAL_CALL(Script, RegisterLifecyclePointers, RegisterLifecyclePointers);
-    CH_ADD_INTERNAL_CALL(Log, Log_Info_Ptr, Log_Info);
-    CH_ADD_INTERNAL_CALL(Log, Log_Warn_Ptr, Log_Warn);
-    CH_ADD_INTERNAL_CALL(Log, Log_Error_Ptr, Log_Error);
-    CH_ADD_INTERNAL_CALL(Application, Application_Close_Ptr, Application_Close);
-    CH_ADD_INTERNAL_CALL(Application, Application_GetFPS_Ptr, Application_GetFPS);
-    CH_ADD_INTERNAL_CALL(Application, Application_GetFrameTime_Ptr, Application_GetFrameTime);
-    CH_ADD_INTERNAL_CALL(AppWindow, Window_SetSize_Ptr, Window_SetSize);
-    CH_ADD_INTERNAL_CALL(AppWindow, Window_SetFullscreen_Ptr, Window_SetFullscreen);
-    CH_ADD_INTERNAL_CALL(AppWindow, Window_SetVSync_Ptr, Window_SetVSync);
-    CH_ADD_INTERNAL_CALL(AppWindow, Window_SetAntialiasing_Ptr, Window_SetAntialiasing);
-
-#undef CH_ADD_INTERNAL_CALL
-} } // namespace CHEngine
-
diff --git a/scripting/script_glue_ui.cpp b/scripting/script_glue_ui.cpp
deleted file mode 100644
index 161d83794..000000000
--- a/scripting/script_glue_ui.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "script_glue_internal.h"
-
-namespace CHEngine
-{
-
-// ── UI Controls ───────────────────────────────────────────────────────
-CH_SCRIPT_FUNC bool ButtonControl_IsPressed(uint64_t entityID)
-{
-    Entity entity = GetEntity(entityID);
-    return entity && entity.HasComponent<ButtonControl>() ? entity.GetComponent<ButtonControl>().PressedThisFrame
-                                                          : false;
-}
-
-CH_SCRIPT_FUNC bool CheckboxControl_GetChecked(uint64_t entityID)
-{
-    Entity entity = GetEntity(entityID);
-    return entity && entity.HasComponent<CheckboxControl>() ? entity.GetComponent<CheckboxControl>().Checked : false;
-}
-
-CH_SCRIPT_FUNC int ComboBoxControl_GetSelectedIndex(uint64_t entityID)
-{
-    Entity entity = GetEntity(entityID);
-    return entity && entity.HasComponent<ComboBoxControl>() ? entity.GetComponent<ComboBoxControl>().SelectedIndex : 0;
-}
-
-CH_SCRIPT_FUNC Coral::String ComboBoxControl_GetItem(uint64_t entityID, int index)
-{
-    Entity entity = GetEntity(entityID);
-    if (entity && entity.HasComponent<ComboBoxControl>())
-    {
-        auto& combo = entity.GetComponent<ComboBoxControl>();
-        if (index >= 0 && index < (int)combo.Items.size())
-        {
-            return Coral::String::New(combo.Items[index]);
-        }
-    }
-    return Coral::String::New("");
-}
-
-CH_SCRIPT_FUNC void UI_Text(Coral::String text)
-{
-    ImGui::Text("%s", ((std::string)text).c_str());
-}
-
-void RegisterUIGlue(Coral::ManagedAssembly& assembly) {
-#define CH_ADD_INTERNAL_CALL(className, fieldName, funcPtr)                                                            \
-    assembly.AddInternalCall("CHEngine." #className, #fieldName, (void*)funcPtr)
-
-    CH_ADD_INTERNAL_CALL(UI, UI_Text_Ptr, UI_Text);
-    CH_ADD_INTERNAL_CALL(ButtonControl, ButtonControl_IsPressed_Ptr, ButtonControl_IsPressed);
-    CH_ADD_INTERNAL_CALL(CheckboxControl, CheckboxControl_GetChecked_Ptr, CheckboxControl_GetChecked);
-    CH_ADD_INTERNAL_CALL(ComboBoxControl, ComboBoxControl_GetSelectedIndex_Ptr, ComboBoxControl_GetSelectedIndex);
-    CH_ADD_INTERNAL_CALL(ComboBoxControl, ComboBoxControl_GetItem_Ptr, ComboBoxControl_GetItem);
-
-#undef CH_ADD_INTERNAL_CALL
-} } // namespace CHEngine
-
diff --git a/scripting/scriptengine.cpp b/scripting/scriptengine.cpp
deleted file mode 100644
index dd5b648c1..000000000
--- a/scripting/scriptengine.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-#include "scriptengine.h"
-#include "engine/core/log.h"
-#include "engine/scene/project.h"
-#include "scene_scripting.h"
-#include "script_glue.h"
-#include <exception>
-#include <filesystem>
-
-namespace CHEngine
-{
-
-namespace
-{
-static ScriptEngine* s_Instance = nullptr;
-} // namespace
-
-ScriptEngine::ScriptEngine()
-{
-    CH_CORE_ASSERT(!s_Instance, "ScriptEngine already exists!");
-    s_Instance = this;
-}
-
-ScriptEngine::~ScriptEngine()
-{
-    s_Instance = nullptr;
-}
-
-ScriptEngine& ScriptEngine::Get()
-{
-    CH_CORE_ASSERT(s_Instance, "ScriptEngine not initialized!");
-    return *s_Instance;
-}
-
-// ── Init / Shutdown ───────────────────────────────────────────────────────────
-void ScriptEngine::Init()
-{
-    if (!s_Instance)
-        s_Instance = new ScriptEngine();
-    s_Instance->InternalInit();
-}
-
-void ScriptEngine::InternalInit()
-{
-    if (GetScriptAssemblyHost().IsInitialized())
-        return;
-
-    CH_CORE_INFO("ScriptEngine: Initializing CoreCLR...");
-
-    if (!GetScriptAssemblyHost().Init())
-        return;
-
-    CH_CORE_INFO("ScriptEngine: CoreCLR initialized.");
-}
-
-void ScriptEngine::Shutdown()
-{
-    if (s_Instance)
-    {
-        s_Instance->InternalShutdown();
-        delete s_Instance;
-        s_Instance = nullptr;
-    }
-}
-
-void ScriptEngine::InternalShutdown()
-{
-    CH_CORE_INFO("ScriptEngine: Shutting down CoreCLR...");
-    GetScriptTypeRegistry().Clear();
-    GetScriptAssemblyHost().Shutdown();
-    m_RuntimeSession.Reset();
-}
-
-// ── Assembly management ───────────────────────────────────────────────────────
-bool ScriptEngine::LoadAppAssembly(const std::string& filepath)
-{
-    if (!GetScriptAssemblyHost().IsInitialized())
-    {
-        CH_CORE_WARN("ScriptEngine::LoadAppAssembly called before Init().");
-        return false;
-    }
-
-    if (filepath.empty())
-    {
-        CH_CORE_WARN("ScriptEngine::LoadAppAssembly called with empty filepath.");
-        return false;
-    }
-
-    if (!std::filesystem::exists(filepath))
-    {
-        CH_CORE_ERROR("ScriptEngine: Assembly not found at '{}'.", filepath);
-        return false;
-    }
-
-    if (!GetScriptAssemblyHost().LoadAppAssembly(filepath))
-    {
-        GetScriptTypeRegistry().Clear();
-        return false;
-    }
-
-    try
-    {
-        Coral::ManagedAssembly* coreAssembly = GetScriptAssemblyHost().GetCoreAssembly();
-        Coral::ManagedAssembly* appAssembly = GetScriptAssemblyHost().GetAppAssembly();
-
-        if (!coreAssembly || !appAssembly)
-        {
-            CH_CORE_ERROR("ScriptEngine: Assembly load completed but managed assemblies are missing.");
-            GetScriptTypeRegistry().Clear();
-            GetScriptAssemblyHost().ClearLoadedAssemblyState();
-            return false;
-        }
-
-        ScriptGlue::RegisterInternalCalls(*coreAssembly);
-        GetScriptTypeRegistry().Discover(*appAssembly, *coreAssembly);
-        return true;
-    }
-    catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("ScriptEngine: Exception during post-load setup for '{}': {}", filepath, e.what());
-        GetScriptTypeRegistry().Clear();
-        GetScriptAssemblyHost().ClearLoadedAssemblyState();
-        return false;
-    }
-    catch (...)
-    {
-        CH_CORE_ERROR("ScriptEngine: Unknown exception during post-load setup for '{}'.", filepath);
-        GetScriptTypeRegistry().Clear();
-        GetScriptAssemblyHost().ClearLoadedAssemblyState();
-        return false;
-    }
-}
-
-bool ScriptEngine::ReloadAssembly()
-{
-    if (!GetScriptAssemblyHost().IsInitialized())
-    {
-        CH_CORE_WARN("ScriptEngine::ReloadAssembly called before Init().");
-        return false;
-    }
-
-    if (!m_RuntimeSession.BeginReload())
-    {
-        CH_CORE_WARN("ScriptEngine::ReloadAssembly skipped: reload already in progress.");
-        return false;
-    }
-
-    struct ReloadScopeGuard
-    {
-        ScriptRuntimeSession& Session;
-        ~ReloadScopeGuard()
-        {
-            Session.EndReload();
-        }
-    } guard{m_RuntimeSession};
-
-    auto project = Project::GetActive();
-    if (!project)
-    {
-        CH_CORE_WARN("ScriptEngine::ReloadAssembly skipped: no active project.");
-        return false;
-    }
-
-    auto& scripting = project->GetConfig().Scripting;
-    if (scripting.ModuleName.empty())
-    {
-        CH_CORE_WARN("ScriptEngine::ReloadAssembly skipped: scripting module name is empty.");
-        return false;
-    }
-
-    std::string dllName = scripting.ModuleName;
-    if (dllName.find(".dll") == std::string::npos)
-        dllName += ".dll";
-
-    std::filesystem::path dllPath = scripting.ModuleDirectory / dllName;
-    if (dllPath.is_relative())
-        dllPath = Project::GetProjectDirectory() / dllPath;
-
-    if (!std::filesystem::exists(dllPath))
-    {
-        CH_CORE_ERROR("ScriptEngine: Assembly not found at '{}'.", dllPath.string());
-        return false;
-    }
-
-    // 1. Stop all running C# scripts cleanly (calls OnDestroy)
-    if (m_RuntimeSession.GetActiveScene())
-    {
-        SceneScripting::Stop(m_RuntimeSession.GetActiveScene());
-    }
-
-    GetScriptTypeRegistry().Clear();
-    if (!GetScriptAssemblyHost().ReloadAppAssembly(dllPath.string()))
-    {
-        CH_CORE_ERROR("ScriptEngine: Reload failed for '{}'.", dllPath.string());
-        return false;
-    }
-
-    try
-    {
-        Coral::ManagedAssembly* coreAssembly = GetScriptAssemblyHost().GetCoreAssembly();
-        Coral::ManagedAssembly* appAssembly = GetScriptAssemblyHost().GetAppAssembly();
-
-        if (!coreAssembly || !appAssembly)
-        {
-            CH_CORE_ERROR("ScriptEngine: Reload completed but managed assemblies are missing.");
-            GetScriptTypeRegistry().Clear();
-            GetScriptAssemblyHost().ClearLoadedAssemblyState();
-            return false;
-        }
-
-        ScriptGlue::RegisterInternalCalls(*coreAssembly);
-        GetScriptTypeRegistry().Discover(*appAssembly, *coreAssembly);
-        CH_CORE_INFO("ScriptEngine: Recreated ALC for reload.");
-        return true;
-    }
-    catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("ScriptEngine: Exception during reload setup for '{}': {}", dllPath.string(), e.what());
-        GetScriptTypeRegistry().Clear();
-        GetScriptAssemblyHost().ClearLoadedAssemblyState();
-        return false;
-    }
-    catch (...)
-    {
-        CH_CORE_ERROR("ScriptEngine: Unknown exception during reload setup for '{}'.", dllPath.string());
-        GetScriptTypeRegistry().Clear();
-        GetScriptAssemblyHost().ClearLoadedAssemblyState();
-        return false;
-    }
-}
-
-bool ScriptEngine::RequestAssemblyReload(const char* requestSource)
-{
-    const char* source = (requestSource && requestSource[0] != '\0') ? requestSource : "ScriptEngine";
-
-    if (IsReloadInProgress())
-    {
-        CH_CORE_INFO("{}: Script reload request ignored (reload already in progress).", source);
-        return false;
-    }
-
-    if (!ReloadAssembly())
-    {
-        CH_CORE_WARN("{}: Script reload failed.", source);
-        return false;
-    }
-
-    return true;
-}
-
-// ── Script lookup ─────────────────────────────────────────────────────────────
-Coral::Type* ScriptEngine::GetScriptClass(const std::string& name)
-{
-    return GetScriptTypeRegistry().GetScriptClass(name);
-}
-
-} // namespace CHEngine
\ No newline at end of file
diff --git a/scripting/scriptengine.h b/scripting/scriptengine.h
deleted file mode 100644
index 30807644d..000000000
--- a/scripting/scriptengine.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef CH_SCRIPT_ENGINE_H
-#define CH_SCRIPT_ENGINE_H
-
-#include "engine/core/base.h"
-#include "scriptengine_services.h"
-#include <Coral/Assembly.hpp>
-#include <string>
-#include <unordered_map>
-
-namespace CHEngine
-{
-
-class Scene;
-
-// Process-wide facade over the scripting host, type registry, and runtime scene handoff state.
-// The singleton shape stays because CoreCLR and the editor/runtime layers expect one scripting service.
-class ScriptEngine
-{
-public:
-    ScriptEngine();
-    ~ScriptEngine();
-
-    static void Init();
-    static void Shutdown();
-
-    void InternalInit();
-    void InternalShutdown();
-
-    // Load (or reload) the game script DLL and refresh the type registry.
-    bool LoadAppAssembly(const std::string& filepath);
-    // Hot-reload: stops running scripts, unloads the old ALC, and loads the new DLL.
-    bool ReloadAssembly();
-    // UI-safe reload entry point with consistent guard/log behavior.
-    bool RequestAssemblyReload(const char* requestSource);
-
-    // Returns a pointer to the Coral::Type for the given short or full class name.
-    // Search is case-insensitive. Returns nullptr if not found.
-    Coral::Type* GetScriptClass(const std::string& name);
-
-    // All discovered script types keyed by lowercase full name.
-    const std::unordered_map<std::string, Coral::Type>& GetScriptClasses() const
-    {
-        return GetScriptTypeRegistry().GetScriptClasses();
-    }
-
-    bool IsInitialized() const
-    {
-        return GetScriptAssemblyHost().IsInitialized();
-    }
-    bool IsReloadInProgress() const
-    {
-        return m_RuntimeSession.IsReloadInProgress();
-    }
-    bool CanExecuteFrameScripts() const
-    {
-        return GetScriptAssemblyHost().IsInitialized() && !m_RuntimeSession.IsReloadInProgress();
-    }
-    Scene* GetActiveScene() const
-    {
-        return m_RuntimeSession.GetActiveScene();
-    }
-    void SetActiveScene(Scene* scene)
-    {
-        m_RuntimeSession.SetActiveScene(scene);
-    }
-
-    // Called from C# script glue - queue a scene to load next frame.
-    void RequestLoadScene(const std::string& path)
-    {
-        m_RuntimeSession.RequestLoadScene(path);
-    }
-    // Consumed by RuntimeLayer::OnUpdate each frame. Returns the path and clears it.
-    std::string ConsumeRequestedScene()
-    {
-        return m_RuntimeSession.ConsumeRequestedScene();
-    }
-    // Safely consumes pending scene requests for frame updates.
-    // Returns false if reload is in progress or there is no pending path.
-    bool TryConsumeRequestedScene(std::string& outPath)
-    {
-        return m_RuntimeSession.TryConsumeRequestedScene(outPath);
-    }
-
-    static ScriptEngine& Get();
-
-private:
-    ScriptRuntimeSession m_RuntimeSession;
-};
-
-} // namespace CHEngine
-#endif // CH_SCRIPT_ENGINE_H
diff --git a/scripting/scriptengine_services.cpp b/scripting/scriptengine_services.cpp
deleted file mode 100644
index 3baf00e59..000000000
--- a/scripting/scriptengine_services.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-#include "scriptengine_services.h"
-
-#include "engine/core/application.h"
-#include "engine/core/log.h"
-#include "engine/scene/project.h"
-#include <Coral/GC.hpp>
-#include <algorithm>
-#include <cctype>
-#include <exception>
-#include <filesystem>
-#include <vector>
-
-#include "build_preset_names.h"
-
-namespace CHEngine
-{
-
-namespace
-{
-constexpr const char* kGameScriptsAlcName = "GameScriptsALC";
-
-std::string ToLowerCopy(std::string value)
-{
-    std::transform(value.begin(), value.end(), value.begin(), [](unsigned char c) {
-        return static_cast<char>(std::tolower(c));
-    });
-    return value;
-}
-
-std::string GetShortTypeName(const std::string& fullName)
-{
-    const size_t lastDot = fullName.find_last_of('.');
-    if (lastDot == std::string::npos || lastDot + 1 >= fullName.size())
-        return fullName;
-
-    return fullName.substr(lastDot + 1);
-}
-
-void AppendBuildBinCandidates(std::vector<std::filesystem::path>& out, const std::filesystem::path& root)
-{
-    if (root.empty())
-        return;
-
-    for (const char* preset : detail::kBuildPresetNames)
-    {
-        const std::filesystem::path binDir = root / "build" / preset / "bin";
-
-        if (std::find(out.begin(), out.end(), binDir) == out.end())
-        {
-            out.push_back(binDir);
-        }
-    }
-}
-} // namespace
-
-static ScriptAssemblyHost s_ScriptAssemblyHost;
-static ScriptTypeRegistry s_ScriptTypeRegistry;
-static ScriptRuntimeSession s_ScriptRuntimeSession;
-
-ScriptAssemblyHost& GetScriptAssemblyHost()
-{
-    return s_ScriptAssemblyHost;
-}
-
-ScriptTypeRegistry& GetScriptTypeRegistry()
-{
-    return s_ScriptTypeRegistry;
-}
-
-bool ScriptRuntimeSession::BeginReload()
-{
-    if (m_ReloadInProgress)
-        return false;
-
-    m_ReloadInProgress = true;
-    return true;
-}
-
-void ScriptRuntimeSession::EndReload()
-{
-    m_ReloadInProgress = false;
-}
-
-std::string ScriptRuntimeSession::ConsumeRequestedScene()
-{
-    std::string scenePath = m_PendingScenePath;
-    m_PendingScenePath.clear();
-    return scenePath;
-}
-
-bool ScriptRuntimeSession::TryConsumeRequestedScene(std::string& outPath)
-{
-    outPath.clear();
-    if (m_ReloadInProgress || m_PendingScenePath.empty())
-    {
-        return false;
-    }
-
-    outPath.swap(m_PendingScenePath);
-    return true;
-}
-
-void ScriptRuntimeSession::Reset()
-{
-    m_ActiveScene = nullptr;
-    m_ReloadInProgress = false;
-    m_PendingScenePath.clear();
-}
-
-std::filesystem::path ScriptAssemblyHost::ResolveCoralDirectory()
-{
-    std::vector<std::filesystem::path> candidateDirs;
-    candidateDirs.push_back(Application::GetExecutableDirectory());
-    candidateDirs.push_back(std::filesystem::current_path());
-
-#ifdef PROJECT_ROOT_DIR
-    const std::filesystem::path engineRoot = std::filesystem::path(PROJECT_ROOT_DIR);
-    candidateDirs.push_back(engineRoot);
-    AppendBuildBinCandidates(candidateDirs, engineRoot);
-#endif
-
-    if (auto project = Project::GetActive())
-    {
-        const std::filesystem::path projectDir = project->GetConfig().ProjectDirectory;
-        candidateDirs.push_back(projectDir);
-        AppendBuildBinCandidates(candidateDirs, projectDir);
-    }
-
-    std::vector<std::string> checkedPaths;
-    for (const auto& candidateRaw : candidateDirs)
-    {
-        if (candidateRaw.empty())
-            continue;
-
-        std::error_code ec;
-        const std::filesystem::path candidate = std::filesystem::absolute(candidateRaw, ec).lexically_normal();
-        const std::filesystem::path managedPath = ec ? (candidateRaw / "Coral.Managed.dll")
-                                                     : (candidate / "Coral.Managed.dll");
-        checkedPaths.push_back(managedPath.string());
-
-        if (std::filesystem::exists(managedPath))
-            return ec ? candidateRaw : candidate;
-    }
-
-    const std::filesystem::path fallback = Application::GetExecutableDirectory();
-    CH_CORE_WARN("ScriptEngine: Coral.Managed.dll not found in fallback candidates. Using executable directory: '{}'.",
-                 fallback.string());
-    for (const auto& checked : checkedPaths)
-    {
-        CH_CORE_TRACE("ScriptEngine: Checked '{}'", checked);
-    }
-    return fallback;
-}
-
-std::filesystem::path ScriptAssemblyHost::ResolveCoreAssemblyPath(const std::filesystem::path& coralDir)
-{
-    std::vector<std::filesystem::path> coreCandidates;
-    if (!coralDir.empty())
-        coreCandidates.push_back(coralDir / "CHEngine.Managed.dll");
-
-    const std::filesystem::path exeDir = Application::GetExecutableDirectory();
-    coreCandidates.push_back(exeDir / "CHEngine.Managed.dll");
-    coreCandidates.push_back(std::filesystem::current_path() / "CHEngine.Managed.dll");
-
-#ifdef PROJECT_ROOT_DIR
-    AppendBuildBinCandidates(coreCandidates, std::filesystem::path(PROJECT_ROOT_DIR));
-#endif
-
-    if (auto project = Project::GetActive())
-    {
-        AppendBuildBinCandidates(coreCandidates, project->GetConfig().ProjectDirectory);
-    }
-
-    for (const auto& candidate : coreCandidates)
-    {
-        if (!candidate.empty() && std::filesystem::exists(candidate))
-            return candidate;
-    }
-
-    return std::filesystem::path("CHEngine.Managed.dll");
-}
-
-void ScriptAssemblyHost::ClearLoadedAssemblyState()
-{
-    m_AppAssembly = nullptr;
-    m_CoreAssembly = nullptr;
-}
-
-bool ScriptAssemblyHost::Init()
-{
-    if (m_IsInitialized)
-        return true;
-
-    Coral::HostSettings settings;
-
-    m_CoralDirectory = ResolveCoralDirectory();
-    settings.CoralDirectory = m_CoralDirectory.string();
-    CH_CORE_INFO("ScriptEngine: Using Coral directory '{}'.", m_CoralDirectory.string());
-
-    auto status = m_Host.Initialize(settings);
-    if (status != Coral::CoralInitStatus::Success)
-    {
-        CH_CORE_ERROR("ScriptEngine: Failed to initialize Coral! Status: {}", (int)status);
-        return false;
-    }
-
-    m_IsInitialized = true;
-
-    if (!RecreateAssemblyLoadContext(false))
-    {
-        m_Host.Shutdown();
-        m_IsInitialized = false;
-        return false;
-    }
-
-    return true;
-}
-
-void ScriptAssemblyHost::Shutdown()
-{
-    if (!m_IsInitialized)
-    {
-        ClearLoadedAssemblyState();
-        m_CoralDirectory.clear();
-        return;
-    }
-
-    try
-    {
-        m_Host.UnloadAssemblyLoadContext(m_AppAssemblyContext);
-        Coral::GC::Collect();
-        Coral::GC::WaitForPendingFinalizers();
-        Coral::GC::Collect();
-    }
-    catch (const std::exception& e)
-    {
-        CH_CORE_WARN("ScriptEngine: Final scripting cleanup failed: {}", e.what());
-    }
-    catch (...)
-    {
-        CH_CORE_WARN("ScriptEngine: Final scripting cleanup failed (unknown exception).");
-    }
-
-    ClearLoadedAssemblyState();
-    m_CoralDirectory.clear();
-
-    m_Host.Shutdown();
-    m_IsInitialized = false;
-}
-
-bool ScriptAssemblyHost::RecreateAssemblyLoadContext(bool unloadCurrent)
-{
-    if (!m_IsInitialized)
-    {
-        CH_CORE_ERROR("ScriptEngine: Cannot recreate ALC before host initialization.");
-        return false;
-    }
-
-    if (unloadCurrent)
-    {
-        try
-        {
-            m_Host.UnloadAssemblyLoadContext(m_AppAssemblyContext);
-        }
-        catch (const std::exception& e)
-        {
-            CH_CORE_ERROR("ScriptEngine: Failed to unload current ALC: {}", e.what());
-            return false;
-        }
-        catch (...)
-        {
-            CH_CORE_ERROR("ScriptEngine: Failed to unload current ALC (unknown exception).");
-            return false;
-        }
-    }
-
-    try
-    {
-        m_AppAssemblyContext = m_Host.CreateAssemblyLoadContext(kGameScriptsAlcName);
-        return true;
-    }
-    catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("ScriptEngine: Failed to create ALC '{}': {}", kGameScriptsAlcName, e.what());
-        return false;
-    }
-    catch (...)
-    {
-        CH_CORE_ERROR("ScriptEngine: Failed to create ALC '{}' (unknown exception).", kGameScriptsAlcName);
-        return false;
-    }
-}
-
-bool ScriptAssemblyHost::LoadAssembliesTransactional(const std::filesystem::path& appAssemblyPath)
-{
-    Coral::ManagedAssembly* loadedCore = nullptr;
-    Coral::ManagedAssembly* loadedApp = nullptr;
-
-    auto rollback = [&]() {
-        ClearLoadedAssemblyState();
-        if (!RecreateAssemblyLoadContext(true))
-        {
-            CH_CORE_ERROR("ScriptEngine: Rollback failed to recreate ALC. Scripting remains unavailable.");
-        }
-    };
-
-    const std::filesystem::path corePath = ResolveCoreAssemblyPath(m_CoralDirectory);
-
-    try
-    {
-        loadedCore = &m_AppAssemblyContext.LoadAssembly(corePath.string());
-    }
-    catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("ScriptEngine: Exception loading core assembly '{}': {}", corePath.string(), e.what());
-        rollback();
-        return false;
-    }
-    catch (...)
-    {
-        CH_CORE_ERROR("ScriptEngine: Unknown exception loading core assembly '{}'.", corePath.string());
-        rollback();
-        return false;
-    }
-
-    if (!loadedCore || loadedCore->GetLoadStatus() != Coral::AssemblyLoadStatus::Success)
-    {
-        CH_CORE_ERROR("ScriptEngine: Failed to load core assembly '{}'. Status: {}", corePath.string(),
-                      loadedCore ? (int)loadedCore->GetLoadStatus() : -1);
-        rollback();
-        return false;
-    }
-
-    try
-    {
-        loadedApp = &m_AppAssemblyContext.LoadAssembly(appAssemblyPath.string());
-    }
-    catch (const std::exception& e)
-    {
-        CH_CORE_ERROR("ScriptEngine: Exception loading app assembly '{}': {}", appAssemblyPath.string(), e.what());
-        rollback();
-        return false;
-    }
-    catch (...)
-    {
-        CH_CORE_ERROR("ScriptEngine: Unknown exception loading app assembly '{}'.", appAssemblyPath.string());
-        rollback();
-        return false;
-    }
-
-    if (!loadedApp || loadedApp->GetLoadStatus() != Coral::AssemblyLoadStatus::Success)
-    {
-        CH_CORE_ERROR("ScriptEngine: Failed to load app assembly '{}'. Status: {}", appAssemblyPath.string(),
-                      loadedApp ? (int)loadedApp->GetLoadStatus() : -1);
-        rollback();
-        return false;
-    }
-
-    m_CoreAssembly = loadedCore;
-    m_AppAssembly = loadedApp;
-
-    CH_CORE_INFO("ScriptEngine: Loaded core assembly '{}'.", corePath.string());
-    CH_CORE_INFO("ScriptEngine: Loaded app assembly '{}'.", appAssemblyPath.string());
-    return true;
-}
-
-bool ScriptAssemblyHost::LoadAppAssembly(const std::string& filepath)
-{
-    if (!m_IsInitialized)
-    {
-        CH_CORE_WARN("ScriptEngine::LoadAppAssembly called before Init().");
-        return false;
-    }
-
-    if (filepath.empty())
-    {
-        CH_CORE_WARN("ScriptEngine::LoadAppAssembly called with empty filepath.");
-        return false;
-    }
-
-    if (!std::filesystem::exists(filepath))
-    {
-        CH_CORE_ERROR("ScriptEngine: Assembly not found at '{}'.", filepath);
-        return false;
-    }
-
-    return LoadAssembliesTransactional(std::filesystem::path(filepath));
-}
-
-bool ScriptAssemblyHost::ReloadAppAssembly(const std::string& filepath)
-{
-    if (!m_IsInitialized)
-    {
-        CH_CORE_WARN("ScriptEngine::ReloadAssembly called before Init().");
-        return false;
-    }
-
-    if (filepath.empty())
-    {
-        CH_CORE_WARN("ScriptEngine::ReloadAssembly called with empty filepath.");
-        return false;
-    }
-
-    if (!std::filesystem::exists(filepath))
-    {
-        CH_CORE_ERROR("ScriptEngine: Assembly not found at '{}'.", filepath);
-        return false;
-    }
-
-    ClearLoadedAssemblyState();
-    if (!RecreateAssemblyLoadContext(true))
-    {
-        return false;
-    }
-
-    return LoadAssembliesTransactional(std::filesystem::path(filepath));
-}
-
-void ScriptTypeRegistry::Clear()
-{
-    m_ScriptClasses.clear();
-    m_ShortNameToFullName.clear();
-    m_MissingScriptsWarnings.clear();
-}
-
-void ScriptTypeRegistry::Discover(Coral::ManagedAssembly& appAssembly, Coral::ManagedAssembly& coreAssembly)
-{
-    Clear();
-
-    Coral::Type scriptBaseType = coreAssembly.GetLocalType("CHEngine.Script");
-
-    if (!scriptBaseType)
-    {
-        CH_CORE_ERROR("ScriptEngine: Could not find base class 'CHEngine.Script' in Core assembly! Type discovery aborted.");
-        return;
-    }
-
-    CH_CORE_INFO("ScriptEngine: Found base script type '{}'.", (std::string)scriptBaseType.GetFullName());
-
-    auto types = appAssembly.GetTypes();
-    CH_CORE_INFO("ScriptEngine: Discovery - searching {} types in assembly '{}'...", types.size(),
-                 (std::string)appAssembly.GetName());
-
-    for (auto& type : types)
-    {
-        if (*type == scriptBaseType)
-            continue;
-
-        if (!type->IsSubclassOf(scriptBaseType))
-            continue;
-
-        std::string fullName = (std::string)type->GetFullName();
-        std::string key = ToLowerCopy(fullName);
-
-        m_ScriptClasses[key] = *type;
-
-        std::string shortKey = ToLowerCopy(GetShortTypeName(fullName));
-        auto [shortIt, inserted] = m_ShortNameToFullName.emplace(shortKey, key);
-        if (!inserted && shortIt->second != key)
-        {
-            shortIt->second.clear();
-        }
-
-        CH_CORE_TRACE("ScriptEngine: Registered script '{}' (key: '{}')", fullName, key);
-    }
-
-    CH_CORE_INFO("ScriptEngine: {} script(s) registered ({} short-name keys).", m_ScriptClasses.size(),
-                 m_ShortNameToFullName.size());
-}
-
-Coral::Type* ScriptTypeRegistry::GetScriptClass(const std::string& name)
-{
-    std::string key = ToLowerCopy(name);
-
-    auto it = m_ScriptClasses.find(key);
-    if (it != m_ScriptClasses.end())
-        return &it->second;
-
-    auto shortIt = m_ShortNameToFullName.find(key);
-    if (shortIt != m_ShortNameToFullName.end())
-    {
-        if (shortIt->second.empty())
-        {
-            CH_CORE_WARN("ScriptEngine: Ambiguous short script name '{}'. Use fully-qualified name.", name);
-            return nullptr;
-        }
-
-        auto fullIt = m_ScriptClasses.find(shortIt->second);
-        if (fullIt != m_ScriptClasses.end())
-            return &fullIt->second;
-    }
-
-    for (auto& [storedKey, type] : m_ScriptClasses)
-    {
-        if (storedKey.size() >= key.size() + 1)
-        {
-            const size_t suffixPos = storedKey.size() - key.size();
-            const char dot = storedKey[suffixPos - 1];
-            if (dot == '.' && storedKey.compare(suffixPos, key.size(), key) == 0)
-                return &type;
-        }
-    }
-
-    if (m_MissingScriptsWarnings.find(key) == m_MissingScriptsWarnings.end())
-    {
-        CH_CORE_WARN("ScriptEngine: No script found for name '{}' (key: '{}')", name, key);
-        m_MissingScriptsWarnings.insert(key);
-    }
-    return nullptr;
-}
-
-} // namespace CHEngine
\ No newline at end of file
diff --git a/scripting/scriptengine_services.h b/scripting/scriptengine_services.h
deleted file mode 100644
index c676c01f4..000000000
--- a/scripting/scriptengine_services.h
+++ /dev/null
@@ -1,123 +0,0 @@
-
-#ifndef CH_SCRIPT_ENGINE_SERVICES_H
-#define CH_SCRIPT_ENGINE_SERVICES_H
-
-#include <Coral/Assembly.hpp>
-#include <Coral/HostInstance.hpp>
-#include <filesystem>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-namespace CHEngine
-{
-
-class Scene;
-
-// Runtime scene handoff and reload state.
-class ScriptRuntimeSession
-{
-public:
-    bool IsReloadInProgress() const
-    {
-        return m_ReloadInProgress;
-    }
-
-    bool BeginReload();
-    void EndReload();
-
-    Scene* GetActiveScene() const
-    {
-        return m_ActiveScene;
-    }
-
-    void SetActiveScene(Scene* scene)
-    {
-        m_ActiveScene = scene;
-    }
-
-    void RequestLoadScene(const std::string& path)
-    {
-        m_PendingScenePath = path;
-    }
-
-    std::string ConsumeRequestedScene();
-    bool TryConsumeRequestedScene(std::string& outPath);
-
-    void Reset();
-
-private:
-    Scene* m_ActiveScene = nullptr;
-    bool m_ReloadInProgress = false;
-    std::string m_PendingScenePath;
-};
-
-// Owns the CoreCLR host and the current app/core assembly handles.
-class ScriptAssemblyHost
-{
-public:
-    bool Init();
-    void Shutdown();
-
-    bool LoadAppAssembly(const std::string& filepath);
-    bool ReloadAppAssembly(const std::string& filepath);
-
-    bool IsInitialized() const
-    {
-        return m_IsInitialized;
-    }
-
-    Coral::ManagedAssembly* GetAppAssembly() const
-    {
-        return m_AppAssembly;
-    }
-
-    Coral::ManagedAssembly* GetCoreAssembly() const
-    {
-        return m_CoreAssembly;
-    }
-
-    void ClearLoadedAssemblyState();
-
-private:
-    bool RecreateAssemblyLoadContext(bool unloadCurrent);
-    bool LoadAssembliesTransactional(const std::filesystem::path& appAssemblyPath);
-
-    static std::filesystem::path ResolveCoralDirectory();
-    static std::filesystem::path ResolveCoreAssemblyPath(const std::filesystem::path& coralDir);
-
-private:
-    std::filesystem::path m_CoralDirectory;
-    Coral::HostInstance m_Host;
-    Coral::AssemblyLoadContext m_AppAssemblyContext;
-    Coral::ManagedAssembly* m_AppAssembly = nullptr;
-    Coral::ManagedAssembly* m_CoreAssembly = nullptr;
-    bool m_IsInitialized = false;
-};
-
-// Caches discovered script types and resolves short names to full names.
-class ScriptTypeRegistry
-{
-public:
-    void Clear();
-    void Discover(Coral::ManagedAssembly& appAssembly, Coral::ManagedAssembly& coreAssembly);
-    Coral::Type* GetScriptClass(const std::string& name);
-
-    const std::unordered_map<std::string, Coral::Type>& GetScriptClasses() const
-    {
-        return m_ScriptClasses;
-    }
-
-private:
-    std::unordered_map<std::string, Coral::Type> m_ScriptClasses;
-    std::unordered_map<std::string, std::string> m_ShortNameToFullName;
-    std::unordered_set<std::string> m_MissingScriptsWarnings;
-};
-
-ScriptAssemblyHost& GetScriptAssemblyHost();
-ScriptTypeRegistry& GetScriptTypeRegistry();
-
-} // namespace CHEngine
-
-#endif // CH_SCRIPT_ENGINE_SERVICES_H
-
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d6b9291c8..072722d02 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,49 +1,9 @@
-add_executable(EngineTests
-    uuid_tests.cpp
-    primitive_tests.cpp
-    serialization_tests.cpp
-    scriptengine_tests.cpp
-    scene_tests.cpp
-    physics_tests.cpp
-    hierarchy_tests.cpp
-    event_input_tests.cpp
-    asset_manager_tests.cpp
-    integration_tests.cpp
-    importer_tests.cpp
-    renderer_tests.cpp
-    scene_serialization_tests.cpp
-    material_tests.cpp
-    audio_tests.cpp
-    test_environment.cpp
-)
+# Root tests directory — delegates to unit/ and integration/
+# Unit tests: fast, no engine runtime, cross-platform
+# Integration tests: slow, need engine + Windows DLLs
 
-target_link_libraries(EngineTests PRIVATE engine editor_core GTest::gtest_main)
-apply_engine_optimizations(EngineTests)
-target_include_directories(EngineTests PRIVATE 
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/editor
-)
+add_subdirectory(unit)
+add_subdirectory(integration)
 
-# Use centralized engine resources
-chained_add_engine_resources_copy()
-add_dependencies(EngineTests EngineResources)
-
-if(DEFINED ENV{CI} OR CH_CI)
-    target_compile_definitions(EngineTests PRIVATE CH_CI)
-endif()
-
-# Fix static linking issues with yaml-cpp on Windows
-target_compile_definitions(EngineTests PRIVATE YAML_CPP_STATIC_DEFINE)
-
-include(GoogleTest)
-gtest_discover_tests(EngineTests 
-    CONFIGURATION_VAR CMAKE_BUILD_TYPE
-    DISCOVERY_MODE PRE_TEST
-    WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-    PROPERTIES LABELS "Engine;Core"
-)
-
-# Installation
-install(TARGETS EngineTests
-    RUNTIME DESTINATION bin
-)
+# Optional: run unit tests as part of default 'test' target
+# Integration tests run manually or on CI schedule
\ No newline at end of file
diff --git a/tests/asset_manager_tests.cpp b/tests/asset_manager_tests.cpp
deleted file mode 100644
index 272d3130d..000000000
--- a/tests/asset_manager_tests.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-#include "engine/core/base.h"
-#include "engine/core/assets/asset_manager.h"
-#include "engine/scene/project.h"
-#include "gtest/gtest.h"
-
-#include <atomic>
-#include <chrono>
-#include <filesystem>
-#include <string>
-#include <thread>
-
-using namespace CHEngine;
-
-namespace
-{
-class DummyAsset final : public Asset
-{
-public:
-    DummyAsset()
-        : Asset(GetStaticType())
-    {
-    }
-
-    static AssetType GetStaticType()
-    {
-        return AssetType::None;
-    }
-
-    int OnLoadedCount = 0;
-    int LoadCount = 0;
-    std::string LastLoadedPath;
-
-    void OnLoaded() override
-    {
-        ++OnLoadedCount;
-    }
-};
-
-class CountingLoader final : public IAssetLoader
-{
-public:
-    explicit CountingLoader(bool shouldSucceed, bool asyncLoad = false)
-        : m_ShouldSucceed(shouldSucceed)
-        , m_AsyncLoad(asyncLoad)
-    {
-    }
-
-    std::shared_ptr<Asset> Create() override
-    {
-        ++CreateCalls;
-        return std::make_shared<DummyAsset>();
-    }
-
-    bool Load(std::shared_ptr<Asset> asset, const std::string& resolvedPath, std::string* outError = nullptr) override
-    {
-        ++LoadCalls;
-        if (auto dummy = std::dynamic_pointer_cast<DummyAsset>(asset))
-        {
-            ++dummy->LoadCount;
-            dummy->LastLoadedPath = resolvedPath;
-        }
-
-        if (!m_ShouldSucceed && outError)
-        {
-            *outError = "CountingLoader: forced failure for test path '" + resolvedPath + "'";
-        }
-
-        return m_ShouldSucceed;
-    }
-
-    bool IsAsync() const override
-    {
-        return m_AsyncLoad;
-    }
-
-    int CreateCalls = 0;
-    int LoadCalls = 0;
-
-private:
-    bool m_ShouldSucceed = true;
-    bool m_AsyncLoad = false;
-};
-
-std::string MakeUniqueAssetPath(const char* suffix)
-{
-    static std::atomic<uint64_t> counter{0};
-    return std::string("unit_tests/") + suffix + "_" + std::to_string(++counter) + ".dummy";
-}
-} // namespace
-
-class AssetManagerTest : public ::testing::Test
-{
-protected:
-    void SetUp() override
-    {
-        auto project = Project::New();
-        project->GetConfig().ProjectDirectory = std::filesystem::current_path();
-        project->GetConfig().AssetDirectory = "assets";
-        Project::SetEngineRoot(project->GetConfig().ProjectDirectory);
-    }
-
-    static CountingLoader* RegisterDummyLoader(bool shouldSucceed, bool asyncLoad = false)
-    {
-        auto loader = std::make_unique<CountingLoader>(shouldSucceed, asyncLoad);
-        CountingLoader* rawLoader = loader.get();
-        AssetManager::Get().RegisterLoader(DummyAsset::GetStaticType(), std::move(loader));
-        return rawLoader;
-    }
-};
-
-TEST_F(AssetManagerTest, ResolvePathReturnsEmptyForEmptyInput)
-{
-    EXPECT_TRUE(AssetManager::Get().ResolvePath("").empty());
-}
-
-TEST_F(AssetManagerTest, GetCachesAssetAndLoadsOnlyOnce)
-{
-    CountingLoader* loader = RegisterDummyLoader(true);
-    const std::string path = MakeUniqueAssetPath("cache");
-
-    auto first = AssetManager::Get().Get<DummyAsset>(path);
-    auto second = AssetManager::Get().Get<DummyAsset>(path);
-
-    ASSERT_NE(first, nullptr);
-    ASSERT_NE(second, nullptr);
-    EXPECT_EQ(first.get(), second.get());
-    EXPECT_EQ(loader->CreateCalls, 1);
-    EXPECT_EQ(loader->LoadCalls, 1);
-    EXPECT_EQ(first->GetState(), AssetState::Ready);
-    EXPECT_EQ(first->OnLoadedCount, 1);
-    EXPECT_FALSE(first->LastLoadedPath.empty());
-}
-
-TEST_F(AssetManagerTest, ResolveToHandleReturnsValidHandleAfterLoad)
-{
-    RegisterDummyLoader(true);
-    const std::string path = MakeUniqueAssetPath("handle");
-
-    auto loaded = AssetManager::Get().Get<DummyAsset>(path);
-    ASSERT_NE(loaded, nullptr);
-
-    AssetHandle handle = AssetManager::Get().ResolveToHandle(path);
-    EXPECT_NE((uint64_t)handle, 0ull);
-
-    auto byHandle = AssetManager::Get().Get<DummyAsset>(handle);
-    ASSERT_NE(byHandle, nullptr);
-    EXPECT_EQ(byHandle.get(), loaded.get());
-}
-
-TEST_F(AssetManagerTest, ReloadInvokesLoaderAgainForExistingAsset)
-{
-    CountingLoader* loader = RegisterDummyLoader(true);
-    const std::string path = MakeUniqueAssetPath("reload");
-
-    auto asset = AssetManager::Get().Load<DummyAsset>(path);
-    ASSERT_NE(asset, nullptr);
-    ASSERT_EQ(loader->LoadCalls, 1);
-
-    AssetManager::Get().Reload<DummyAsset>(path);
-
-    EXPECT_EQ(loader->LoadCalls, 2);
-    EXPECT_GE(asset->OnLoadedCount, 2);
-}
-
-TEST_F(AssetManagerTest, FailedLoadMarksAssetAsFailed)
-{
-    CountingLoader* loader = RegisterDummyLoader(false);
-    const std::string path = MakeUniqueAssetPath("failed");
-
-    auto asset = AssetManager::Get().Load<DummyAsset>(path);
-
-    ASSERT_NE(asset, nullptr);
-    EXPECT_EQ(loader->LoadCalls, 1);
-    EXPECT_EQ(asset->GetState(), AssetState::Failed);
-    EXPECT_EQ(asset->OnLoadedCount, 0);
-}
-
-TEST_F(AssetManagerTest, AsyncLoadQueuesFinalizeAndCompletesOnUpdate)
-{
-    CountingLoader* loader = RegisterDummyLoader(true, true);
-    const std::string path = MakeUniqueAssetPath("async");
-
-    auto asset = AssetManager::Get().Load<DummyAsset>(path);
-    ASSERT_NE(asset, nullptr);
-
-    for (int attempt = 0; attempt < 200 && AssetManager::Get().GetPendingFinalizeCount() == 0; ++attempt)
-    {
-        std::this_thread::sleep_for(std::chrono::milliseconds(5));
-    }
-
-    ASSERT_GT(AssetManager::Get().GetPendingFinalizeCount(), 0u);
-
-    AssetManager::Get().Update();
-
-    EXPECT_EQ(loader->LoadCalls, 1);
-    EXPECT_EQ(asset->GetState(), AssetState::Ready);
-    EXPECT_EQ(asset->OnLoadedCount, 1);
-    EXPECT_EQ(AssetManager::Get().GetPendingFinalizeCount(), 0u);
-}
diff --git a/tests/audio_tests.cpp b/tests/audio_tests.cpp
deleted file mode 100644
index c931c1be7..000000000
--- a/tests/audio_tests.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "engine/audio/audio.h"
-#include "gtest/gtest.h"
-
-#include <array>
-
-using namespace CHEngine;
-
-TEST(AudioTest, SingletonReturnsSameInstance)
-{
-    auto& first = Audio::Get();
-    auto& second = Audio::Get();
-    EXPECT_EQ(&first, &second);
-}
-
-TEST(AudioTest, EmptyBufferPlaybackIsNoOp)
-{
-    auto& audio = Audio::Get();
-
-    EXPECT_NO_THROW(audio.Play(AudioHandle(0)));
-    EXPECT_NO_THROW(audio.Update(Timestep(0.016f)));
-    EXPECT_NO_THROW(audio.StopAll());
-}
-
-TEST(AudioTest, TinyBufferPlaybackAndStopAllAreSafe)
-{
-    auto& audio = Audio::Get();
-
-    EXPECT_NO_THROW(audio.Play(AudioHandle(0), 0.25f, 1.0f, false, false));
-    EXPECT_NO_THROW(audio.Update(Timestep(0.016f)));
-    EXPECT_NO_THROW(audio.StopAll());
-}
diff --git a/tests/event_input_tests.cpp b/tests/event_input_tests.cpp
deleted file mode 100644
index eee0fb961..000000000
--- a/tests/event_input_tests.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "engine/core/events.h"
-#include "engine/core/key_codes.h"
-#include "engine/core/mouse_codes.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-TEST(EventSystemTest, KeyPressedEventCreation)
-{
-    KeyPressedEvent event(Key::W, false);
-    EXPECT_EQ(event.GetKeyCode(), Key::W);
-    EXPECT_FALSE(event.IsRepeat());
-    EXPECT_EQ(event.GetEventType(), EventType::KeyPressed);
-    EXPECT_TRUE(event.IsInCategory(EventCategoryKeyboard));
-    EXPECT_TRUE(event.IsInCategory(EventCategoryInput));
-}
-
-TEST(EventSystemTest, KeyReleasedEventCreation)
-{
-    KeyReleasedEvent event(Key::Space);
-    EXPECT_EQ(event.GetKeyCode(), Key::Space);
-    EXPECT_EQ(event.GetEventType(), EventType::KeyReleased);
-}
-
-TEST(EventSystemTest, MouseButtonEventCreation)
-{
-    MouseButtonPressedEvent pressEvent(Mouse::ButtonLeft);
-    EXPECT_EQ(pressEvent.GetMouseButton(), Mouse::ButtonLeft);
-    EXPECT_EQ(pressEvent.GetAction(), MouseButtonEvent::Action::Pressed);
-    EXPECT_TRUE(pressEvent.IsInCategory(EventCategoryMouseButton));
-    EXPECT_TRUE(pressEvent.IsInCategory(EventCategoryInput));
-
-    MouseButtonReleasedEvent releaseEvent(Mouse::ButtonRight);
-    EXPECT_EQ(releaseEvent.GetMouseButton(), Mouse::ButtonRight);
-    EXPECT_EQ(releaseEvent.GetAction(), MouseButtonEvent::Action::Released);
-}
-
-TEST(EventSystemTest, EventDispatcherKeyPressed)
-{
-    KeyPressedEvent event(Key::W, false);
-    bool handlerCalled = false;
-    int receivedKey = -1;
-
-    EventDispatcher dispatcher(event);
-    const bool dispatched = dispatcher.Dispatch<KeyPressedEvent>([&](KeyPressedEvent& e) {
-        handlerCalled = true;
-        receivedKey = e.GetKeyCode();
-        return true;
-    });
-
-    EXPECT_TRUE(dispatched);
-    EXPECT_TRUE(handlerCalled);
-    EXPECT_EQ(receivedKey, Key::W);
-    EXPECT_TRUE(event.Handled);
-}
-
-TEST(EventSystemTest, EventDispatcherWrongType)
-{
-    KeyPressedEvent event(Key::W, false);
-    bool handlerCalled = false;
-
-    EventDispatcher dispatcher(event);
-    const bool dispatched = dispatcher.Dispatch<MouseButtonPressedEvent>([&](MouseButtonPressedEvent&) {
-        handlerCalled = true;
-        return true;
-    });
-
-    EXPECT_FALSE(dispatched);
-    EXPECT_FALSE(handlerCalled);
-    EXPECT_FALSE(event.Handled);
-}
-
-TEST(EventSystemTest, EventDispatcherMultipleHandlers)
-{
-    KeyPressedEvent event(Key::Space, false);
-    int handlerCount = 0;
-
-    EventDispatcher dispatcher(event);
-
-    dispatcher.Dispatch<KeyPressedEvent>([&](KeyPressedEvent& e) {
-        handlerCount++;
-        return false; // Don't mark as handled
-    });
-
-    dispatcher.Dispatch<KeyPressedEvent>([&](KeyPressedEvent& e) {
-        handlerCount++;
-        return true; // Mark as handled
-    });
-
-    EXPECT_EQ(handlerCount, 2);
-    EXPECT_TRUE(event.Handled);
-}
-
-TEST(EventSystemTest, WindowResizeToStringIncludesDimensions)
-{
-    WindowResizeEvent event(1280, 720);
-
-    EXPECT_EQ(event.GetWidth(), 1280u);
-    EXPECT_EQ(event.GetHeight(), 720u);
-    EXPECT_NE(event.ToString().find("1280"), std::string::npos);
-    EXPECT_NE(event.ToString().find("720"), std::string::npos);
-}
diff --git a/tests/hierarchy_tests.cpp b/tests/hierarchy_tests.cpp
deleted file mode 100644
index 2fdac26a8..000000000
--- a/tests/hierarchy_tests.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "engine/scene/components.h"
-#include "engine/scene/scene.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-TEST(HierarchyTest, BasicParenting)
-{
-    Scene scene;
-    Entity parent = scene.CreateEntity("Parent");
-    Entity child = scene.CreateEntity("Child");
-
-    auto& phc = parent.AddComponent<HierarchyComponent>();
-    auto& chc = child.AddComponent<HierarchyComponent>();
-
-    chc.Parent = (entt::entity)parent;
-    phc.Children.push_back((entt::entity)child);
-
-    EXPECT_EQ(chc.Parent, (entt::entity)parent);
-    EXPECT_EQ(phc.Children.size(), 1);
-    EXPECT_EQ(phc.Children[0], (entt::entity)child);
-}
-
-TEST(HierarchyTest, DestroyParent)
-{
-    Scene scene;
-    Entity parent = scene.CreateEntity("Parent");
-    Entity child = scene.CreateEntity("Child");
-
-    parent.AddComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
-    child.AddComponent<HierarchyComponent>().Parent = (entt::entity)parent;
-
-    entt::entity childHandle = (entt::entity)child;
-
-    scene.DestroyEntity(parent);
-
-    // In this engine, DestroyEntity is recursive
-    EXPECT_FALSE(scene.GetRegistry().valid(childHandle));
-}
-
-TEST(HierarchyTest, ClearParent)
-{
-    Scene scene;
-    Entity parent = scene.CreateEntity("Parent");
-    Entity child = scene.CreateEntity("Child");
-
-    auto& phc = parent.AddComponent<HierarchyComponent>();
-    auto& chc = child.AddComponent<HierarchyComponent>();
-
-    chc.Parent = (entt::entity)parent;
-    phc.Children.push_back((entt::entity)child);
-
-    // Clear parenting
-    chc.Parent = entt::null;
-    auto it = std::find(phc.Children.begin(), phc.Children.end(), (entt::entity)child);
-    if (it != phc.Children.end())
-        phc.Children.erase(it);
-
-    EXPECT_TRUE(chc.Parent == entt::null);
-    EXPECT_EQ(phc.Children.size(), 0);
-}
-
-TEST(HierarchyTest, DeepHierarchyDestruction)
-{
-    Scene scene;
-    Entity root   = scene.CreateEntity("Root");
-    Entity child1 = scene.CreateEntity("Child 1");
-    Entity child2 = scene.CreateEntity("Child 2");
-
-    // Root -> Child1 -> Child2
-    root.AddComponent<HierarchyComponent>().Children.push_back((entt::entity)child1);
-    child1.AddComponent<HierarchyComponent>().Parent = (entt::entity)root;
-    child1.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child2);
-    child2.AddComponent<HierarchyComponent>().Parent = (entt::entity)child1;
-
-    entt::entity c1 = (entt::entity)child1;
-    entt::entity c2 = (entt::entity)child2;
-
-    scene.DestroyEntity(root);
-
-    EXPECT_FALSE(scene.GetRegistry().valid(c1));
-    EXPECT_FALSE(scene.GetRegistry().valid(c2));
-}
-
-// ============================================================
-//  Destructive / Negative Tests
-// ============================================================
-
-// Destroy child BEFORE parent — parent's child list becomes stale.
-// Engine must handle it without crashing.
-TEST(HierarchyDestructiveTest, DestroyChildBeforeParent)
-{
-    Scene scene;
-    Entity parent = scene.CreateEntity("Parent");
-    Entity child  = scene.CreateEntity("Child");
-
-    parent.AddComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
-    child.AddComponent<HierarchyComponent>().Parent = (entt::entity)parent;
-
-    entt::entity parentHandle = (entt::entity)parent;
-    entt::entity childHandle  = (entt::entity)child;
-
-    EXPECT_NO_THROW(scene.DestroyEntity(child));
-    EXPECT_FALSE(scene.GetRegistry().valid(childHandle));
-    EXPECT_TRUE(scene.GetRegistry().valid(parentHandle));
-
-    // Parent still alive but its children list has a stale handle — must not crash
-    EXPECT_NO_THROW(scene.DestroyEntity(parent));
-    EXPECT_FALSE(scene.GetRegistry().valid(parentHandle));
-}
-
-// 1 parent + 500 children destroyed at once — no stack overflow, no O(n^2).
-TEST(HierarchyDestructiveTest, WideHierarchyMassDestruction)
-{
-    Scene scene;
-    Entity root = scene.CreateEntity("Root");
-    root.AddComponent<HierarchyComponent>();
-
-    constexpr int kCount = 500;
-    for (int i = 0; i < kCount; ++i)
-    {
-        Entity child = scene.CreateEntity("C_" + std::to_string(i));
-        child.AddComponent<HierarchyComponent>().Parent = (entt::entity)root;
-        root.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
-    }
-
-    EXPECT_EQ((int)root.GetComponent<HierarchyComponent>().Children.size(), kCount);
-    EXPECT_NO_THROW(scene.DestroyEntity(root));
-
-    auto view = scene.GetRegistry().view<TagComponent>();
-    EXPECT_EQ(std::distance(view.begin(), view.end()), 0);
-}
-
-// Re-parent the same entity 100 times alternately between two parents.
-TEST(HierarchyDestructiveTest, RapidReparenting)
-{
-    Scene scene;
-    Entity p1    = scene.CreateEntity("Parent1");
-    Entity p2    = scene.CreateEntity("Parent2");
-    Entity child = scene.CreateEntity("Child");
-
-    p1.AddComponent<HierarchyComponent>();
-    p2.AddComponent<HierarchyComponent>();
-    auto& chc = child.AddComponent<HierarchyComponent>();
-
-    for (int i = 0; i < 100; ++i)
-    {
-        Entity& newP = (i % 2 == 0) ? p1 : p2;
-        Entity& oldP = (i % 2 == 0) ? p2 : p1;
-
-        auto& oldKids = oldP.GetComponent<HierarchyComponent>().Children;
-        oldKids.erase(std::remove(oldKids.begin(), oldKids.end(), (entt::entity)child), oldKids.end());
-
-        newP.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
-        chc.Parent = (entt::entity)newP;
-    }
-
-    // 100 swaps (starting at 0 for p1, 1 for p2... 99 for p2)
-    // Means the last assigned parent is p2!
-    EXPECT_EQ(chc.Parent, (entt::entity)p2);
-    EXPECT_NO_THROW(scene.DestroyEntity(p1));
-    EXPECT_NO_THROW(scene.DestroyEntity(p2));
-}
diff --git a/tests/importer_tests.cpp b/tests/importer_tests.cpp
deleted file mode 100644
index f50980ec9..000000000
--- a/tests/importer_tests.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "engine/graphics/loaders/assimp_importer.h"
-#include "gtest/gtest.h"
-#include <filesystem>
-#include <fstream>
-
-using namespace CHEngine;
-
-class ImporterTest : public ::testing::Test
-{
-protected:
-    void SetUp() override
-    {
-        std::ofstream out("test_load.obj");
-        if (!out.is_open()) {
-            std::filesystem::create_directories("test_assets");
-            out.open("test_load.obj");
-        }
-        out << "v -1.0 -1.0 0.0\n";
-        out << "v 1.0 -1.0 0.0\n";
-        out << "v 0.0 1.0 0.0\n";
-        out << "f 1 2 3\n";
-        out.close();
-    }
-
-    void TearDown() override
-    {
-        std::filesystem::remove("test_load.obj");
-    }
-};
-
-TEST_F(ImporterTest, AssimpImporter_LoadBasicObj)
-{
-    auto data = AssimpImporter::Import("test_load.obj", 30);
-    EXPECT_TRUE(data.isValid);
-    EXPECT_EQ(data.meshes.size(), 1);
-    if (!data.meshes.empty()) {
-        EXPECT_EQ(data.meshes[0].vertices.size(), 3 * 3); // 3 vertices * 3 coords
-        EXPECT_EQ(data.meshes[0].indices.size(), 3); // 1 face * 3 indices
-    }
-}
-
-TEST_F(ImporterTest, AssimpImporter_InvalidPath)
-{
-    auto data = AssimpImporter::Import("non_existent_model.obj", 30);
-    EXPECT_FALSE(data.isValid);
-}
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
new file mode 100644
index 000000000..bed7dff12
--- /dev/null
+++ b/tests/integration/CMakeLists.txt
@@ -0,0 +1,69 @@
+# Integration tests — require engine runtime (Application, Scene, Physics, Renderer, Scripting)
+set(INTEGRATION_SOURCES
+    scene_tests.cpp
+    scene_serialization_tests.cpp
+    async_scene_loader_tests.cpp
+    physics_tests.cpp
+    scriptengine_tests.cpp
+    renderer_tests.cpp
+    audio_tests.cpp
+    importer_tests.cpp
+    integration_tests.cpp
+    asset_manager_tests.cpp
+    primitive_tests.cpp
+    material_tests.cpp
+    hierarchy_tests.cpp
+    serialization_tests.cpp
+    network_tests.cpp
+    smoke_tests.cpp
+    regression_tests.cpp
+    test_environment.cpp
+    test_main.cpp
+)
+
+add_executable(engine_tests_integration ${INTEGRATION_SOURCES})
+
+target_link_libraries(engine_tests_integration PRIVATE
+    engine_core
+    engine_app
+    engine_scene
+    engine_graphics
+    engine_physics
+    engine_audio
+    engine_scripting
+    engine_project
+    engine_assets
+    engine_network
+    engine_external_imgui
+    engine_external_entt
+    engine_reflection
+    gtest
+    gtest_main
+)
+
+# MinGW/gcc: statically link the gcc/stdc++ runtime so the test exe can start
+# during test discovery without libstdc++-6.dll / libgcc_s / libwinpthread on PATH.
+if(MINGW)
+    target_link_options(engine_tests_integration PRIVATE -static-libgcc -static-libstdc++)
+endif()
+
+target_include_directories(engine_tests_integration PRIVATE
+    ${CMAKE_SOURCE_DIR}
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_tests_integration PRIVATE engine_pch)
+endif()
+
+include(GoogleTest)
+# Discover individual GTest tests so each shows up as a separate CTest entry.
+# POST_BUILD mode discovers tests at build time, avoiding PRE_TEST path issues
+# on Windows and the overhead of running the discovery binary at test time.
+gtest_discover_tests(engine_tests_integration
+    WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+    DISCOVERY_TIMEOUT 60
+    PROPERTIES
+        LABELS "Integration"
+        ENVIRONMENT "ENGINE_ROOT=${CMAKE_SOURCE_DIR}"
+        TIMEOUT 120
+)
\ No newline at end of file
diff --git a/tests/integration/asset_manager_tests.cpp b/tests/integration/asset_manager_tests.cpp
new file mode 100644
index 000000000..bc964a449
--- /dev/null
+++ b/tests/integration/asset_manager_tests.cpp
@@ -0,0 +1,309 @@
+#include "engine/core/service_locator.h"
+#include "engine/app/application.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/loaders/iasset_loader.h"
+#include "thirdparty/googletest/googletest/include/gtest/gtest.h"
+
+#include <atomic>
+#include <chrono>
+#include <filesystem>
+#include <future>
+#include <string>
+#include <thread>
+
+using namespace Chained;
+
+namespace
+{
+	class DummyAsset final : public Asset
+	{
+	public:
+		DummyAsset()
+			: Asset(GetStaticType())
+		{
+		}
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::None;
+		}
+
+		int OnLoadedCount = 0;
+		int LoadCount = 0;
+		std::string LastLoadedPath;
+
+		void OnLoaded() override
+		{
+			++OnLoadedCount;
+		}
+	};
+
+	struct CountingLoaderData
+	{
+		int LoadCalls = 0;
+	};
+
+	class DummyLoader final : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return m_Async;
+		}
+		std::shared_ptr<Asset> Create() override
+		{
+			return std::make_shared<DummyAsset>();
+		}
+		bool Load(std::shared_ptr<Asset> asset, const std::string& path, std::string* outError) override
+		{
+			auto dummy = std::dynamic_pointer_cast<DummyAsset>(asset);
+			if (!dummy)
+			{
+				return false;
+			}
+
+			++m_Data->LoadCalls;
+			if (!m_ShouldSucceed)
+			{
+				if (outError)
+				{
+					*outError = "CountingLoader: forced failure for test path '" + path + "'";
+				}
+				return false;
+			}
+
+			dummy->SetPath(path);
+			dummy->LoadCount = 1;
+			dummy->LastLoadedPath = path;
+			return true;
+		}
+
+		bool m_Async = false;
+		bool m_ShouldSucceed = true;
+		std::shared_ptr<CountingLoaderData> m_Data;
+	};
+
+	std::string MakeUniqueAssetPath(const char* suffix)
+	{
+		static std::atomic<uint64_t> counter{0};
+		return std::string("unit_tests/") + suffix + "_" + std::to_string(++counter) + ".dummy";
+	}
+} // namespace
+
+class AssetManagerTest : public ::testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		m_AssetManager = std::make_shared<AssetManager>();
+
+		auto currentPath = std::filesystem::current_path();
+		m_AssetManager->SetProjectDirectory(currentPath);
+		m_AssetManager->SetAssetDirectory(currentPath / "test_assets_unit");
+		m_AssetManager->SetEngineRoot(currentPath);
+		std::filesystem::create_directories(m_AssetManager->GetAssetDirectory());
+	}
+
+	void TearDown() override
+	{
+		m_AssetManager.reset();
+	}
+
+	std::shared_ptr<AssetManager> m_AssetManager;
+	AssetManager* m_PreviousAssetManager = nullptr;
+	std::vector<std::shared_ptr<CountingLoaderData>> m_LoaderData;
+
+	CountingLoaderData* RegisterDummyLoader(bool shouldSucceed, bool asyncLoad = false)
+	{
+		auto data = std::make_shared<CountingLoaderData>();
+		m_LoaderData.push_back(data);
+
+		auto loader = std::make_unique<DummyLoader>();
+		loader->m_Async = asyncLoad;
+		loader->m_ShouldSucceed = shouldSucceed;
+		loader->m_Data = data;
+		m_AssetManager->RegisterLoader(DummyAsset::GetStaticType(), std::move(loader));
+		return data.get();
+	}
+};
+
+TEST_F(AssetManagerTest, ResolvePathReturnsEmptyForEmptyInput)
+{
+	EXPECT_TRUE(m_AssetManager->ResolvePath("").empty());
+}
+
+TEST_F(AssetManagerTest, GetCachesAssetAndLoadsOnlyOnce)
+{
+	CountingLoaderData* loader = RegisterDummyLoader(true);
+	const std::string path = MakeUniqueAssetPath("cache");
+
+	auto first = m_AssetManager->Get<DummyAsset>(path);
+	auto second = m_AssetManager->Get<DummyAsset>(path);
+
+	ASSERT_NE(first, nullptr);
+	ASSERT_NE(second, nullptr);
+	EXPECT_EQ(first.get(), second.get());
+	EXPECT_EQ(loader->LoadCalls, 1);
+	EXPECT_EQ(first->GetState(), AssetState::Ready);
+	EXPECT_EQ(first->OnLoadedCount, 1);
+	EXPECT_FALSE(first->LastLoadedPath.empty());
+}
+
+TEST_F(AssetManagerTest, ResolveToHandleReturnsValidHandleAfterLoad)
+{
+	RegisterDummyLoader(true);
+	const std::string path = MakeUniqueAssetPath("handle");
+
+	auto loaded = m_AssetManager->Get<DummyAsset>(path);
+	auto loadedHandle = m_AssetManager->ResolveToHandle(path);
+	ASSERT_NE(loaded, nullptr);
+
+	AssetHandle handle = m_AssetManager->ResolveToHandle(path);
+	EXPECT_NE((uint64_t)handle, 0ull);
+
+	auto byHandle = m_AssetManager->Get<DummyAsset>(handle);
+	ASSERT_NE(byHandle, nullptr);
+	EXPECT_EQ(byHandle.get(), loaded.get());
+}
+
+TEST_F(AssetManagerTest, ReloadInvokesLoaderAgainForExistingAsset)
+{
+	CountingLoaderData* loader = RegisterDummyLoader(true);
+	const std::string path = MakeUniqueAssetPath("reload");
+
+	auto asset = m_AssetManager->Get<DummyAsset>(path);
+	ASSERT_NE(asset, nullptr);
+	ASSERT_EQ(loader->LoadCalls, 1);
+
+	m_AssetManager->Reload<DummyAsset>(path);
+
+	// AssetManager::Reload needs implementation in project, currently empty
+	// But for tests we might want to check it if we implement it.
+	// EXPECT_EQ(loader->LoadCalls, 2);
+}
+
+TEST_F(AssetManagerTest, FailedLoadMarksAssetAsFailed)
+{
+	CountingLoaderData* loader = RegisterDummyLoader(false);
+	const std::string path = MakeUniqueAssetPath("failed");
+
+	auto asset = m_AssetManager->Get<DummyAsset>(path);
+
+	ASSERT_NE(asset, nullptr);
+	EXPECT_EQ(loader->LoadCalls, 1);
+	EXPECT_EQ(asset->GetState(), AssetState::Failed);
+	EXPECT_EQ(asset->OnLoadedCount, 0);
+}
+
+TEST_F(AssetManagerTest, AsyncLoadQueuesFinalizeAndCompletesOnUpdate)
+{
+	CountingLoaderData* loader = RegisterDummyLoader(true, true);
+	const std::string path = MakeUniqueAssetPath("async");
+
+	auto asset = m_AssetManager->Get<DummyAsset>(path);
+	ASSERT_NE(asset, nullptr);
+
+	for (int attempt = 0; attempt < 1000 && m_AssetManager->GetPendingFinalizeCount() == 0; ++attempt)
+	{
+		std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+
+	ASSERT_GT(m_AssetManager->GetPendingFinalizeCount(), 0u);
+
+	m_AssetManager->Update(Timestep(0.016f));
+
+	EXPECT_EQ(loader->LoadCalls, 1);
+	EXPECT_EQ(asset->GetState(), AssetState::Ready);
+	EXPECT_EQ(asset->OnLoadedCount, 1);
+	EXPECT_EQ(m_AssetManager->GetPendingFinalizeCount(), 0u);
+}
+
+TEST_F(AssetManagerTest, GetWithInvalidHandleReturnsNull)
+{
+	auto asset = m_AssetManager->Get<DummyAsset>(AssetHandle(0));
+	EXPECT_EQ(asset, nullptr);
+
+	auto assetInvalid = m_AssetManager->Get<DummyAsset>(AssetHandle(123456789));
+	EXPECT_EQ(assetInvalid, nullptr);
+}
+
+TEST_F(AssetManagerTest, MultipleAsyncLoads)
+{
+	CountingLoaderData* loader = RegisterDummyLoader(true, true);
+	const int count = 5;
+	std::vector<std::shared_ptr<DummyAsset>> assets;
+
+	for (int i = 0; i < count; ++i)
+	{
+		const std::string path = MakeUniqueAssetPath("multi_async");
+		assets.push_back(m_AssetManager->Get<DummyAsset>(path));
+	}
+
+	// Wait for all to be in pending finalize
+	for (int attempt = 0; attempt < 2000 && m_AssetManager->GetPendingFinalizeCount() < count; ++attempt)
+	{
+		std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+
+	EXPECT_EQ(m_AssetManager->GetPendingFinalizeCount(), (size_t)count);
+
+	for (int attempt = 0; attempt < 1000 && m_AssetManager->GetPendingFinalizeCount() > 0; ++attempt)
+	{
+		m_AssetManager->Update(Timestep(0.016f));
+	}
+
+	EXPECT_EQ(m_AssetManager->GetPendingFinalizeCount(), 0u);
+	for (auto& asset : assets)
+	{
+		EXPECT_EQ(asset->GetState(), AssetState::Ready);
+	}
+}
+
+TEST_F(AssetManagerTest, ReloadMissingAssetDoesNotCrash)
+{
+	EXPECT_NO_THROW({ m_AssetManager->Reload<DummyAsset>("nonexistent_path_999.dummy"); });
+}
+
+TEST_F(AssetManagerTest, ConcurrentGetSamePathReturnsSameAsset)
+{
+	RegisterDummyLoader(true);
+	const std::string path = MakeUniqueAssetPath("concurrent");
+
+	std::vector<std::shared_ptr<DummyAsset>> results;
+	std::vector<std::future<std::shared_ptr<DummyAsset>>> futures;
+
+	for (int i = 0; i < 4; ++i)
+	{
+		futures.push_back(
+			std::async(std::launch::async, [this, &path]() { return m_AssetManager->Get<DummyAsset>(path); }));
+	}
+
+	for (auto& f : futures)
+	{
+		results.push_back(f.get());
+	}
+
+	for (size_t i = 1; i < results.size(); ++i)
+	{
+		ASSERT_NE(results[i], nullptr);
+		EXPECT_EQ(results[i].get(), results[0].get()) << "Thread " << i << " got different asset";
+	}
+}
+
+TEST_F(AssetManagerTest, AssetReferenceCounting)
+{
+	RegisterDummyLoader(true);
+	const std::string path = MakeUniqueAssetPath("refcount");
+
+	auto asset1 = m_AssetManager->Get<DummyAsset>(path);
+	ASSERT_NE(asset1, nullptr);
+	EXPECT_EQ(asset1.use_count(), 2); // cache + local
+
+	{
+		auto asset2 = m_AssetManager->Get<DummyAsset>(path);
+		EXPECT_EQ(asset1.use_count(), 3); // cache + asset1 + asset2
+		EXPECT_EQ(asset2.get(), asset1.get());
+	}
+
+	EXPECT_EQ(asset1.use_count(), 2); // cache + local
+}
diff --git a/tests/integration/async_scene_loader_tests.cpp b/tests/integration/async_scene_loader_tests.cpp
new file mode 100644
index 000000000..93f0c7ffc
--- /dev/null
+++ b/tests/integration/async_scene_loader_tests.cpp
@@ -0,0 +1,67 @@
+#include "engine/scene/async_scene_loader.h"
+#include "engine/common/thread_pool.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/scene_serializer.h"
+#include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+
+namespace Chained
+{
+
+	class AsyncSceneLoaderTest : public ::testing::Test
+	{
+	protected:
+		void SetUp() override
+		{
+			m_ThreadPool = std::make_unique<ThreadPool>(2);
+			ServiceLocator::Provide<ThreadPool>([this]() { return std::move(m_ThreadPool); });
+		}
+
+		void TearDown() override
+		{
+			ServiceLocator::Shutdown();
+		}
+
+		std::unique_ptr<ThreadPool> m_ThreadPool;
+	};
+
+	TEST_F(AsyncSceneLoaderTest, InitialStateIsIdle)
+	{
+		AsyncSceneLoader loader;
+		EXPECT_FALSE(loader.IsLoading());
+		EXPECT_FLOAT_EQ(loader.GetProgress(), 0.0f);
+	}
+
+	TEST_F(AsyncSceneLoaderTest, FailsGracefullyOnNonExistentFile)
+	{
+		AsyncSceneLoader loader;
+		bool callbackInvoked = false;
+		std::shared_ptr<Scene> loadedScene = nullptr;
+		std::string loadError;
+
+		bool started = loader.LoadSceneAsync("non_existent_scene_path.chscene",
+											 [&](std::shared_ptr<Scene> scene, const std::string& err) {
+												 callbackInvoked = true;
+												 loadedScene = scene;
+												 loadError = err;
+											 });
+
+		EXPECT_TRUE(started);
+		EXPECT_TRUE(loader.IsLoading());
+
+		// Pump update loop until completion
+		auto start = std::chrono::steady_clock::now();
+		while (loader.IsLoading() && std::chrono::steady_clock::now() - start < std::chrono::seconds(5))
+		{
+			loader.OnUpdate(Timestep(0.016f));
+			std::this_thread::sleep_for(std::chrono::milliseconds(10));
+		}
+
+		EXPECT_TRUE(callbackInvoked);
+		EXPECT_FALSE(loader.IsLoading());
+		EXPECT_EQ(loadedScene, nullptr);
+		EXPECT_FALSE(loadError.empty());
+	}
+
+} // namespace Chained
diff --git a/tests/integration/audio_tests.cpp b/tests/integration/audio_tests.cpp
new file mode 100644
index 000000000..685559ca4
--- /dev/null
+++ b/tests/integration/audio_tests.cpp
@@ -0,0 +1,31 @@
+#include "engine/audio/audio.h"
+#include "engine/assets/loaders/audio_loader.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(AudioTest, EmptyBufferPlaybackIsNoOp)
+{
+	Audio audio;
+
+	EXPECT_NO_THROW(audio.Play(AssetHandle(0)));
+	EXPECT_NO_THROW(audio.Update(Timestep(0.016f)));
+	EXPECT_NO_THROW(audio.StopAll());
+}
+
+TEST(AudioTest, TinyBufferPlaybackAndStopAllAreSafe)
+{
+	Audio audio;
+
+	EXPECT_NO_THROW(audio.Play(AssetHandle(0), 0.25f, 1.0f, false, false));
+	EXPECT_NO_THROW(audio.Update(Timestep(0.016f)));
+	EXPECT_NO_THROW(audio.StopAll());
+}
+
+TEST(AudioTest, LoadAudio)
+{
+	AudioLoader loader;
+	auto audio = loader.Create();
+	loader.Load(audio, "resources/audio/default.wav");
+	EXPECT_EQ(audio->GetType(), AssetType::Audio);
+}
diff --git a/tests/integration/hierarchy_tests.cpp b/tests/integration/hierarchy_tests.cpp
new file mode 100644
index 000000000..c57c2eef7
--- /dev/null
+++ b/tests/integration/hierarchy_tests.cpp
@@ -0,0 +1,171 @@
+#include "engine/scene/components.h"
+#include "engine/scene/scene.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(HierarchyTest, BasicParenting)
+{
+	Scene scene;
+	Entity parent = scene.CreateEntity("Parent");
+	Entity child = scene.CreateEntity("Child");
+
+	parent.AddComponent<HierarchyComponent>();
+	child.AddComponent<HierarchyComponent>();
+
+	auto& phc = parent.GetComponent<HierarchyComponent>();
+	auto& chc = child.GetComponent<HierarchyComponent>();
+
+	chc.Parent = (entt::entity)parent;
+	phc.Children.push_back((entt::entity)child);
+
+	EXPECT_EQ(chc.Parent, (entt::entity)parent);
+	EXPECT_EQ(phc.Children.size(), 1);
+	EXPECT_EQ(phc.Children[0], (entt::entity)child);
+}
+
+TEST(HierarchyTest, DestroyParent)
+{
+	Scene scene;
+	Entity parent = scene.CreateEntity("Parent");
+	Entity child = scene.CreateEntity("Child");
+
+	parent.AddComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
+	child.AddComponent<HierarchyComponent>().Parent = (entt::entity)parent;
+
+	entt::entity childHandle = (entt::entity)child;
+
+	scene.DestroyEntity(parent);
+
+	// In this engine, DestroyEntity is recursive
+	EXPECT_FALSE(scene.GetRegistry().valid(childHandle));
+}
+
+TEST(HierarchyTest, ClearParent)
+{
+	Scene scene;
+	Entity parent = scene.CreateEntity("Parent");
+	Entity child = scene.CreateEntity("Child");
+
+	parent.AddComponent<HierarchyComponent>();
+	child.AddComponent<HierarchyComponent>();
+
+	auto& phc = parent.GetComponent<HierarchyComponent>();
+	auto& chc = child.GetComponent<HierarchyComponent>();
+
+	chc.Parent = (entt::entity)parent;
+	phc.Children.push_back((entt::entity)child);
+
+	// Clear parenting
+	chc.Parent = entt::null;
+	auto it = std::find(phc.Children.begin(), phc.Children.end(), (entt::entity)child);
+	if (it != phc.Children.end())
+	{
+		phc.Children.erase(it);
+	}
+
+	EXPECT_TRUE(chc.Parent == entt::null);
+	EXPECT_EQ(phc.Children.size(), 0);
+}
+
+TEST(HierarchyTest, DeepHierarchyDestruction)
+{
+	Scene scene;
+	Entity root = scene.CreateEntity("Root");
+	Entity child1 = scene.CreateEntity("Child 1");
+	Entity child2 = scene.CreateEntity("Child 2");
+
+	// Root -> Child1 -> Child2
+	root.AddComponent<HierarchyComponent>().Children.push_back((entt::entity)child1);
+	child1.AddComponent<HierarchyComponent>().Parent = (entt::entity)root;
+	child1.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child2);
+	child2.AddComponent<HierarchyComponent>().Parent = (entt::entity)child1;
+
+	entt::entity c1 = (entt::entity)child1;
+	entt::entity c2 = (entt::entity)child2;
+
+	scene.DestroyEntity(root);
+
+	EXPECT_FALSE(scene.GetRegistry().valid(c1));
+	EXPECT_FALSE(scene.GetRegistry().valid(c2));
+}
+
+// ============================================================
+//  Destructive / Negative Tests
+// ============================================================
+
+// Destroy child BEFORE parent — parent's child list becomes stale.
+// Engine must handle it without crashing.
+TEST(HierarchyDestructiveTest, DestroyChildBeforeParent)
+{
+	Scene scene;
+	Entity parent = scene.CreateEntity("Parent");
+	Entity child = scene.CreateEntity("Child");
+
+	parent.AddComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
+	child.AddComponent<HierarchyComponent>().Parent = (entt::entity)parent;
+
+	entt::entity parentHandle = (entt::entity)parent;
+	entt::entity childHandle = (entt::entity)child;
+
+	EXPECT_NO_THROW(scene.DestroyEntity(child));
+	EXPECT_FALSE(scene.GetRegistry().valid(childHandle));
+	EXPECT_TRUE(scene.GetRegistry().valid(parentHandle));
+
+	// Parent still alive but its children list has a stale handle — must not crash
+	EXPECT_NO_THROW(scene.DestroyEntity(parent));
+	EXPECT_FALSE(scene.GetRegistry().valid(parentHandle));
+}
+
+// 1 parent + 500 children destroyed at once — no stack overflow, no O(n^2).
+TEST(HierarchyDestructiveTest, WideHierarchyMassDestruction)
+{
+	Scene scene;
+	Entity root = scene.CreateEntity("Root");
+	root.AddComponent<HierarchyComponent>();
+
+	constexpr int kCount = 500;
+	for (int i = 0; i < kCount; ++i)
+	{
+		Entity child = scene.CreateEntity("C_" + std::to_string(i));
+		child.AddComponent<HierarchyComponent>().Parent = (entt::entity)root;
+		root.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
+	}
+
+	EXPECT_EQ((int)root.GetComponent<HierarchyComponent>().Children.size(), kCount);
+	EXPECT_NO_THROW(scene.DestroyEntity(root));
+
+	auto view = scene.GetRegistry().view<TagComponent>();
+	EXPECT_EQ(std::distance(view.begin(), view.end()), 0);
+}
+
+// Re-parent the same entity 100 times alternately between two parents.
+TEST(HierarchyDestructiveTest, RapidReparenting)
+{
+	Scene scene;
+	Entity p1 = scene.CreateEntity("Parent1");
+	Entity p2 = scene.CreateEntity("Parent2");
+	Entity child = scene.CreateEntity("Child");
+
+	p1.AddComponent<HierarchyComponent>();
+	p2.AddComponent<HierarchyComponent>();
+	auto& chc = child.AddComponent<HierarchyComponent>();
+
+	for (int i = 0; i < 100; ++i)
+	{
+		Entity& newP = (i % 2 == 0) ? p1 : p2;
+		Entity& oldP = (i % 2 == 0) ? p2 : p1;
+
+		auto& oldKids = oldP.GetComponent<HierarchyComponent>().Children;
+		oldKids.erase(std::remove(oldKids.begin(), oldKids.end(), (entt::entity)child), oldKids.end());
+
+		newP.GetComponent<HierarchyComponent>().Children.push_back((entt::entity)child);
+		chc.Parent = (entt::entity)newP;
+	}
+
+	// 100 swaps (starting at 0 for p1, 1 for p2... 99 for p2)
+	// Means the last assigned parent is p2!
+	EXPECT_EQ(chc.Parent, (entt::entity)p2);
+	EXPECT_NO_THROW(scene.DestroyEntity(p1));
+	EXPECT_NO_THROW(scene.DestroyEntity(p2));
+}
diff --git a/tests/integration/importer_tests.cpp b/tests/integration/importer_tests.cpp
new file mode 100644
index 000000000..87348dfc1
--- /dev/null
+++ b/tests/integration/importer_tests.cpp
@@ -0,0 +1,48 @@
+#include "engine/assets/loaders/assimp_importer.h"
+#include "gtest/gtest.h"
+#include <filesystem>
+#include <fstream>
+
+using namespace Chained;
+
+class ImporterTest : public ::testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		std::ofstream out("test_load.obj");
+		if (!out.is_open())
+		{
+			std::filesystem::create_directories("test_assets");
+			out.open("test_load.obj");
+		}
+		out << "v -1.0 -1.0 0.0\n";
+		out << "v 1.0 -1.0 0.0\n";
+		out << "v 0.0 1.0 0.0\n";
+		out << "f 1 2 3\n";
+		out.close();
+	}
+
+	void TearDown() override
+	{
+		std::filesystem::remove("test_load.obj");
+	}
+};
+
+TEST_F(ImporterTest, AssimpImporter_LoadBasicObj)
+{
+	auto data = AssimpImporter::Import("test_load.obj", 30);
+	EXPECT_TRUE(data.isValid);
+	EXPECT_EQ(data.meshes.size(), 1);
+	if (!data.meshes.empty())
+	{
+		EXPECT_EQ(data.meshes[0].vertices.size(), 3 * 3); // 3 vertices * 3 coords
+		EXPECT_EQ(data.meshes[0].indices.size(), 3);	  // 1 face * 3 indices
+	}
+}
+
+TEST_F(ImporterTest, AssimpImporter_InvalidPath)
+{
+	auto data = AssimpImporter::Import("non_existent_model.obj", 30);
+	EXPECT_FALSE(data.isValid);
+}
diff --git a/tests/integration/integration_tests.cpp b/tests/integration/integration_tests.cpp
new file mode 100644
index 000000000..173133e67
--- /dev/null
+++ b/tests/integration/integration_tests.cpp
@@ -0,0 +1,125 @@
+// Integration tests — headless only, no GPU/OpenGL required
+#include "engine/common/base.h"
+#include "engine/core/events/events.h"
+#include "engine/common/uuid.h"
+#include "engine/scene/components.h"
+#include "engine/scene/entity.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/scene_events.h"
+#include "engine/scene/scene_serializer.h"
+#include "gtest/gtest.h"
+#include <memory>
+
+using namespace Chained;
+
+// --- Scene + Entity Integration ---
+
+class SceneIntegrationTest : public ::testing::Test
+{
+protected:
+	std::shared_ptr<Scene> scene;
+	void SetUp() override
+	{
+		scene = std::make_shared<Scene>();
+	}
+};
+
+TEST_F(SceneIntegrationTest, CreateAndDestroyEntity)
+{
+	auto entity = scene->CreateEntity("TestEntity");
+	EXPECT_TRUE(entity);
+	EXPECT_TRUE(entity.HasComponent<TagComponent>());
+	EXPECT_EQ(entity.GetComponent<TagComponent>().Tag, "TestEntity");
+
+	scene->DestroyEntity(entity);
+}
+
+TEST_F(SceneIntegrationTest, MultipleEntitiesHaveUniqueIDs)
+{
+	auto e1 = scene->CreateEntity("A");
+	auto e2 = scene->CreateEntity("B");
+	auto e3 = scene->CreateEntity("C");
+
+	auto id1 = e1.GetComponent<IDComponent>().ID;
+	auto id2 = e2.GetComponent<IDComponent>().ID;
+	auto id3 = e3.GetComponent<IDComponent>().ID;
+
+	EXPECT_NE(id1, id2);
+	EXPECT_NE(id2, id3);
+	EXPECT_NE(id1, id3);
+}
+
+TEST_F(SceneIntegrationTest, EntityComponentLifecycle)
+{
+	auto entity = scene->CreateEntity("Player");
+
+	// Transform is added by default
+	EXPECT_TRUE(entity.HasComponent<TransformComponent>());
+	auto& transform = entity.GetComponent<TransformComponent>();
+	transform.Translation = {10.0f, 20.0f, 30.0f};
+	EXPECT_FLOAT_EQ(entity.GetComponent<TransformComponent>().Translation.x, 10.0f);
+
+	// Add and remove a component
+	entity.AddComponent<RigidBodyComponent>();
+	EXPECT_TRUE(entity.HasComponent<RigidBodyComponent>());
+	entity.RemoveComponent<RigidBodyComponent>();
+	EXPECT_FALSE(entity.HasComponent<RigidBodyComponent>());
+}
+
+TEST_F(SceneIntegrationTest, FindEntityByTag)
+{
+	auto entity = scene->CreateEntity("Findable");
+
+	auto found = scene->FindEntityByTag("Findable");
+	EXPECT_TRUE(found);
+	EXPECT_EQ(found.GetComponent<TagComponent>().Tag, "Findable");
+}
+
+TEST_F(SceneIntegrationTest, ReloadSceneLifecycle)
+{
+	auto entity = scene->CreateEntity("Player");
+	entity.AddComponent<SceneTransitionComponent>().TargetScenePath = "test_reload.chscene";
+
+	scene->TransitionToState(SceneState::Play);
+	EXPECT_EQ(scene->GetSceneState(), SceneState::Play);
+
+	scene->OnRuntimeStop();
+	scene->TransitionToState(SceneState::Edit);
+	EXPECT_EQ(scene->GetSceneState(), SceneState::Edit);
+
+	// Deep copy / reload simulation
+	auto reloadedScene = Scene::Copy(scene);
+	EXPECT_NE(reloadedScene, nullptr);
+	EXPECT_TRUE(reloadedScene->FindEntityByTag("Player"));
+}
+
+// --- Event System Integration ---
+
+class EventIntegrationTest : public ::testing::Test
+{
+};
+
+TEST_F(EventIntegrationTest, SceneChangeRequestEvent)
+{
+	SceneChangeRequestEvent event("scenes/level2.chscene");
+	EXPECT_EQ(event.GetPath(), "scenes/level2.chscene");
+	EXPECT_FALSE(event.Handled);
+
+	event.Handled = true;
+	EXPECT_TRUE(event.Handled);
+}
+
+TEST_F(EventIntegrationTest, EventDispatcher)
+{
+	SceneChangeRequestEvent event("test.chscene");
+	EventDispatcher dispatcher(event);
+
+	bool handled = false;
+	dispatcher.Dispatch<SceneChangeRequestEvent>([&handled](SceneChangeRequestEvent& e) -> bool {
+		handled = true;
+		return true;
+	});
+
+	EXPECT_TRUE(handled);
+	EXPECT_TRUE(event.Handled);
+}
diff --git a/tests/integration/material_tests.cpp b/tests/integration/material_tests.cpp
new file mode 100644
index 000000000..87265b04c
--- /dev/null
+++ b/tests/integration/material_tests.cpp
@@ -0,0 +1,55 @@
+// material_tests.cpp
+// Tests for the MaterialInstance struct (engine/graphics/pipeline/material.h).
+// These tests are pure-CPU and do not require an OpenGL context.
+#include "engine/graphics/api/renderer_types.h"
+#include "engine/graphics/pipeline/material.h"
+#include "engine/assets/loaders/material_loader.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+// Verifies that a default-constructed Material has engine-standard default values:
+// white albedo, metalness=0, roughness=0.5, alpha=1.
+TEST(MaterialTest, DefaultInitialization)
+{
+	MaterialInstance material;
+
+	EXPECT_EQ(material.AlbedoColor.r, 255);
+	EXPECT_EQ(material.AlbedoColor.g, 255);
+	EXPECT_EQ(material.AlbedoColor.b, 255);
+	EXPECT_EQ(material.AlbedoColor.a, 255);
+
+	EXPECT_FLOAT_EQ(material.Metalness, 0.0f);
+	EXPECT_FLOAT_EQ(material.Roughness, 0.5f);
+
+	EXPECT_FALSE(material.Transparent);
+	EXPECT_FLOAT_EQ(material.Alpha, 1.0f);
+}
+
+// Verifies that fields can be mutated and read back correctly.
+TEST(MaterialTest, StateModification)
+{
+	MaterialInstance material;
+
+	AssetHandle testHandle(12345);
+	material.AlbedoHandle = testHandle;
+
+	material.Metalness = 0.8f;
+	material.Roughness = 0.2f;
+	material.Transparent = true;
+	material.Alpha = 0.5f;
+
+	EXPECT_EQ(material.AlbedoHandle, testHandle);
+	EXPECT_FLOAT_EQ(material.Metalness, 0.8f);
+	EXPECT_FLOAT_EQ(material.Roughness, 0.2f);
+	EXPECT_TRUE(material.Transparent);
+	EXPECT_FLOAT_EQ(material.Alpha, 0.5f);
+}
+
+TEST(MaterialTest, LoadMaterial)
+{
+	MaterialLoader loader;
+	auto material = loader.Create();
+	loader.Load(material, "resources/materials/default.mat");
+	EXPECT_EQ(material->GetType(), AssetType::Material);
+}
diff --git a/tests/integration/network_tests.cpp b/tests/integration/network_tests.cpp
new file mode 100644
index 000000000..3a017de9a
--- /dev/null
+++ b/tests/integration/network_tests.cpp
@@ -0,0 +1,248 @@
+#include <gtest/gtest.h>
+
+#include "engine/networking/net_packet.h"
+#include "engine/networking/network_service.h"
+
+#include <chrono>
+#include <cstring>
+#include <thread>
+#include <atomic>
+
+using namespace Chained;
+
+// Network loopback tests are flaky in CI (timing-sensitive, UPnP/firewall side-effects).
+// They still run locally when CH_CI is not defined.
+#ifndef CH_CI
+namespace
+{
+	constexpr uint16_t kTestPortBase = 27599;
+	std::atomic<uint16_t> s_PortCounter{0};
+
+	class NetworkLoopbackTest : public ::testing::Test
+	{
+	protected:
+		void SetUp() override
+		{
+			m_Port = kTestPortBase + (s_PortCounter.fetch_add(1) % 50);
+			m_Host.SetTestMode(true);
+			m_Client.SetTestMode(true);
+			m_Host.Initialize();
+			m_Client.Initialize();
+			ASSERT_TRUE(m_Host.IsEnabled()) << "ENet failed to initialize";
+			ASSERT_TRUE(m_Client.IsEnabled()) << "ENet failed to initialize";
+		}
+
+		void TearDown() override
+		{
+			m_Client.Shutdown();
+			m_Host.Shutdown();
+		}
+
+		template <typename Predicate> bool PumpUntil(Predicate pred, std::chrono::milliseconds timeout)
+		{
+			const auto deadline = std::chrono::steady_clock::now() + timeout;
+			while (std::chrono::steady_clock::now() < deadline)
+			{
+				m_Host.Update(1.0f / 60.0f);
+				m_Client.Update(1.0f / 60.0f);
+				if (pred())
+				{
+					return true;
+				}
+				std::this_thread::sleep_for(std::chrono::milliseconds(5));
+			}
+			return false;
+		}
+
+		uint16_t m_Port = 0;
+		Network m_Host;
+		Network m_Client;
+	};
+} // namespace
+
+TEST_F(NetworkLoopbackTest, InitializeSucceeds)
+{
+	EXPECT_EQ(m_Host.GetRole(), Role::Offline);
+	EXPECT_FALSE(m_Host.IsConnected());
+}
+
+TEST_F(NetworkLoopbackTest, HostGameOpensListenSocket)
+{
+	m_Host.HostGame(m_Port, 4);
+
+	EXPECT_TRUE(m_Host.IsEnabled()) << "HostGame disabled the service — listen socket failed";
+	EXPECT_EQ(m_Host.GetRole(), Role::Host);
+	EXPECT_EQ(m_Host.GetPort(), m_Port);
+}
+
+TEST_F(NetworkLoopbackTest, ClientConnectsToHost)
+{
+	m_Host.HostGame(m_Port, 4);
+	ASSERT_TRUE(m_Host.IsEnabled());
+
+	m_Client.ConnectTo("127.0.0.1", m_Port);
+	ASSERT_TRUE(m_Client.IsEnabled());
+	EXPECT_EQ(m_Client.GetRole(), Role::Client);
+
+	const bool connected = PumpUntil([this] { return m_Host.GetClientCount() == 1; }, std::chrono::seconds(10));
+	EXPECT_TRUE(connected) << "Host never accepted the client connection";
+}
+
+TEST_F(NetworkLoopbackTest, ClientToHostPacketRoundTrip)
+{
+	m_Host.HostGame(m_Port, 4);
+	ASSERT_TRUE(m_Host.IsEnabled());
+
+	m_Client.ConnectTo("127.0.0.1", m_Port);
+	ASSERT_TRUE(m_Client.IsEnabled());
+	ASSERT_TRUE(PumpUntil([this] { return m_Host.GetClientCount() == 1; }, std::chrono::seconds(10)));
+
+	InputStateMessage received{};
+	bool gotPacket = false;
+	m_Host.SetPacketCallback([&](int clientIndex, MessageType type, const uint8_t* data, size_t len) {
+		if (type == MessageType_InputState && clientIndex >= 0)
+		{
+			ByteReader r(data, len);
+			if (received.Decode(r))
+			{
+				gotPacket = true;
+			}
+		}
+	});
+
+	InputStateMessage sent;
+	sent.Tick = 4242;
+	sent.MoveX = 1.5f;
+	sent.MoveZ = -2.5f;
+	sent.ActionFlags = InputAction_Jump | InputAction_Sprint;
+
+	ByteWriter w;
+	sent.Encode(w);
+	m_Client.SendToServer(MessageType_InputState, w.Data().data(), w.Data().size(), true);
+
+	ASSERT_TRUE(PumpUntil([&] { return gotPacket; }, std::chrono::seconds(10)))
+		<< "Host never received the client's input message";
+
+	EXPECT_EQ(received.Tick, 4242u);
+	EXPECT_FLOAT_EQ(received.MoveX, 1.5f);
+	EXPECT_FLOAT_EQ(received.MoveZ, -2.5f);
+	EXPECT_EQ(received.ActionFlags, InputAction_Jump | InputAction_Sprint);
+
+	m_Host.ClearPacketCallback();
+}
+
+TEST_F(NetworkLoopbackTest, HostBroadcastReachesClient)
+{
+	m_Host.HostGame(m_Port, 4);
+	ASSERT_TRUE(m_Host.IsEnabled());
+
+	m_Client.ConnectTo("127.0.0.1", m_Port);
+	ASSERT_TRUE(m_Client.IsEnabled());
+	ASSERT_TRUE(PumpUntil([this] { return m_Host.GetClientCount() == 1; }, std::chrono::seconds(10)));
+
+	std::string receivedPath;
+	m_Client.SetPacketCallback([&](int clientIndex, MessageType type, const uint8_t* data, size_t len) {
+		if (type == MessageType_SceneChange)
+		{
+			SceneChangeMessage msg;
+			ByteReader r(data, len);
+			if (msg.Decode(r))
+			{
+				receivedPath = msg.ScenePath;
+			}
+		}
+	});
+
+	m_Host.BroadcastSceneChange("assets/scenes/level_01.chscene");
+
+	ASSERT_TRUE(PumpUntil([&] { return !receivedPath.empty(); }, std::chrono::seconds(10)))
+		<< "Client never received the broadcast scene change";
+	EXPECT_EQ(receivedPath, "assets/scenes/level_01.chscene");
+
+	m_Client.ClearPacketCallback();
+}
+
+TEST_F(NetworkLoopbackTest, HostAppearsInItsOwnPlayerList)
+{
+	m_Host.SetLocalPlayerInfo("Alice", 3);
+	m_Host.HostGame(m_Port, 4);
+	ASSERT_TRUE(m_Host.IsEnabled());
+
+	const auto& players = m_Host.GetPlayerList();
+	ASSERT_EQ(players.size(), 1u) << "Host is missing from its own lobby";
+	EXPECT_EQ(players[0].NetworkID, 1u);
+	EXPECT_EQ(players[0].IsHost, 1);
+	EXPECT_EQ(players[0].Name, "Alice");
+	EXPECT_EQ(players[0].SkinIndex, 3);
+	EXPECT_EQ(m_Host.GetLocalNetworkID(), 1u);
+}
+
+TEST_F(NetworkLoopbackTest, PeerGetsIdentityDistinctFromHost)
+{
+	m_Host.HostGame(m_Port, 4);
+	ASSERT_TRUE(m_Host.IsEnabled());
+
+	m_Client.ConnectTo("127.0.0.1", m_Port);
+	ASSERT_TRUE(m_Client.IsEnabled());
+	ASSERT_TRUE(PumpUntil([this] { return m_Host.GetClientCount() == 1; }, std::chrono::seconds(10)));
+
+	const auto clients = m_Host.GetClients();
+	ASSERT_EQ(clients.size(), 1u);
+	const int peer = clients.front();
+	const uint64_t peerID = m_Host.GetNetworkIDForConnection(peer);
+	EXPECT_NE(peerID, 0u) << "Peer identity was not bound at accept time";
+	EXPECT_NE(peerID, 1u) << "NetworkID 1 is reserved for the host";
+
+	const auto& players = m_Host.GetPlayerList();
+	ASSERT_EQ(players.size(), 2u);
+	int hostFlags = 0;
+	for (const auto& p : players)
+	{
+		hostFlags += p.IsHost ? 1 : 0;
+	}
+	EXPECT_EQ(hostFlags, 1);
+
+	EXPECT_EQ(m_Host.GetNetworkIDForConnection(kInvalidPeerHandle), 0u);
+}
+#endif // CH_CI
+
+TEST(NetworkMessageTest, EntitySpawnFields)
+{
+	EntitySpawnMessage msg;
+	msg.NetworkID = 0x00000000DEADBEEFull;
+	std::strncpy(msg.PrefabPath, "prefab/player.chprefab", sizeof(msg.PrefabPath) - 1);
+	msg.PrefabPath[sizeof(msg.PrefabPath) - 1] = '\0';
+
+	ByteWriter w;
+	msg.Encode(w);
+
+	EntitySpawnMessage decoded;
+	ByteReader r(w.Data().data(), w.Data().size());
+	ASSERT_TRUE(decoded.Decode(r));
+
+	EXPECT_EQ(decoded.NetworkID, 0x00000000DEADBEEFull);
+	EXPECT_STREQ(decoded.PrefabPath, "prefab/player.chprefab");
+}
+
+TEST(NetworkMessageTest, EntityDestroyAndPlayerAssignFields)
+{
+	EntityDestroyMessage destroy;
+	destroy.NetworkID = 77;
+
+	ByteWriter w1;
+	destroy.Encode(w1);
+	EntityDestroyMessage dec1;
+	ByteReader r1(w1.Data().data(), w1.Data().size());
+	ASSERT_TRUE(dec1.Decode(r1));
+	EXPECT_EQ(dec1.NetworkID, 77u);
+
+	PlayerAssignMessage assign;
+	assign.NetworkID = 5;
+
+	ByteWriter w2;
+	assign.Encode(w2);
+	PlayerAssignMessage dec2;
+	ByteReader r2(w2.Data().data(), w2.Data().size());
+	ASSERT_TRUE(dec2.Decode(r2));
+	EXPECT_EQ(dec2.NetworkID, 5u);
+}
diff --git a/tests/integration/physics_tests.cpp b/tests/integration/physics_tests.cpp
new file mode 100644
index 000000000..f7baf10e4
--- /dev/null
+++ b/tests/integration/physics_tests.cpp
@@ -0,0 +1,176 @@
+
+#include "engine/core/service_locator.h"
+#include "engine/physics/iphysics_world.h"
+#include "engine/physics/physics.h"
+#include "engine/scene/components.h"
+#include "engine/scene/scene.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(PhysicsTest, Raycast)
+{
+	auto scene = std::make_shared<Scene>();
+	auto entity = scene->CreateEntity("Test Entity");
+	auto& transform = entity.GetComponent<TransformComponent>();
+	transform.Translation = {0.0f, 0.0f, 5.0f};
+
+	auto& collider = entity.AddComponent<ColliderComponent>();
+	collider.Size = {1.0f, 1.0f, 1.0f};
+	collider.Offset = {-0.5f, -0.5f, -0.5f};
+
+	auto& rb = entity.AddComponent<RigidBodyComponent>();
+	rb.Type = RigidBodyComponent::BodyType::Static;
+
+	Ray ray;
+	ray.position = {0.0f, 0.0f, 0.0f};
+	ray.direction = {0.0f, 0.0f, 1.0f};
+
+	scene->OnRuntimeStart();
+	scene->OnUpdateRuntime(Timestep(0.016f));
+
+	RaycastResult result = ServiceLocator::Get<Physics>()->Raycast(ray);
+	EXPECT_TRUE(result.Hit);
+	EXPECT_NEAR(result.Distance, 4.0f, 0.001f);
+	EXPECT_EQ(result.Entity, (entt::entity)entity);
+
+	ray.direction = {0.0f, 0.0f, -1.0f};
+	result = ServiceLocator::Get<Physics>()->Raycast(ray);
+	EXPECT_FALSE(result.Hit);
+}
+
+TEST(PhysicsTest, RaycastMissingCollider)
+{
+	auto scene = std::make_shared<Scene>();
+	auto entity = scene->CreateEntity("No Collider");
+	auto& transform = entity.GetComponent<TransformComponent>();
+	transform.Translation = {0.0f, 0.0f, 5.0f};
+
+	auto& rb = entity.AddComponent<RigidBodyComponent>();
+	rb.Type = RigidBodyComponent::BodyType::Static;
+
+	Ray ray;
+	ray.position = {0.0f, 0.0f, 0.0f};
+	ray.direction = {0.0f, 0.0f, 1.0f};
+
+	scene->OnRuntimeStart();
+	scene->OnUpdateRuntime(Timestep(0.016f));
+
+	RaycastResult result = ServiceLocator::Get<Physics>()->Raycast(ray);
+	EXPECT_FALSE(result.Hit);
+}
+
+TEST(PhysicsTest, ColliderEnabledFlag)
+{
+	auto scene = std::make_shared<Scene>();
+	auto entity = scene->CreateEntity("Collider Entity");
+	auto& collider = entity.AddComponent<ColliderComponent>();
+
+	// Default is true
+	EXPECT_TRUE(collider.Enabled);
+
+	// Set to false
+	collider.Enabled = false;
+	EXPECT_FALSE(collider.Enabled);
+}
+
+TEST(PhysicsTest, ContextLifecycleResetAndClear)
+{
+	auto scene = std::make_shared<Scene>();
+
+	// ResetAccumulator should be safe to call even if no accumulator exists yet
+	ServiceLocator::Get<Physics>()->ResetAccumulator(scene.get());
+
+	// ClearContext should clean up without issues
+	ServiceLocator::Get<Physics>()->ClearContext(scene.get());
+
+	// Calling ResetAccumulator after ClearContext should be safe
+	ServiceLocator::Get<Physics>()->ResetAccumulator(scene.get());
+}
+
+TEST(PhysicsTest, RuntimeStartInitializesRigidBodyHandles)
+{
+	auto scene = std::make_shared<Scene>();
+	auto entity = scene->CreateEntity("Physics Entity");
+	entity.AddComponent<ColliderComponent>();
+	auto& rigidBody = entity.AddComponent<RigidBodyComponent>();
+
+	EXPECT_EQ(rigidBody.Handle, kInvalidPhysicsBody);
+
+	scene->OnRuntimeStart();
+	scene->OnUpdateRuntime(Timestep(0.016f));
+
+	EXPECT_NE(rigidBody.Handle, kInvalidPhysicsBody);
+}
+
+namespace
+{
+	// Unit cube centered at the origin, half-extent 0.5, in unscaled model-local space.
+	// Winding is irrelevant for mesh-shape raycasting.
+	std::vector<PhysicsTriangle> MakeUnitCubeTriangles()
+	{
+		const glm::vec3 c[8] = {
+			{-0.5f, -0.5f, -0.5f}, {0.5f, -0.5f, -0.5f}, {0.5f, 0.5f, -0.5f}, {-0.5f, 0.5f, -0.5f},
+			{-0.5f, -0.5f, 0.5f},  {0.5f, -0.5f, 0.5f},	 {0.5f, 0.5f, 0.5f},  {-0.5f, 0.5f, 0.5f},
+		};
+		const int idx[12][3] = {
+			{0, 1, 2}, {0, 2, 3}, {4, 6, 5}, {4, 7, 6}, {0, 3, 7}, {0, 7, 4},
+			{1, 5, 6}, {1, 6, 2}, {0, 4, 5}, {0, 5, 1}, {3, 2, 6}, {3, 6, 7},
+		};
+		std::vector<PhysicsTriangle> tris;
+		tris.reserve(12);
+		for (const auto& t : idx)
+		{
+			tris.push_back({c[t[0]], c[t[1]], c[t[2]]});
+		}
+		return tris;
+	}
+} // namespace
+
+// Two bodies share the same cached mesh BVH (same CacheKey) but different MeshScale.
+// If scale were baked into the cached shape, the second body would inherit the first's
+// scale; instead each gets its own ScaledShape over one shared bare BVH, so the raycast
+// hit distance to each near face reflects its own scale.
+TEST(PhysicsTest, MeshShapeCacheIsScaleIndependent)
+{
+	auto* physics = ServiceLocator::Get<Physics>();
+	physics->ResetWorld(); // fresh world → clean shape cache
+	auto* world = physics->GetWorld();
+	ASSERT_NE(world, nullptr);
+
+	auto tris = MakeUnitCubeTriangles();
+
+	// Body A: scale 1 at x=0, z=10 → near (-Z) face at z = 10 - 0.5 = 9.5
+	PhysicsBodyDesc a;
+	a.Shape = ColliderType::Mesh;
+	a.IsStatic = true;
+	a.Position = {0.0f, 0.0f, 10.0f};
+	a.Triangles = tris;
+	a.MeshScale = {1.0f, 1.0f, 1.0f};
+	a.CacheKey = "unit_cube_test";
+	PhysicsBodyHandle hA = world->CreateBody(a);
+	ASSERT_NE(hA, kInvalidPhysicsBody);
+
+	// Body B: same CacheKey, scale 2 at x=100, z=10 → near face at z = 10 - 1.0 = 9.0
+	PhysicsBodyDesc b;
+	b.Shape = ColliderType::Mesh;
+	b.IsStatic = true;
+	b.Position = {100.0f, 0.0f, 10.0f};
+	b.Triangles = tris;
+	b.MeshScale = {2.0f, 2.0f, 2.0f};
+	b.CacheKey = "unit_cube_test";
+	PhysicsBodyHandle hB = world->CreateBody(b);
+	ASSERT_NE(hB, kInvalidPhysicsBody);
+
+	RaycastResult hitA = world->Raycast({0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f}, 1000.0f);
+	ASSERT_TRUE(hitA.Hit);
+	EXPECT_NEAR(hitA.Distance, 9.5f, 0.01f);
+
+	RaycastResult hitB = world->Raycast({100.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f}, 1000.0f);
+	ASSERT_TRUE(hitB.Hit);
+	EXPECT_NEAR(hitB.Distance, 9.0f, 0.01f);
+
+	world->DestroyBody(hA);
+	world->DestroyBody(hB);
+	physics->ResetWorld();
+}
diff --git a/tests/integration/primitive_tests.cpp b/tests/integration/primitive_tests.cpp
new file mode 100644
index 000000000..629ef2ed0
--- /dev/null
+++ b/tests/integration/primitive_tests.cpp
@@ -0,0 +1,82 @@
+#include "engine/scene/components/render/primitive_component.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(PrimitiveTest, Defaults)
+{
+	PrimitiveComponent component;
+
+	EXPECT_EQ(component.Type, PrimitiveType::None);
+	EXPECT_FLOAT_EQ(component.Radius, 0.5f);
+	EXPECT_FLOAT_EQ(component.InnerRadius, 0.2f);
+	EXPECT_FLOAT_EQ(component.Height, 1.0f);
+	EXPECT_EQ(component.Slices, 16);
+	EXPECT_EQ(component.Stacks, 16);
+	EXPECT_FLOAT_EQ(component.Dimensions.x, 1.0f);
+	EXPECT_FLOAT_EQ(component.Dimensions.y, 1.0f);
+	EXPECT_FLOAT_EQ(component.Dimensions.z, 1.0f);
+	EXPECT_TRUE(component.MeshPath.empty());
+}
+
+TEST(PrimitiveTest, TypeConstructorSetsRequestedPrimitiveType)
+{
+	PrimitiveComponent sphere;
+	sphere.Type = PrimitiveType::Sphere;
+
+	EXPECT_EQ(sphere.Type, PrimitiveType::Sphere);
+	EXPECT_FLOAT_EQ(sphere.Radius, 0.5f);
+	EXPECT_EQ(sphere.Slices, 16);
+}
+
+TEST(PrimitiveTest, CopyConstructorPreservesConfiguredValues)
+{
+	PrimitiveComponent source;
+	source.Type = PrimitiveType::Cylinder;
+	source.Radius = 2.5f;
+	source.InnerRadius = 0.7f;
+	source.Height = 4.0f;
+	source.Slices = 24;
+	source.Stacks = 12;
+	source.Dimensions = {2.0f, 3.0f, 4.0f};
+	source.MeshPath = "primitives/TestCube.chmesh";
+
+	PrimitiveComponent copy(source);
+
+	EXPECT_EQ(copy.Type, source.Type);
+	EXPECT_FLOAT_EQ(copy.Radius, source.Radius);
+	EXPECT_FLOAT_EQ(copy.InnerRadius, source.InnerRadius);
+	EXPECT_FLOAT_EQ(copy.Height, source.Height);
+	EXPECT_EQ(copy.Slices, source.Slices);
+	EXPECT_EQ(copy.Stacks, source.Stacks);
+	EXPECT_FLOAT_EQ(copy.Dimensions.x, source.Dimensions.x);
+	EXPECT_FLOAT_EQ(copy.Dimensions.y, source.Dimensions.y);
+	EXPECT_FLOAT_EQ(copy.Dimensions.z, source.Dimensions.z);
+	EXPECT_EQ(copy.MeshPath, source.MeshPath);
+}
+
+#include "engine/scene/scene.h"
+#include "engine/scene/components/render/model_component.h"
+
+TEST(PrimitiveTest, PrimitiveSystemBakesMeshAndAttachesModelComponent)
+{
+	auto scene = Scene::CreateDefault();
+	Entity entity = scene->CreateEntity("TestCube");
+
+	PrimitiveComponent prim;
+	prim.Type = PrimitiveType::Cube;
+	prim.Dimensions = {2.0f, 2.0f, 2.0f};
+	entity.AddComponent<PrimitiveComponent>(prim);
+
+	// PrimitiveSystem should have baked the mesh and attached ModelComponent
+	EXPECT_TRUE(entity.HasComponent<ModelComponent>());
+	auto& mc = entity.GetComponent<ModelComponent>();
+	EXPECT_EQ(mc.ModelPath, "primitives/TestCube.chmesh");
+
+	auto& primComp = entity.GetComponent<PrimitiveComponent>();
+	EXPECT_EQ(primComp.MeshPath, mc.ModelPath);
+
+	// Removing PrimitiveComponent removes ModelComponent
+	entity.RemoveComponent<PrimitiveComponent>();
+	EXPECT_FALSE(entity.HasComponent<ModelComponent>());
+}
diff --git a/tests/integration/regression_tests.cpp b/tests/integration/regression_tests.cpp
new file mode 100644
index 000000000..72eabd42b
--- /dev/null
+++ b/tests/integration/regression_tests.cpp
@@ -0,0 +1,135 @@
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/assets/loaders/iasset_loader.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/components.h"
+#include "gtest/gtest.h"
+
+#include <atomic>
+#include <chrono>
+#include <filesystem>
+#include <string>
+#include <thread>
+
+using namespace Chained;
+
+namespace
+{
+	class RegressionAsset final : public Asset
+	{
+	public:
+		RegressionAsset()
+			: Asset(GetStaticType())
+		{
+		}
+
+		static AssetType GetStaticType()
+		{
+			return AssetType::None;
+		}
+
+		void OnLoaded() override
+		{
+		}
+	};
+
+	class RegressionLoader final : public IAssetLoader
+	{
+	public:
+		bool IsAsync() const override
+		{
+			return m_Async;
+		}
+		std::shared_ptr<Asset> Create() override
+		{
+			return std::make_shared<RegressionAsset>();
+		}
+		bool Load(std::shared_ptr<Asset> asset, const std::string& path, std::string*) override
+		{
+			auto dummy = std::dynamic_pointer_cast<RegressionAsset>(asset);
+			if (!dummy)
+			{
+				return false;
+			}
+			dummy->SetPath(path);
+			return true;
+		}
+		bool m_Async = true;
+	};
+
+	std::string RegressionPath(const char* suffix)
+	{
+		static std::atomic<uint64_t> counter{0};
+		return std::string("regression/") + suffix + "_" + std::to_string(++counter) + ".dummy";
+	}
+} // namespace
+
+class RegressionTest : public ::testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		m_AssetManager = std::make_shared<AssetManager>();
+		auto currentPath = std::filesystem::current_path();
+		m_AssetManager->SetProjectDirectory(currentPath);
+		m_AssetManager->SetAssetDirectory(currentPath / "test_regression");
+		m_AssetManager->SetEngineRoot(currentPath);
+		std::filesystem::create_directories(m_AssetManager->GetAssetDirectory());
+
+		auto loader = std::make_unique<RegressionLoader>();
+		loader->m_Async = true;
+		m_AssetManager->RegisterLoader(RegressionAsset::GetStaticType(), std::move(loader));
+	}
+
+	void TearDown() override
+	{
+		m_AssetManager.reset();
+	}
+
+	std::shared_ptr<AssetManager> m_AssetManager;
+};
+
+// Regression: MultipleAsyncLoads only finalized 2 of 5 assets per frame
+// due to 5ms time budget in FinalizePendingLoads().
+// Fixed by calling Update() in a loop until GetPendingFinalizeCount() == 0.
+TEST_F(RegressionTest, MultipleAsyncLoadsFinalizeAll)
+{
+	const int count = 5;
+	std::vector<std::shared_ptr<RegressionAsset>> assets;
+
+	for (int i = 0; i < count; ++i)
+	{
+		const std::string path = RegressionPath("async");
+		assets.push_back(m_AssetManager->Get<RegressionAsset>(path));
+	}
+
+	for (int attempt = 0; attempt < 2000 && m_AssetManager->GetPendingFinalizeCount() < count; ++attempt)
+	{
+		std::this_thread::sleep_for(std::chrono::milliseconds(1));
+	}
+
+	EXPECT_EQ(m_AssetManager->GetPendingFinalizeCount(), (size_t)count);
+
+	for (int attempt = 0; attempt < 1000 && m_AssetManager->GetPendingFinalizeCount() > 0; ++attempt)
+	{
+		m_AssetManager->Update(Timestep(0.016f));
+	}
+
+	EXPECT_EQ(m_AssetManager->GetPendingFinalizeCount(), 0u);
+	for (auto& asset : assets)
+	{
+		EXPECT_EQ(asset->GetState(), AssetState::Ready);
+	}
+}
+
+// Regression: CopyEntity must reset UUID and script state
+TEST_F(RegressionTest, CopyEntityResetsUUID)
+{
+	Scene scene;
+	Entity src = scene.CreateEntity("Original");
+	src.AddComponent<CameraComponent>();
+
+	Entity dst = {scene.CopyEntity(src), scene.GetRegistryPtr()};
+	EXPECT_NE(src.GetUUID(), dst.GetUUID());
+	EXPECT_TRUE(dst.HasComponent<CameraComponent>());
+}
diff --git a/tests/integration/renderer_tests.cpp b/tests/integration/renderer_tests.cpp
new file mode 100644
index 000000000..6792e3946
--- /dev/null
+++ b/tests/integration/renderer_tests.cpp
@@ -0,0 +1,174 @@
+// renderer_tests.cpp
+// Tests for the main Renderer and Renderer2D singletons.
+// These tests require a valid OpenGL context and are skipped on CI.
+#include "engine/app/application.h"
+#include <filesystem>
+#include "engine/core/service_locator.h"
+#include "engine/common/base.h"
+#include "engine/graphics/pipeline/renderer.h"
+#include "engine/ui/ui_data_components.h"
+#include "engine/scene/components/render/light_component.h"
+#include "gtest/gtest.h"
+#include "yaml-cpp/yaml.h"
+
+using namespace Chained;
+
+class RendererTest : public ::testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		if (!ServiceLocator::Has<Renderer>())
+		{
+			GTEST_SKIP() << "Renderer not available in headless mode";
+		}
+	}
+
+	Renderer* GetRenderer()
+	{
+		return ServiceLocator::TryGet<Renderer>();
+	}
+};
+
+// Verifies that the Renderer singleton can be initialized and shut down without errors.
+TEST_F(RendererTest, RendererInitialization)
+{
+	EXPECT_TRUE(ServiceLocator::Has<Renderer>());
+}
+
+// Verifies viewport size management
+TEST_F(RendererTest, ViewportSize)
+{
+	auto* renderer = GetRenderer();
+	ASSERT_NE(renderer, nullptr);
+
+	renderer->SetViewportSize(1920, 1080);
+	EXPECT_EQ(renderer->GetViewportWidth(), 1920);
+	EXPECT_EQ(renderer->GetViewportHeight(), 1080);
+}
+
+// Verifies that BeginScene updates internal camera data
+TEST_F(RendererTest, SceneLifecycle)
+{
+	auto* renderer = GetRenderer();
+	ASSERT_NE(renderer, nullptr);
+
+	Camera3D camera;
+	camera.Position = {10.0f, 5.0f, 2.0f};
+	camera.Target = {0.0f, 0.0f, 0.0f};
+	camera.Up = {0.0f, 1.0f, 0.0f};
+	camera.FovDegrees = 45.0f;
+	camera.Projection = ProjectionType::Perspective;
+
+	renderer->BeginScene(camera);
+
+	EXPECT_FLOAT_EQ(renderer->GetFrame().CameraPosition.x, 10.0f);
+	EXPECT_FLOAT_EQ(renderer->GetFrame().CameraPosition.y, 5.0f);
+	EXPECT_FLOAT_EQ(renderer->GetFrame().CameraPosition.z, 2.0f);
+
+	renderer->EndScene();
+}
+
+// Verifies that lights can be set, counted, and cleared on the renderer.
+TEST_F(RendererTest, LightManagement)
+{
+	auto* renderer = GetRenderer();
+	ASSERT_NE(renderer, nullptr);
+
+	auto& lm = renderer->GetLightingManager();
+
+	lm.Clear();
+	EXPECT_EQ(lm.GetLighting().LightCount, 0);
+
+	RenderLight light;
+	light.color = {1.0f, 0.5f, 0.0f, 1.0f};
+	light.intensity = 5.0f;
+	light.position = {1.0f, 2.0f, 3.0f};
+
+	lm.SetLight(0, light);
+	lm.SetLightCount(1);
+
+	EXPECT_EQ(lm.GetLighting().LightCount, 1);
+	EXPECT_FLOAT_EQ(lm.GetLighting().Lights[0].intensity, 5.0f);
+	EXPECT_FLOAT_EQ(lm.GetLighting().Lights[0].position.x, 1.0f);
+	EXPECT_FLOAT_EQ(lm.GetLighting().Lights[0].color.g, 0.5f);
+
+	lm.Clear();
+	EXPECT_EQ(lm.GetLighting().LightCount, 0);
+}
+
+TEST_F(RendererTest, DirectionalLightTypeIsPreserved)
+{
+	auto* renderer = GetRenderer();
+	ASSERT_NE(renderer, nullptr);
+
+	auto& lm = renderer->GetLightingManager();
+	lm.Clear();
+
+	RenderLight light;
+	light.color = {1.0f, 1.0f, 1.0f, 1.0f};
+	light.intensity = 2.0f;
+	light.direction = {0.0f, -1.0f, 0.0f};
+	light.lightType = static_cast<int>(LightType::Directional);
+	light.enabled = 1;
+
+	lm.SetLight(0, light);
+	lm.SetLightCount(1);
+
+	EXPECT_EQ(lm.GetLighting().Lights[0].lightType, static_cast<int>(LightType::Directional));
+	EXPECT_EQ(lm.GetLighting().Lights[0].enabled, 1);
+	EXPECT_FLOAT_EQ(lm.GetLighting().Lights[0].direction.y, -1.0f);
+}
+
+TEST_F(RendererTest, WidgetDataDeserializationUsesExplicitType)
+{
+	YAML::Node node = YAML::Load(R"(
+WidgetComponent:
+  Box Style:
+    BG Color: [40, 40, 40, 255]
+    Hover Color: [60, 60, 60, 255]
+  Text Style:
+    Font Name: font/static/Figtree-Regular.ttf
+  Widget Type: 9
+  Texture Path: materials/logo.png
+  Tint Color: [255, 255, 255, 255]
+  Border Color: [0, 0, 0, 0]
+)");
+
+	auto data = DeserializeControlData(9, node["WidgetComponent"]);
+	ASSERT_TRUE(std::holds_alternative<ImageData>(data));
+	const auto& image = std::get<ImageData>(data);
+	EXPECT_EQ(image.TexturePath, "materials/logo.png");
+	EXPECT_EQ(image.TintColor.r, 255);
+	EXPECT_EQ(image.BorderColor.a, 0);
+}
+
+// Verifies that Frame.DiagnosticMode float can be pushed into the renderer's data block.
+TEST_F(RendererTest, FrameDiagnosticMode)
+{
+	auto* renderer = GetRenderer();
+	ASSERT_NE(renderer, nullptr);
+
+	renderer->SetDiagnosticMode(2.0f);
+	EXPECT_FLOAT_EQ(renderer->GetFrame().DiagnosticMode, 2.0f);
+
+	renderer->SetDiagnosticMode(0.0f);
+	EXPECT_FLOAT_EQ(renderer->GetFrame().DiagnosticMode, 0.0f);
+}
+
+// Verifies environment settings application
+TEST_F(RendererTest, EnvironmentApplication)
+{
+	auto* renderer = GetRenderer();
+	ASSERT_NE(renderer, nullptr);
+
+	auto& lm = renderer->GetLightingManager();
+
+	EnvironmentSettings env;
+	env.Lighting.Ambient = 0.75f;
+	env.Lighting.Exposure = 1.2f;
+
+	lm.ApplyEnvironment(env);
+	EXPECT_FLOAT_EQ(lm.GetLighting().CurrentLighting.Ambient, 0.75f);
+	EXPECT_FLOAT_EQ(lm.GetLighting().CurrentLighting.Exposure, 1.2f);
+}
diff --git a/tests/integration/scene_serialization_tests.cpp b/tests/integration/scene_serialization_tests.cpp
new file mode 100644
index 000000000..b2f08d22f
--- /dev/null
+++ b/tests/integration/scene_serialization_tests.cpp
@@ -0,0 +1,229 @@
+#include "engine/scene/components.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/scene_serializer.h"
+#include "gtest/gtest.h"
+
+#include <filesystem>
+#include <fstream>
+
+using namespace Chained;
+
+// Destructive / malformed-input tests for SceneSerializer. These exercise the parser against
+// inputs it must survive without throwing, even when it can't produce a usable scene.
+class SceneSerializationDestructiveTest : public ::testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		std::filesystem::create_directories("test_assets");
+	}
+	void TearDown() override
+	{
+		std::filesystem::remove_all("test_assets");
+	}
+
+	static void WriteFile(const std::string& path, const std::string& content)
+	{
+		std::ofstream f(path);
+		f << content;
+	}
+};
+
+// Empty file — must return false, must not throw.
+TEST_F(SceneSerializationDestructiveTest, EmptyFile)
+{
+	std::string path = "test_assets/empty.chscene";
+	WriteFile(path, "");
+
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW({
+		bool ok = serializer.Deserialize(path);
+		EXPECT_FALSE(ok);
+	});
+}
+
+// Binary garbage — YAML parser must not throw unhandled exception.
+TEST_F(SceneSerializationDestructiveTest, BinaryGarbage)
+{
+	std::string path = "test_assets/garbage.chscene";
+	{
+		std::ofstream f(path, std::ios::binary);
+		static const unsigned char kGarbage[] = {0xFF, 0x00, 0xDE, 0xAD, 0xBE, 0xEF, 0x13, 0x37};
+		f.write(reinterpret_cast<const char*>(kGarbage), sizeof(kGarbage));
+	}
+
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW(serializer.Deserialize(path));
+}
+
+// Valid YAML missing the "Scene:" root key.
+TEST_F(SceneSerializationDestructiveTest, MissingSceneKey)
+{
+	std::string path = "test_assets/no_scene.chscene";
+	WriteFile(path, "Entities:\n  - tag: Foo\n");
+
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW(serializer.Deserialize(path));
+}
+
+// Entity block missing UUID entirely — must not crash; either skip the entity or assign a new UUID.
+TEST_F(SceneSerializationDestructiveTest, EntityMissingUUID)
+{
+	std::string path = "test_assets/no_uuid.chscene";
+	WriteFile(path, "Scene: Test\n"
+					"Entities:\n"
+					"  - Entity:\n"
+					"      TagComponent:\n"
+					"        Tag: NoUUID\n");
+
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW(serializer.Deserialize(path));
+}
+
+// Truncated mid-token YAML.
+TEST_F(SceneSerializationDestructiveTest, TruncatedYAML)
+{
+	std::string path = "test_assets/truncated.chscene";
+	WriteFile(path,
+			  "Scene: Test\n"
+			  "Entities:\n"
+			  "  - Entity:\n"
+			  "      TagCompon"); // intentionally cut
+
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW(serializer.Deserialize(path));
+}
+
+// Path that does not exist.
+TEST_F(SceneSerializationDestructiveTest, NonExistentFile)
+{
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW({
+		bool ok = serializer.Deserialize("test_assets/ghost.chscene");
+		EXPECT_FALSE(ok);
+	});
+}
+
+// Malformed string input via DeserializeFromString — parser must report failure, not throw.
+TEST_F(SceneSerializationDestructiveTest, DeserializeFromStringInvalidYAML)
+{
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW({
+		bool ok = serializer.DeserializeFromString("not: [valid, yaml");
+		EXPECT_FALSE(ok);
+	});
+}
+
+// Deeply nested / duplicate keys shouldn't cause infinite loops or crashes.
+TEST_F(SceneSerializationDestructiveTest, DuplicateEntityUUIDs)
+{
+	std::string path = "test_assets/dup_uuid.chscene";
+	WriteFile(path, "Scene: Test\n"
+					"Entities:\n"
+					"  - Entity: 1234567890\n"
+					"    TagComponent:\n"
+					"      Tag: First\n"
+					"  - Entity: 1234567890\n"
+					"    TagComponent:\n"
+					"      Tag: Second\n");
+
+	Scene scene;
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW(serializer.Deserialize(path));
+}
+
+// Round-trip with many entities — verify count and tags survive serialize/deserialize.
+TEST_F(SceneSerializationDestructiveTest, LargeSceneRoundTrip)
+{
+	constexpr int kCount = 200;
+	std::string path = "test_assets/large.chscene";
+
+	std::vector<UUID> originalUUIDs;
+	{
+		Scene scene;
+		for (int i = 0; i < kCount; ++i)
+		{
+			Entity e = scene.CreateEntity("E_" + std::to_string(i));
+			originalUUIDs.push_back(e.GetUUID());
+		}
+
+		SceneSerializer serializer(&scene);
+		ASSERT_TRUE(serializer.Serialize(path));
+	}
+
+	{
+		Scene scene;
+		SceneSerializer serializer(&scene);
+		ASSERT_TRUE(serializer.Deserialize(path));
+
+		int count = 0;
+		auto view = scene.GetRegistry().view<TagComponent>();
+		for (auto e : view)
+		{
+			(void)e;
+			++count;
+		}
+		EXPECT_EQ(count, kCount);
+
+		// Spot-check a few entities preserved their UUID and tag.
+		Entity first = scene.GetEntityByUUID(originalUUIDs.front());
+		ASSERT_TRUE(first);
+		EXPECT_EQ(first.GetComponent<TagComponent>().Tag, "E_0");
+
+		Entity last = scene.GetEntityByUUID(originalUUIDs.back());
+		ASSERT_TRUE(last);
+		EXPECT_EQ(last.GetComponent<TagComponent>().Tag, "E_" + std::to_string(kCount - 1));
+	}
+}
+
+// Round-trip via the in-memory string API — no filesystem involved.
+TEST_F(SceneSerializationDestructiveTest, StringRoundTrip)
+{
+	std::string yaml;
+	UUID uuid;
+	{
+		Scene scene;
+		Entity e = scene.CreateEntity("StringEntity");
+		uuid = e.GetUUID();
+
+		SceneSerializer serializer(&scene);
+		yaml = serializer.SerializeToString();
+		EXPECT_FALSE(yaml.empty());
+	}
+
+	{
+		Scene scene;
+		SceneSerializer serializer(&scene);
+		ASSERT_TRUE(serializer.DeserializeFromString(yaml));
+
+		Entity found = scene.GetEntityByUUID(uuid);
+		ASSERT_TRUE(found);
+		EXPECT_EQ(found.GetComponent<TagComponent>().Tag, "StringEntity");
+	}
+}
+
+// Re-deserializing into a non-empty scene shouldn't leak/duplicate previously-existing entities
+// beyond what's expected, and must not crash.
+TEST_F(SceneSerializationDestructiveTest, DeserializeIntoNonEmptyScene)
+{
+	std::string path = "test_assets/second.chscene";
+	{
+		Scene source;
+		source.CreateEntity("FromFile");
+		SceneSerializer serializer(&source);
+		ASSERT_TRUE(serializer.Serialize(path));
+	}
+
+	Scene scene;
+	scene.CreateEntity("PreExisting");
+
+	SceneSerializer serializer(&scene);
+	EXPECT_NO_THROW(serializer.Deserialize(path));
+}
diff --git a/tests/integration/scene_tests.cpp b/tests/integration/scene_tests.cpp
new file mode 100644
index 000000000..6670c6285
--- /dev/null
+++ b/tests/integration/scene_tests.cpp
@@ -0,0 +1,264 @@
+#include "engine/app/application.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/components.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/component_serializer.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+class SceneTest : public ::testing::Test
+{
+};
+
+TEST_F(SceneTest, CreateEntity)
+{
+	Scene scene;
+	Entity entity = scene.CreateEntity("Test Entity");
+
+	EXPECT_TRUE(entity);
+	EXPECT_TRUE(entity.HasComponent<TagComponent>());
+	EXPECT_TRUE(entity.HasComponent<TransformComponent>());
+	EXPECT_EQ(entity.GetComponent<TagComponent>().Tag, "Test Entity");
+}
+
+TEST_F(SceneTest, DestroyEntity)
+{
+	Scene scene;
+	Entity entity = scene.CreateEntity("To Destroy");
+	entt::entity handle = entity;
+
+	scene.DestroyEntity(entity);
+	EXPECT_FALSE(scene.GetRegistry().valid(handle));
+}
+
+TEST_F(SceneTest, ComponentOperations)
+{
+	Scene scene;
+	Entity entity = scene.CreateEntity();
+
+	struct CustomComponent
+	{
+		int Value;
+	};
+	entity.AddComponent<CustomComponent>(42);
+
+	EXPECT_TRUE(entity.HasComponent<CustomComponent>());
+	EXPECT_EQ(entity.GetComponent<CustomComponent>().Value, 42);
+
+	entity.RemoveComponent<CustomComponent>();
+	EXPECT_FALSE(entity.HasComponent<CustomComponent>());
+}
+
+TEST_F(SceneTest, EntityRenaming)
+{
+	Scene scene;
+	Entity entity = scene.CreateEntity("Old Name");
+
+	auto& tag = entity.GetComponent<TagComponent>().Tag;
+	EXPECT_EQ(tag, "Old Name");
+
+	tag = "New Name";
+	EXPECT_EQ(entity.GetComponent<TagComponent>().Tag, "New Name");
+}
+
+TEST_F(SceneTest, FindEntityByTag)
+{
+	Scene scene;
+	scene.CreateEntity("Entity A");
+	scene.CreateEntity("Entity B");
+
+	Entity found = scene.FindEntityByTag("Entity B");
+	EXPECT_TRUE(found);
+	EXPECT_EQ(found.GetName(), "Entity B");
+
+	Entity notFound = scene.FindEntityByTag("Non-existent");
+	EXPECT_FALSE(notFound);
+}
+
+TEST_F(SceneTest, GetEntityByUUID)
+{
+	Scene scene;
+	Entity entity = scene.CreateEntity("Tracked Entity");
+	UUID id = entity.GetUUID();
+
+	Entity found = scene.GetEntityByUUID(id);
+	EXPECT_TRUE(found);
+	EXPECT_EQ(found.GetName(), "Tracked Entity");
+
+	Entity notFound = scene.GetEntityByUUID(UUID(999999));
+	EXPECT_FALSE(notFound);
+}
+
+TEST_F(SceneTest, CopyEntity)
+{
+	Scene scene;
+	Entity src = scene.CreateEntity("Source");
+	src.AddComponent<CameraComponent>().Primary = true;
+
+	Entity dst = {scene.CopyEntity(src), scene.GetRegistryPtr()};
+	EXPECT_TRUE(dst);
+	EXPECT_EQ(dst.GetName(), "Source_copy"); // Copy must have "_copy" suffix
+	EXPECT_NE(src.GetUUID(), dst.GetUUID()); // Different UUID
+	EXPECT_TRUE(dst.HasComponent<CameraComponent>());
+	EXPECT_TRUE(dst.GetComponent<CameraComponent>().Primary);
+}
+
+TEST_F(SceneTest, CopyEntityResetsManagedScriptRuntimeState)
+{
+	Scene scene;
+	Entity src = scene.CreateEntity("Scripted");
+
+	auto& scripts = src.AddComponent<ManagedScriptComponent>().Scripts;
+	scripts.emplace_back("TestScript");
+	auto& script = scripts.back();
+	// Simulate a live runtime instance
+	script.IsInstantiated = true;
+	script.NeedsStart = false;
+
+	Entity dst = {scene.CopyEntity(src), scene.GetRegistryPtr()};
+	ASSERT_TRUE(dst.HasComponent<ManagedScriptComponent>());
+
+	const auto& copiedScripts = dst.GetComponent<ManagedScriptComponent>().Scripts;
+	ASSERT_EQ(copiedScripts.size(), 1u);
+	EXPECT_EQ(copiedScripts[0].ClassName, "TestScript");
+	EXPECT_EQ(copiedScripts[0].Fields.size(), 0u);
+	EXPECT_FALSE(copiedScripts[0].HasInstance());
+	EXPECT_TRUE(copiedScripts[0].NeedsStart);
+}
+
+TEST_F(SceneTest, DestructiveOperations)
+{
+	Scene scene;
+	Entity entity1 = scene.CreateEntity("Entity 1");
+	Entity entity2 = scene.CreateEntity("Entity 2");
+
+	entt::entity handle1 = entity1;
+	entt::entity handle2 = entity2;
+	UUID uuid1 = entity1.GetUUID();
+
+	// 1. Destroy one entity, check if other is intact
+	scene.DestroyEntity(entity1);
+	EXPECT_FALSE(scene.GetRegistry().valid(handle1));
+	EXPECT_TRUE(scene.GetRegistry().valid(handle2));
+
+	// 2. Fetch by UUID should fail for destroyed entity
+	EXPECT_FALSE(scene.GetEntityByUUID(uuid1));
+
+	// 3. Component removal stress test
+	entity2.AddComponent<CameraComponent>();
+	entity2.AddComponent<LightComponent>();
+	entity2.AddComponent<SpriteComponent>();
+
+	EXPECT_TRUE(entity2.HasComponent<CameraComponent>());
+	EXPECT_TRUE(entity2.HasComponent<LightComponent>());
+	EXPECT_TRUE(entity2.HasComponent<SpriteComponent>());
+
+	entity2.RemoveComponent<LightComponent>();
+	EXPECT_FALSE(entity2.HasComponent<LightComponent>());
+	EXPECT_TRUE(entity2.HasComponent<CameraComponent>()); // Others should still exist
+
+	// 4. Repeated add/remove
+	entity2.AddComponent<LightComponent>();
+	EXPECT_TRUE(entity2.HasComponent<LightComponent>());
+	entity2.RemoveComponent<LightComponent>();
+	EXPECT_FALSE(entity2.HasComponent<LightComponent>());
+
+	// 5. Destroying scene should clear remaining entities
+	// (We simulate this by verifying the registry count drops, though destruction of the Scene obj handles actual
+	// cleanup)
+	scene.DestroyEntity(entity2);
+	EXPECT_FALSE(scene.GetRegistry().valid(handle2));
+
+	// 6. Test trying to destroy an invalid entity (should not crash)
+	Entity invalidEntity; // Default constructor creates null entity
+	EXPECT_NO_THROW({ scene.DestroyEntity(invalidEntity); });
+}
+
+TEST_F(SceneTest, EntityTagUniqueness)
+{
+	Scene scene;
+	scene.CreateEntity("SameTag");
+	scene.CreateEntity("SameTag");
+
+	Entity found = scene.FindEntityByTag("SameTag");
+	EXPECT_TRUE(found);
+
+	int count = 0;
+	auto& reg = scene.GetRegistry();
+	for (auto entity : reg.view<TagComponent>())
+	{
+		Entity e(entity, &reg);
+		if (e.GetName() == "SameTag")
+		{
+			++count;
+		}
+	}
+	EXPECT_EQ(count, 2);
+}
+
+TEST_F(SceneTest, CopyEntityDeepCopy)
+{
+	Scene scene;
+	Entity src = scene.CreateEntity("Original");
+	src.GetComponent<TransformComponent>().Translation = {1.0f, 2.0f, 3.0f};
+	src.AddComponent<LightComponent>();
+	src.AddComponent<SpriteComponent>();
+
+	Entity dst = {scene.CopyEntity(src), scene.GetRegistryPtr()};
+
+	auto& srcTransform = src.GetComponent<TransformComponent>();
+	auto& dstTransform = dst.GetComponent<TransformComponent>();
+	EXPECT_FLOAT_EQ(dstTransform.Translation.x, 1.0f);
+	EXPECT_FLOAT_EQ(dstTransform.Translation.y, 2.0f);
+	EXPECT_FLOAT_EQ(dstTransform.Translation.z, 3.0f);
+
+	srcTransform.Translation = {10.0f, 20.0f, 30.0f};
+	EXPECT_FLOAT_EQ(dstTransform.Translation.x, 1.0f);
+
+	EXPECT_TRUE(dst.HasComponent<LightComponent>());
+	EXPECT_TRUE(dst.HasComponent<SpriteComponent>());
+}
+
+TEST_F(SceneTest, AddMultipleComponentTypes)
+{
+	Scene scene;
+	Entity entity = scene.CreateEntity("MultiComponent");
+
+	entity.AddComponent<CameraComponent>();
+	entity.AddComponent<LightComponent>();
+	entity.AddComponent<SpriteComponent>();
+
+	EXPECT_TRUE(entity.HasComponent<CameraComponent>());
+	EXPECT_TRUE(entity.HasComponent<LightComponent>());
+	EXPECT_TRUE(entity.HasComponent<SpriteComponent>());
+}
+
+TEST_F(SceneTest, DestroyEntityInIteration)
+{
+	Scene scene;
+	for (int i = 0; i < 5; ++i)
+	{
+		scene.CreateEntity("E" + std::to_string(i));
+	}
+
+	std::vector<entt::entity> toDestroy;
+	auto& reg = scene.GetRegistry();
+	for (auto entity : reg.view<TagComponent>())
+	{
+		Entity e(entity, &reg);
+		if (e.GetName() == "E2")
+		{
+			toDestroy.push_back(entity);
+		}
+	}
+
+	for (auto handle : toDestroy)
+	{
+		scene.DestroyEntity(Entity(handle, &reg));
+	}
+
+	EXPECT_FALSE(scene.FindEntityByTag("E2"));
+	EXPECT_TRUE(scene.FindEntityByTag("E0"));
+	EXPECT_TRUE(scene.FindEntityByTag("E4"));
+}
diff --git a/tests/integration/scriptengine_tests.cpp b/tests/integration/scriptengine_tests.cpp
new file mode 100644
index 000000000..703a8d598
--- /dev/null
+++ b/tests/integration/scriptengine_tests.cpp
@@ -0,0 +1,137 @@
+#include "engine/app/application.h"
+#include "engine/core/service_locator.h"
+#include "engine/assets/asset_manager.h"
+#include "engine/project/project.h"
+#include "engine/scripting/scriptengine.h"
+#include "gtest/gtest.h"
+
+#include <filesystem>
+#include <vector>
+
+using namespace Chained;
+
+namespace
+{
+	std::vector<std::filesystem::path> GetReloadAssemblyCandidates()
+	{
+		std::vector<std::filesystem::path> candidates;
+		candidates.emplace_back(std::filesystem::current_path() / "ChainedDecos.Scripts.dll");
+		candidates.emplace_back(std::filesystem::current_path() / "Chained.Managed.dll");
+
+		std::vector<std::filesystem::path> existing;
+		for (const auto& candidate : candidates)
+		{
+			if (std::filesystem::exists(candidate))
+			{
+				existing.emplace_back(std::filesystem::absolute(candidate).lexically_normal());
+			}
+		}
+
+		return existing;
+	}
+} // namespace
+
+class ScriptEngineTest : public ::testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		if (!ServiceLocator::Has<ScriptEngine>())
+		{
+			GTEST_SKIP() << "Skipping ScriptEngine tests: ScriptEngine not registered in ServiceLocator.";
+		}
+		if (!ServiceLocator::Get<ScriptEngine>()->IsHostInitialized())
+		{
+			GTEST_SKIP() << "Skipping ScriptEngine tests: CoreCLR host initialization failed in this environment.";
+		}
+	}
+
+	void TearDown() override
+	{
+		Project::SetActive(nullptr);
+	}
+};
+
+TEST_F(ScriptEngineTest, ReloadWithoutActiveProjectReturnsFalseAndClearsFlag)
+{
+	auto* scriptEngine = ServiceLocator::Get<ScriptEngine>();
+	ASSERT_NE(scriptEngine, nullptr);
+	EXPECT_FALSE(scriptEngine->IsReloadInProgress());
+	EXPECT_FALSE(scriptEngine->ReloadAssembly(""));
+	EXPECT_FALSE(scriptEngine->IsReloadInProgress());
+}
+
+TEST_F(ScriptEngineTest, ReloadWithMissingModuleReturnsFalseAndClearsFlag)
+{
+	auto project = std::make_shared<Project>();
+	project->GetConfig().ProjectDirectory = std::filesystem::current_path();
+	project->GetConfig().Scripting.ModuleName = "DefinitelyMissingModule";
+	project->GetConfig().Scripting.ModuleDirectory = "missing_modules";
+	Project::SetActive(project);
+
+	auto* scriptEngine = ServiceLocator::Get<ScriptEngine>();
+	ASSERT_NE(scriptEngine, nullptr);
+	EXPECT_FALSE(scriptEngine->ReloadAssembly("missing_modules/DefinitelyMissingModule.dll"));
+	EXPECT_FALSE(scriptEngine->IsReloadInProgress());
+}
+
+TEST_F(ScriptEngineTest, LoadAppAssemblyRejectsMissingPath)
+{
+	auto* scriptEngine = ServiceLocator::Get<ScriptEngine>();
+	ASSERT_NE(scriptEngine, nullptr);
+	EXPECT_FALSE(scriptEngine->LoadAppAssembly("D:/definitely_missing/ChainedDecos.Scripts.dll"));
+	EXPECT_TRUE(scriptEngine->GetScriptClasses().empty());
+}
+
+TEST_F(ScriptEngineTest, ReloadWithValidProjectLoadsScriptTypes)
+{
+	const std::vector<std::filesystem::path> candidates = GetReloadAssemblyCandidates();
+	if (candidates.empty())
+	{
+		GTEST_SKIP() << "Skipping ScriptEngine reload success test: no managed assembly candidates found.";
+	}
+
+	auto* scriptEngine = ServiceLocator::Get<ScriptEngine>();
+	ASSERT_NE(scriptEngine, nullptr);
+	bool reloaded = false;
+	for (const auto& assemblyPath : candidates)
+	{
+		auto project = std::make_shared<Project>();
+		project->GetConfig().ProjectDirectory = assemblyPath.parent_path();
+		project->GetConfig().Scripting.ModuleName = assemblyPath.stem().string();
+		project->GetConfig().Scripting.ModuleDirectory = assemblyPath.parent_path();
+		Project::SetActive(project);
+
+		if (scriptEngine->ReloadAssembly(assemblyPath.string()))
+		{
+			reloaded = true;
+			break;
+		}
+
+		EXPECT_FALSE(scriptEngine->IsReloadInProgress());
+	}
+
+	if (!reloaded)
+	{
+		GTEST_SKIP() << "Skipping ScriptEngine reload success test: all managed assembly candidates failed to load.";
+	}
+
+	EXPECT_FALSE(scriptEngine->IsReloadInProgress());
+	EXPECT_EQ(scriptEngine->GetScriptClass("DefinitelyMissingType"), nullptr);
+
+	if (scriptEngine->GetScriptClasses().empty())
+	{
+		GTEST_SKIP() << "Loaded assembly exposes no script subclasses; skipping script type lookup assertions.";
+	}
+
+	const std::string fullName = scriptEngine->GetScriptClasses().begin()->first;
+	ASSERT_FALSE(fullName.empty());
+	EXPECT_NE(scriptEngine->GetScriptClass(fullName), nullptr);
+
+	const size_t lastDot = fullName.find_last_of('.');
+	if (lastDot != std::string::npos && lastDot + 1 < fullName.size())
+	{
+		const std::string shortName = fullName.substr(lastDot + 1);
+		EXPECT_NE(scriptEngine->GetScriptClass(shortName), nullptr);
+	}
+}
diff --git a/tests/integration/serialization_tests.cpp b/tests/integration/serialization_tests.cpp
new file mode 100644
index 000000000..46e1e3d39
--- /dev/null
+++ b/tests/integration/serialization_tests.cpp
@@ -0,0 +1,101 @@
+#include "engine/scene/serialization.h"
+#include "engine/scene/components/render/model_component.h"
+#include "gtest/gtest.h"
+#include <filesystem>
+
+using namespace Chained;
+using namespace Chained::Serialization;
+
+struct NestedData
+{
+	float X = 0.0f;
+	int Y = 0;
+
+	template <typename Archive> void Reflect(Chained::Properties<Archive>& props)
+	{
+		props.Property("X", X);
+		props.Property("Y", Y);
+	}
+};
+
+TEST(SerializationTest, PropertyArchiveBasic)
+{
+	YAML::Emitter out;
+	out << YAML::BeginMap;
+	{
+		PropertyArchive archive(out);
+		float floatValue = 1.23f;
+		int intValue = 42;
+		std::string stringValue = "hello";
+
+		archive.Property("Float", floatValue);
+		archive.Property("Int", intValue);
+		archive.Property("String", stringValue);
+	}
+	out << YAML::EndMap;
+
+	YAML::Node node = YAML::Load(out.c_str());
+	EXPECT_FLOAT_EQ(node["Float"].as<float>(), 1.23f);
+	EXPECT_EQ(node["Int"].as<int>(), 42);
+	EXPECT_EQ(node["String"].as<std::string>(), "hello");
+
+	// Deserialize
+	PropertyArchive in(node);
+	float loadedFloatValue = 0;
+	int loadedIntValue = 0;
+	std::string loadedStringValue = "";
+	in.Property("Float", loadedFloatValue);
+	in.Property("Int", loadedIntValue);
+	in.Property("String", loadedStringValue);
+
+	EXPECT_FLOAT_EQ(loadedFloatValue, 1.23f);
+	EXPECT_EQ(loadedIntValue, 42);
+	EXPECT_EQ(loadedStringValue, "hello");
+}
+
+TEST(SerializationTest, PropertyArchiveHandle)
+{
+	UUID id;
+	YAML::Emitter out;
+	out << YAML::BeginMap;
+	{
+		PropertyArchive archive(out);
+		uint64_t handle = (uint64_t)id;
+		archive.Handle("MyID", handle);
+	}
+	out << YAML::EndMap;
+
+	YAML::Node node = YAML::Load(out.c_str());
+	EXPECT_EQ(node["MyID"].as<uint64_t>(), (uint64_t)id);
+
+	uint64_t id2 = 0;
+	PropertyArchive in(node);
+	in.Handle("MyID", id2);
+	EXPECT_EQ(id2, (uint64_t)id);
+}
+
+TEST(SerializationTest, PropertyArchiveNested)
+{
+	YAML::Emitter out;
+	out << YAML::BeginMap;
+	PropertyArchive archive(out);
+	Properties<PropertyArchive> props(archive);
+
+	NestedData data;
+	data.X = 10.5f;
+	data.Y = 42;
+
+	props.Nested("Settings", data);
+
+	YAML::Node inNode = YAML::Load(out.c_str());
+	PropertyArchive in(inNode);
+
+	NestedData data2;
+	Properties<PropertyArchive> inProps(in);
+	inProps.Nested("Settings", data2);
+
+	EXPECT_FLOAT_EQ(data2.X, 10.5f);
+	EXPECT_EQ(data2.Y, 42);
+
+	out << YAML::EndMap;
+}
diff --git a/tests/integration/smoke_tests.cpp b/tests/integration/smoke_tests.cpp
new file mode 100644
index 000000000..3104eff04
--- /dev/null
+++ b/tests/integration/smoke_tests.cpp
@@ -0,0 +1,39 @@
+#include "engine/app/application.h"
+#include "engine/core/service_locator.h"
+#include "engine/scene/scene.h"
+#include "engine/scene/components.h"
+#include "engine/assets/asset_manager.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(SmokeTest, ApplicationHeadlessInit)
+{
+	EXPECT_TRUE(ServiceLocator::IsAvailable());
+	EXPECT_NE(ServiceLocator::TryGet<AssetManager>(), nullptr);
+}
+
+TEST(SmokeTest, SceneCreateAndDestroy)
+{
+	Scene scene;
+	for (int i = 0; i < 10; ++i)
+	{
+		scene.CreateEntity("Smoke_" + std::to_string(i));
+	}
+
+	auto& reg = scene.GetRegistry();
+	int count = 0;
+	for (auto entity : reg.view<TagComponent>())
+	{
+		(void)entity;
+		++count;
+	}
+	EXPECT_EQ(count, 10);
+}
+
+TEST(SmokeTest, AssetManagerLoadDummy)
+{
+	auto* am = ServiceLocator::TryGet<AssetManager>();
+	ASSERT_NE(am, nullptr);
+	EXPECT_TRUE(am->GetAssetDirectory().empty() || std::filesystem::exists(am->GetAssetDirectory()));
+}
diff --git a/tests/integration/test_environment.cpp b/tests/integration/test_environment.cpp
new file mode 100644
index 000000000..dd4ef1858
--- /dev/null
+++ b/tests/integration/test_environment.cpp
@@ -0,0 +1,46 @@
+// test_environment.cpp
+// Global gtest Environment that boots a minimal headless Application before any test runs,
+// then tears it down after all tests complete. This provides a valid engine context
+// (log system, event bus, etc.) without showing a window.
+#include "engine/app/application.h"
+#include "gtest/gtest.h"
+
+class TestApplication : public Chained::Application
+{
+public:
+	TestApplication()
+		: Chained::Application([]() {
+			  Chained::ApplicationSpecification spec;
+			  spec.Name = "Engine Tests";
+			  spec.Headless = true;
+			  spec.EnableScripting = false; // No live test needs CoreCLR (scriptengine_tests.cpp is
+											// currently disabled). Tests that exercise scripting must
+											// boot the host themselves via ScriptEngine::SetEnabled +
+											// Initialize in their own fixture, so the .NET runtime is
+											// not paid for (and cannot crash) in unrelated tests.
+			  return spec;
+		  }())
+	{
+	}
+};
+
+// GlobalTestEnvironment: SetUp() is called once before the first test,
+// TearDown() is called once after the last test.
+class EngineEnvironment : public ::testing::Environment
+{
+public:
+	void SetUp() override
+	{
+		app = new TestApplication();
+	}
+	void TearDown() override
+	{
+		delete app;
+	}
+
+private:
+	TestApplication* app = nullptr;
+};
+
+// Register the custom environment globally so all test suites share the same engine boot.
+::testing::Environment* const engine_env = ::testing::AddGlobalTestEnvironment(new EngineEnvironment);
diff --git a/tests/integration/test_main.cpp b/tests/integration/test_main.cpp
new file mode 100644
index 000000000..2c39741ea
--- /dev/null
+++ b/tests/integration/test_main.cpp
@@ -0,0 +1,7 @@
+#include "gtest/gtest.h"
+
+int main(int argc, char** argv)
+{
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/tests/integration_tests.cpp b/tests/integration_tests.cpp
deleted file mode 100644
index 9b71d202b..000000000
--- a/tests/integration_tests.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// Integration tests — headless only, no GPU/OpenGL required
-#include "engine/core/base.h"
-#include "engine/core/events.h"
-#include "engine/core/uuid.h"
-#include "engine/scene/components.h"
-#include "engine/scene/entity.h"
-#include "engine/scene/scene.h"
-#include "engine/scene/scene_events.h"
-#include "engine/scene/scene_serializer.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace CHEngine;
-
-// --- Scene + Entity Integration ---
-
-class SceneIntegrationTest : public ::testing::Test
-{
-protected:
-    std::shared_ptr<Scene> scene;
-    void SetUp() override
-    {
-        scene = std::make_shared<Scene>();
-    }
-};
-
-TEST_F(SceneIntegrationTest, CreateAndDestroyEntity)
-{
-    auto entity = scene->CreateEntity("TestEntity");
-    EXPECT_TRUE(entity);
-    EXPECT_TRUE(entity.HasComponent<TagComponent>());
-    EXPECT_EQ(entity.GetComponent<TagComponent>().Tag, "TestEntity");
-
-    scene->DestroyEntity(entity);
-}
-
-TEST_F(SceneIntegrationTest, MultipleEntitiesHaveUniqueIDs)
-{
-    auto e1 = scene->CreateEntity("A");
-    auto e2 = scene->CreateEntity("B");
-    auto e3 = scene->CreateEntity("C");
-
-    auto id1 = e1.GetComponent<IDComponent>().ID;
-    auto id2 = e2.GetComponent<IDComponent>().ID;
-    auto id3 = e3.GetComponent<IDComponent>().ID;
-
-    EXPECT_NE(id1, id2);
-    EXPECT_NE(id2, id3);
-    EXPECT_NE(id1, id3);
-}
-
-TEST_F(SceneIntegrationTest, EntityComponentLifecycle)
-{
-    auto entity = scene->CreateEntity("Player");
-
-    // Transform is added by default
-    EXPECT_TRUE(entity.HasComponent<TransformComponent>());
-    auto& transform = entity.GetComponent<TransformComponent>();
-    transform.Translation = {10.0f, 20.0f, 30.0f};
-    EXPECT_FLOAT_EQ(entity.GetComponent<TransformComponent>().Translation.x, 10.0f);
-
-    // Add and remove a component
-    entity.AddComponent<RigidBodyComponent>();
-    EXPECT_TRUE(entity.HasComponent<RigidBodyComponent>());
-    entity.RemoveComponent<RigidBodyComponent>();
-    EXPECT_FALSE(entity.HasComponent<RigidBodyComponent>());
-}
-
-TEST_F(SceneIntegrationTest, FindEntityByTag)
-{
-    auto entity = scene->CreateEntity("Findable");
-
-    auto found = scene->FindEntityByTag("Findable");
-    EXPECT_TRUE(found);
-    EXPECT_EQ(found.GetComponent<TagComponent>().Tag, "Findable");
-}
-
-
-
-// --- Event System Integration ---
-
-class EventIntegrationTest : public ::testing::Test
-{
-};
-
-TEST_F(EventIntegrationTest, SceneChangeRequestEvent)
-{
-    SceneChangeRequestEvent event("scenes/level2.chscene");
-    EXPECT_EQ(event.GetPath(), "scenes/level2.chscene");
-    EXPECT_FALSE(event.Handled);
-
-    event.Handled = true;
-    EXPECT_TRUE(event.Handled);
-}
-
-TEST_F(EventIntegrationTest, EventDispatcher)
-{
-    SceneChangeRequestEvent event("test.chscene");
-    EventDispatcher dispatcher(event);
-
-    bool handled = false;
-    dispatcher.Dispatch<SceneChangeRequestEvent>([&handled](SceneChangeRequestEvent& e) -> bool {
-        handled = true;
-        return true;
-    });
-
-    EXPECT_TRUE(handled);
-    EXPECT_TRUE(event.Handled);
-}
diff --git a/tests/material_tests.cpp b/tests/material_tests.cpp
deleted file mode 100644
index c823e1908..000000000
--- a/tests/material_tests.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// material_tests.cpp
-// Tests for the MaterialInstance struct (engine/graphics/pipeline/material.h).
-// These tests are pure-CPU and do not require an OpenGL context.
-#include "engine/graphics/pipeline/material.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-// Verifies that a default-constructed MaterialInstance has engine-standard default values:
-// white albedo, no overrides, metalness=0, roughness=0.5, alpha=1.
-TEST(MaterialTest, DefaultInitialization)
-{
-    MaterialInstance material;
-    
-    EXPECT_EQ(material.AlbedoColor.r, 255);
-    EXPECT_EQ(material.AlbedoColor.g, 255);
-    EXPECT_EQ(material.AlbedoColor.b, 255);
-    EXPECT_EQ(material.AlbedoColor.a, 255);
-
-    EXPECT_FALSE(material.OverrideAlbedo);
-    EXPECT_FALSE(material.OverrideNormal);
-    EXPECT_FALSE(material.OverrideMetallicRoughness);
-    EXPECT_FALSE(material.OverrideOcclusion);
-    EXPECT_FALSE(material.OverrideEmissive);
-    EXPECT_FALSE(material.OverrideShader);
-
-    EXPECT_FLOAT_EQ(material.Metalness, 0.0f);
-    EXPECT_FLOAT_EQ(material.Roughness, 0.5f);
-
-    EXPECT_FALSE(material.DoubleSided);
-    EXPECT_FALSE(material.Transparent);
-    EXPECT_FLOAT_EQ(material.Alpha, 1.0f);
-}
-
-// Verifies that fields can be mutated and read back correctly — ensures no unexpected
-// padding or bitfield truncation in the struct layout.
-TEST(MaterialTest, StateModification)
-{
-    MaterialInstance material;
-    
-    material.AlbedoPath = "textures/test_albedo.png";
-    material.OverrideAlbedo = true;
-    
-    material.Metalness = 0.8f;
-    material.Roughness = 0.2f;
-    material.Transparent = true;
-    material.Alpha = 0.5f;
-
-    EXPECT_TRUE(material.OverrideAlbedo);
-    EXPECT_EQ(material.AlbedoPath, "textures/test_albedo.png");
-    EXPECT_FLOAT_EQ(material.Metalness, 0.8f);
-    EXPECT_FLOAT_EQ(material.Roughness, 0.2f);
-    EXPECT_TRUE(material.Transparent);
-    EXPECT_FLOAT_EQ(material.Alpha, 0.5f);
-}
diff --git a/tests/physics_tests.cpp b/tests/physics_tests.cpp
deleted file mode 100644
index f158e646f..000000000
--- a/tests/physics_tests.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "engine/physics/collision/collision.h"
-#include "engine/physics/physics.h"
-#include "engine/scene/components.h"
-#include "engine/scene/scene.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-TEST(PhysicsTest, AABBIntersection)
-{
-    glm::vec3 minA = {0.0f, 0.0f, 0.0f};
-    glm::vec3 maxA = {1.0f, 1.0f, 1.0f};
-
-    glm::vec3 minB = {0.5f, 0.5f, 0.5f};
-    glm::vec3 maxB = {1.5f, 1.5f, 1.5f};
-
-    // Obvious overlap
-    EXPECT_TRUE(Collision::CheckAABB(minA, maxA, minB, maxB));
-    EXPECT_TRUE(Collision::CheckAABB(minB, maxB, minA, maxA));
-
-    // Touching on edge (should be true based on <= and >=)
-    glm::vec3 minC = {1.0f, 0.0f, 0.0f};
-    glm::vec3 maxC = {2.0f, 1.0f, 1.0f};
-    EXPECT_TRUE(Collision::CheckAABB(minA, maxA, minC, maxC));
-
-    // No overlap
-    glm::vec3 minD = {1.1f, 0.0f, 0.0f};
-    glm::vec3 maxD = {2.1f, 1.0f, 1.0f};
-    EXPECT_FALSE(Collision::CheckAABB(minA, maxA, minD, maxD));
-}
-
-TEST(PhysicsTest, Raycast)
-{
-    auto scene = std::make_shared<Scene>();
-    auto entity = scene->CreateEntity("Test Entity");
-    auto& transform = entity.GetComponent<TransformComponent>();
-    transform.Translation = {0.0f, 0.0f, 5.0f};
-
-    auto& collider = entity.AddComponent<ColliderComponent>();
-    collider.Size = {1.0f, 1.0f, 1.0f};
-    collider.Offset = {-0.5f, -0.5f, -0.5f}; // Center it
-
-    // Ray from origin looking forward
-    Ray ray;
-    ray.position = {0.0f, 0.0f, 0.0f};
-    ray.direction = {0.0f, 0.0f, 1.0f};
-
-    RaycastResult result = Physics::Raycast(scene.get(), ray);
-    EXPECT_TRUE(result.Hit);
-    EXPECT_NEAR(result.Distance, 4.5f, 0.001f);
-    EXPECT_EQ(result.Entity, (entt::entity)entity);
-
-    // Ray looking away
-    ray.direction = {0.0f, 0.0f, -1.0f};
-    result = Physics::Raycast(scene.get(), ray);
-    EXPECT_FALSE(result.Hit);
-}
-
-TEST(PhysicsTest, RaycastMissingCollider)
-{
-    auto scene = std::make_shared<Scene>();
-    auto entity = scene->CreateEntity("No Collider");
-    auto& transform = entity.GetComponent<TransformComponent>();
-    transform.Translation = {0.0f, 0.0f, 5.0f};
-
-    // No ColliderComponent added
-
-    Ray ray;
-    ray.position = {0.0f, 0.0f, 0.0f};
-    ray.direction = {0.0f, 0.0f, 1.0f};
-
-    RaycastResult result = Physics::Raycast(scene.get(), ray);
-    EXPECT_FALSE(result.Hit);
-}
-
-TEST(PhysicsTest, ColliderEnabledFlag)
-{
-    auto scene = std::make_shared<Scene>();
-    auto entity = scene->CreateEntity("Collider Entity");
-    auto& collider = entity.AddComponent<ColliderComponent>();
-    
-    // Default is true
-    EXPECT_TRUE(collider.Enabled);
-    
-    // Set to false
-    collider.Enabled = false;
-    EXPECT_FALSE(collider.Enabled);
-}
-
-TEST(PhysicsTest, ContextLifecycleResetAndClear)
-{
-    auto scene = std::make_shared<Scene>();
-
-    auto& context = Physics::GetContext(scene.get());
-    context.Accumulator = 0.1337f;
-
-    bool callbackInvoked = false;
-    Physics::SetCollisionCallback(scene.get(), [&callbackInvoked](entt::entity, entt::entity) {
-        callbackInvoked = true;
-    });
-
-    Physics::ResetAccumulator(scene.get());
-    EXPECT_FLOAT_EQ(Physics::GetContext(scene.get()).Accumulator, 0.0f);
-    EXPECT_TRUE((bool)Physics::GetContext(scene.get()).CollisionCallback);
-
-    Physics::ClearContext(scene.get());
-
-    auto& recreated = Physics::GetContext(scene.get());
-    EXPECT_FLOAT_EQ(recreated.Accumulator, 0.0f);
-    EXPECT_FALSE((bool)recreated.CollisionCallback);
-    EXPECT_FALSE(callbackInvoked);
-}
diff --git a/tests/primitive_tests.cpp b/tests/primitive_tests.cpp
deleted file mode 100644
index 098cc5d5b..000000000
--- a/tests/primitive_tests.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "engine/scene/components/primitive_component.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-TEST(PrimitiveTest, Defaults)
-{
-	PrimitiveComponent component;
-
-	EXPECT_EQ(component.Type, PrimitiveType::None);
-	EXPECT_FLOAT_EQ(component.Radius, 0.5f);
-	EXPECT_FLOAT_EQ(component.InnerRadius, 0.2f);
-	EXPECT_FLOAT_EQ(component.Height, 1.0f);
-	EXPECT_EQ(component.Slices, 16);
-	EXPECT_EQ(component.Stacks, 16);
-	EXPECT_FLOAT_EQ(component.Dimensions.x, 1.0f);
-	EXPECT_FLOAT_EQ(component.Dimensions.y, 1.0f);
-	EXPECT_FLOAT_EQ(component.Dimensions.z, 1.0f);
-	EXPECT_FALSE(component.Dirty);
-	EXPECT_EQ(component.Asset, nullptr);
-}
-
-TEST(PrimitiveTest, TypeConstructorSetsRequestedPrimitiveType)
-{
-	PrimitiveComponent sphere(PrimitiveType::Sphere);
-
-	EXPECT_EQ(sphere.Type, PrimitiveType::Sphere);
-	EXPECT_FLOAT_EQ(sphere.Radius, 0.5f);
-	EXPECT_EQ(sphere.Slices, 16);
-	EXPECT_FALSE(sphere.Dirty);
-}
-
-TEST(PrimitiveTest, CopyConstructorPreservesConfiguredValues)
-{
-	PrimitiveComponent source;
-	source.Type = PrimitiveType::Cylinder;
-	source.Radius = 2.5f;
-	source.InnerRadius = 0.7f;
-	source.Height = 4.0f;
-	source.Slices = 24;
-	source.Stacks = 12;
-	source.Dimensions = {2.0f, 3.0f, 4.0f};
-	source.Dirty = true;
-
-	PrimitiveComponent copy(source);
-
-	EXPECT_EQ(copy.Type, source.Type);
-	EXPECT_FLOAT_EQ(copy.Radius, source.Radius);
-	EXPECT_FLOAT_EQ(copy.InnerRadius, source.InnerRadius);
-	EXPECT_FLOAT_EQ(copy.Height, source.Height);
-	EXPECT_EQ(copy.Slices, source.Slices);
-	EXPECT_EQ(copy.Stacks, source.Stacks);
-	EXPECT_FLOAT_EQ(copy.Dimensions.x, source.Dimensions.x);
-	EXPECT_FLOAT_EQ(copy.Dimensions.y, source.Dimensions.y);
-	EXPECT_FLOAT_EQ(copy.Dimensions.z, source.Dimensions.z);
-	EXPECT_EQ(copy.Dirty, source.Dirty);
-	EXPECT_EQ(copy.Asset, source.Asset);
-}
diff --git a/tests/renderer_tests.cpp b/tests/renderer_tests.cpp
deleted file mode 100644
index 00223f6df..000000000
--- a/tests/renderer_tests.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// renderer_tests.cpp
-// Tests for the main Renderer and Renderer2D singletons.
-// These tests require a valid OpenGL context and are skipped on CI.
-#include "engine/core/base.h"
-#include "engine/graphics/pipeline/renderer.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-class RendererTest : public ::testing::Test
-{
-protected:
-    void SetUp() override
-    {
-#if defined(CH_CI)
-        GTEST_SKIP() << "Skipping renderer tests on CI due to lack of reliable OpenGL support.";
-#endif
-    }
-
-    void TearDown() override
-    {
-    }
-};
-
-#if !defined(CH_CI)
-
-// Verifies that the Renderer singleton can be initialized and shut down without errors.
-TEST_F(RendererTest, RendererInitialization)
-{
-    auto& renderer = Renderer::Get();
-    renderer.Init();
-    renderer.Shutdown();
-}
-
-// Verifies that the Renderer can be init/shutdown in sequence multiple times
-// without memory corruption or double-free.
-TEST_F(RendererTest, Lifetime)
-{
-    auto& renderer = Renderer::Get();
-    renderer.Init();
-    renderer.Shutdown();
-
-    renderer.Init();
-    renderer.Shutdown();
-}
-
-// Verifies that lights can be set, counted, and cleared on the renderer.
-TEST_F(RendererTest, LightManagement)
-{
-    auto& renderer = Renderer::Get();
-    renderer.Init();
-
-    EXPECT_EQ(renderer.GetData().LightCount, 0);
-
-    RenderLight light;
-    light.color[0] = 1.0f;
-    light.intensity = 5.0f;
-
-    renderer.SetLight(0, light);
-    renderer.SetLightCount(1);
-
-    EXPECT_EQ(renderer.GetData().LightCount, 1);
-    EXPECT_FLOAT_EQ(renderer.GetData().Lighting.Lights[0].intensity, 5.0f);
-
-    renderer.ClearLights();
-    EXPECT_EQ(renderer.GetData().LightCount, 0);
-
-    renderer.Shutdown();
-}
-
-// Verifies that DiagnosticMode float can be pushed into the renderer's data block.
-TEST_F(RendererTest, DiagnosticMode)
-{
-    auto& renderer = Renderer::Get();
-    renderer.Init();
-
-    renderer.SetDiagnosticMode(2.0f);
-    EXPECT_FLOAT_EQ(renderer.GetData().DiagnosticMode, 2.0f);
-
-    renderer.Shutdown();
-}
-
-// Verifies that an EnvironmentSettings object is applied correctly to the renderer's
-// internal lighting data (e.g. ambient value round-trips through ApplyEnvironment).
-TEST_F(RendererTest, EnvironmentApplication)
-{
-    auto& renderer = Renderer::Get();
-    renderer.Init();
-
-    EnvironmentSettings env;
-    env.Lighting.Ambient = 0.5f;
-
-    renderer.ApplyEnvironment(env);
-    EXPECT_FLOAT_EQ(renderer.GetData().Lighting.CurrentLighting.Ambient, 0.5f);
-
-    renderer.Shutdown();
-}
-
-#endif // CH_CI
diff --git a/tests/scene_serialization_tests.cpp b/tests/scene_serialization_tests.cpp
deleted file mode 100644
index 25c08451a..000000000
--- a/tests/scene_serialization_tests.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-#include "engine/scene/component_serializer.h"
-#include "engine/scene/components.h"
-#include "engine/scene/scene.h"
-#include "engine/scene/scene_serializer.h"
-#include "gtest/gtest.h"
-#include <filesystem>
-#include <fstream>
-
-using namespace CHEngine;
-
-TEST(SceneSerializationTest, SaveAndLoadScene)
-{
-    std::string testPath = "test_assets/test_scene.chscene";
-    std::filesystem::create_directories("test_assets");
-
-    UUID entityID;
-    {
-        Scene scene;
-        Entity entity = scene.CreateEntity("Serialized Entity");
-        entityID = entity.GetUUID();
-        entity.AddComponent<CameraComponent>().Primary = true;
-
-        SceneSerializer serializer(&scene);
-        serializer.Serialize(testPath);
-    }
-
-    {
-        Scene scene;
-        SceneSerializer serializer(&scene);
-        EXPECT_TRUE(serializer.Deserialize(testPath));
-
-        auto view = scene.GetRegistry().view<TagComponent>();
-        bool found = false;
-        for (auto entityHandle : view)
-        {
-            Entity entity(entityHandle, &scene.GetRegistry());
-            if (entity.GetUUID() == entityID)
-            {
-                EXPECT_EQ(entity.GetName(), "Serialized Entity");
-                EXPECT_TRUE(entity.HasComponent<CameraComponent>());
-                EXPECT_TRUE(entity.GetComponent<CameraComponent>().Primary);
-                found = true;
-            }
-        }
-        EXPECT_TRUE(found);
-    }
-
-    std::filesystem::remove_all("test_assets");
-}
-
-TEST(SceneSerializationTest, CameraProjectionRoundTrip)
-{
-    std::string testPath = "test_assets/test_camera_roundtrip.chscene";
-    std::filesystem::create_directories("test_assets");
-
-    UUID entityID;
-    {
-        Scene scene;
-        Entity entity = scene.CreateEntity("Camera Entity");
-        entityID = entity.GetUUID();
-
-        auto& cameraComponent = entity.AddComponent<CameraComponent>();
-        cameraComponent.Camera.SetProjectionType(ProjectionType::Orthographic);
-        cameraComponent.Camera.SetOrthographic(37.5f, -7.0f, 321.0f);
-
-        SceneSerializer serializer(&scene);
-        ASSERT_TRUE(serializer.Serialize(testPath));
-    }
-
-    {
-        Scene scene;
-        SceneSerializer serializer(&scene);
-        ASSERT_TRUE(serializer.Deserialize(testPath));
-
-        auto loadedEntity = scene.GetEntityByUUID(entityID);
-        ASSERT_TRUE(loadedEntity);
-        ASSERT_TRUE(loadedEntity.HasComponent<CameraComponent>());
-
-        const auto& camera = loadedEntity.GetComponent<CameraComponent>().Camera;
-        EXPECT_EQ(camera.GetProjectionType(), ProjectionType::Orthographic);
-        EXPECT_FLOAT_EQ(camera.GetOrthographicSize(), 37.5f);
-        EXPECT_FLOAT_EQ(camera.GetOrthographicNearClip(), -7.0f);
-        EXPECT_FLOAT_EQ(camera.GetOrthographicFarClip(), 321.0f);
-    }
-
-    std::filesystem::remove_all("test_assets");
-}
-
-// ============================================================
-//  Destructive / Negative Serialization Tests
-// ============================================================
-
-class SceneSerializationDestructiveTest : public ::testing::Test
-{
-protected:
-    void SetUp() override    { std::filesystem::create_directories("test_assets"); }
-    void TearDown() override { std::filesystem::remove_all("test_assets"); }
-
-    static void WriteFile(const std::string& path, const std::string& content)
-    {
-        std::ofstream f(path);
-        f << content;
-    }
-};
-
-// Empty file — must return false, must not throw.
-TEST_F(SceneSerializationDestructiveTest, EmptyFile)
-{
-    std::string path = "test_assets/empty.chscene";
-    WriteFile(path, "");
-
-    Scene scene;
-    SceneSerializer serializer(&scene);
-    EXPECT_NO_THROW({
-        bool ok = serializer.Deserialize(path);
-        EXPECT_FALSE(ok);
-    });
-}
-
-// Binary garbage — YAML parser must not throw unhandled exception.
-TEST_F(SceneSerializationDestructiveTest, BinaryGarbage)
-{
-    std::string path = "test_assets/garbage.chscene";
-    {
-        std::ofstream f(path, std::ios::binary);
-        static const unsigned char kGarbage[] = {0xFF, 0x00, 0xDE, 0xAD, 0xBE, 0xEF, 0x13, 0x37};
-        f.write(reinterpret_cast<const char*>(kGarbage), sizeof(kGarbage));
-    }
-
-    Scene scene;
-    SceneSerializer serializer(&scene);
-    EXPECT_NO_THROW(serializer.Deserialize(path));
-}
-
-// Valid YAML missing the "Scene:" root key.
-TEST_F(SceneSerializationDestructiveTest, MissingSceneKey)
-{
-    std::string path = "test_assets/no_scene.chscene";
-    WriteFile(path, "Entities:\n  - tag: Foo\n");
-
-    Scene scene;
-    SceneSerializer serializer(&scene);
-    EXPECT_NO_THROW(serializer.Deserialize(path));
-}
-
-// Entity block missing UUID entirely.
-TEST_F(SceneSerializationDestructiveTest, EntityMissingUUID)
-{
-    std::string path = "test_assets/no_uuid.chscene";
-    WriteFile(path,
-        "Scene: Test\n"
-        "Entities:\n"
-        "  - Entity:\n"
-        "      TagComponent:\n"
-        "        Tag: NoUUID\n");
-
-    Scene scene;
-    SceneSerializer serializer(&scene);
-    // Must not crash — either skip this entity or assign a new UUID.
-    EXPECT_NO_THROW(serializer.Deserialize(path));
-}
-
-// Truncated mid-token YAML.
-TEST_F(SceneSerializationDestructiveTest, TruncatedYAML)
-{
-    std::string path = "test_assets/truncated.chscene";
-    WriteFile(path,
-        "Scene: Test\n"
-        "Entities:\n"
-        "  - Entity:\n"
-        "      TagCompon");   // intentionally cut
-
-    Scene scene;
-    SceneSerializer serializer(&scene);
-    EXPECT_NO_THROW(serializer.Deserialize(path));
-}
-
-// Path that does not exist.
-TEST_F(SceneSerializationDestructiveTest, NonExistentFile)
-{
-    Scene scene;
-    SceneSerializer serializer(&scene);
-    EXPECT_NO_THROW({
-        bool ok = serializer.Deserialize("test_assets/ghost.chscene");
-        EXPECT_FALSE(ok);
-    });
-}
-
-// Round-trip with 200 entities — verify count survives serialize/deserialize.
-TEST_F(SceneSerializationDestructiveTest, LargeSceneRoundTrip)
-{
-    constexpr int kCount = 200;
-    std::string   path   = "test_assets/large.chscene";
-
-    {
-        Scene scene;
-        for (int i = 0; i < kCount; ++i)
-            scene.CreateEntity("E_" + std::to_string(i));
-
-        SceneSerializer serializer(&scene);
-        ASSERT_TRUE(serializer.Serialize(path));
-    }
-
-    {
-        Scene scene;
-        SceneSerializer serializer(&scene);
-        ASSERT_TRUE(serializer.Deserialize(path));
-
-        int count = 0;
-        auto view = scene.GetRegistry().view<TagComponent>();
-        for (auto e : view) ++count;
-        EXPECT_EQ(count, kCount);
-    }
-}
diff --git a/tests/scene_tests.cpp b/tests/scene_tests.cpp
deleted file mode 100644
index 545a55382..000000000
--- a/tests/scene_tests.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include "engine/scene/components.h"
-#include "engine/scene/scene.h"
-#include "engine/scene/component_serializer.h"
-#include "gtest/gtest.h"
-
-using namespace CHEngine;
-
-TEST(SceneTest, CreateEntity)
-{
-    Scene scene;
-    Entity entity = scene.CreateEntity("Test Entity");
-
-    EXPECT_TRUE(entity);
-    EXPECT_TRUE(entity.HasComponent<TagComponent>());
-    EXPECT_TRUE(entity.HasComponent<TransformComponent>());
-    EXPECT_EQ(entity.GetComponent<TagComponent>().Tag, "Test Entity");
-}
-
-TEST(SceneTest, DestroyEntity)
-{
-    Scene scene;
-    Entity entity = scene.CreateEntity("To Destroy");
-    entt::entity handle = entity;
-
-    scene.DestroyEntity(entity);
-    EXPECT_FALSE(scene.GetRegistry().valid(handle));
-}
-
-TEST(SceneTest, ComponentOperations)
-{
-    Scene scene;
-    Entity entity = scene.CreateEntity();
-
-    struct CustomComponent
-    {
-        int Value;
-    };
-    entity.AddComponent<CustomComponent>(42);
-
-    EXPECT_TRUE(entity.HasComponent<CustomComponent>());
-    EXPECT_EQ(entity.GetComponent<CustomComponent>().Value, 42);
-
-    entity.RemoveComponent<CustomComponent>();
-    EXPECT_FALSE(entity.HasComponent<CustomComponent>());
-}
-
-TEST(SceneTest, EntityRenaming)
-{
-    Scene scene;
-    Entity entity = scene.CreateEntity("Old Name");
-
-    auto& tag = entity.GetComponent<TagComponent>().Tag;
-    EXPECT_EQ(tag, "Old Name");
-
-    tag = "New Name";
-    EXPECT_EQ(entity.GetComponent<TagComponent>().Tag, "New Name");
-}
-
-TEST(SceneTest, FindEntityByTag)
-{
-    Scene scene;
-    scene.CreateEntity("Entity A");
-    scene.CreateEntity("Entity B");
-
-    Entity found = scene.FindEntityByTag("Entity B");
-    EXPECT_TRUE(found);
-    EXPECT_EQ(found.GetName(), "Entity B");
-
-    Entity notFound = scene.FindEntityByTag("Non-existent");
-    EXPECT_FALSE(notFound);
-}
-
-TEST(SceneTest, GetEntityByUUID)
-{
-    Scene scene;
-    Entity entity = scene.CreateEntity("Tracked Entity");
-    UUID id = entity.GetUUID();
-
-    Entity found = scene.GetEntityByUUID(id);
-    EXPECT_TRUE(found);
-    EXPECT_EQ(found.GetName(), "Tracked Entity");
-
-    Entity notFound = scene.GetEntityByUUID(UUID(999999));
-    EXPECT_FALSE(notFound);
-}
-
-
-TEST(SceneTest, CopyEntity)
-{
-    auto& serializer = ComponentSerializer::Get();
-    
-    Scene scene;
-    Entity src = scene.CreateEntity("Source");
-    src.AddComponent<CameraComponent>().Primary = true;
-    
-    Entity dst = scene.CopyEntity((entt::entity)src);
-    EXPECT_TRUE(dst);
-    EXPECT_EQ(dst.GetName(), "Source_copy"); // Copy must have "_copy" suffix
-    EXPECT_NE(src.GetUUID(), dst.GetUUID()); // Different UUID
-    EXPECT_TRUE(dst.HasComponent<CameraComponent>());
-    EXPECT_TRUE(dst.GetComponent<CameraComponent>().Primary);
-}
-
-TEST(SceneTest, CopyEntityResetsManagedScriptRuntimeState)
-{
-    Scene scene;
-    Entity src = scene.CreateEntity("Scripted");
-
-    auto& scripts = src.AddComponent<ManagedScriptComponent>().Scripts;
-    scripts.emplace_back("TestScript");
-    auto& script = scripts.back();
-    script.Instance = reinterpret_cast<void*>(0x1234);
-    script.NeedsStart = false;
-    script.OnCreate = reinterpret_cast<void (*)()>(0x1);
-    script.OnStart = reinterpret_cast<void (*)()>(0x2);
-    script.OnUpdate = reinterpret_cast<void (*)(float)>(0x3);
-    script.OnDestroy = reinterpret_cast<void (*)()>(0x4);
-    script.OnGUI = reinterpret_cast<void (*)()>(0x5);
-    script.OnCollisionEnter = reinterpret_cast<void (*)(uint64_t)>(0x6);
-
-    Entity dst = scene.CopyEntity((entt::entity)src);
-    ASSERT_TRUE(dst.HasComponent<ManagedScriptComponent>());
-
-    const auto& copiedScripts = dst.GetComponent<ManagedScriptComponent>().Scripts;
-    ASSERT_EQ(copiedScripts.size(), 1u);
-    EXPECT_EQ(copiedScripts[0].ClassName, "TestScript");
-    EXPECT_EQ(copiedScripts[0].Fields.size(), 0u);
-    EXPECT_EQ(copiedScripts[0].Instance, nullptr);
-    EXPECT_TRUE(copiedScripts[0].NeedsStart);
-    EXPECT_EQ(copiedScripts[0].OnCreate, nullptr);
-    EXPECT_EQ(copiedScripts[0].OnStart, nullptr);
-    EXPECT_EQ(copiedScripts[0].OnUpdate, nullptr);
-    EXPECT_EQ(copiedScripts[0].OnDestroy, nullptr);
-    EXPECT_EQ(copiedScripts[0].OnGUI, nullptr);
-    EXPECT_EQ(copiedScripts[0].OnCollisionEnter, nullptr);
-}
-
-TEST(SceneTest, DestructiveOperations)
-{
-    Scene scene;
-    Entity entity1 = scene.CreateEntity("Entity 1");
-    Entity entity2 = scene.CreateEntity("Entity 2");
-    
-    entt::entity handle1 = entity1;
-    entt::entity handle2 = entity2;
-    UUID uuid1 = entity1.GetUUID();
-
-    // 1. Destroy one entity, check if other is intact
-    scene.DestroyEntity(entity1);
-    EXPECT_FALSE(scene.GetRegistry().valid(handle1));
-    EXPECT_TRUE(scene.GetRegistry().valid(handle2));
-
-    // 2. Fetch by UUID should fail for destroyed entity
-    EXPECT_FALSE(scene.GetEntityByUUID(uuid1));
-
-    // 3. Component removal stress test
-    entity2.AddComponent<CameraComponent>();
-    entity2.AddComponent<LightComponent>();
-    entity2.AddComponent<SpriteComponent>();
-
-    EXPECT_TRUE(entity2.HasComponent<CameraComponent>());
-    EXPECT_TRUE(entity2.HasComponent<LightComponent>());
-    EXPECT_TRUE(entity2.HasComponent<SpriteComponent>());
-
-    entity2.RemoveComponent<LightComponent>();
-    EXPECT_FALSE(entity2.HasComponent<LightComponent>());
-    EXPECT_TRUE(entity2.HasComponent<CameraComponent>()); // Others should still exist
-
-    // 4. Repeated add/remove
-    entity2.AddComponent<LightComponent>();
-    EXPECT_TRUE(entity2.HasComponent<LightComponent>());
-    entity2.RemoveComponent<LightComponent>();
-    EXPECT_FALSE(entity2.HasComponent<LightComponent>());
-
-    // 5. Destroying scene should clear remaining entities
-    // (We simulate this by verifying the registry count drops, though destruction of the Scene obj handles actual cleanup)
-    scene.DestroyEntity(entity2);
-    EXPECT_FALSE(scene.GetRegistry().valid(handle2));
-    
-    // 6. Test trying to destroy an invalid entity (should not crash)
-    Entity invalidEntity; // Default constructor creates null entity
-    EXPECT_NO_THROW({
-        scene.DestroyEntity(invalidEntity);
-    });
-}
diff --git a/tests/scriptengine_tests.cpp b/tests/scriptengine_tests.cpp
deleted file mode 100644
index 1e4b071d4..000000000
--- a/tests/scriptengine_tests.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-#include "engine/scene/project.h"
-#include "gtest/gtest.h"
-#include "scripting/scriptengine.h"
-
-#include <filesystem>
-#include <vector>
-
-using namespace CHEngine;
-
-namespace
-{
-std::vector<std::filesystem::path> GetReloadAssemblyCandidates()
-{
-    std::vector<std::filesystem::path> candidates;
-    candidates.emplace_back(std::filesystem::current_path() / "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(std::filesystem::current_path() / "CHEngine.Managed.dll");
-
-#ifdef PROJECT_ROOT_DIR
-    const std::filesystem::path root = std::filesystem::path(PROJECT_ROOT_DIR);
-    candidates.emplace_back(root / "game" / "chaineddecos" / "bin" / "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(root / "game" / "chaineddecos" / "scripts" / "bin" / "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(root / "game" / "chaineddecos" / "scripts" / "game" / "chaineddecos" / "bin" /
-                            "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(root / "build" / "windows-ninja" / "bin" / "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(root / "build" / "windows-gcc" / "bin" / "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(root / "build" / "windows-clang" / "bin" / "ChainedDecos.Scripts.dll");
-    candidates.emplace_back(root / "build" / "windows-ninja" / "bin" / "CHEngine.Managed.dll");
-    candidates.emplace_back(root / "build" / "windows-gcc" / "bin" / "CHEngine.Managed.dll");
-    candidates.emplace_back(root / "build" / "windows-clang" / "bin" / "CHEngine.Managed.dll");
-    candidates.emplace_back(root / "scripting" / "managed" / "bin" / "CHEngine.Managed.dll");
-    candidates.emplace_back(root / "scripting" / "managed" / "bin" / "Debug" / "CHEngine.Managed.dll");
-#endif
-
-    std::vector<std::filesystem::path> existing;
-    for (const auto& candidate : candidates)
-    {
-        if (std::filesystem::exists(candidate))
-        {
-            existing.emplace_back(std::filesystem::absolute(candidate).lexically_normal());
-        }
-    }
-
-    return existing;
-}
-} // namespace
-
-class ScriptEngineTest : public ::testing::Test
-{
-protected:
-    void SetUp() override
-    {
-        Project::SetActive(nullptr);
-        ScriptEngine::Init();
-
-        if (!ScriptEngine::Get().IsInitialized())
-        {
-            GTEST_SKIP() << "Skipping ScriptEngine tests: CoreCLR host initialization failed in this environment.";
-        }
-    }
-
-    void TearDown() override
-    {
-        Project::SetActive(nullptr);
-        ScriptEngine::Shutdown();
-    }
-};
-
-TEST_F(ScriptEngineTest, ReloadWithoutActiveProjectReturnsFalseAndClearsFlag)
-{
-    auto& scriptEngine = ScriptEngine::Get();
-    EXPECT_FALSE(scriptEngine.IsReloadInProgress());
-    EXPECT_FALSE(scriptEngine.ReloadAssembly());
-    EXPECT_FALSE(scriptEngine.IsReloadInProgress());
-}
-
-TEST_F(ScriptEngineTest, ReloadWithMissingModuleReturnsFalseAndClearsFlag)
-{
-    auto project = Project::New();
-    project->GetConfig().ProjectDirectory = std::filesystem::current_path();
-    project->GetConfig().Scripting.ModuleName = "DefinitelyMissingModule";
-    project->GetConfig().Scripting.ModuleDirectory = "missing_modules";
-
-    auto& scriptEngine = ScriptEngine::Get();
-    EXPECT_FALSE(scriptEngine.ReloadAssembly());
-    EXPECT_FALSE(scriptEngine.IsReloadInProgress());
-}
-
-TEST_F(ScriptEngineTest, LoadAppAssemblyRejectsMissingPath)
-{
-    auto& scriptEngine = ScriptEngine::Get();
-    EXPECT_FALSE(scriptEngine.LoadAppAssembly("D:/definitely_missing/ChainedDecos.Scripts.dll"));
-    EXPECT_TRUE(scriptEngine.GetScriptClasses().empty());
-}
-
-TEST_F(ScriptEngineTest, ReloadWithValidProjectLoadsScriptTypes)
-{
-    const std::vector<std::filesystem::path> candidates = GetReloadAssemblyCandidates();
-    if (candidates.empty())
-    {
-        GTEST_SKIP() << "Skipping ScriptEngine reload success test: no managed assembly candidates found.";
-    }
-
-    auto& scriptEngine = ScriptEngine::Get();
-    bool reloaded = false;
-    for (const auto& assemblyPath : candidates)
-    {
-        auto project = Project::New();
-        project->GetConfig().ProjectDirectory = assemblyPath.parent_path();
-        project->GetConfig().Scripting.ModuleName = assemblyPath.stem().string();
-        project->GetConfig().Scripting.ModuleDirectory = assemblyPath.parent_path();
-
-        if (scriptEngine.ReloadAssembly())
-        {
-            reloaded = true;
-            break;
-        }
-
-        EXPECT_FALSE(scriptEngine.IsReloadInProgress());
-    }
-
-    if (!reloaded)
-    {
-        GTEST_SKIP() << "Skipping ScriptEngine reload success test: all managed assembly candidates failed to load.";
-    }
-
-    EXPECT_FALSE(scriptEngine.IsReloadInProgress());
-    EXPECT_EQ(scriptEngine.GetScriptClass("DefinitelyMissingType"), nullptr);
-
-    if (scriptEngine.GetScriptClasses().empty())
-    {
-        GTEST_SKIP() << "Loaded assembly exposes no script subclasses; skipping script type lookup assertions.";
-    }
-
-    const std::string fullName = scriptEngine.GetScriptClasses().begin()->first;
-    ASSERT_FALSE(fullName.empty());
-    EXPECT_NE(scriptEngine.GetScriptClass(fullName), nullptr);
-
-    const size_t lastDot = fullName.find_last_of('.');
-    if (lastDot != std::string::npos && lastDot + 1 < fullName.size())
-    {
-        const std::string shortName = fullName.substr(lastDot + 1);
-        EXPECT_NE(scriptEngine.GetScriptClass(shortName), nullptr);
-    }
-}
diff --git a/tests/serialization_tests.cpp b/tests/serialization_tests.cpp
deleted file mode 100644
index f9a470494..000000000
--- a/tests/serialization_tests.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "engine/scene/serialization_utils.h"
-#include "gtest/gtest.h"
-#include <filesystem>
-
-using namespace CHEngine;
-using namespace CHEngine::SerializationUtils;
-
-struct NestedData
-{
-    float X = 0.0f;
-    int Y = 0;
-
-    template<typename Archive>
-    void Reflect(CHEngine::Properties<Archive>& props)
-    {
-        props.Property("X", X);
-        props.Property("Y", Y);
-    }
-};
-
-TEST(SerializationTest, PropertyArchiveBasic)
-{
-    YAML::Emitter out;
-    out << YAML::BeginMap;
-    {
-        PropertyArchive archive(out);
-        float floatValue = 1.23f;
-        int intValue = 42;
-        std::string stringValue = "hello";
-
-        archive.Property("Float", floatValue);
-        archive.Property("Int", intValue);
-        archive.Property("String", stringValue);
-    }
-    out << YAML::EndMap;
-
-    YAML::Node node = YAML::Load(out.c_str());
-    EXPECT_FLOAT_EQ(node["Float"].as<float>(), 1.23f);
-    EXPECT_EQ(node["Int"].as<int>(), 42);
-    EXPECT_EQ(node["String"].as<std::string>(), "hello");
-
-    // Deserialize
-    PropertyArchive in(node);
-    float loadedFloatValue = 0;
-    int loadedIntValue = 0;
-    std::string loadedStringValue = "";
-    in.Property("Float", loadedFloatValue);
-    in.Property("Int", loadedIntValue);
-    in.Property("String", loadedStringValue);
-
-    EXPECT_FLOAT_EQ(loadedFloatValue, 1.23f);
-    EXPECT_EQ(loadedIntValue, 42);
-    EXPECT_EQ(loadedStringValue, "hello");
-}
-
-TEST(SerializationTest, PropertyArchiveHandle)
-{
-    UUID id;
-    YAML::Emitter out;
-    out << YAML::BeginMap;
-    {
-        PropertyArchive archive(out);
-        archive.Handle("MyID", id);
-    }
-    out << YAML::EndMap;
-
-    YAML::Node node = YAML::Load(out.c_str());
-    EXPECT_EQ(node["MyID"].as<uint64_t>(), (uint64_t)id);
-
-    UUID id2(0);
-    PropertyArchive in(node);
-    in.Handle("MyID", id2);
-    EXPECT_EQ((uint64_t)id2, (uint64_t)id);
-}
-
-TEST(SerializationTest, PropertyArchiveNested)
-{
-    YAML::Emitter out;
-    PropertyArchive archive(out);
-    
-    NestedData data;
-    data.X = 10.5f;
-    data.Y = 42;
-    
-    archive.Nested("Settings", data);
-    
-    YAML::Node inNode = YAML::Load(out.c_str());
-    PropertyArchive in(inNode);
-    
-    NestedData data2;
-}
diff --git a/tests/test_environment.cpp b/tests/test_environment.cpp
deleted file mode 100644
index fe521b82a..000000000
--- a/tests/test_environment.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// test_environment.cpp
-// Global gtest Environment that boots a minimal headless Application before any test runs,
-// then tears it down after all tests complete. This provides a valid engine context
-// (log system, event bus, etc.) without showing a window.
-#include "gtest/gtest.h"
-#include "engine/core/application.h"
-#include "engine/graphics/pipeline/renderer.h"
-
-class TestApplication : public CHEngine::Application
-{
-public:
-    TestApplication() : CHEngine::Application([](){
-        CHEngine::ApplicationSpecification spec{"Engine Tests"};
-        spec.Headless = true;
-        spec.EnableScripting = false;
-        return spec;
-    }()) {}
-};
-
-// GlobalTestEnvironment: SetUp() is called once before the first test,
-// TearDown() is called once after the last test.
-class EngineEnvironment : public ::testing::Environment {
-public:
-    void SetUp() override {
-        // Run completely headless/hidden for tests — no window on screen
-        app = new TestApplication();
-    }
-    void TearDown() override {
-        delete app;
-    }
-private:
-    TestApplication* app = nullptr;
-};
-
-// Register the custom environment globally so all test suites share the same engine boot.
-::testing::Environment* const engine_env = ::testing::AddGlobalTestEnvironment(new EngineEnvironment);
diff --git a/tests/test_paths.h.in b/tests/test_paths.h.in
new file mode 100644
index 000000000..846e1a549
--- /dev/null
+++ b/tests/test_paths.h.in
@@ -0,0 +1,9 @@
+#ifndef TEST_PATHS_H
+#define TEST_PATHS_H
+
+#define TEST_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@"
+#define TEST_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@"
+#define ENGINE_ROOT_DIR "@CMAKE_SOURCE_DIR@"
+#define ENGINE_BIN_DIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
+
+#endif // TEST_PATHS_H
\ No newline at end of file
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
new file mode 100644
index 000000000..8a0b0f7fe
--- /dev/null
+++ b/tests/unit/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Unit tests — fast, no full engine runtime required
+# Links against specific engine modules, not the full engine facade.
+
+set(UNIT_SOURCES
+    test_main_unit.cpp
+    uuid_tests.cpp
+    timestep_tests.cpp
+    color_tests.cpp
+    thread_pool_tests.cpp
+    event_tests.cpp
+    event_input_tests.cpp
+    layer_stack_tests.cpp
+    service_locator_tests.cpp
+)
+
+add_executable(engine_tests_unit ${UNIT_SOURCES})
+
+target_link_libraries(engine_tests_unit PRIVATE
+    engine_common
+    engine_core
+    gtest
+    gtest_main
+)
+
+# MinGW/gcc: statically link the gcc/stdc++ runtime so the test exe can start
+# during test discovery without libstdc++-6.dll / libgcc_s / libwinpthread on PATH.
+if(MINGW)
+    target_link_options(engine_tests_unit PRIVATE -static-libgcc -static-libstdc++)
+endif()
+
+target_include_directories(engine_tests_unit PRIVATE
+    ${CMAKE_SOURCE_DIR}
+)
+
+if(TARGET engine_pch)
+    target_link_libraries(engine_tests_unit PRIVATE engine_pch)
+endif()
+
+include(GoogleTest)
+# Discover individual GTest tests so each shows up as a separate CTest entry.
+# Unit tests are fast (no engine boot), so per-test discovery has negligible overhead.
+gtest_discover_tests(engine_tests_unit
+    WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+    PROPERTIES
+        LABELS "Unit"
+        ENVIRONMENT "ENGINE_ROOT=${CMAKE_SOURCE_DIR}"
+        TIMEOUT 30
+)
diff --git a/tests/unit/CMakeLists_minimal.txt b/tests/unit/CMakeLists_minimal.txt
new file mode 100644
index 000000000..69015134c
--- /dev/null
+++ b/tests/unit/CMakeLists_minimal.txt
@@ -0,0 +1,21 @@
+# Minimal test — just GTest, no engine at all
+add_executable(engine_tests_minimal
+    minimal_test.cpp
+)
+
+target_link_libraries(engine_tests_minimal PRIVATE
+    gtest
+    gtest_main
+)
+
+target_include_directories(engine_tests_minimal PRIVATE
+    ${CMAKE_SOURCE_DIR}/thirdparty/googletest/googletest/include
+)
+
+include(GoogleTest)
+gtest_discover_tests(engine_tests_minimal
+    CONFIGURATION_VAR CMAKE_BUILD_TYPE
+    DISCOVERY_MODE POST_BUILD
+    DISCOVERY_TIMEOUT 30
+    PROPERTIES LABELS "Minimal"
+)
\ No newline at end of file
diff --git a/tests/unit/color_tests.cpp b/tests/unit/color_tests.cpp
new file mode 100644
index 000000000..75e5ed456
--- /dev/null
+++ b/tests/unit/color_tests.cpp
@@ -0,0 +1,67 @@
+#include "engine/common/color.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(ColorTest, DefaultConstructor)
+{
+	Color c;
+	EXPECT_EQ(c.r, 0);
+	EXPECT_EQ(c.g, 0);
+	EXPECT_EQ(c.b, 0);
+	EXPECT_EQ(c.a, 255);
+}
+
+TEST(ColorTest, ParameterizedConstructor)
+{
+	Color c(100, 150, 200, 128);
+	EXPECT_EQ(c.r, 100);
+	EXPECT_EQ(c.g, 150);
+	EXPECT_EQ(c.b, 200);
+	EXPECT_EQ(c.a, 128);
+}
+
+TEST(ColorTest, DefaultAlphaIs255)
+{
+	Color c(255, 0, 0);
+	EXPECT_EQ(c.a, 255);
+}
+
+TEST(ColorTest, NamedColors)
+{
+	auto white = Color::White();
+	EXPECT_EQ(white.r, 255);
+	EXPECT_EQ(white.g, 255);
+	EXPECT_EQ(white.b, 255);
+	EXPECT_EQ(white.a, 255);
+
+	auto black = Color::Black();
+	EXPECT_EQ(black.r, 0);
+	EXPECT_EQ(black.g, 0);
+	EXPECT_EQ(black.b, 0);
+	EXPECT_EQ(black.a, 255);
+
+	auto red = Color::Red();
+	EXPECT_EQ(red.r, 255);
+	EXPECT_EQ(red.g, 0);
+	EXPECT_EQ(red.b, 0);
+
+	auto green = Color::Green();
+	EXPECT_EQ(green.r, 0);
+	EXPECT_EQ(green.g, 255);
+	EXPECT_EQ(green.b, 0);
+
+	auto blue = Color::Blue();
+	EXPECT_EQ(blue.r, 0);
+	EXPECT_EQ(blue.g, 0);
+	EXPECT_EQ(blue.b, 255);
+}
+
+TEST(ColorTest, MaxValues)
+{
+	Color c(255, 255, 255, 255);
+	EXPECT_EQ(c.r, 255);
+	EXPECT_EQ(c.g, 255);
+	EXPECT_EQ(c.b, 255);
+	EXPECT_EQ(c.a, 255);
+}
diff --git a/tests/unit/event_input_tests.cpp b/tests/unit/event_input_tests.cpp
new file mode 100644
index 000000000..9385da94d
--- /dev/null
+++ b/tests/unit/event_input_tests.cpp
@@ -0,0 +1,83 @@
+#include "engine/core/events/events.h"
+#include "engine/core/events/input_events.h"
+#include "engine/core/events/window_events.h"
+#include "engine/core/key_codes.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(EventSystemTest, KeyPressedEventCreation)
+{
+	KeyPressedEvent event(KeyCode::W, false);
+	EXPECT_EQ(event.GetKeyCode(), KeyCode::W);
+	EXPECT_FALSE(event.IsRepeat());
+	EXPECT_EQ(event.GetEventType(), EventType::KeyPressed);
+	EXPECT_TRUE(event.IsInCategory(EventCategoryKeyboard));
+	EXPECT_TRUE(event.IsInCategory(EventCategoryInput));
+}
+
+TEST(EventSystemTest, EventDispatcherKeyPressed)
+{
+	KeyPressedEvent event(KeyCode::W, false);
+	bool handlerCalled = false;
+	int receivedKey = -1;
+
+	EventDispatcher dispatcher(event);
+	const bool dispatched = dispatcher.Dispatch<KeyPressedEvent>([&](KeyPressedEvent& e) {
+		handlerCalled = true;
+		receivedKey = (int)e.GetKeyCode();
+		return true;
+	});
+
+	EXPECT_TRUE(dispatched);
+	EXPECT_TRUE(handlerCalled);
+	EXPECT_EQ(receivedKey, (int)KeyCode::W);
+	EXPECT_TRUE(event.Handled);
+}
+
+TEST(EventSystemTest, EventDispatcherWrongType)
+{
+	KeyPressedEvent event(KeyCode::W, false);
+	bool handlerCalled = false;
+
+	EventDispatcher dispatcher(event);
+	const bool dispatched = dispatcher.Dispatch<WindowResizeEvent>([&](WindowResizeEvent&) {
+		handlerCalled = true;
+		return true;
+	});
+
+	EXPECT_FALSE(dispatched);
+	EXPECT_FALSE(handlerCalled);
+	EXPECT_FALSE(event.Handled);
+}
+
+TEST(EventSystemTest, EventDispatcherMultipleHandlers)
+{
+	KeyPressedEvent event(KeyCode::Space, false);
+	int handlerCount = 0;
+
+	EventDispatcher dispatcher(event);
+
+	dispatcher.Dispatch<KeyPressedEvent>([&](KeyPressedEvent& e) {
+		handlerCount++;
+		return false; // Don't mark as handled
+	});
+
+	dispatcher.Dispatch<KeyPressedEvent>([&](KeyPressedEvent& e) {
+		handlerCount++;
+		return true; // Mark as handled
+	});
+
+	EXPECT_EQ(handlerCount, 2);
+	EXPECT_TRUE(event.Handled);
+}
+
+TEST(EventSystemTest, WindowResizeToStringIncludesDimensions)
+{
+	WindowResizeEvent event(1280, 720);
+
+	EXPECT_EQ(event.GetWidth(), 1280u);
+	EXPECT_EQ(event.GetHeight(), 720u);
+	EXPECT_NE(event.ToString().find("1280"), std::string::npos);
+	EXPECT_NE(event.ToString().find("720"), std::string::npos);
+}
diff --git a/tests/unit/event_tests.cpp b/tests/unit/event_tests.cpp
new file mode 100644
index 000000000..7ea09face
--- /dev/null
+++ b/tests/unit/event_tests.cpp
@@ -0,0 +1,52 @@
+#include <gtest/gtest.h>
+#include "engine/core/events/events.h"
+#include "engine/core/events/window_events.h"
+#include "engine/core/events/input_events.h"
+
+using namespace Chained;
+
+TEST(EventTest, Dispatcher)
+{
+	WindowResizeEvent e(1280, 720);
+	EventDispatcher dispatcher(e);
+
+	bool dispatched = dispatcher.Dispatch<WindowResizeEvent>([](WindowResizeEvent& event) {
+		EXPECT_EQ(event.GetWidth(), 1280);
+		EXPECT_EQ(event.GetHeight(), 720);
+		return true;
+	});
+
+	EXPECT_TRUE(dispatched);
+	EXPECT_TRUE(e.Handled);
+}
+
+TEST(EventTest, Queue)
+{
+	EventQueue queue;
+	queue.Push(std::make_unique<WindowCloseEvent>());
+	queue.Enqueue<KeyPressedEvent>(KeyCode::A, false); // 'A' key
+
+	int processedCount = 0;
+	queue.Process([&processedCount](Event& e) {
+		processedCount++;
+		if (processedCount == 1)
+		{
+			EXPECT_EQ(e.GetEventType(), EventType::WindowClose);
+		}
+		else if (processedCount == 2)
+		{
+			EXPECT_EQ(e.GetEventType(), EventType::KeyPressed);
+		}
+	});
+
+	EXPECT_EQ(processedCount, 2);
+	EXPECT_TRUE(queue.IsEmpty());
+}
+
+TEST(EventTest, Category)
+{
+	KeyPressedEvent e(KeyCode::A);
+	EXPECT_TRUE(e.IsInCategory(EventCategoryKeyboard));
+	EXPECT_TRUE(e.IsInCategory(EventCategoryInput));
+	EXPECT_FALSE(e.IsInCategory(EventCategoryEditor));
+}
diff --git a/tests/unit/layer_stack_tests.cpp b/tests/unit/layer_stack_tests.cpp
new file mode 100644
index 000000000..0c95b37f7
--- /dev/null
+++ b/tests/unit/layer_stack_tests.cpp
@@ -0,0 +1,87 @@
+#include "engine/core/layer_stack.h"
+#include "engine/core/layer.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(LayerStackTest, EmptyOnInit)
+{
+	LayerStack stack;
+	EXPECT_EQ(stack.begin(), stack.end());
+	EXPECT_EQ(stack.GetLayerCount(), 0u);
+}
+
+TEST(LayerStackTest, PushLayerAddsLayer)
+{
+	LayerStack stack;
+	stack.PushLayer(std::make_unique<Layer>("TestLayer"));
+
+	EXPECT_EQ(stack.GetLayerCount(), 1u);
+	EXPECT_NE(stack.GetLayerAt(0), nullptr);
+	EXPECT_EQ(stack.GetLayerAt(0)->GetName(), "TestLayer");
+}
+
+TEST(LayerStackTest, PushOverlayAddsToEnd)
+{
+	LayerStack stack;
+	stack.PushLayer(std::make_unique<Layer>("Layer1"));
+	stack.PushLayer(std::make_unique<Layer>("Layer2"));
+	stack.PushOverlay(std::make_unique<Layer>("Overlay"));
+
+	ASSERT_EQ(stack.GetLayerCount(), 3u);
+	EXPECT_EQ(stack.GetLayerAt(0)->GetName(), "Layer1");
+	EXPECT_EQ(stack.GetLayerAt(1)->GetName(), "Layer2");
+	EXPECT_EQ(stack.GetLayerAt(2)->GetName(), "Overlay");
+}
+
+TEST(LayerStackTest, HasLayerFindsByName)
+{
+	LayerStack stack;
+	stack.PushLayer(std::make_unique<Layer>("PlayerLayer"));
+
+	EXPECT_TRUE(stack.HasLayer("PlayerLayer"));
+	EXPECT_FALSE(stack.HasLayer("Nonexistent"));
+}
+
+TEST(LayerStackTest, LayerInsertIndex)
+{
+	LayerStack stack;
+	stack.PushLayer(std::make_unique<Layer>("A"));
+	stack.PushLayer(std::make_unique<Layer>("B"));
+	stack.PushOverlay(std::make_unique<Layer>("O1"));
+	stack.PushLayer(std::make_unique<Layer>("C"));
+
+	ASSERT_EQ(stack.GetLayerCount(), 4u);
+	EXPECT_EQ(stack.GetLayerAt(0)->GetName(), "A");
+	EXPECT_EQ(stack.GetLayerAt(1)->GetName(), "B");
+	EXPECT_EQ(stack.GetLayerAt(2)->GetName(), "C");
+	EXPECT_EQ(stack.GetLayerAt(3)->GetName(), "O1");
+}
+
+TEST(LayerStackTest, ShutdownClearsLayers)
+{
+	LayerStack stack;
+	stack.PushLayer(std::make_unique<Layer>("L1"));
+	stack.PushLayer(std::make_unique<Layer>("L2"));
+
+	stack.Shutdown();
+	EXPECT_EQ(stack.GetLayerCount(), 0u);
+}
+
+TEST(LayerStackTest, GetLayerAtReturnsNullptrForOutOfBounds)
+{
+	LayerStack stack;
+	EXPECT_EQ(stack.GetLayerAt(0), nullptr);
+	EXPECT_EQ(stack.GetLayerAt(100), nullptr);
+}
+
+TEST(LayerStackTest, ConstGetLayersIsReadOnly)
+{
+	LayerStack stack;
+	stack.PushLayer(std::make_unique<Layer>("ReadOnly"));
+	const auto& constStack = stack;
+
+	EXPECT_EQ(constStack.GetLayerCount(), 1u);
+	EXPECT_EQ(constStack.GetLayerAt(0)->GetName(), "ReadOnly");
+	EXPECT_FALSE(constStack.GetLayers().empty());
+}
diff --git a/tests/unit/minimal_test.cpp b/tests/unit/minimal_test.cpp
new file mode 100644
index 000000000..a124c44cd
--- /dev/null
+++ b/tests/unit/minimal_test.cpp
@@ -0,0 +1,12 @@
+#include "gtest/gtest.h"
+
+TEST(MinimalTest, Works)
+{
+	EXPECT_EQ(1 + 1, 2);
+}
+
+int main(int argc, char** argv)
+{
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/tests/unit/no_libs_test.cpp b/tests/unit/no_libs_test.cpp
new file mode 100644
index 000000000..c93f7f349
--- /dev/null
+++ b/tests/unit/no_libs_test.cpp
@@ -0,0 +1,8 @@
+#include <cstdio>
+
+int main(int argc, char** argv)
+{
+	fprintf(stdout, "Hello from minimal test! argc=%d\n", argc);
+	fflush(stdout);
+	return 0;
+}
\ No newline at end of file
diff --git a/tests/unit/service_locator_tests.cpp b/tests/unit/service_locator_tests.cpp
new file mode 100644
index 000000000..223fc403b
--- /dev/null
+++ b/tests/unit/service_locator_tests.cpp
@@ -0,0 +1,226 @@
+#include "engine/core/service.h"
+#include "engine/core/service_locator.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+namespace
+{
+	// The ServiceLocator OWNS provided modules and deletes them during Shutdown().
+	// Tests therefore route the shutdown flag through an external bool that outlives
+	// the module, so assertions after Shutdown() don't read freed memory.
+	class TestModuleA : public Service
+	{
+	public:
+		bool initialized = false;
+		bool* shutdownFlag = nullptr;
+
+		void Initialize() override
+		{
+			initialized = true;
+		}
+		void Shutdown() override
+		{
+			if (shutdownFlag)
+			{
+				*shutdownFlag = true;
+			}
+		}
+	};
+
+	class TestModuleB : public Service
+	{
+	public:
+		bool initialized = false;
+		bool* shutdownFlag = nullptr;
+
+		void Initialize() override
+		{
+			initialized = true;
+		}
+		void Shutdown() override
+		{
+			if (shutdownFlag)
+			{
+				*shutdownFlag = true;
+			}
+		}
+	};
+} // namespace
+
+class ServiceLocatorTest : public ::testing::Test
+{
+protected:
+	void TearDown() override
+	{
+		ServiceLocator::Shutdown();
+	}
+};
+
+TEST_F(ServiceLocatorTest, ProvideAndGet)
+{
+	auto module = std::make_unique<TestModuleA>();
+	auto* raw = module.get();
+	ServiceLocator::Provide(std::move(module));
+
+	auto* retrieved = ServiceLocator::Get<TestModuleA>();
+	EXPECT_EQ(retrieved, raw);
+}
+
+TEST_F(ServiceLocatorTest, HasReturnsTrueAfterProvide)
+{
+	ServiceLocator::Provide(std::make_unique<TestModuleA>());
+	EXPECT_TRUE(ServiceLocator::Has<TestModuleA>());
+	EXPECT_FALSE(ServiceLocator::Has<TestModuleB>());
+}
+
+TEST_F(ServiceLocatorTest, TryGetReturnsNullptrWhenMissing)
+{
+	EXPECT_EQ(ServiceLocator::TryGet<TestModuleA>(), nullptr);
+}
+
+TEST_F(ServiceLocatorTest, TryGetReturnsPointerWhenProvided)
+{
+	auto module = std::make_unique<TestModuleA>();
+	auto* raw = module.get();
+	ServiceLocator::Provide(std::move(module));
+	EXPECT_EQ(ServiceLocator::TryGet<TestModuleA>(), raw);
+}
+
+TEST_F(ServiceLocatorTest, IsAvailableAfterProvide)
+{
+	EXPECT_FALSE(ServiceLocator::IsAvailable());
+	ServiceLocator::Provide(std::make_unique<TestModuleA>());
+	EXPECT_TRUE(ServiceLocator::IsAvailable());
+}
+
+TEST_F(ServiceLocatorTest, ShutdownCallsShutdownOnModules)
+{
+	bool shutdownCalled = false;
+	auto module = std::make_unique<TestModuleA>();
+	module->shutdownFlag = &shutdownCalled;
+	ServiceLocator::Provide(std::move(module));
+
+	ServiceLocator::Shutdown();
+
+	EXPECT_TRUE(shutdownCalled);
+}
+
+TEST_F(ServiceLocatorTest, ShutdownClearsServices)
+{
+	ServiceLocator::Provide(std::make_unique<TestModuleA>());
+	ServiceLocator::Shutdown();
+
+	EXPECT_FALSE(ServiceLocator::IsAvailable());
+}
+
+TEST_F(ServiceLocatorTest, MultipleModulesShutdownInReverseOrder)
+{
+	bool shutdownA = false;
+	bool shutdownB = false;
+
+	auto moduleA = std::make_unique<TestModuleA>();
+	moduleA->shutdownFlag = &shutdownA;
+	ServiceLocator::Provide(std::move(moduleA));
+
+	auto moduleB = std::make_unique<TestModuleB>();
+	moduleB->shutdownFlag = &shutdownB;
+	ServiceLocator::Provide(std::move(moduleB));
+
+	ServiceLocator::Shutdown();
+
+	EXPECT_TRUE(shutdownB);
+	EXPECT_TRUE(shutdownA);
+}
+
+TEST_F(ServiceLocatorTest, ProvideUniquePtrAndGet)
+{
+	auto module = std::make_unique<TestModuleA>();
+	auto* raw = module.get();
+	ServiceLocator::Provide(std::move(module));
+
+	EXPECT_EQ(ServiceLocator::Get<TestModuleA>(), raw);
+}
+
+TEST_F(ServiceLocatorTest, ProvideAfterLockIsRejectedWithoutLeak)
+{
+	ServiceLocator::Provide(std::make_unique<TestModuleA>());
+	ServiceLocator::Lock();
+
+	bool shutdownCalled = false;
+	auto rejected = std::make_unique<TestModuleB>();
+	rejected->shutdownFlag = &shutdownCalled;
+	ServiceLocator::Provide(std::move(rejected)); // unique_ptr destroys it on rejection
+
+	EXPECT_FALSE(ServiceLocator::Has<TestModuleB>());
+	// Rejected module was never registered, so Shutdown() must not be called on it.
+	ServiceLocator::Shutdown();
+	EXPECT_FALSE(shutdownCalled);
+}
+
+TEST_F(ServiceLocatorTest, DuplicateProvideKeepsOriginal)
+{
+	auto original = std::make_unique<TestModuleA>();
+	auto* raw = original.get();
+	ServiceLocator::Provide(std::move(original));
+	ServiceLocator::Provide(std::make_unique<TestModuleA>()); // rejected + destroyed
+
+	EXPECT_EQ(ServiceLocator::TryGet<TestModuleA>(), raw);
+}
+
+TEST_F(ServiceLocatorTest, TryGetReturnsNullptrWhenDisabled)
+{
+	auto module = std::make_unique<TestModuleA>();
+	auto* raw = module.get();
+	ServiceLocator::Provide(std::move(module));
+	raw->SetEnabled(false);
+
+	EXPECT_EQ(ServiceLocator::TryGet<TestModuleA>(), nullptr);
+}
+
+namespace
+{
+	// Looks up TestModuleA (registered before it, shut down AFTER it in reverse order)
+	// and TestModuleB (registered after it, shut down BEFORE it) from within Shutdown().
+	class DependencyProbeModule : public Service
+	{
+	public:
+		bool* sawLiveDependency = nullptr; // TestModuleA must still be reachable
+		bool* sawDeadDependency = nullptr; // TestModuleB must already be unavailable
+
+		void Initialize() override
+		{
+		}
+		void Shutdown() override
+		{
+			if (sawLiveDependency)
+			{
+				*sawLiveDependency = ServiceLocator::TryGet<TestModuleA>() != nullptr;
+			}
+			if (sawDeadDependency)
+			{
+				*sawDeadDependency = ServiceLocator::TryGet<TestModuleB>() != nullptr;
+			}
+		}
+	};
+} // namespace
+
+TEST_F(ServiceLocatorTest, ShutdownHidesAlreadyShutDownModules)
+{
+	bool liveDependencyReachable = false;
+	bool deadDependencyReachable = true;
+
+	ServiceLocator::Provide(std::make_unique<TestModuleA>());
+	auto probe = std::make_unique<DependencyProbeModule>();
+	probe->sawLiveDependency = &liveDependencyReachable;
+	probe->sawDeadDependency = &deadDependencyReachable;
+	ServiceLocator::Provide(std::move(probe));
+	ServiceLocator::Provide(std::make_unique<TestModuleB>());
+
+	ServiceLocator::Shutdown();
+
+	// Reverse order: B shuts down first, then probe. From the probe's Shutdown(),
+	// A (not yet shut down) is reachable, B (already shut down) is not.
+	EXPECT_TRUE(liveDependencyReachable);
+	EXPECT_FALSE(deadDependencyReachable);
+}
diff --git a/tests/unit/test_main_unit.cpp b/tests/unit/test_main_unit.cpp
new file mode 100644
index 000000000..f4862d7dc
--- /dev/null
+++ b/tests/unit/test_main_unit.cpp
@@ -0,0 +1,12 @@
+#include <gtest/gtest.h>
+
+#include "engine/core/log.h"
+
+int main(int argc, char** argv)
+{
+	::Chained::Log::Init();
+	::testing::InitGoogleTest(&argc, argv);
+	const int result = RUN_ALL_TESTS();
+	::Chained::Log::Shutdown();
+	return result;
+}
diff --git a/tests/unit/thread_pool_tests.cpp b/tests/unit/thread_pool_tests.cpp
new file mode 100644
index 000000000..8a055f47b
--- /dev/null
+++ b/tests/unit/thread_pool_tests.cpp
@@ -0,0 +1,83 @@
+#include "engine/common/thread_pool.h"
+#include "gtest/gtest.h"
+#include <atomic>
+#include <chrono>
+#include <vector>
+
+using namespace Chained;
+
+TEST(ThreadPoolTest, EnqueueReturnsCorrectResult)
+{
+	ThreadPool pool(2);
+	auto future = pool.Enqueue([]() { return 42; });
+	EXPECT_EQ(future.get(), 42);
+}
+
+TEST(ThreadPoolTest, EnqueueWithArguments)
+{
+	ThreadPool pool(2);
+	auto future = pool.Enqueue([](int a, int b) { return a + b; }, 3, 7);
+	EXPECT_EQ(future.get(), 10);
+}
+
+TEST(ThreadPoolTest, MultipleTasksExecute)
+{
+	ThreadPool pool(4);
+	std::vector<std::future<int>> futures;
+
+	for (int i = 0; i < 10; ++i)
+	{
+		futures.push_back(pool.Enqueue([i]() { return i * 2; }));
+	}
+
+	for (int i = 0; i < 10; ++i)
+	{
+		EXPECT_EQ(futures[i].get(), i * 2);
+	}
+}
+
+TEST(ThreadPoolTest, TasksRunConcurrently)
+{
+	ThreadPool pool(4);
+	std::atomic<int> counter{0};
+	std::vector<std::future<void>> futures;
+
+	for (int i = 0; i < 20; ++i)
+	{
+		futures.push_back(pool.Enqueue([&counter]() { counter.fetch_add(1, std::memory_order_relaxed); }));
+	}
+
+	for (auto& f : futures)
+	{
+		f.get();
+	}
+
+	EXPECT_EQ(counter.load(), 20);
+}
+
+TEST(ThreadPoolTest, QueueTaskExecutesLambda)
+{
+	ThreadPool pool(1);
+	std::atomic<bool> executed{false};
+	pool.QueueTask([&executed]() { executed.store(true); });
+
+	auto future = pool.Enqueue([]() { return 0; });
+	future.get();
+	EXPECT_TRUE(executed.load());
+}
+
+TEST(ThreadPoolTest, EnqueueAfterShutdownThrows)
+{
+	ThreadPool pool(1);
+	pool.Shutdown();
+
+	EXPECT_THROW(pool.Enqueue([]() { return 1; }), std::runtime_error);
+}
+
+TEST(ThreadPoolTest, QueueTaskAfterShutdownThrows)
+{
+	ThreadPool pool(1);
+	pool.Shutdown();
+
+	EXPECT_THROW(pool.QueueTask([]() {}), std::runtime_error);
+}
diff --git a/tests/unit/timestep_tests.cpp b/tests/unit/timestep_tests.cpp
new file mode 100644
index 000000000..e6f08ee11
--- /dev/null
+++ b/tests/unit/timestep_tests.cpp
@@ -0,0 +1,38 @@
+#include "engine/common/timestep.h"
+#include "gtest/gtest.h"
+
+using namespace Chained;
+
+TEST(TimestepTest, DefaultConstruction)
+{
+	Timestep ts;
+	EXPECT_FLOAT_EQ(ts.GetSeconds(), 0.0f);
+	EXPECT_FLOAT_EQ(ts.GetMilliseconds(), 0.0f);
+}
+
+TEST(TimestepTest, ValueConstruction)
+{
+	Timestep ts(0.016f);
+	EXPECT_FLOAT_EQ(ts.GetSeconds(), 0.016f);
+	EXPECT_FLOAT_EQ(ts.GetMilliseconds(), 16.0f);
+}
+
+TEST(TimestepTest, ImplicitFloatConversion)
+{
+	Timestep ts(0.5f);
+	float value = ts;
+	EXPECT_FLOAT_EQ(value, 0.5f);
+}
+
+TEST(TimestepTest, NegativeDelta)
+{
+	Timestep ts(-1.0f);
+	EXPECT_FLOAT_EQ(ts.GetSeconds(), -1.0f);
+}
+
+TEST(TimestepTest, LargeDelta)
+{
+	Timestep ts(1000.0f);
+	EXPECT_FLOAT_EQ(ts.GetSeconds(), 1000.0f);
+	EXPECT_FLOAT_EQ(ts.GetMilliseconds(), 1000000.0f);
+}
diff --git a/tests/unit/uuid_tests.cpp b/tests/unit/uuid_tests.cpp
new file mode 100644
index 000000000..2bf8bb377
--- /dev/null
+++ b/tests/unit/uuid_tests.cpp
@@ -0,0 +1,63 @@
+#include "engine/common/uuid.h"
+#include "gtest/gtest.h"
+#include <unordered_set>
+
+using namespace Chained;
+
+TEST(UUIDTest, GenerationUniqueness)
+{
+	std::unordered_set<uint64_t> uuids;
+	const int count = 1000;
+	for (int i = 0; i < count; i++)
+	{
+		UUID id;
+		uuids.insert((uint64_t)id);
+	}
+
+	EXPECT_EQ(uuids.size(), count);
+}
+
+TEST(UUIDTest, CopyAndAssignment)
+{
+	UUID id1;
+	UUID id2 = id1;
+	EXPECT_EQ((uint64_t)id1, (uint64_t)id2);
+
+	UUID id3;
+	id3 = id1;
+	EXPECT_EQ((uint64_t)id1, (uint64_t)id3);
+}
+
+TEST(UUIDTest, StringConversion)
+{
+	UUID id;
+	std::string str = id.ToString();
+	EXPECT_FALSE(str.empty());
+
+	// Test conversion back from string
+	UUID idFromString(str);
+	EXPECT_EQ((uint64_t)id, (uint64_t)idFromString);
+}
+
+TEST(UUIDTest, InvalidStringConversion)
+{
+	// Test with invalid string, it should hopefully generate a valid new ID or
+	// handle it gracefully depending on implementation. If not implemented
+	// safely, it might crash, but let's test it.
+	UUID idFromString("invalid-uuid-string");
+	// Usually it just hashes the string or returns 0.
+	EXPECT_EQ((uint64_t)idFromString, 0);
+}
+
+TEST(UUIDTest, Hashability)
+{
+	std::unordered_map<UUID, std::string> uuidMap;
+	UUID id1, id2;
+
+	uuidMap[id1] = "ID1";
+	uuidMap[id2] = "ID2";
+
+	EXPECT_EQ(uuidMap[id1], "ID1");
+	EXPECT_EQ(uuidMap[id2], "ID2");
+	EXPECT_EQ(uuidMap.size(), 2);
+}
diff --git a/tests/uuid_tests.cpp b/tests/uuid_tests.cpp
deleted file mode 100644
index 4bc980442..000000000
--- a/tests/uuid_tests.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "engine/core/uuid.h"
-#include "gtest/gtest.h"
-#include <unordered_set>
-
-using namespace CHEngine;
-
-TEST(UUIDTest, GenerationUniqueness)
-{
-    std::unordered_set<uint64_t> uuids;
-    const int count = 1000;
-    for (int i = 0; i < count; i++)
-    {
-        UUID id;
-        uuids.insert((uint64_t)id);
-    }
-
-    EXPECT_EQ(uuids.size(), count);
-}
-
-TEST(UUIDTest, CopyAndAssignment)
-{
-    UUID id1;
-    UUID id2 = id1;
-    EXPECT_EQ((uint64_t)id1, (uint64_t)id2);
-
-    UUID id3;
-    id3 = id1;
-    EXPECT_EQ((uint64_t)id1, (uint64_t)id3);
-}
-
-TEST(UUIDTest, StringConversion)
-{
-    UUID id;
-    std::string str = id.ToString();
-    EXPECT_FALSE(str.empty());
-
-    // Test conversion back from string
-    UUID idFromString(str);
-    EXPECT_EQ((uint64_t)id, (uint64_t)idFromString);
-}
-
-TEST(UUIDTest, InvalidStringConversion)
-{
-    // Test with invalid string, it should hopefully generate a valid new ID or handle it gracefully
-    // depending on implementation. If not implemented safely, it might crash, but let's test it.
-    UUID idFromString("invalid-uuid-string");
-    // Usually it just hashes the string or returns 0.
-    EXPECT_EQ((uint64_t)idFromString, 0); 
-}
-
-TEST(UUIDTest, Hashability)
-{
-    std::unordered_map<UUID, std::string> uuidMap;
-    UUID id1, id2;
-
-    uuidMap[id1] = "ID1";
-    uuidMap[id2] = "ID2";
-
-    EXPECT_EQ(uuidMap[id1], "ID1");
-    EXPECT_EQ(uuidMap[id2], "ID2");
-    EXPECT_EQ(uuidMap.size(), 2);
-}
diff --git a/include/IconsFontAwesome6.h b/thirdparty/IconsFontAwesome6.h
similarity index 99%
rename from include/IconsFontAwesome6.h
rename to thirdparty/IconsFontAwesome6.h
index f6fa6319e..7f3a3c96a 100644
--- a/include/IconsFontAwesome6.h
+++ b/thirdparty/IconsFontAwesome6.h
@@ -1,7 +1,6 @@
 #ifndef ICONS_FONT_AWESOME_6_H
 #define ICONS_FONT_AWESOME_6_H
 
-
 #define ICON_MIN_FA 0xe005
 #define ICON_MAX_16_FA 0xf8ff
 #define ICON_MAX_FA 0xf8ff
@@ -84,5 +83,4 @@
 #define ICON_FA_WINDOW_RESTORE "\xef\x8b\x92"
 #define ICON_FA_XMARK "\xef\x80\x8d"
 
-
 #endif /* A9AA0D13_3152_475F_917F_26AAD4C14D0C */
diff --git a/thirdparty/JoltPhysics b/thirdparty/JoltPhysics
new file mode 160000
index 000000000..159579006
--- /dev/null
+++ b/thirdparty/JoltPhysics
@@ -0,0 +1 @@
+Subproject commit 15957900663e5dd8c53980ae32e18e28773d4429
diff --git a/include/assimp b/thirdparty/assimp
similarity index 100%
rename from include/assimp
rename to thirdparty/assimp
diff --git a/thirdparty/cereal b/thirdparty/cereal
new file mode 160000
index 000000000..22a1b369f
--- /dev/null
+++ b/thirdparty/cereal
@@ -0,0 +1 @@
+Subproject commit 22a1b369f39be918ca79206a83c4facd759f9105
diff --git a/include/coral b/thirdparty/coral
similarity index 100%
rename from include/coral
rename to thirdparty/coral
diff --git a/thirdparty/enet b/thirdparty/enet
new file mode 160000
index 000000000..8b43b9259
--- /dev/null
+++ b/thirdparty/enet
@@ -0,0 +1 @@
+Subproject commit 8b43b92591fa9458662262a598b092ecc5132865
diff --git a/include/entt b/thirdparty/entt
similarity index 100%
rename from include/entt
rename to thirdparty/entt
diff --git a/thirdparty/freetype b/thirdparty/freetype
new file mode 160000
index 000000000..9e9d3b73f
--- /dev/null
+++ b/thirdparty/freetype
@@ -0,0 +1 @@
+Subproject commit 9e9d3b73f31367dbb4261f93c727a277f6632c77
diff --git a/thirdparty/freetype-gl b/thirdparty/freetype-gl
new file mode 160000
index 000000000..a3f0547ec
--- /dev/null
+++ b/thirdparty/freetype-gl
@@ -0,0 +1 @@
+Subproject commit a3f0547ec90b1424ee692f753509120f0569f9dc
diff --git a/include/glad b/thirdparty/glad
similarity index 100%
rename from include/glad
rename to thirdparty/glad
diff --git a/include/glfw b/thirdparty/glfw
similarity index 100%
rename from include/glfw
rename to thirdparty/glfw
diff --git a/include/glm b/thirdparty/glm
similarity index 100%
rename from include/glm
rename to thirdparty/glm
diff --git a/include/googletest b/thirdparty/googletest
similarity index 100%
rename from include/googletest
rename to thirdparty/googletest
diff --git a/include/imgui b/thirdparty/imgui
similarity index 100%
rename from include/imgui
rename to thirdparty/imgui
diff --git a/include/imguizmo b/thirdparty/imguizmo
similarity index 100%
rename from include/imguizmo
rename to thirdparty/imguizmo
diff --git a/thirdparty/mingw_compat.h b/thirdparty/mingw_compat.h
new file mode 100644
index 000000000..1a249e19f
--- /dev/null
+++ b/thirdparty/mingw_compat.h
@@ -0,0 +1,13 @@
+#ifndef MINGW_COMPAT_H
+#define MINGW_COMPAT_H
+#if defined(_WIN32)
+#if defined(__MINGW32__) || defined(__clang__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <timeapi.h>
+#include <windows.h>
+
+#endif
+#endif
+#endif
diff --git a/include/miniaudio b/thirdparty/miniaudio
similarity index 100%
rename from include/miniaudio
rename to thirdparty/miniaudio
diff --git a/thirdparty/miniupnp b/thirdparty/miniupnp
new file mode 160000
index 000000000..91eeeaecc
--- /dev/null
+++ b/thirdparty/miniupnp
@@ -0,0 +1 @@
+Subproject commit 91eeeaecc70d3f312871fe5d0f9e9f5ece8d0f56
diff --git a/include/nfd b/thirdparty/nfd
similarity index 100%
rename from include/nfd
rename to thirdparty/nfd
diff --git a/thirdparty/pack b/thirdparty/pack
new file mode 160000
index 000000000..453f2a553
--- /dev/null
+++ b/thirdparty/pack
@@ -0,0 +1 @@
+Subproject commit 453f2a55310e473782ee7adef8407575a8c1370b
diff --git a/thirdparty/portable-file-dialogs b/thirdparty/portable-file-dialogs
new file mode 160000
index 000000000..c12ea8c9a
--- /dev/null
+++ b/thirdparty/portable-file-dialogs
@@ -0,0 +1 @@
+Subproject commit c12ea8c9a727f5320a2b4570aee863bbede2a204
diff --git a/thirdparty/reflect-cpp b/thirdparty/reflect-cpp
new file mode 160000
index 000000000..1327ef1d0
--- /dev/null
+++ b/thirdparty/reflect-cpp
@@ -0,0 +1 @@
+Subproject commit 1327ef1d0b403f1424776da4c47bf0c7a6b0feaa
diff --git a/thirdparty/sodium/sodium.c b/thirdparty/sodium/sodium.c
new file mode 100644
index 000000000..a21ac6d9f
--- /dev/null
+++ b/thirdparty/sodium/sodium.c
@@ -0,0 +1,6523 @@
+/*
+ * ISC License
+ *
+ * Copyright (c) 2013-2026
+ * Frank Denis <j at pureftpd dot org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Amalgamated libsodium subset for yojimbo/netcode — generated; do not edit by hand. */
+
+#include "sodium.h"
+
+/* ================= sodium_version.c ================= */
+
+
+const char *
+sodium_version_string(void)
+{
+    return SODIUM_VERSION_STRING;
+}
+
+int
+sodium_library_version_major(void)
+{
+    return SODIUM_LIBRARY_VERSION_MAJOR;
+}
+
+int
+sodium_library_version_minor(void)
+{
+    return SODIUM_LIBRARY_VERSION_MINOR;
+}
+
+int
+sodium_library_minimal(void)
+{
+#ifdef SODIUM_LIBRARY_MINIMAL
+    return 1;
+#else
+    return 0;
+#endif
+}
+
+/* ================= sodium_utils.c ================= */
+#ifndef __STDC_WANT_LIB_EXT1__
+# define __STDC_WANT_LIB_EXT1__ 1
+#endif
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#if !defined(__ORBIS__) && !defined(__PROSPERO__)
+#include <signal.h>
+#endif
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
+#ifdef _WIN32
+# include <windows.h>
+# if !defined(_XBOX_ONE) && !defined(_GAMING_XBOX)
+#  include <wincrypt.h>
+# endif
+#else
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_C_VARARRAYS
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# elif !defined(alloca)
+#  if defined(__clang__) || defined(__GNUC__)
+#   define alloca __builtin_alloca
+#  elif defined _AIX
+#   define alloca __alloca
+#  elif defined _MSC_VER
+#   include <malloc.h>
+#   define alloca _alloca
+#  else
+#   include <stddef.h>
+#   ifdef  __cplusplus
+extern "C"
+#   endif
+void *alloca (size_t);
+#  endif
+# endif
+#endif
+
+
+#ifndef ENOSYS
+# define ENOSYS ENXIO
+#endif
+
+#if defined(_WIN32) && \
+    (!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+# define WINAPI_DESKTOP
+#endif
+
+#define CANARY_SIZE 16U
+#define GARBAGE_VALUE 0xdb
+
+#ifndef MAP_NOCORE
+# define MAP_NOCORE 0
+#endif
+#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
+# define MAP_ANON MAP_ANONYMOUS
+#endif
+#if defined(WINAPI_DESKTOP) || (defined(MAP_ANON) && defined(HAVE_MMAP)) || \
+    defined(HAVE_POSIX_MEMALIGN)
+# define HAVE_ALIGNED_MALLOC
+#endif
+#if defined(HAVE_MPROTECT) && \
+    !(defined(PROT_NONE) && defined(PROT_READ) && defined(PROT_WRITE))
+# undef HAVE_MPROTECT
+#endif
+#if defined(HAVE_ALIGNED_MALLOC) && \
+    (defined(WINAPI_DESKTOP) || defined(HAVE_MPROTECT))
+# define HAVE_PAGE_PROTECTION
+#endif
+#if !defined(MADV_DODUMP) && defined(MADV_CORE)
+# define MADV_DODUMP   MADV_CORE
+# define MADV_DONTDUMP MADV_NOCORE
+#endif
+
+#ifdef HAVE_ALIGNED_MALLOC
+static size_t        page_size;
+#endif // #if HAVE_ALIGNED_MALLOC
+static unsigned char canary[CANARY_SIZE];
+
+/* LCOV_EXCL_START */
+#ifdef HAVE_WEAK_SYMBOLS
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memzero_lto(void *const  pnt,
+                                            const size_t len);
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memzero_lto(void *const  pnt,
+                                            const size_t len)
+{
+    (void) pnt; /* LCOV_EXCL_LINE */
+    (void) len; /* LCOV_EXCL_LINE */
+}
+#endif
+/* LCOV_EXCL_STOP */
+
+void
+sodium_memzero(void *const pnt, const size_t len)
+{
+#ifdef _WIN32
+    SecureZeroMemory(pnt, len);
+#elif defined(HAVE_MEMSET_S)
+    if (len > 0U && memset_s(pnt, (rsize_t) len, 0, (rsize_t) len) != 0) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+#elif defined(HAVE_EXPLICIT_BZERO)
+    explicit_bzero(pnt, len);
+#elif defined(HAVE_EXPLICIT_MEMSET)
+    explicit_memset(pnt, 0, len);
+#elif HAVE_WEAK_SYMBOLS
+    memset(pnt, 0, len);
+    _sodium_dummy_symbol_to_prevent_memzero_lto(pnt, len);
+# ifdef HAVE_INLINE_ASM
+    __asm__ __volatile__ ("" : : "r"(pnt) : "memory");
+# endif
+#else
+    volatile unsigned char *volatile pnt_ =
+        (volatile unsigned char *volatile) pnt;
+    size_t i = (size_t) 0U;
+
+    while (i < len) {
+        pnt_[i++] = 0U;
+    }
+#endif
+}
+
+void
+sodium_stackzero(const size_t len)
+{
+    (void) len;
+#ifdef HAVE_C_VARARRAYS
+    unsigned char fodder[len];
+    sodium_memzero(fodder, len);
+#elif HAVE_ALLOCA
+    sodium_memzero(alloca(len), len);
+#endif
+}
+
+#ifdef HAVE_WEAK_SYMBOLS
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memcmp_lto(const unsigned char *b1,
+                                           const unsigned char *b2,
+                                           const size_t         len);
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memcmp_lto(const unsigned char *b1,
+                                           const unsigned char *b2,
+                                           const size_t         len)
+{
+    (void) b1;
+    (void) b2;
+    (void) len;
+}
+#endif
+
+int
+sodium_memcmp(const void *const b1_, const void *const b2_, size_t len)
+{
+#ifdef HAVE_WEAK_SYMBOLS
+    const unsigned char *b1 = (const unsigned char *) b1_;
+    const unsigned char *b2 = (const unsigned char *) b2_;
+#else
+    const volatile unsigned char *volatile b1 =
+        (const volatile unsigned char *volatile) b1_;
+    const volatile unsigned char *volatile b2 =
+        (const volatile unsigned char *volatile) b2_;
+#endif
+    size_t                 i;
+    volatile unsigned char d = 0U;
+
+#if HAVE_WEAK_SYMBOLS
+    _sodium_dummy_symbol_to_prevent_memcmp_lto(b1, b2, len);
+#endif
+    for (i = 0U; i < len; i++) {
+        d |= b1[i] ^ b2[i];
+    }
+    return (1 & ((d - 1) >> 8)) - 1;
+}
+
+#ifdef HAVE_WEAK_SYMBOLS
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_compare_lto(const unsigned char *b1,
+                                            const unsigned char *b2,
+                                            const size_t         len);
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_compare_lto(const unsigned char *b1,
+                                            const unsigned char *b2,
+                                            const size_t         len)
+{
+    (void) b1;
+    (void) b2;
+    (void) len;
+}
+#endif
+
+int
+sodium_compare(const unsigned char *b1_, const unsigned char *b2_, size_t len)
+{
+#ifdef HAVE_WEAK_SYMBOLS
+    const unsigned char *b1 = b1_;
+    const unsigned char *b2 = b2_;
+#else
+    const volatile unsigned char *volatile b1 =
+        (const volatile unsigned char *volatile) b1_;
+    const volatile unsigned char *volatile b2 =
+        (const volatile unsigned char *volatile) b2_;
+#endif
+    size_t                 i;
+    volatile unsigned char gt = 0U;
+    volatile unsigned char eq = 1U;
+    uint16_t               x1, x2;
+
+#if HAVE_WEAK_SYMBOLS
+    _sodium_dummy_symbol_to_prevent_compare_lto(b1, b2, len);
+#endif
+    i = len;
+    while (i != 0U) {
+        i--;
+        x1 = b1[i];
+        x2 = b2[i];
+        gt |= ((x2 - x1) >> 8) & eq;
+        eq &= ((x2 ^ x1) - 1) >> 8;
+    }
+    return (int) (gt + gt + eq) - 1;
+}
+
+int
+sodium_is_zero(const unsigned char *n, const size_t nlen)
+{
+    size_t                 i;
+    volatile unsigned char d = 0U;
+
+    for (i = 0U; i < nlen; i++) {
+        d |= n[i];
+    }
+    return 1 & ((d - 1) >> 8);
+}
+
+void
+sodium_increment(unsigned char *n, const size_t nlen)
+{
+    size_t        i = 0U;
+    uint_fast16_t c = 1U;
+
+#ifdef HAVE_AMD64_ASM
+    uint64_t t64, t64_2;
+    uint32_t t32;
+
+    if (nlen == 12U) {
+        __asm__ __volatile__(
+            "xorq %[t64], %[t64] \n"
+            "xorl %[t32], %[t32] \n"
+            "stc \n"
+            "adcq %[t64], (%[out]) \n"
+            "adcl %[t32], 8(%[out]) \n"
+            : [t64] "=&r"(t64), [t32] "=&r"(t32)
+            : [out] "D"(n)
+            : "memory", "flags", "cc");
+        return;
+    } else if (nlen == 24U) {
+        __asm__ __volatile__(
+            "movq $1, %[t64] \n"
+            "xorq %[t64_2], %[t64_2] \n"
+            "addq %[t64], (%[out]) \n"
+            "adcq %[t64_2], 8(%[out]) \n"
+            "adcq %[t64_2], 16(%[out]) \n"
+            : [t64] "=&r"(t64), [t64_2] "=&r"(t64_2)
+            : [out] "D"(n)
+            : "memory", "flags", "cc");
+        return;
+    } else if (nlen == 8U) {
+        __asm__ __volatile__("incq (%[out]) \n"
+                             :
+                             : [out] "D"(n)
+                             : "memory", "flags", "cc");
+        return;
+    }
+#endif
+    for (; i < nlen; i++) {
+        c += (uint_fast16_t) n[i];
+        n[i] = (unsigned char) c;
+        c >>= 8;
+    }
+}
+
+void
+sodium_add(unsigned char *a, const unsigned char *b, const size_t len)
+{
+    size_t        i;
+    uint_fast16_t c = 0U;
+
+#ifdef HAVE_AMD64_ASM
+    uint64_t t64, t64_2, t64_3;
+    uint32_t t32;
+
+    if (len == 12U) {
+        __asm__ __volatile__(
+            "movq (%[in]), %[t64] \n"
+            "movl 8(%[in]), %[t32] \n"
+            "addq %[t64], (%[out]) \n"
+            "adcl %[t32], 8(%[out]) \n"
+            : [t64] "=&r"(t64), [t32] "=&r"(t32)
+            : [in] "S"(b), [out] "D"(a)
+            : "memory", "flags", "cc");
+        return;
+    } else if (len == 24U) {
+        __asm__ __volatile__(
+            "movq (%[in]), %[t64] \n"
+            "movq 8(%[in]), %[t64_2] \n"
+            "movq 16(%[in]), %[t64_3] \n"
+            "addq %[t64], (%[out]) \n"
+            "adcq %[t64_2], 8(%[out]) \n"
+            "adcq %[t64_3], 16(%[out]) \n"
+            : [t64] "=&r"(t64), [t64_2] "=&r"(t64_2), [t64_3] "=&r"(t64_3)
+            : [in] "S"(b), [out] "D"(a)
+            : "memory", "flags", "cc");
+        return;
+    } else if (len == 8U) {
+        __asm__ __volatile__(
+            "movq (%[in]), %[t64] \n"
+            "addq %[t64], (%[out]) \n"
+            : [t64] "=&r"(t64)
+            : [in] "S"(b), [out] "D"(a)
+            : "memory", "flags", "cc");
+        return;
+    }
+#endif
+    for (i = 0U; i < len; i++) {
+        c += (uint_fast16_t) a[i] + (uint_fast16_t) b[i];
+        a[i] = (unsigned char) c;
+        c >>= 8;
+    }
+}
+
+void
+sodium_sub(unsigned char *a, const unsigned char *b, const size_t len)
+{
+    uint_fast16_t c = 0U;
+    size_t        i;
+
+#ifdef HAVE_AMD64_ASM
+    uint64_t t64_1, t64_2, t64_3, t64_4;
+    uint64_t t64_5, t64_6, t64_7, t64_8;
+    uint32_t t32;
+
+    if (len == 64U) {
+        __asm__ __volatile__(
+            "movq   (%[in]), %[t64_1] \n"
+            "movq  8(%[in]), %[t64_2] \n"
+            "movq 16(%[in]), %[t64_3] \n"
+            "movq 24(%[in]), %[t64_4] \n"
+            "movq 32(%[in]), %[t64_5] \n"
+            "movq 40(%[in]), %[t64_6] \n"
+            "movq 48(%[in]), %[t64_7] \n"
+            "movq 56(%[in]), %[t64_8] \n"
+            "subq %[t64_1],   (%[out]) \n"
+            "sbbq %[t64_2],  8(%[out]) \n"
+            "sbbq %[t64_3], 16(%[out]) \n"
+            "sbbq %[t64_4], 24(%[out]) \n"
+            "sbbq %[t64_5], 32(%[out]) \n"
+            "sbbq %[t64_6], 40(%[out]) \n"
+            "sbbq %[t64_7], 48(%[out]) \n"
+            "sbbq %[t64_8], 56(%[out]) \n"
+            : [t64_1] "=&r"(t64_1), [t64_2] "=&r"(t64_2), [t64_3] "=&r"(t64_3), [t64_4] "=&r"(t64_4),
+              [t64_5] "=&r"(t64_5), [t64_6] "=&r"(t64_6), [t64_7] "=&r"(t64_7), [t64_8] "=&r"(t64_8)
+            : [in] "S"(b), [out] "D"(a)
+            : "memory", "flags", "cc");
+        return;
+    }
+#endif
+    for (i = 0U; i < len; i++) {
+        c = (uint_fast16_t) a[i] - (uint_fast16_t) b[i] - c;
+        a[i] = (unsigned char) c;
+        c = (c >> 8) & 1U;
+    }
+}
+
+int
+_sodium_alloc_init(void)
+{
+#ifdef HAVE_ALIGNED_MALLOC
+# if defined(_SC_PAGESIZE)
+    long page_size_ = sysconf(_SC_PAGESIZE);
+    if (page_size_ > 0L) {
+        page_size = (size_t) page_size_;
+    }
+# elif defined(WINAPI_DESKTOP)
+    SYSTEM_INFO si;
+    GetSystemInfo(&si);
+    page_size = (size_t) si.dwPageSize;
+# endif
+    if (page_size < CANARY_SIZE || page_size < sizeof(size_t)) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+#endif
+    randombytes_buf(canary, sizeof canary);
+
+    return 0;
+}
+
+int
+sodium_mlock(void *const addr, const size_t len)
+{
+    (void) len;
+    (void) addr;
+#if defined(MADV_DONTDUMP) && defined(HAVE_MADVISE)
+    (void) madvise(addr, len, MADV_DONTDUMP);
+#endif
+#ifdef HAVE_MLOCK
+    return mlock(addr, len);
+#elif defined(WINAPI_DESKTOP)
+    return -(VirtualLock(addr, len) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int
+sodium_munlock(void *const addr, const size_t len)
+{
+    sodium_memzero(addr, len);
+#if defined(MADV_DODUMP) && defined(HAVE_MADVISE)
+    (void) madvise(addr, len, MADV_DODUMP);
+#endif
+#ifdef HAVE_MLOCK
+    return munlock(addr, len);
+#elif defined(WINAPI_DESKTOP)
+    return -(VirtualUnlock(addr, len) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+static int
+_mprotect_noaccess(void *ptr, size_t size)
+{
+    (void) ptr;
+    (void) size;
+#ifdef HAVE_MPROTECT
+    return mprotect(ptr, size, PROT_NONE);
+#elif defined(WINAPI_DESKTOP)
+    DWORD old;
+    return -(VirtualProtect(ptr, size, PAGE_NOACCESS, &old) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+static int
+_mprotect_readonly(void *ptr, size_t size)
+{
+    (void) ptr;
+    (void) size;
+#ifdef HAVE_MPROTECT
+    return mprotect(ptr, size, PROT_READ);
+#elif defined(WINAPI_DESKTOP)
+    DWORD old;
+    return -(VirtualProtect(ptr, size, PAGE_READONLY, &old) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+static int
+_mprotect_readwrite(void *ptr, size_t size)
+{
+    (void) ptr;
+    (void) size;
+#ifdef HAVE_MPROTECT
+    return mprotect(ptr, size, PROT_READ | PROT_WRITE);
+#elif defined(WINAPI_DESKTOP)
+    DWORD old;
+    return -(VirtualProtect(ptr, size, PAGE_READWRITE, &old) == 0);
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+#ifdef HAVE_ALIGNED_MALLOC
+
+__attribute__((noreturn)) static void
+_out_of_bounds(void)
+{
+# ifdef SIGSEGV
+    raise(SIGSEGV);
+# elif defined(SIGKILL)
+    raise(SIGKILL);
+# endif
+    abort(); /* not something we want any higher-level API to catch */
+} /* LCOV_EXCL_LINE */
+
+static inline size_t
+_page_round(const size_t size)
+{
+    const size_t page_mask = page_size - 1U;
+
+    return (size + page_mask) & ~page_mask;
+}
+
+static __attribute__((malloc)) unsigned char *
+_alloc_aligned(const size_t size)
+{
+    void *ptr;
+
+# if defined(MAP_ANON) && defined(HAVE_MMAP)
+    if ((ptr = mmap(NULL, size, PROT_READ | PROT_WRITE,
+                    MAP_ANON | MAP_PRIVATE | MAP_NOCORE, -1, 0)) ==
+        MAP_FAILED) {
+        ptr = NULL; /* LCOV_EXCL_LINE */
+    }               /* LCOV_EXCL_LINE */
+# elif defined(HAVE_POSIX_MEMALIGN)
+    if (posix_memalign(&ptr, page_size, size) != 0) {
+        ptr = NULL; /* LCOV_EXCL_LINE */
+    }               /* LCOV_EXCL_LINE */
+# elif defined(WINAPI_DESKTOP)
+    ptr = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+# else
+#  error Bug
+# endif
+    return (unsigned char *) ptr;
+}
+
+static void
+_free_aligned(unsigned char *const ptr, const size_t size)
+{
+    (void) size;
+# if defined(MAP_ANON) && defined(HAVE_MMAP)
+    (void) munmap(ptr, size);
+# elif defined(HAVE_POSIX_MEMALIGN)
+    free(ptr);
+# elif defined(WINAPI_DESKTOP)
+    VirtualFree(ptr, 0U, MEM_RELEASE);
+# else
+#  error Bug
+#endif
+}
+
+static unsigned char *
+_unprotected_ptr_from_user_ptr(void *const ptr)
+{
+    uintptr_t      unprotected_ptr_u;
+    unsigned char *canary_ptr;
+    size_t         page_mask;
+
+    canary_ptr = ((unsigned char *) ptr) - sizeof canary;
+    page_mask = page_size - 1U;
+    unprotected_ptr_u = ((uintptr_t) canary_ptr & (uintptr_t) ~page_mask);
+    if (unprotected_ptr_u <= page_size * 2U) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+    return (unsigned char *) unprotected_ptr_u;
+}
+
+#endif /* HAVE_ALIGNED_MALLOC */
+
+#ifndef HAVE_ALIGNED_MALLOC
+static __attribute__((malloc)) void *
+_sodium_malloc(const size_t size)
+{
+    return malloc(size > (size_t) 0U ? size : (size_t) 1U);
+}
+#else
+static __attribute__((malloc)) void *
+_sodium_malloc(const size_t size)
+{
+    void          *user_ptr;
+    unsigned char *base_ptr;
+    unsigned char *canary_ptr;
+    unsigned char *unprotected_ptr;
+    size_t         size_with_canary;
+    size_t         total_size;
+    size_t         unprotected_size;
+
+    if (size >= (size_t) SIZE_MAX - page_size * 4U) {
+        errno = ENOMEM;
+        return NULL;
+    }
+    if (page_size <= sizeof canary || page_size < sizeof unprotected_size) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+    size_with_canary = (sizeof canary) + size;
+    unprotected_size = _page_round(size_with_canary);
+    total_size       = page_size + page_size + unprotected_size + page_size;
+    if ((base_ptr = _alloc_aligned(total_size)) == NULL) {
+        return NULL; /* LCOV_EXCL_LINE */
+    }
+    unprotected_ptr = base_ptr + page_size * 2U;
+    _mprotect_noaccess(base_ptr + page_size, page_size);
+# ifndef HAVE_PAGE_PROTECTION
+    memcpy(unprotected_ptr + unprotected_size, canary, sizeof canary);
+# endif
+    _mprotect_noaccess(unprotected_ptr + unprotected_size, page_size);
+    sodium_mlock(unprotected_ptr, unprotected_size);
+    canary_ptr =
+        unprotected_ptr + _page_round(size_with_canary) - size_with_canary;
+    user_ptr = canary_ptr + sizeof canary;
+    memcpy(canary_ptr, canary, sizeof canary);
+    memcpy(base_ptr, &unprotected_size, sizeof unprotected_size);
+    _mprotect_readonly(base_ptr, page_size);
+    assert(_unprotected_ptr_from_user_ptr(user_ptr) == unprotected_ptr);
+
+    return user_ptr;
+}
+#endif /* !HAVE_ALIGNED_MALLOC */
+
+__attribute__((malloc)) void *
+sodium_malloc(const size_t size)
+{
+    void *ptr;
+
+    if ((ptr = _sodium_malloc(size)) == NULL) {
+        return NULL;
+    }
+    memset(ptr, (int) GARBAGE_VALUE, size);
+
+    return ptr;
+}
+
+__attribute__((malloc)) void *
+sodium_allocarray(size_t count, size_t size)
+{
+    if (count > (size_t) 0U && size >= (size_t) SIZE_MAX / count) {
+        errno = ENOMEM;
+        return NULL;
+    }
+    return sodium_malloc(count * size);
+}
+
+#ifndef HAVE_ALIGNED_MALLOC
+void
+sodium_free(void *ptr)
+{
+    free(ptr);
+}
+#else
+void
+sodium_free(void *ptr)
+{
+    unsigned char *base_ptr;
+    unsigned char *canary_ptr;
+    unsigned char *unprotected_ptr;
+    size_t         total_size;
+    size_t         unprotected_size;
+
+    if (ptr == NULL) {
+        return;
+    }
+    canary_ptr      = ((unsigned char *) ptr) - sizeof canary;
+    unprotected_ptr = _unprotected_ptr_from_user_ptr(ptr);
+    base_ptr        = unprotected_ptr - page_size * 2U;
+    memcpy(&unprotected_size, base_ptr, sizeof unprotected_size);
+    total_size = page_size + page_size + unprotected_size + page_size;
+    _mprotect_readwrite(base_ptr, total_size);
+    if (sodium_memcmp(canary_ptr, canary, sizeof canary) != 0) {
+        _out_of_bounds();
+    }
+# ifndef HAVE_PAGE_PROTECTION
+    if (sodium_memcmp(unprotected_ptr + unprotected_size, canary,
+                      sizeof canary) != 0) {
+        _out_of_bounds();
+    }
+# endif
+    sodium_munlock(unprotected_ptr, unprotected_size);
+    _free_aligned(base_ptr, total_size);
+}
+#endif /* HAVE_ALIGNED_MALLOC */
+
+#ifndef HAVE_PAGE_PROTECTION
+static int
+_sodium_mprotect(void *ptr, int (*cb)(void *ptr, size_t size))
+{
+    (void) ptr;
+    (void) cb;
+    errno = ENOSYS;
+    return -1;
+}
+#else
+static int
+_sodium_mprotect(void *ptr, int (*cb)(void *ptr, size_t size))
+{
+    unsigned char *base_ptr;
+    unsigned char *unprotected_ptr;
+    size_t         unprotected_size;
+
+    unprotected_ptr = _unprotected_ptr_from_user_ptr(ptr);
+    base_ptr        = unprotected_ptr - page_size * 2U;
+    memcpy(&unprotected_size, base_ptr, sizeof unprotected_size);
+
+    return cb(unprotected_ptr, unprotected_size);
+}
+#endif
+
+int
+sodium_mprotect_noaccess(void *ptr)
+{
+    return _sodium_mprotect(ptr, _mprotect_noaccess);
+}
+
+int
+sodium_mprotect_readonly(void *ptr)
+{
+    return _sodium_mprotect(ptr, _mprotect_readonly);
+}
+
+int
+sodium_mprotect_readwrite(void *ptr)
+{
+    return _sodium_mprotect(ptr, _mprotect_readwrite);
+}
+
+int
+sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
+           size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+{
+    unsigned char          *tail;
+    size_t                  i;
+    size_t                  xpadlen;
+    size_t                  xpadded_len;
+    volatile unsigned char  mask;
+    unsigned char           barrier_mask;
+
+    if (blocksize <= 0U) {
+        return -1;
+    }
+    xpadlen = blocksize - 1U;
+    if ((blocksize & (blocksize - 1U)) == 0U) {
+        xpadlen -= unpadded_buflen & (blocksize - 1U);
+    } else {
+        xpadlen -= unpadded_buflen % blocksize;
+    }
+    if ((size_t) SIZE_MAX - unpadded_buflen <= xpadlen) {
+        sodium_misuse();
+    }
+    xpadded_len = unpadded_buflen + xpadlen;
+    if (xpadded_len >= max_buflen) {
+        return -1;
+    }
+    tail = &buf[xpadded_len];
+    if (padded_buflen_p != NULL) {
+        *padded_buflen_p = xpadded_len + 1U;
+    }
+    mask = 0U;
+    for (i = 0; i < blocksize; i++) {
+        barrier_mask = (unsigned char) (((i ^ xpadlen) - 1U)
+           >> ((sizeof(size_t) - 1) * CHAR_BIT));
+        *(tail - i) = ((*(tail - i)) & mask) | (0x80 & barrier_mask);
+        mask |= barrier_mask;
+    }
+    return 0;
+}
+
+int
+sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
+             size_t padded_buflen, size_t blocksize)
+{
+    const unsigned char *tail;
+    unsigned char        acc = 0U;
+    unsigned char        c;
+    unsigned char        valid = 0U;
+    volatile size_t      pad_len = 0U;
+    size_t               i;
+    size_t               is_barrier;
+
+    if (padded_buflen < blocksize || blocksize <= 0U) {
+        return -1;
+    }
+    tail = &buf[padded_buflen - 1U];
+
+    for (i = 0U; i < blocksize; i++) {
+        c = *(tail - i);
+        is_barrier =
+            (( (acc - 1U) & (pad_len - 1U) & ((c ^ 0x80) - 1U) ) >> 8) & 1U;
+        acc |= c;
+        pad_len |= i & (1U + ~is_barrier);
+        valid |= (unsigned char) is_barrier;
+    }
+    *unpadded_buflen_p = padded_buflen - 1U - pad_len;
+
+    return (int) (valid - 1U);
+}
+#undef __STDC_WANT_LIB_EXT1__
+#undef alloca
+#undef ENOSYS
+#undef WINAPI_DESKTOP
+#undef CANARY_SIZE
+#undef GARBAGE_VALUE
+#undef MAP_NOCORE
+#undef MAP_ANON
+#undef HAVE_ALIGNED_MALLOC
+#undef HAVE_PAGE_PROTECTION
+#undef MADV_DODUMP
+#undef MADV_DONTDUMP
+
+/* ================= sodium_verify.c ================= */
+
+#include <stddef.h>
+#include <stdint.h>
+
+
+size_t
+crypto_verify_16_bytes(void)
+{
+    return crypto_verify_16_BYTES;
+}
+
+size_t
+crypto_verify_32_bytes(void)
+{
+    return crypto_verify_32_BYTES;
+}
+
+size_t
+crypto_verify_64_bytes(void)
+{
+    return crypto_verify_64_BYTES;
+}
+
+#if defined(HAVE_EMMINTRIN_H) && defined(__SSE2__)
+
+# ifdef __GNUC__
+#  pragma GCC target("sse2")
+# endif
+# include <emmintrin.h>
+
+static inline int
+crypto_verify_n(const unsigned char *x_, const unsigned char *y_,
+                const int n)
+{
+    const    __m128i zero = _mm_setzero_si128();
+    volatile __m128i v1, v2, z;
+    volatile int     m;
+    int              i;
+
+    const volatile __m128i *volatile x =
+        (const volatile __m128i *volatile) (const void *) x_;
+    const volatile __m128i *volatile y =
+        (const volatile __m128i *volatile) (const void *) y_;
+    v1 = _mm_loadu_si128((const __m128i *) &x[0]);
+    v2 = _mm_loadu_si128((const __m128i *) &y[0]);
+    z = _mm_xor_si128(v1, v2);
+    for (i = 1; i < n / 16; i++) {
+        v1 = _mm_loadu_si128((const __m128i *) &x[i]);
+        v2 = _mm_loadu_si128((const __m128i *) &y[i]);
+        z = _mm_or_si128(z, _mm_xor_si128(v1, v2));
+    }
+    m = _mm_movemask_epi8(_mm_cmpeq_epi32(z, zero));
+    v1 = zero; v2 = zero; z = zero;
+
+    return (int) (((uint32_t) m + 1U) >> 16) - 1;
+}
+
+#else
+
+static volatile uint16_t optblocker_u16;
+
+static inline int
+crypto_verify_n(const unsigned char *x_, const unsigned char *y_,
+                const int n)
+{
+    const volatile unsigned char *volatile x =
+        (const volatile unsigned char *volatile) x_;
+    const volatile unsigned char *volatile y =
+        (const volatile unsigned char *volatile) y_;
+    volatile uint16_t d = 0U;
+    int               i;
+
+    for (i = 0; i < n; i++) {
+        d |= x[i] ^ y[i];
+    }
+# ifdef HAVE_INLINE_ASM
+    __asm__ __volatile__("" : "+r"(d) :);
+# endif
+    d--;
+    d = ((d >> 13) ^ optblocker_u16) >> 2;
+
+    return (int) d - 1;
+}
+
+#endif
+
+int
+crypto_verify_16(const unsigned char *x, const unsigned char *y)
+{
+    return crypto_verify_n(x, y, crypto_verify_16_BYTES);
+}
+
+int
+crypto_verify_32(const unsigned char *x, const unsigned char *y)
+{
+    return crypto_verify_n(x, y, crypto_verify_32_BYTES);
+}
+
+int
+crypto_verify_64(const unsigned char *x, const unsigned char *y)
+{
+    return crypto_verify_n(x, y, crypto_verify_64_BYTES);
+}
+
+/* ================= sodium_runtime.c ================= */
+#include <stddef.h>
+#include <stdint.h>
+#ifdef HAVE_ANDROID_GETCPUFEATURES
+# include <cpu-features.h>
+#endif
+
+#include <stdio.h>
+
+typedef struct CPUFeatures_ {
+    int initialized;
+    int has_neon;
+    int has_sse2;
+    int has_sse3;
+    int has_ssse3;
+    int has_sse41;
+    int has_avx;
+    int has_avx2;
+    int has_avx512f;
+    int has_pclmul;
+    int has_aesni;
+    int has_rdrand;
+} CPUFeatures;
+
+static CPUFeatures _cpu_features;
+
+#define CPUID_EBX_AVX2    0x00000020
+#define CPUID_EBX_AVX512F 0x00010000
+
+#define CPUID_ECX_SSE3    0x00000001
+#define CPUID_ECX_PCLMUL  0x00000002
+#define CPUID_ECX_SSSE3   0x00000200
+#define CPUID_ECX_SSE41   0x00080000
+#define CPUID_ECX_AESNI   0x02000000
+#define CPUID_ECX_XSAVE   0x04000000
+#define CPUID_ECX_OSXSAVE 0x08000000
+#define CPUID_ECX_AVX     0x10000000
+#define CPUID_ECX_RDRAND  0x40000000
+
+#define CPUID_EDX_SSE2    0x04000000
+
+#define XCR0_SSE       0x00000002
+#define XCR0_AVX       0x00000004
+#define XCR0_OPMASK    0x00000020
+#define XCR0_ZMM_HI256 0x00000040
+#define XCR0_HI16_ZMM  0x00000080
+
+static int
+_sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features)
+{
+#ifndef __arm__
+    cpu_features->has_neon = 0;
+    return -1;
+#else
+# ifdef __APPLE__
+#  ifdef __ARM_NEON__
+    cpu_features->has_neon = 1;
+#  else
+    cpu_features->has_neon = 0;
+#  endif
+# elif defined(HAVE_ANDROID_GETCPUFEATURES) && \
+    defined(ANDROID_CPU_ARM_FEATURE_NEON)
+    cpu_features->has_neon =
+        (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0x0;
+# else
+    cpu_features->has_neon = 0;
+# endif
+    return 0;
+#endif
+}
+
+static void
+_cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type)
+{
+#if defined(_MSC_VER) && \
+    (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))
+    __cpuid((int *) cpu_info, cpu_info_type);
+#elif defined(HAVE_CPUID)
+    cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;
+# ifdef __i386__
+    __asm__ __volatile__(
+        "pushfl; pushfl; "
+        "popl %0; "
+        "movl %0, %1; xorl %2, %0; "
+        "pushl %0; "
+        "popfl; pushfl; popl %0; popfl"
+        : "=&r"(cpu_info[0]), "=&r"(cpu_info[1])
+        : "i"(0x200000));
+    if (((cpu_info[0] ^ cpu_info[1]) & 0x200000) == 0x0) {
+        return; /* LCOV_EXCL_LINE */
+    }
+# endif
+# ifdef __i386__
+    __asm__ __volatile__("xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1"
+                         : "=a"(cpu_info[0]), "=&r"(cpu_info[1]),
+                           "=c"(cpu_info[2]), "=d"(cpu_info[3])
+                         : "0"(cpu_info_type), "2"(0U));
+# elif defined(__x86_64__)
+    __asm__ __volatile__("xchgq %%rbx, %q1; cpuid; xchgq %%rbx, %q1"
+                         : "=a"(cpu_info[0]), "=&r"(cpu_info[1]),
+                           "=c"(cpu_info[2]), "=d"(cpu_info[3])
+                         : "0"(cpu_info_type), "2"(0U));
+# else
+    __asm__ __volatile__("cpuid"
+                         : "=a"(cpu_info[0]), "=b"(cpu_info[1]),
+                           "=c"(cpu_info[2]), "=d"(cpu_info[3])
+                         : "0"(cpu_info_type), "2"(0U));
+# endif
+#else
+    (void) cpu_info_type;
+    cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;
+#endif
+}
+
+static int
+_sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
+{
+    unsigned int cpu_info[4];
+    unsigned int id;
+    uint32_t     xcr0 = 0U;
+
+    _cpuid(cpu_info, 0x0);
+    if ((id = cpu_info[0]) == 0U) {
+        return -1; /* LCOV_EXCL_LINE */
+    }
+    _cpuid(cpu_info, 0x00000001);
+#ifdef HAVE_EMMINTRIN_H
+    cpu_features->has_sse2 = ((cpu_info[3] & CPUID_EDX_SSE2) != 0x0);
+#else
+    cpu_features->has_sse2   = 0;
+#endif
+
+#ifdef HAVE_PMMINTRIN_H
+    cpu_features->has_sse3 = ((cpu_info[2] & CPUID_ECX_SSE3) != 0x0);
+#else
+    cpu_features->has_sse3   = 0;
+#endif
+
+#ifdef HAVE_TMMINTRIN_H
+    cpu_features->has_ssse3 = ((cpu_info[2] & CPUID_ECX_SSSE3) != 0x0);
+#else
+    cpu_features->has_ssse3  = 0;
+#endif
+
+#ifdef HAVE_SMMINTRIN_H
+    cpu_features->has_sse41 = ((cpu_info[2] & CPUID_ECX_SSE41) != 0x0);
+#else
+    cpu_features->has_sse41  = 0;
+#endif
+
+    cpu_features->has_avx = 0;
+
+    (void) xcr0;
+#ifdef HAVE_AVXINTRIN_H
+    if ((cpu_info[2] & (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) ==
+        (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) {
+        xcr0 = 0U;
+# if defined(HAVE__XGETBV) || \
+        (defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK) && _MSC_FULL_VER >= 160040219)
+        xcr0 = (uint32_t) _xgetbv(0);
+# elif defined(_MSC_VER) && defined(_M_IX86)
+        /*
+         * Visual Studio documentation states that eax/ecx/edx don't need to
+         * be preserved in inline assembly code. But that doesn't seem to
+         * always hold true on Visual Studio 2010.
+         */
+        __asm {
+            push eax
+            push ecx
+            push edx
+            xor ecx, ecx
+            _asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0
+            mov xcr0, eax
+            pop edx
+            pop ecx
+            pop eax
+        }
+# elif defined(HAVE_AVX_ASM)
+        __asm__ __volatile__(".byte 0x0f, 0x01, 0xd0" /* XGETBV */
+                             : "=a"(xcr0)
+                             : "c"((uint32_t) 0U)
+                             : "%edx");
+# endif
+        if ((xcr0 & (XCR0_SSE | XCR0_AVX)) == (XCR0_SSE | XCR0_AVX)) {
+            cpu_features->has_avx = 1;
+        }
+    }
+#endif
+
+    cpu_features->has_avx2 = 0;
+#ifdef HAVE_AVX2INTRIN_H
+    if (cpu_features->has_avx) {
+        unsigned int cpu_info7[4];
+
+        _cpuid(cpu_info7, 0x00000007);
+        cpu_features->has_avx2 = ((cpu_info7[1] & CPUID_EBX_AVX2) != 0x0);
+    }
+#endif
+
+    cpu_features->has_avx512f = 0;
+#ifdef HAVE_AVX512FINTRIN_H
+    if (cpu_features->has_avx2) {
+        unsigned int cpu_info7[4];
+
+        _cpuid(cpu_info7, 0x00000007);
+        if ((cpu_info7[1] & CPUID_EBX_AVX512F) == CPUID_EBX_AVX512F &&
+            (xcr0 & (XCR0_OPMASK | XCR0_ZMM_HI256 | XCR0_HI16_ZMM))
+            == (XCR0_OPMASK | XCR0_ZMM_HI256 | XCR0_HI16_ZMM)) {
+            cpu_features->has_avx512f = 1;
+        }
+    }
+#endif
+
+#ifdef HAVE_WMMINTRIN_H
+    cpu_features->has_pclmul = ((cpu_info[2] & CPUID_ECX_PCLMUL) != 0x0);
+    cpu_features->has_aesni  = ((cpu_info[2] & CPUID_ECX_AESNI) != 0x0);
+#else
+    cpu_features->has_pclmul = 0;
+    cpu_features->has_aesni  = 0;
+#endif
+
+#ifdef HAVE_RDRAND
+    cpu_features->has_rdrand = ((cpu_info[2] & CPUID_ECX_RDRAND) != 0x0);
+#else
+    cpu_features->has_rdrand = 0;
+#endif
+
+    return 0;
+}
+
+int
+_sodium_runtime_get_cpu_features(void)
+{
+    int ret = -1;
+
+    ret &= _sodium_runtime_arm_cpu_features(&_cpu_features);
+    ret &= _sodium_runtime_intel_cpu_features(&_cpu_features);
+    _cpu_features.initialized = 1;
+
+    #if NETCODE_CRYPTO_LOGS
+    printf( "\nCPU features: " );
+    if ( _cpu_features.has_sse2 ) printf( "sse2 " );
+    if ( _cpu_features.has_ssse3 ) printf( "ssse3 " );
+    if ( _cpu_features.has_sse41 ) printf( "sse41 " );
+    if ( _cpu_features.has_avx ) printf( "avx " );
+    if ( _cpu_features.has_avx2 ) printf( "avx2 " );
+    if ( _cpu_features.has_avx512f ) printf( "avx512f " );
+    printf( "\n\n" );
+    #endif // #if NETCODE_CRYPTO_LOGS
+    
+    return ret;
+}
+
+int
+sodium_runtime_has_neon(void)
+{
+    return _cpu_features.has_neon;
+}
+
+int
+sodium_runtime_has_sse2(void)
+{
+    return _cpu_features.has_sse2;
+}
+
+int
+sodium_runtime_has_sse3(void)
+{
+    return _cpu_features.has_sse3;
+}
+
+int
+sodium_runtime_has_ssse3(void)
+{
+    return _cpu_features.has_ssse3;
+}
+
+int
+sodium_runtime_has_sse41(void)
+{
+    return _cpu_features.has_sse41;
+}
+
+int
+sodium_runtime_has_avx(void)
+{
+    return _cpu_features.has_avx;
+}
+
+int
+sodium_runtime_has_avx2(void)
+{
+    return _cpu_features.has_avx2;
+}
+
+int
+sodium_runtime_has_avx512f(void)
+{
+    return _cpu_features.has_avx512f;
+}
+
+int
+sodium_runtime_has_pclmul(void)
+{
+    return _cpu_features.has_pclmul;
+}
+
+int
+sodium_runtime_has_aesni(void)
+{
+    return _cpu_features.has_aesni;
+}
+
+int
+sodium_runtime_has_rdrand(void)
+{
+    return _cpu_features.has_rdrand;
+}
+#undef CPUID_EBX_AVX2
+#undef CPUID_EBX_AVX512F
+#undef CPUID_ECX_SSE3
+#undef CPUID_ECX_PCLMUL
+#undef CPUID_ECX_SSSE3
+#undef CPUID_ECX_SSE41
+#undef CPUID_ECX_AESNI
+#undef CPUID_ECX_XSAVE
+#undef CPUID_ECX_OSXSAVE
+#undef CPUID_ECX_AVX
+#undef CPUID_ECX_RDRAND
+#undef CPUID_EDX_SSE2
+#undef XCR0_SSE
+#undef XCR0_AVX
+#undef XCR0_OPMASK
+#undef XCR0_ZMM_HI256
+#undef XCR0_HI16_ZMM
+
+/* ================= sodium_randombytes_sysrandom.c ================= */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
+
+#include <stdlib.h>
+#include <sys/types.h>
+#ifndef _WIN32
+# include <sys/stat.h>
+# include <sys/time.h>
+#endif
+#ifdef __linux__
+# ifdef __dietlibc__
+#  define _LINUX_SOURCE
+#  include <sys/random.h>
+#  define HAVE_LINUX_COMPATIBLE_GETRANDOM
+# else /* __dietlibc__ */
+#  include <sys/syscall.h>
+#  if defined(SYS_getrandom) && defined(__NR_getrandom)
+#   define getrandom(B, S, F) syscall(SYS_getrandom, (B), (int) (S), (F))
+#   define HAVE_LINUX_COMPATIBLE_GETRANDOM
+#  endif
+# endif /* __dietlibc */
+#elif defined(__FreeBSD__)
+# include <sys/param.h>
+# if defined(__FreeBSD_version) && __FreeBSD_version >= 1200000
+#  include <sys/random.h>
+#  define HAVE_LINUX_COMPATIBLE_GETRANDOM
+# endif
+#endif
+#if !defined(NO_BLOCKING_RANDOM_POLL) && defined(__linux__)
+# define BLOCK_ON_DEV_RANDOM
+#endif
+#ifdef BLOCK_ON_DEV_RANDOM
+# include <poll.h>
+#endif
+
+
+#ifdef _WIN32
+/* `RtlGenRandom` is used over `CryptGenRandom` on Microsoft Windows based systems:
+ *  - `CryptGenRandom` requires pulling in `CryptoAPI` which causes unnecessary
+ *     memory overhead if this API is not being used for other purposes
+ *  - `RtlGenRandom` is thus called directly instead. A detailed explanation
+ *     can be found here: https://blogs.msdn.microsoft.com/michael_howard/2005/01/14/cryptographically-secure-random-number-on-windows-without-using-cryptoapi/
+ *
+ * In spite of the disclaimer on the `RtlGenRandom` documentation page that was
+ * written back in the Windows XP days, this function is here to stay. The CRT
+ * function `rand_s()` directly depends on it, so touching it would break many
+ * applications released since Windows XP.
+ *
+ * Also note that Rust, Firefox and BoringSSL (thus, Google Chrome and everything
+ * based on Chromium) also depend on it, and that libsodium allows the RNG to be
+ * replaced without patching nor recompiling the library.
+ */
+# include <windows.h>
+# define RtlGenRandom SystemFunction036
+# if defined(__cplusplus)
+extern "C"
+# endif
+# if !defined(_XBOX_ONE) && !defined(_GAMING_XBOX)
+BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
+# pragma comment(lib, "advapi32.lib")
+# endif
+#endif
+
+#if defined(__OpenBSD__) || defined(__CloudABI__)
+# define HAVE_SAFE_ARC4RANDOM 1
+#endif
+
+#ifndef SSIZE_MAX
+# define SSIZE_MAX (SIZE_MAX / 2 - 1)
+#endif
+
+#ifdef HAVE_SAFE_ARC4RANDOM
+
+static uint32_t
+randombytes_sysrandom(void)
+{
+    return arc4random();
+}
+
+static void
+randombytes_sysrandom_stir(void)
+{
+}
+
+static void
+randombytes_sysrandom_buf(void * const buf, const size_t size)
+{
+    arc4random_buf(buf, size);
+}
+
+static int
+randombytes_sysrandom_close(void)
+{
+    return 0;
+}
+
+#elif defined(__ORBIS__) || defined(__PROSPERO__)
+
+static uint32_t
+randombytes_sysrandom(void)
+{
+    return 0;
+}
+
+static void
+randombytes_sysrandom_stir(void)
+{
+}
+
+static void
+randombytes_sysrandom_buf(void * const buf, const size_t size)
+{
+}
+
+static int
+randombytes_sysrandom_close(void)
+{
+    return 0;
+}
+
+#else /* __OpenBSD__ */
+
+typedef struct SysRandom_ {
+    int random_data_source_fd;
+    int initialized;
+    int getrandom_available;
+} SysRandom;
+
+static SysRandom stream = {
+    SODIUM_C99(.random_data_source_fd =) -1,
+    SODIUM_C99(.initialized =) 0,
+    SODIUM_C99(.getrandom_available =) 0
+};
+
+# ifndef _WIN32
+static ssize_t
+safe_read(const int fd, void * const buf_, size_t size)
+{
+    unsigned char *buf = (unsigned char *) buf_;
+    ssize_t        readnb;
+
+    assert(size > (size_t) 0U);
+    assert(size <= SSIZE_MAX);
+    do {
+        while ((readnb = read(fd, buf, size)) < (ssize_t) 0 &&
+               (errno == EINTR || errno == EAGAIN)); /* LCOV_EXCL_LINE */
+        if (readnb < (ssize_t) 0) {
+            return readnb; /* LCOV_EXCL_LINE */
+        }
+        if (readnb == (ssize_t) 0) {
+            break; /* LCOV_EXCL_LINE */
+        }
+        size -= (size_t) readnb;
+        buf += readnb;
+    } while (size > (ssize_t) 0);
+
+    return (ssize_t) (buf - (unsigned char *) buf_);
+}
+
+#  ifdef BLOCK_ON_DEV_RANDOM
+static int
+randombytes_block_on_dev_random(void)
+{
+    struct pollfd pfd;
+    int           fd;
+    int           pret;
+
+    fd = open("/dev/random", O_RDONLY);
+    if (fd == -1) {
+        return 0;
+    }
+    pfd.fd = fd;
+    pfd.events = POLLIN;
+    pfd.revents = 0;
+    do {
+        pret = poll(&pfd, 1, -1);
+    } while (pret < 0 && (errno == EINTR || errno == EAGAIN));
+    if (pret != 1) {
+        (void) close(fd);
+        errno = EIO;
+        return -1;
+    }
+    return close(fd);
+}
+#  endif /* BLOCK_ON_DEV_RANDOM */
+
+static int
+randombytes_sysrandom_random_dev_open(void)
+{
+/* LCOV_EXCL_START */
+    struct stat        st;
+    static const char *devices[] = {
+#  ifndef USE_BLOCKING_RANDOM
+        "/dev/urandom",
+#  endif
+        "/dev/random", NULL
+    };
+    const char       **device = devices;
+    int                fd;
+
+#  ifdef BLOCK_ON_DEV_RANDOM
+    if (randombytes_block_on_dev_random() != 0) {
+        return -1;
+    }
+#  endif
+    do {
+        fd = open(*device, O_RDONLY);
+        if (fd != -1) {
+            if (fstat(fd, &st) == 0 &&
+#  ifdef __COMPCERT__
+                1
+#  elif defined(S_ISNAM)
+                (S_ISNAM(st.st_mode) || S_ISCHR(st.st_mode))
+#  else
+                S_ISCHR(st.st_mode)
+#  endif
+               ) {
+#  if defined(F_SETFD) && defined(FD_CLOEXEC) && !defined(NN_NINTENDO_SDK)
+                (void) fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+#  endif
+                return fd;
+            }
+            (void) close(fd);
+        } else if (errno == EINTR) {
+            continue;
+        }
+        device++;
+    } while (*device != NULL);
+
+    errno = EIO;
+    return -1;
+/* LCOV_EXCL_STOP */
+}
+
+#  ifdef HAVE_LINUX_COMPATIBLE_GETRANDOM
+static int
+_randombytes_linux_getrandom(void * const buf, const size_t size)
+{
+    int readnb;
+
+    assert(size <= 256U);
+    do {
+        readnb = getrandom(buf, size, 0);
+    } while (readnb < 0 && (errno == EINTR || errno == EAGAIN));
+
+    return (readnb == (int) size) - 1;
+}
+
+static int
+randombytes_linux_getrandom(void * const buf_, size_t size)
+{
+    unsigned char *buf = (unsigned char *) buf_;
+    size_t         chunk_size = 256U;
+
+    do {
+        if (size < chunk_size) {
+            chunk_size = size;
+            assert(chunk_size > (size_t) 0U);
+        }
+        if (_randombytes_linux_getrandom(buf, chunk_size) != 0) {
+            return -1;
+        }
+        size -= chunk_size;
+        buf += chunk_size;
+    } while (size > (size_t) 0U);
+
+    return 0;
+}
+#  endif /* HAVE_LINUX_COMPATIBLE_GETRANDOM */
+
+static void
+randombytes_sysrandom_init(void)
+{
+    const int     errno_save = errno;
+
+#  ifdef HAVE_LINUX_COMPATIBLE_GETRANDOM
+    {
+        unsigned char fodder[16];
+
+        if (randombytes_linux_getrandom(fodder, sizeof fodder) == 0) {
+            stream.getrandom_available = 1;
+            errno = errno_save;
+            return;
+        }
+        stream.getrandom_available = 0;
+    }
+#  endif
+
+    if ((stream.random_data_source_fd =
+         randombytes_sysrandom_random_dev_open()) == -1) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+    errno = errno_save;
+}
+
+# else /* _WIN32 */
+
+static void
+randombytes_sysrandom_init(void)
+{
+}
+# endif /* _WIN32 */
+
+static void
+randombytes_sysrandom_stir(void)
+{
+    if (stream.initialized == 0) {
+        randombytes_sysrandom_init();
+        stream.initialized = 1;
+    }
+}
+
+static void
+randombytes_sysrandom_stir_if_needed(void)
+{
+    if (stream.initialized == 0) {
+        randombytes_sysrandom_stir();
+    }
+}
+
+static int
+randombytes_sysrandom_close(void)
+{
+    int ret = -1;
+
+# ifndef _WIN32
+    if (stream.random_data_source_fd != -1 &&
+        close(stream.random_data_source_fd) == 0) {
+        stream.random_data_source_fd = -1;
+        stream.initialized = 0;
+        ret = 0;
+    }
+#  ifdef HAVE_LINUX_COMPATIBLE_GETRANDOM
+    if (stream.getrandom_available != 0) {
+        ret = 0;
+    }
+#  endif
+# else /* _WIN32 */
+    if (stream.initialized != 0) {
+        stream.initialized = 0;
+        ret = 0;
+    }
+# endif /* _WIN32 */
+    return ret;
+}
+
+static void
+randombytes_sysrandom_buf(void * const buf, const size_t size)
+{
+    (void) buf;
+    randombytes_sysrandom_stir_if_needed();
+# if defined(ULLONG_MAX) && defined(SIZE_MAX)
+#  if SIZE_MAX > ULLONG_MAX
+    /* coverity[result_independent_of_operands] */
+    assert(size <= ULLONG_MAX);
+#  endif
+# endif
+# ifndef _WIN32
+#  ifdef HAVE_LINUX_COMPATIBLE_GETRANDOM
+    if (stream.getrandom_available != 0) {
+        if (randombytes_linux_getrandom(buf, size) != 0) {
+            sodium_misuse(); /* LCOV_EXCL_LINE */
+        }
+        return;
+    }
+#  endif
+    if (stream.random_data_source_fd == -1 ||
+        safe_read(stream.random_data_source_fd, buf, size) != (ssize_t) size) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+# else /* _WIN32 */
+    COMPILER_ASSERT(randombytes_BYTES_MAX <= 0xffffffffUL);
+    if (size > (size_t) 0xffffffffUL) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+#  if !defined(_XBOX_ONE) && !defined(_GAMING_XBOX)
+    if (! RtlGenRandom((PVOID) buf, (ULONG) size)) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
+    }
+#  endif
+# endif /* _WIN32 */
+}
+
+static uint32_t
+randombytes_sysrandom(void)
+{
+    uint32_t r;
+
+    randombytes_sysrandom_buf(&r, sizeof r);
+
+    return r;
+}
+
+#endif /* __OpenBSD__ */
+
+static const char *
+randombytes_sysrandom_implementation_name(void)
+{
+    return "sysrandom";
+}
+
+struct randombytes_implementation randombytes_sysrandom_implementation = {
+    SODIUM_C99(.implementation_name =) randombytes_sysrandom_implementation_name,
+    SODIUM_C99(.random =) randombytes_sysrandom,
+    SODIUM_C99(.stir =) randombytes_sysrandom_stir,
+    SODIUM_C99(.uniform =) NULL,
+    SODIUM_C99(.buf =) randombytes_sysrandom_buf,
+    SODIUM_C99(.close =) randombytes_sysrandom_close
+};
+#undef _LINUX_SOURCE
+#undef HAVE_LINUX_COMPATIBLE_GETRANDOM
+#undef getrandom
+#undef BLOCK_ON_DEV_RANDOM
+#undef RtlGenRandom
+#undef HAVE_SAFE_ARC4RANDOM
+#undef SSIZE_MAX
+
+/* ================= sodium_randombytes.c ================= */
+#define implementation implementation__rb
+
+#include <assert.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+
+#ifdef __EMSCRIPTEN__
+# include <emscripten.h>
+#endif
+
+#ifdef RANDOMBYTES_DEFAULT_IMPLEMENTATION
+#else
+# ifdef __native_client__
+# else
+# endif
+#endif
+#include <stdio.h>
+
+/* C++Builder defines a "random" macro */
+#undef random
+
+static const randombytes_implementation *implementation;
+
+#ifndef RANDOMBYTES_DEFAULT_IMPLEMENTATION
+# ifdef __EMSCRIPTEN__
+#  define RANDOMBYTES_DEFAULT_IMPLEMENTATION NULL
+# else
+#  ifdef __native_client__
+#   define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_nativeclient_implementation;
+#  else
+#   define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_sysrandom_implementation;
+#  endif
+# endif
+#endif
+
+static void
+randombytes_init_if_needed(void)
+{
+    if (implementation == NULL) {
+        implementation = RANDOMBYTES_DEFAULT_IMPLEMENTATION;
+        randombytes_stir();
+    }
+}
+
+int
+randombytes_set_implementation(randombytes_implementation *impl)
+{
+    implementation = impl;
+
+    return 0;
+}
+
+const char *
+randombytes_implementation_name(void)
+{
+#ifndef __EMSCRIPTEN__
+    randombytes_init_if_needed();
+    return implementation->implementation_name();
+#else
+    return "js";
+#endif
+}
+
+uint32_t
+randombytes_random(void)
+{
+#ifndef __EMSCRIPTEN__
+    randombytes_init_if_needed();
+    return implementation->random();
+#else
+    return EM_ASM_INT_V({
+        return Module.getRandomValue();
+    });
+#endif
+}
+
+void
+randombytes_stir(void)
+{
+#ifndef __EMSCRIPTEN__
+    randombytes_init_if_needed();
+    if (implementation->stir != NULL) {
+        implementation->stir();
+    }
+#else
+    EM_ASM({
+        if (Module.getRandomValue === undefined) {
+            try {
+                var window_ = 'object' === typeof window ? window : self;
+                var crypto_ = typeof window_.crypto !== 'undefined' ? window_.crypto : window_.msCrypto;
+                var randomValuesStandard = function() {
+                    var buf = new Uint32Array(1);
+                    crypto_.getRandomValues(buf);
+                    return buf[0] >>> 0;
+                };
+                randomValuesStandard();
+                Module.getRandomValue = randomValuesStandard;
+            } catch (e) {
+                try {
+                    var crypto = require('crypto');
+                    var randomValueNodeJS = function() {
+                        var buf = crypto['randomBytes'](4);
+                        return (buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]) >>> 0;
+                    };
+                    randomValueNodeJS();
+                    Module.getRandomValue = randomValueNodeJS;
+                } catch (e) {
+                    throw 'No secure random number generator found';
+                }
+            }
+        }
+    });
+#endif
+}
+
+uint32_t
+randombytes_uniform(const uint32_t upper_bound)
+{
+    uint32_t min;
+    uint32_t r;
+
+#ifndef __EMSCRIPTEN__
+    randombytes_init_if_needed();
+    if (implementation->uniform != NULL) {
+        return implementation->uniform(upper_bound);
+    }
+#endif
+    if (upper_bound < 2) {
+        return 0;
+    }
+    min = (1U + ~upper_bound) % upper_bound; /* = 2**32 mod upper_bound */
+    do {
+        r = randombytes_random();
+    } while (r < min);
+    /* r is now clamped to a set whose size mod upper_bound == 0
+     * the worst case (2**31+1) requires ~ 2 attempts */
+
+    return r % upper_bound;
+}
+
+void
+randombytes_buf(void * const buf, const size_t size)
+{
+#ifndef __EMSCRIPTEN__
+    randombytes_init_if_needed();
+    if (size > (size_t) 0U) {
+        implementation->buf(buf, size);
+    }
+#else
+    unsigned char *p = (unsigned char *) buf;
+    size_t         i;
+
+    for (i = (size_t) 0U; i < size; i++) {
+        p[i] = (unsigned char) randombytes_random();
+    }
+#endif
+}
+
+void
+randombytes_buf_deterministic(void * const buf, const size_t size,
+                              const unsigned char seed[randombytes_SEEDBYTES])
+{
+    static const unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES] = {
+        'L', 'i', 'b', 's', 'o', 'd', 'i', 'u', 'm', 'D', 'R', 'G'
+    };
+
+    COMPILER_ASSERT(randombytes_SEEDBYTES == crypto_stream_chacha20_ietf_KEYBYTES);
+#if SIZE_MAX > 0x4000000000ULL
+    COMPILER_ASSERT(randombytes_BYTES_MAX <= 0x4000000000ULL);
+    if (size > 0x4000000000ULL) {
+        sodium_misuse();
+    }
+#endif
+    crypto_stream_chacha20_ietf((unsigned char *) buf, (unsigned long long) size,
+                                nonce, seed);
+}
+
+size_t
+randombytes_seedbytes(void)
+{
+    return randombytes_SEEDBYTES;
+}
+
+int
+randombytes_close(void)
+{
+    if (implementation != NULL && implementation->close != NULL) {
+        return implementation->close();
+    }
+    return 0;
+}
+
+void
+randombytes(unsigned char * const buf, const unsigned long long buf_len)
+{
+    assert(buf_len <= SIZE_MAX);
+    randombytes_buf(buf, (size_t) buf_len);
+}
+#undef implementation
+#undef RANDOMBYTES_DEFAULT_IMPLEMENTATION
+
+/* ================= sodium_core.c ================= */
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#ifdef _WIN32
+# include <windows.h>
+#elif defined(HAVE_PTHREAD)
+# include <pthread.h>
+#endif
+
+
+static volatile int initialized;
+#ifdef _WIN32
+static volatile int locked;
+#endif // #ifdef _WIN32
+
+int
+sodium_init(void)
+{
+    if (sodium_crit_enter() != 0) {
+        return -1; /* LCOV_EXCL_LINE */
+    }
+    if (initialized != 0) {
+        if (sodium_crit_leave() != 0) {
+            return -1; /* LCOV_EXCL_LINE */
+        }
+        return 1;
+    }
+    _sodium_runtime_get_cpu_features();
+    randombytes_stir();
+    _sodium_alloc_init();
+    _crypto_onetimeauth_poly1305_pick_best_implementation();
+    _crypto_stream_chacha20_pick_best_implementation();
+    initialized = 1;
+    if (sodium_crit_leave() != 0) {
+        return -1; /* LCOV_EXCL_LINE */
+    }
+    #if NETCODE_CRYPTO_LOGS
+    printf( "\n" );
+    #endif // #if NETCODE_CRYPTO_LOGS
+    return 0;
+}
+
+#ifdef _WIN32
+
+static CRITICAL_SECTION _sodium_lock;
+static volatile LONG    _sodium_lock_initialized;
+
+int
+_sodium_crit_init(void)
+{
+    LONG status = 0L;
+
+    while ((status = InterlockedCompareExchange(&_sodium_lock_initialized,
+                                                1L, 0L)) == 1L) {
+        Sleep(0);
+    }
+
+    switch (status) {
+    case 0L:
+        InitializeCriticalSection(&_sodium_lock);
+        return InterlockedExchange(&_sodium_lock_initialized, 2L) == 1L ? 0 : -1;
+    case 2L:
+        return 0;
+    default: /* should never be reached */
+        return -1;
+    }
+}
+
+int
+sodium_crit_enter(void)
+{
+    if (_sodium_crit_init() != 0) {
+        return -1; /* LCOV_EXCL_LINE */
+    }
+    EnterCriticalSection(&_sodium_lock);
+    assert(locked == 0);
+    locked = 1;
+
+    return 0;
+}
+
+int
+sodium_crit_leave(void)
+{
+    if (locked == 0) {
+# ifdef EPERM
+        errno = EPERM;
+# endif
+        return -1;
+    }
+    locked = 0;
+    LeaveCriticalSection(&_sodium_lock);
+
+    return 0;
+}
+
+#elif defined(HAVE_PTHREAD) && !defined(__EMSCRIPTEN__)
+
+static pthread_mutex_t _sodium_lock = PTHREAD_MUTEX_INITIALIZER;
+
+int
+sodium_crit_enter(void)
+{
+    int ret;
+
+    if ((ret = pthread_mutex_lock(&_sodium_lock)) == 0) {
+        assert(locked == 0);
+        locked = 1;
+    }
+    return ret;
+}
+
+int
+sodium_crit_leave(void)
+{
+    if (locked == 0) {
+# ifdef EPERM
+        errno = EPERM;
+# endif
+        return -1;
+    }
+    locked = 0;
+
+    return pthread_mutex_unlock(&_sodium_lock);
+}
+
+#elif defined(HAVE_ATOMIC_OPS) && !defined(__EMSCRIPTEN__) && !defined(__native_client__)
+
+static volatile int _sodium_lock;
+
+int
+sodium_crit_enter(void)
+{
+# ifdef HAVE_NANOSLEEP
+    struct timespec q;
+    memset(&q, 0, sizeof q);
+# endif
+    while (__sync_lock_test_and_set(&_sodium_lock, 1) != 0) {
+# ifdef HAVE_NANOSLEEP
+        (void) nanosleep(&q, NULL);
+# elif defined(__x86_64__) || defined(__i386__)
+        __asm__ __volatile__ ("pause");
+# endif
+    }
+    return 0;
+}
+
+int
+sodium_crit_leave(void)
+{
+    __sync_lock_release(&_sodium_lock);
+
+    return 0;
+}
+
+#else
+
+int
+sodium_crit_enter(void)
+{
+    return 0;
+}
+
+int
+sodium_crit_leave(void)
+{
+    return 0;
+}
+
+#endif
+
+static void (*_misuse_handler)(void);
+
+void
+sodium_misuse(void)
+{
+    void (*handler)(void);
+
+    (void) sodium_crit_leave();
+    if (sodium_crit_enter() == 0) {
+        handler = _misuse_handler;
+        if (handler != NULL) {
+            handler();
+        }
+    }
+/* LCOV_EXCL_START */
+    abort();
+}
+/* LCOV_EXCL_STOP */
+
+int
+sodium_set_misuse_handler(void (*handler)(void))
+{
+    if (sodium_crit_enter() != 0) {
+        return -1; /* LCOV_EXCL_LINE */
+    }
+    _misuse_handler = handler;
+    if (sodium_crit_leave() != 0) {
+        return -1; /* LCOV_EXCL_LINE */
+    }
+    return 0;
+}
+
+/* ================= sodium_chacha20-ref.c ================= */
+
+/*
+ chacha-merged.c version 20080118
+ D. J. Bernstein
+ Public domain.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+
+struct chacha_ctx {
+    uint32_t input[16];
+};
+
+typedef struct chacha_ctx chacha_ctx;
+
+#define U32C(v) (v##U)
+
+#define U32V(v) ((uint32_t)(v) &U32C(0xFFFFFFFF))
+
+#define ROTATE(v, c) (ROTL32(v, c))
+#define XOR(v, w) ((v) ^ (w))
+#define PLUS(v, w) (U32V((v) + (w)))
+#define PLUSONE(v) (PLUS((v), 1))
+
+#define QUARTERROUND(a, b, c, d) \
+    a = PLUS(a, b);              \
+    d = ROTATE(XOR(d, a), 16);   \
+    c = PLUS(c, d);              \
+    b = ROTATE(XOR(b, c), 12);   \
+    a = PLUS(a, b);              \
+    d = ROTATE(XOR(d, a), 8);    \
+    c = PLUS(c, d);              \
+    b = ROTATE(XOR(b, c), 7);
+
+static void
+chacha_keysetup(chacha_ctx *ctx, const uint8_t *k)
+{
+    ctx->input[0]  = U32C(0x61707865);
+    ctx->input[1]  = U32C(0x3320646e);
+    ctx->input[2]  = U32C(0x79622d32);
+    ctx->input[3]  = U32C(0x6b206574);
+    ctx->input[4]  = LOAD32_LE(k + 0);
+    ctx->input[5]  = LOAD32_LE(k + 4);
+    ctx->input[6]  = LOAD32_LE(k + 8);
+    ctx->input[7]  = LOAD32_LE(k + 12);
+    ctx->input[8]  = LOAD32_LE(k + 16);
+    ctx->input[9]  = LOAD32_LE(k + 20);
+    ctx->input[10] = LOAD32_LE(k + 24);
+    ctx->input[11] = LOAD32_LE(k + 28);
+}
+
+static void
+chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
+{
+    ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter + 0);
+    ctx->input[13] = counter == NULL ? 0 : LOAD32_LE(counter + 4);
+    ctx->input[14] = LOAD32_LE(iv + 0);
+    ctx->input[15] = LOAD32_LE(iv + 4);
+}
+
+static void
+chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
+{
+    ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter);
+    ctx->input[13] = LOAD32_LE(iv + 0);
+    ctx->input[14] = LOAD32_LE(iv + 4);
+    ctx->input[15] = LOAD32_LE(iv + 8);
+}
+
+static void
+chacha20_encrypt_bytes(chacha_ctx *ctx, const uint8_t *m, uint8_t *c,
+                       unsigned long long bytes)
+{
+    uint32_t x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14,
+        x15;
+    uint32_t j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14,
+        j15;
+    uint8_t     *ctarget = NULL;
+    uint8_t      tmp[64];
+    unsigned int i;
+
+    if (!bytes) {
+        return; /* LCOV_EXCL_LINE */
+    }
+    j0  = ctx->input[0];
+    j1  = ctx->input[1];
+    j2  = ctx->input[2];
+    j3  = ctx->input[3];
+    j4  = ctx->input[4];
+    j5  = ctx->input[5];
+    j6  = ctx->input[6];
+    j7  = ctx->input[7];
+    j8  = ctx->input[8];
+    j9  = ctx->input[9];
+    j10 = ctx->input[10];
+    j11 = ctx->input[11];
+    j12 = ctx->input[12];
+    j13 = ctx->input[13];
+    j14 = ctx->input[14];
+    j15 = ctx->input[15];
+
+    for (;;) {
+        if (bytes < 64) {
+            memset(tmp, 0, 64);
+            for (i = 0; i < bytes; ++i) {
+                tmp[i] = m[i];
+            }
+            m       = tmp;
+            ctarget = c;
+            c       = tmp;
+        }
+        x0  = j0;
+        x1  = j1;
+        x2  = j2;
+        x3  = j3;
+        x4  = j4;
+        x5  = j5;
+        x6  = j6;
+        x7  = j7;
+        x8  = j8;
+        x9  = j9;
+        x10 = j10;
+        x11 = j11;
+        x12 = j12;
+        x13 = j13;
+        x14 = j14;
+        x15 = j15;
+        for (i = 20; i > 0; i -= 2) {
+            QUARTERROUND(x0, x4, x8, x12)
+            QUARTERROUND(x1, x5, x9, x13)
+            QUARTERROUND(x2, x6, x10, x14)
+            QUARTERROUND(x3, x7, x11, x15)
+            QUARTERROUND(x0, x5, x10, x15)
+            QUARTERROUND(x1, x6, x11, x12)
+            QUARTERROUND(x2, x7, x8, x13)
+            QUARTERROUND(x3, x4, x9, x14)
+        }
+        x0  = PLUS(x0, j0);
+        x1  = PLUS(x1, j1);
+        x2  = PLUS(x2, j2);
+        x3  = PLUS(x3, j3);
+        x4  = PLUS(x4, j4);
+        x5  = PLUS(x5, j5);
+        x6  = PLUS(x6, j6);
+        x7  = PLUS(x7, j7);
+        x8  = PLUS(x8, j8);
+        x9  = PLUS(x9, j9);
+        x10 = PLUS(x10, j10);
+        x11 = PLUS(x11, j11);
+        x12 = PLUS(x12, j12);
+        x13 = PLUS(x13, j13);
+        x14 = PLUS(x14, j14);
+        x15 = PLUS(x15, j15);
+
+        x0  = XOR(x0, LOAD32_LE(m + 0));
+        x1  = XOR(x1, LOAD32_LE(m + 4));
+        x2  = XOR(x2, LOAD32_LE(m + 8));
+        x3  = XOR(x3, LOAD32_LE(m + 12));
+        x4  = XOR(x4, LOAD32_LE(m + 16));
+        x5  = XOR(x5, LOAD32_LE(m + 20));
+        x6  = XOR(x6, LOAD32_LE(m + 24));
+        x7  = XOR(x7, LOAD32_LE(m + 28));
+        x8  = XOR(x8, LOAD32_LE(m + 32));
+        x9  = XOR(x9, LOAD32_LE(m + 36));
+        x10 = XOR(x10, LOAD32_LE(m + 40));
+        x11 = XOR(x11, LOAD32_LE(m + 44));
+        x12 = XOR(x12, LOAD32_LE(m + 48));
+        x13 = XOR(x13, LOAD32_LE(m + 52));
+        x14 = XOR(x14, LOAD32_LE(m + 56));
+        x15 = XOR(x15, LOAD32_LE(m + 60));
+
+        j12 = PLUSONE(j12);
+        /* LCOV_EXCL_START */
+        if (!j12) {
+            j13 = PLUSONE(j13);
+        }
+        /* LCOV_EXCL_STOP */
+
+        STORE32_LE(c + 0, x0);
+        STORE32_LE(c + 4, x1);
+        STORE32_LE(c + 8, x2);
+        STORE32_LE(c + 12, x3);
+        STORE32_LE(c + 16, x4);
+        STORE32_LE(c + 20, x5);
+        STORE32_LE(c + 24, x6);
+        STORE32_LE(c + 28, x7);
+        STORE32_LE(c + 32, x8);
+        STORE32_LE(c + 36, x9);
+        STORE32_LE(c + 40, x10);
+        STORE32_LE(c + 44, x11);
+        STORE32_LE(c + 48, x12);
+        STORE32_LE(c + 52, x13);
+        STORE32_LE(c + 56, x14);
+        STORE32_LE(c + 60, x15);
+
+        if (bytes <= 64) {
+            if (bytes < 64) {
+                for (i = 0; i < (unsigned int) bytes; ++i) {
+                    ctarget[i] = c[i]; /* ctarget cannot be NULL */
+                }
+            }
+            ctx->input[12] = j12;
+            ctx->input[13] = j13;
+
+            return;
+        }
+        bytes -= 64;
+        c += 64;
+        m += 64;
+    }
+}
+
+static int
+stream_ref(unsigned char *c, unsigned long long clen, const unsigned char *n,
+           const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
+    chacha_keysetup(&ctx, k);
+    chacha_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ietf_ext_ref(unsigned char *c, unsigned long long clen,
+                    const unsigned char *n, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                  unsigned long long mlen, const unsigned char *n, uint64_t ic,
+                  const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[8];
+    uint32_t          ic_high;
+    uint32_t          ic_low;
+
+    if (!mlen) {
+        return 0;
+    }
+    ic_high = U32V(ic >> 32);
+    ic_low  = U32V(ic);
+    STORE32_LE(&ic_bytes[0], ic_low);
+    STORE32_LE(&ic_bytes[4], ic_high);
+    chacha_keysetup(&ctx, k);
+    chacha_ivsetup(&ctx, n, ic_bytes);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ietf_ext_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           uint32_t ic, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[4];
+
+    if (!mlen) {
+        return 0;
+    }
+    STORE32_LE(ic_bytes, ic);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, ic_bytes);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+struct crypto_stream_chacha20_implementation
+    crypto_stream_chacha20_ref_implementation = {
+        SODIUM_C99(.stream =) stream_ref,
+        SODIUM_C99(.stream_ietf_ext =) stream_ietf_ext_ref,
+        SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic,
+        SODIUM_C99(.stream_ietf_ext_xor_ic =) stream_ietf_ext_ref_xor_ic
+    };
+#undef U32C
+#undef U32V
+#undef ROTATE
+#undef XOR
+#undef PLUS
+#undef PLUSONE
+#undef QUARTERROUND
+
+/* ================= sodium_dolbeau_chacha20-ssse3.c ================= */
+#define chacha_ctx chacha_ctx__ssse3
+#define chacha_keysetup chacha_keysetup__ssse3
+#define chacha_ivsetup chacha_ivsetup__ssse3
+#define chacha_ietf_ivsetup chacha_ietf_ivsetup__ssse3
+#define chacha20_encrypt_bytes chacha20_encrypt_bytes__ssse3
+#define stream_ref stream_ref__ssse3
+#define stream_ietf_ext_ref stream_ietf_ext_ref__ssse3
+#define stream_ref_xor_ic stream_ref_xor_ic__ssse3
+#define stream_ietf_ext_ref_xor_ic stream_ietf_ext_ref_xor_ic__ssse3
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
+
+# ifdef __clang__
+#  pragma clang attribute push(__attribute__((target("sse2,ssse3"))), apply_to = function)
+# elif defined(__GNUC__)
+#  pragma GCC target("sse2,ssse3")
+# endif
+
+# include <emmintrin.h>
+# include <tmmintrin.h>
+
+
+# define ROUNDS 20
+
+typedef struct chacha_ctx {
+    uint32_t input[16];
+} chacha_ctx;
+
+static void
+chacha_keysetup(chacha_ctx *ctx, const uint8_t *k)
+{
+    ctx->input[0]  = 0x61707865;
+    ctx->input[1]  = 0x3320646e;
+    ctx->input[2]  = 0x79622d32;
+    ctx->input[3]  = 0x6b206574;
+    ctx->input[4]  = LOAD32_LE(k + 0);
+    ctx->input[5]  = LOAD32_LE(k + 4);
+    ctx->input[6]  = LOAD32_LE(k + 8);
+    ctx->input[7]  = LOAD32_LE(k + 12);
+    ctx->input[8]  = LOAD32_LE(k + 16);
+    ctx->input[9]  = LOAD32_LE(k + 20);
+    ctx->input[10] = LOAD32_LE(k + 24);
+    ctx->input[11] = LOAD32_LE(k + 28);
+}
+
+static void
+chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
+{
+    ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter + 0);
+    ctx->input[13] = counter == NULL ? 0 : LOAD32_LE(counter + 4);
+    ctx->input[14] = LOAD32_LE(iv + 0);
+    ctx->input[15] = LOAD32_LE(iv + 4);
+}
+
+static void
+chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
+{
+    ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter);
+    ctx->input[13] = LOAD32_LE(iv + 0);
+    ctx->input[14] = LOAD32_LE(iv + 4);
+    ctx->input[15] = LOAD32_LE(iv + 8);
+}
+
+static void
+chacha20_encrypt_bytes(chacha_ctx *ctx, const uint8_t *m, uint8_t *c,
+                       unsigned long long bytes)
+{
+    uint32_t * const x = &ctx->input[0];
+
+    if (!bytes) {
+        return; /* LCOV_EXCL_LINE */
+    }
+/* inlined sodium_dolbeau_u4.h */
+
+#define VEC4_ROT(A, IMM) \
+    _mm_or_si128(_mm_slli_epi32(A, IMM), _mm_srli_epi32(A, (32 - IMM)))
+
+/* same, but replace 2 of the shift/shift/or "rotation" by byte shuffles (8 &
+ * 16) (better) */
+#define VEC4_QUARTERROUND_SHUFFLE(A, B, C, D) \
+    x_##A = _mm_add_epi32(x_##A, x_##B);      \
+    t_##A = _mm_xor_si128(x_##D, x_##A);      \
+    x_##D = _mm_shuffle_epi8(t_##A, rot16);   \
+    x_##C = _mm_add_epi32(x_##C, x_##D);      \
+    t_##C = _mm_xor_si128(x_##B, x_##C);      \
+    x_##B = VEC4_ROT(t_##C, 12);              \
+    x_##A = _mm_add_epi32(x_##A, x_##B);      \
+    t_##A = _mm_xor_si128(x_##D, x_##A);      \
+    x_##D = _mm_shuffle_epi8(t_##A, rot8);    \
+    x_##C = _mm_add_epi32(x_##C, x_##D);      \
+    t_##C = _mm_xor_si128(x_##B, x_##C);      \
+    x_##B = VEC4_ROT(t_##C, 7)
+
+#define VEC4_QUARTERROUND(A, B, C, D) VEC4_QUARTERROUND_SHUFFLE(A, B, C, D)
+
+if (bytes >= 256) {
+    /* constant for shuffling bytes (replacing multiple-of-8 rotates) */
+    __m128i rot16 =
+        _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    __m128i rot8 =
+        _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+
+    __m128i x_0  = _mm_set1_epi32(x[0]);
+    __m128i x_1  = _mm_set1_epi32(x[1]);
+    __m128i x_2  = _mm_set1_epi32(x[2]);
+    __m128i x_3  = _mm_set1_epi32(x[3]);
+    __m128i x_4  = _mm_set1_epi32(x[4]);
+    __m128i x_5  = _mm_set1_epi32(x[5]);
+    __m128i x_6  = _mm_set1_epi32(x[6]);
+    __m128i x_7  = _mm_set1_epi32(x[7]);
+    __m128i x_8  = _mm_set1_epi32(x[8]);
+    __m128i x_9  = _mm_set1_epi32(x[9]);
+    __m128i x_10 = _mm_set1_epi32(x[10]);
+    __m128i x_11 = _mm_set1_epi32(x[11]);
+    __m128i x_12;
+    __m128i x_13;
+    __m128i x_14   = _mm_set1_epi32(x[14]);
+    __m128i x_15   = _mm_set1_epi32(x[15]);
+    __m128i orig0  = x_0;
+    __m128i orig1  = x_1;
+    __m128i orig2  = x_2;
+    __m128i orig3  = x_3;
+    __m128i orig4  = x_4;
+    __m128i orig5  = x_5;
+    __m128i orig6  = x_6;
+    __m128i orig7  = x_7;
+    __m128i orig8  = x_8;
+    __m128i orig9  = x_9;
+    __m128i orig10 = x_10;
+    __m128i orig11 = x_11;
+    __m128i orig12;
+    __m128i orig13;
+    __m128i orig14 = x_14;
+    __m128i orig15 = x_15;
+    __m128i t_0, t_1, t_2, t_3, t_4, t_5, t_6, t_7, t_8, t_9, t_10, t_11, t_12,
+        t_13, t_14, t_15;
+
+    uint32_t in12, in13;
+    int      i;
+
+    while (bytes >= 256) {
+        const __m128i addv12 = _mm_set_epi64x(1, 0);
+        const __m128i addv13 = _mm_set_epi64x(3, 2);
+        __m128i       t12, t13;
+        uint64_t      in1213;
+
+        x_0  = orig0;
+        x_1  = orig1;
+        x_2  = orig2;
+        x_3  = orig3;
+        x_4  = orig4;
+        x_5  = orig5;
+        x_6  = orig6;
+        x_7  = orig7;
+        x_8  = orig8;
+        x_9  = orig9;
+        x_10 = orig10;
+        x_11 = orig11;
+        x_14 = orig14;
+        x_15 = orig15;
+
+        in12   = x[12];
+        in13   = x[13];
+        in1213 = ((uint64_t) in12) | (((uint64_t) in13) << 32);
+        t12    = _mm_set1_epi64x(in1213);
+        t13    = _mm_set1_epi64x(in1213);
+
+        x_12 = _mm_add_epi64(addv12, t12);
+        x_13 = _mm_add_epi64(addv13, t13);
+
+        t12 = _mm_unpacklo_epi32(x_12, x_13);
+        t13 = _mm_unpackhi_epi32(x_12, x_13);
+
+        x_12 = _mm_unpacklo_epi32(t12, t13);
+        x_13 = _mm_unpackhi_epi32(t12, t13);
+
+        orig12 = x_12;
+        orig13 = x_13;
+
+        in1213 += 4;
+
+        x[12] = in1213 & 0xFFFFFFFF;
+        x[13] = (in1213 >> 32) & 0xFFFFFFFF;
+
+        for (i = 0; i < ROUNDS; i += 2) {
+            VEC4_QUARTERROUND(0, 4, 8, 12);
+            VEC4_QUARTERROUND(1, 5, 9, 13);
+            VEC4_QUARTERROUND(2, 6, 10, 14);
+            VEC4_QUARTERROUND(3, 7, 11, 15);
+            VEC4_QUARTERROUND(0, 5, 10, 15);
+            VEC4_QUARTERROUND(1, 6, 11, 12);
+            VEC4_QUARTERROUND(2, 7, 8, 13);
+            VEC4_QUARTERROUND(3, 4, 9, 14);
+        }
+
+#define ONEQUAD_TRANSPOSE(A, B, C, D)                                          \
+    {                                                                          \
+        __m128i t0, t1, t2, t3;                                                \
+                                                                               \
+        x_##A = _mm_add_epi32(x_##A, orig##A);                                 \
+        x_##B = _mm_add_epi32(x_##B, orig##B);                                 \
+        x_##C = _mm_add_epi32(x_##C, orig##C);                                 \
+        x_##D = _mm_add_epi32(x_##D, orig##D);                                 \
+        t_##A = _mm_unpacklo_epi32(x_##A, x_##B);                              \
+        t_##B = _mm_unpacklo_epi32(x_##C, x_##D);                              \
+        t_##C = _mm_unpackhi_epi32(x_##A, x_##B);                              \
+        t_##D = _mm_unpackhi_epi32(x_##C, x_##D);                              \
+        x_##A = _mm_unpacklo_epi64(t_##A, t_##B);                              \
+        x_##B = _mm_unpackhi_epi64(t_##A, t_##B);                              \
+        x_##C = _mm_unpacklo_epi64(t_##C, t_##D);                              \
+        x_##D = _mm_unpackhi_epi64(t_##C, t_##D);                              \
+                                                                               \
+        t0 = _mm_xor_si128(x_##A, _mm_loadu_si128((const __m128i*) (m + 0)));  \
+        _mm_storeu_si128((__m128i*) (c + 0), t0);                              \
+        t1 = _mm_xor_si128(x_##B, _mm_loadu_si128((const __m128i*) (m + 64))); \
+        _mm_storeu_si128((__m128i*) (c + 64), t1);                             \
+        t2 =                                                                   \
+            _mm_xor_si128(x_##C, _mm_loadu_si128((const __m128i*) (m + 128))); \
+        _mm_storeu_si128((__m128i*) (c + 128), t2);                            \
+        t3 =                                                                   \
+            _mm_xor_si128(x_##D, _mm_loadu_si128((const __m128i*) (m + 192))); \
+        _mm_storeu_si128((__m128i*) (c + 192), t3);                            \
+    }
+
+#define ONEQUAD(A, B, C, D) ONEQUAD_TRANSPOSE(A, B, C, D)
+
+        ONEQUAD(0, 1, 2, 3);
+        m += 16;
+        c += 16;
+        ONEQUAD(4, 5, 6, 7);
+        m += 16;
+        c += 16;
+        ONEQUAD(8, 9, 10, 11);
+        m += 16;
+        c += 16;
+        ONEQUAD(12, 13, 14, 15);
+        m -= 48;
+        c -= 48;
+
+#undef ONEQUAD
+#undef ONEQUAD_TRANSPOSE
+
+        bytes -= 256;
+        c += 256;
+        m += 256;
+    }
+}
+#undef VEC4_ROT
+#undef VEC4_QUARTERROUND
+#undef VEC4_QUARTERROUND_SHUFFLE
+/* inlined sodium_dolbeau_u1.h */
+while (bytes >= 64) {
+    __m128i       x_0, x_1, x_2, x_3;
+    __m128i       t_1;
+    const __m128i rot16 =
+        _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    const __m128i rot8 =
+        _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+
+    uint32_t in12;
+    uint32_t in13;
+    int      i;
+
+    x_0 = _mm_loadu_si128((const __m128i*) (x + 0));
+    x_1 = _mm_loadu_si128((const __m128i*) (x + 4));
+    x_2 = _mm_loadu_si128((const __m128i*) (x + 8));
+    x_3 = _mm_loadu_si128((const __m128i*) (x + 12));
+
+    for (i = 0; i < ROUNDS; i += 2) {
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x93);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x39);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x39);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x93);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+    }
+    x_0 = _mm_add_epi32(x_0, _mm_loadu_si128((const __m128i*) (x + 0)));
+    x_1 = _mm_add_epi32(x_1, _mm_loadu_si128((const __m128i*) (x + 4)));
+    x_2 = _mm_add_epi32(x_2, _mm_loadu_si128((const __m128i*) (x + 8)));
+    x_3 = _mm_add_epi32(x_3, _mm_loadu_si128((const __m128i*) (x + 12)));
+    x_0 = _mm_xor_si128(x_0, _mm_loadu_si128((const __m128i*) (m + 0)));
+    x_1 = _mm_xor_si128(x_1, _mm_loadu_si128((const __m128i*) (m + 16)));
+    x_2 = _mm_xor_si128(x_2, _mm_loadu_si128((const __m128i*) (m + 32)));
+    x_3 = _mm_xor_si128(x_3, _mm_loadu_si128((const __m128i*) (m + 48)));
+    _mm_storeu_si128((__m128i*) (c + 0), x_0);
+    _mm_storeu_si128((__m128i*) (c + 16), x_1);
+    _mm_storeu_si128((__m128i*) (c + 32), x_2);
+    _mm_storeu_si128((__m128i*) (c + 48), x_3);
+
+    in12 = x[12];
+    in13 = x[13];
+    in12++;
+    if (in12 == 0) {
+        in13++;
+    }
+    x[12] = in12;
+    x[13] = in13;
+
+    bytes -= 64;
+    c += 64;
+    m += 64;
+}
+/* inlined sodium_dolbeau_u0.h */
+if (bytes > 0) {
+    __m128i       x_0, x_1, x_2, x_3;
+    __m128i       t_1;
+    const __m128i rot16 =
+        _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    const __m128i rot8 =
+        _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+    uint8_t partialblock[64];
+
+    unsigned int i;
+
+    x_0 = _mm_loadu_si128((const __m128i*) (x + 0));
+    x_1 = _mm_loadu_si128((const __m128i*) (x + 4));
+    x_2 = _mm_loadu_si128((const __m128i*) (x + 8));
+    x_3 = _mm_loadu_si128((const __m128i*) (x + 12));
+
+    for (i = 0; i < ROUNDS; i += 2) {
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x93);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x39);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x39);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x93);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+    }
+    x_0 = _mm_add_epi32(x_0, _mm_loadu_si128((const __m128i*) (x + 0)));
+    x_1 = _mm_add_epi32(x_1, _mm_loadu_si128((const __m128i*) (x + 4)));
+    x_2 = _mm_add_epi32(x_2, _mm_loadu_si128((const __m128i*) (x + 8)));
+    x_3 = _mm_add_epi32(x_3, _mm_loadu_si128((const __m128i*) (x + 12)));
+    _mm_storeu_si128((__m128i*) (partialblock + 0), x_0);
+    _mm_storeu_si128((__m128i*) (partialblock + 16), x_1);
+    _mm_storeu_si128((__m128i*) (partialblock + 32), x_2);
+    _mm_storeu_si128((__m128i*) (partialblock + 48), x_3);
+
+    for (i = 0; i < bytes; i++) {
+        c[i] = m[i] ^ partialblock[i];
+    }
+
+    sodium_memzero(partialblock, sizeof partialblock);
+}
+}
+
+static int
+stream_ref(unsigned char *c, unsigned long long clen, const unsigned char *n,
+           const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
+    chacha_keysetup(&ctx, k);
+    chacha_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ietf_ext_ref(unsigned char *c, unsigned long long clen,
+                    const unsigned char *n, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                  unsigned long long mlen, const unsigned char *n, uint64_t ic,
+                  const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[8];
+    uint32_t          ic_high;
+    uint32_t          ic_low;
+
+    if (!mlen) {
+        return 0;
+    }
+    ic_high = (uint32_t) (ic >> 32);
+    ic_low  = (uint32_t) ic;
+    STORE32_LE(&ic_bytes[0], ic_low);
+    STORE32_LE(&ic_bytes[4], ic_high);
+    chacha_keysetup(&ctx, k);
+    chacha_ivsetup(&ctx, n, ic_bytes);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ietf_ext_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           uint32_t ic, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[4];
+
+    if (!mlen) {
+        return 0;
+    }
+    STORE32_LE(ic_bytes, ic);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, ic_bytes);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+struct crypto_stream_chacha20_implementation
+    crypto_stream_chacha20_dolbeau_ssse3_implementation = {
+        SODIUM_C99(.stream =) stream_ref,
+        SODIUM_C99(.stream_ietf_ext =) stream_ietf_ext_ref,
+        SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic,
+        SODIUM_C99(.stream_ietf_ext_xor_ic =) stream_ietf_ext_ref_xor_ic
+    };
+
+# ifdef __clang__
+#  pragma clang attribute pop
+# endif
+
+#endif
+
+int chacha20_dolbeau_ssse3_link_warning_dummy = 0;
+#undef chacha_ctx
+#undef chacha_keysetup
+#undef chacha_ivsetup
+#undef chacha_ietf_ivsetup
+#undef chacha20_encrypt_bytes
+#undef stream_ref
+#undef stream_ietf_ext_ref
+#undef stream_ref_xor_ic
+#undef stream_ietf_ext_ref_xor_ic
+#undef ROUNDS
+#undef VEC4_ROT
+#undef VEC4_QUARTERROUND_SHUFFLE
+#undef VEC4_QUARTERROUND
+#undef ONEQUAD_TRANSPOSE
+#undef ONEQUAD
+
+/* ================= sodium_dolbeau_chacha20-avx2.c ================= */
+#define chacha_ctx chacha_ctx__avx2
+#define chacha_keysetup chacha_keysetup__avx2
+#define chacha_ivsetup chacha_ivsetup__avx2
+#define chacha_ietf_ivsetup chacha_ietf_ivsetup__avx2
+#define chacha20_encrypt_bytes chacha20_encrypt_bytes__avx2
+#define stream_ref stream_ref__avx2
+#define stream_ietf_ext_ref stream_ietf_ext_ref__avx2
+#define stream_ref_xor_ic stream_ref_xor_ic__avx2
+#define stream_ietf_ext_ref_xor_ic stream_ietf_ext_ref_xor_ic__avx2
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
+        defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
+
+# ifdef __clang__
+#  pragma clang attribute push(__attribute__((target("sse2,ssse3,sse4.1,avx2"))), apply_to = function)
+# elif defined(__GNUC__)
+#  pragma GCC target("sse2,ssse3,sse4.1,avx2")
+# endif
+
+# include <emmintrin.h>
+# include <immintrin.h>
+# include <smmintrin.h>
+# include <tmmintrin.h>
+
+
+# define ROUNDS 20
+
+typedef struct chacha_ctx {
+    uint32_t input[16];
+} chacha_ctx;
+
+static void
+chacha_keysetup(chacha_ctx *ctx, const uint8_t *k)
+{
+    ctx->input[0]  = 0x61707865;
+    ctx->input[1]  = 0x3320646e;
+    ctx->input[2]  = 0x79622d32;
+    ctx->input[3]  = 0x6b206574;
+    ctx->input[4]  = LOAD32_LE(k + 0);
+    ctx->input[5]  = LOAD32_LE(k + 4);
+    ctx->input[6]  = LOAD32_LE(k + 8);
+    ctx->input[7]  = LOAD32_LE(k + 12);
+    ctx->input[8]  = LOAD32_LE(k + 16);
+    ctx->input[9]  = LOAD32_LE(k + 20);
+    ctx->input[10] = LOAD32_LE(k + 24);
+    ctx->input[11] = LOAD32_LE(k + 28);
+}
+
+static void
+chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
+{
+    ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter + 0);
+    ctx->input[13] = counter == NULL ? 0 : LOAD32_LE(counter + 4);
+    ctx->input[14] = LOAD32_LE(iv + 0);
+    ctx->input[15] = LOAD32_LE(iv + 4);
+}
+
+static void
+chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, const uint8_t *counter)
+{
+    ctx->input[12] = counter == NULL ? 0 : LOAD32_LE(counter);
+    ctx->input[13] = LOAD32_LE(iv + 0);
+    ctx->input[14] = LOAD32_LE(iv + 4);
+    ctx->input[15] = LOAD32_LE(iv + 8);
+}
+
+static void
+chacha20_encrypt_bytes(chacha_ctx *ctx, const uint8_t *m, uint8_t *c,
+                       unsigned long long bytes)
+{
+    uint32_t * const x = &ctx->input[0];
+
+    if (!bytes) {
+        return; /* LCOV_EXCL_LINE */
+    }
+/* inlined sodium_dolbeau_u8.h */
+
+#define VEC8_ROT(A, IMM) \
+    _mm256_or_si256(_mm256_slli_epi32(A, IMM), _mm256_srli_epi32(A, (32 - IMM)))
+
+/* implements a vector quarter round by-the-book (naive!) */
+#define VEC8_QUARTERROUND_NAIVE(A, B, C, D) \
+    x_##A = _mm256_add_epi32(x_##A, x_##B); \
+    t_##A = _mm256_xor_si256(x_##D, x_##A); \
+    x_##D = VEC8_ROT(t_##A, 16);            \
+    x_##C = _mm256_add_epi32(x_##C, x_##D); \
+    t_##C = _mm256_xor_si256(x_##B, x_##C); \
+    x_##B = VEC8_ROT(t_##C, 12);            \
+    x_##A = _mm256_add_epi32(x_##A, x_##B); \
+    t_##A = _mm256_xor_si256(x_##D, x_##A); \
+    x_##D = VEC8_ROT(t_##A, 8);             \
+    x_##C = _mm256_add_epi32(x_##C, x_##D); \
+    t_##C = _mm256_xor_si256(x_##B, x_##C); \
+    x_##B = VEC8_ROT(t_##C, 7)
+
+/* same, but replace 2 of the shift/shift/or "rotation" by byte shuffles (8 &
+ * 16) (better) */
+#define VEC8_QUARTERROUND_SHUFFLE(A, B, C, D)  \
+    x_##A = _mm256_add_epi32(x_##A, x_##B);    \
+    t_##A = _mm256_xor_si256(x_##D, x_##A);    \
+    x_##D = _mm256_shuffle_epi8(t_##A, rot16); \
+    x_##C = _mm256_add_epi32(x_##C, x_##D);    \
+    t_##C = _mm256_xor_si256(x_##B, x_##C);    \
+    x_##B = VEC8_ROT(t_##C, 12);               \
+    x_##A = _mm256_add_epi32(x_##A, x_##B);    \
+    t_##A = _mm256_xor_si256(x_##D, x_##A);    \
+    x_##D = _mm256_shuffle_epi8(t_##A, rot8);  \
+    x_##C = _mm256_add_epi32(x_##C, x_##D);    \
+    t_##C = _mm256_xor_si256(x_##B, x_##C);    \
+    x_##B = VEC8_ROT(t_##C, 7)
+
+/* same, but replace 2 of the shift/shift/or "rotation" by byte & word shuffles
+ * (8 & 16) (not as good as previous) */
+#define VEC8_QUARTERROUND_SHUFFLE2(A, B, C, D)                                 \
+    x_##A = _mm256_add_epi32(x_##A, x_##B);                                    \
+    t_##A = _mm256_xor_si256(x_##D, x_##A);                                    \
+    x_##D = _mm256_shufflehi_epi16(_mm256_shufflelo_epi16(t_##A, 0xb1), 0xb1); \
+    x_##C = _mm256_add_epi32(x_##C, x_##D);                                    \
+    t_##C = _mm256_xor_si256(x_##B, x_##C);                                    \
+    x_##B = VEC8_ROT(t_##C, 12);                                               \
+    x_##A = _mm256_add_epi32(x_##A, x_##B);                                    \
+    t_##A = _mm256_xor_si256(x_##D, x_##A);                                    \
+    x_##D = _mm256_shuffle_epi8(t_##A, rot8);                                  \
+    x_##C = _mm256_add_epi32(x_##C, x_##D);                                    \
+    t_##C = _mm256_xor_si256(x_##B, x_##C);                                    \
+    x_##B = VEC8_ROT(t_##C, 7)
+
+#define VEC8_QUARTERROUND(A, B, C, D) VEC8_QUARTERROUND_SHUFFLE(A, B, C, D)
+
+#define VEC8_LINE1(A, B, C, D)              \
+    x_##A = _mm256_add_epi32(x_##A, x_##B); \
+    x_##D = _mm256_shuffle_epi8(_mm256_xor_si256(x_##D, x_##A), rot16)
+#define VEC8_LINE2(A, B, C, D)              \
+    x_##C = _mm256_add_epi32(x_##C, x_##D); \
+    x_##B = VEC8_ROT(_mm256_xor_si256(x_##B, x_##C), 12)
+#define VEC8_LINE3(A, B, C, D)              \
+    x_##A = _mm256_add_epi32(x_##A, x_##B); \
+    x_##D = _mm256_shuffle_epi8(_mm256_xor_si256(x_##D, x_##A), rot8)
+#define VEC8_LINE4(A, B, C, D)              \
+    x_##C = _mm256_add_epi32(x_##C, x_##D); \
+    x_##B = VEC8_ROT(_mm256_xor_si256(x_##B, x_##C), 7)
+
+#define VEC8_ROUND_SEQ(A1, B1, C1, D1, A2, B2, C2, D2, A3, B3, C3, D3, A4, B4, \
+                       C4, D4)                                                 \
+    VEC8_LINE1(A1, B1, C1, D1);                                                \
+    VEC8_LINE1(A2, B2, C2, D2);                                                \
+    VEC8_LINE1(A3, B3, C3, D3);                                                \
+    VEC8_LINE1(A4, B4, C4, D4);                                                \
+    VEC8_LINE2(A1, B1, C1, D1);                                                \
+    VEC8_LINE2(A2, B2, C2, D2);                                                \
+    VEC8_LINE2(A3, B3, C3, D3);                                                \
+    VEC8_LINE2(A4, B4, C4, D4);                                                \
+    VEC8_LINE3(A1, B1, C1, D1);                                                \
+    VEC8_LINE3(A2, B2, C2, D2);                                                \
+    VEC8_LINE3(A3, B3, C3, D3);                                                \
+    VEC8_LINE3(A4, B4, C4, D4);                                                \
+    VEC8_LINE4(A1, B1, C1, D1);                                                \
+    VEC8_LINE4(A2, B2, C2, D2);                                                \
+    VEC8_LINE4(A3, B3, C3, D3);                                                \
+    VEC8_LINE4(A4, B4, C4, D4)
+
+#define VEC8_ROUND_HALF(A1, B1, C1, D1, A2, B2, C2, D2, A3, B3, C3, D3, A4, \
+                        B4, C4, D4)                                         \
+    VEC8_LINE1(A1, B1, C1, D1);                                             \
+    VEC8_LINE1(A2, B2, C2, D2);                                             \
+    VEC8_LINE2(A1, B1, C1, D1);                                             \
+    VEC8_LINE2(A2, B2, C2, D2);                                             \
+    VEC8_LINE3(A1, B1, C1, D1);                                             \
+    VEC8_LINE3(A2, B2, C2, D2);                                             \
+    VEC8_LINE4(A1, B1, C1, D1);                                             \
+    VEC8_LINE4(A2, B2, C2, D2);                                             \
+    VEC8_LINE1(A3, B3, C3, D3);                                             \
+    VEC8_LINE1(A4, B4, C4, D4);                                             \
+    VEC8_LINE2(A3, B3, C3, D3);                                             \
+    VEC8_LINE2(A4, B4, C4, D4);                                             \
+    VEC8_LINE3(A3, B3, C3, D3);                                             \
+    VEC8_LINE3(A4, B4, C4, D4);                                             \
+    VEC8_LINE4(A3, B3, C3, D3);                                             \
+    VEC8_LINE4(A4, B4, C4, D4)
+
+#define VEC8_ROUND_HALFANDHALF(A1, B1, C1, D1, A2, B2, C2, D2, A3, B3, C3, D3, \
+                               A4, B4, C4, D4)                                 \
+    VEC8_LINE1(A1, B1, C1, D1);                                                \
+    VEC8_LINE1(A2, B2, C2, D2);                                                \
+    VEC8_LINE2(A1, B1, C1, D1);                                                \
+    VEC8_LINE2(A2, B2, C2, D2);                                                \
+    VEC8_LINE1(A3, B3, C3, D3);                                                \
+    VEC8_LINE1(A4, B4, C4, D4);                                                \
+    VEC8_LINE2(A3, B3, C3, D3);                                                \
+    VEC8_LINE2(A4, B4, C4, D4);                                                \
+    VEC8_LINE3(A1, B1, C1, D1);                                                \
+    VEC8_LINE3(A2, B2, C2, D2);                                                \
+    VEC8_LINE4(A1, B1, C1, D1);                                                \
+    VEC8_LINE4(A2, B2, C2, D2);                                                \
+    VEC8_LINE3(A3, B3, C3, D3);                                                \
+    VEC8_LINE3(A4, B4, C4, D4);                                                \
+    VEC8_LINE4(A3, B3, C3, D3);                                                \
+    VEC8_LINE4(A4, B4, C4, D4)
+
+#define VEC8_ROUND(A1, B1, C1, D1, A2, B2, C2, D2, A3, B3, C3, D3, A4, B4, C4, \
+                   D4)                                                         \
+    VEC8_ROUND_SEQ(A1, B1, C1, D1, A2, B2, C2, D2, A3, B3, C3, D3, A4, B4, C4, \
+                   D4)
+
+if (bytes >= 512) {
+    /* constant for shuffling bytes (replacing multiple-of-8 rotates) */
+    __m256i rot16 =
+        _mm256_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2,
+                        13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    __m256i rot8 =
+        _mm256_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3,
+                        14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+    uint32_t in12, in13;
+
+    /* the naive way seems as fast (if not a bit faster) than the vector way */
+    __m256i x_0  = _mm256_set1_epi32(x[0]);
+    __m256i x_1  = _mm256_set1_epi32(x[1]);
+    __m256i x_2  = _mm256_set1_epi32(x[2]);
+    __m256i x_3  = _mm256_set1_epi32(x[3]);
+    __m256i x_4  = _mm256_set1_epi32(x[4]);
+    __m256i x_5  = _mm256_set1_epi32(x[5]);
+    __m256i x_6  = _mm256_set1_epi32(x[6]);
+    __m256i x_7  = _mm256_set1_epi32(x[7]);
+    __m256i x_8  = _mm256_set1_epi32(x[8]);
+    __m256i x_9  = _mm256_set1_epi32(x[9]);
+    __m256i x_10 = _mm256_set1_epi32(x[10]);
+    __m256i x_11 = _mm256_set1_epi32(x[11]);
+    __m256i x_12;
+    __m256i x_13;
+    __m256i x_14 = _mm256_set1_epi32(x[14]);
+    __m256i x_15 = _mm256_set1_epi32(x[15]);
+
+    __m256i orig0  = x_0;
+    __m256i orig1  = x_1;
+    __m256i orig2  = x_2;
+    __m256i orig3  = x_3;
+    __m256i orig4  = x_4;
+    __m256i orig5  = x_5;
+    __m256i orig6  = x_6;
+    __m256i orig7  = x_7;
+    __m256i orig8  = x_8;
+    __m256i orig9  = x_9;
+    __m256i orig10 = x_10;
+    __m256i orig11 = x_11;
+    __m256i orig12;
+    __m256i orig13;
+    __m256i orig14 = x_14;
+    __m256i orig15 = x_15;
+    __m256i t_0, t_1, t_2, t_3, t_4, t_5, t_6, t_7, t_8, t_9, t_10, t_11, t_12,
+        t_13, t_14, t_15;
+
+    while (bytes >= 512) {
+        const __m256i addv12  = _mm256_set_epi64x(3, 2, 1, 0);
+        const __m256i addv13  = _mm256_set_epi64x(7, 6, 5, 4);
+        const __m256i permute = _mm256_set_epi32(7, 6, 3, 2, 5, 4, 1, 0);
+        __m256i       t12, t13;
+
+        uint64_t in1213;
+        int      i;
+
+        x_0  = orig0;
+        x_1  = orig1;
+        x_2  = orig2;
+        x_3  = orig3;
+        x_4  = orig4;
+        x_5  = orig5;
+        x_6  = orig6;
+        x_7  = orig7;
+        x_8  = orig8;
+        x_9  = orig9;
+        x_10 = orig10;
+        x_11 = orig11;
+        x_14 = orig14;
+        x_15 = orig15;
+
+        in12   = x[12];
+        in13   = x[13];
+        in1213 = ((uint64_t) in12) | (((uint64_t) in13) << 32);
+        x_12 = x_13 = _mm256_broadcastq_epi64(_mm_cvtsi64_si128(in1213));
+
+        t12 = _mm256_add_epi64(addv12, x_12);
+        t13 = _mm256_add_epi64(addv13, x_13);
+
+        x_12 = _mm256_unpacklo_epi32(t12, t13);
+        x_13 = _mm256_unpackhi_epi32(t12, t13);
+
+        t12 = _mm256_unpacklo_epi32(x_12, x_13);
+        t13 = _mm256_unpackhi_epi32(x_12, x_13);
+
+        /* required because unpack* are intra-lane */
+        x_12 = _mm256_permutevar8x32_epi32(t12, permute);
+        x_13 = _mm256_permutevar8x32_epi32(t13, permute);
+
+        orig12 = x_12;
+        orig13 = x_13;
+
+        in1213 += 8;
+
+        x[12] = in1213 & 0xFFFFFFFF;
+        x[13] = (in1213 >> 32) & 0xFFFFFFFF;
+
+        for (i = 0; i < ROUNDS; i += 2) {
+            VEC8_ROUND(0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15);
+            VEC8_ROUND(0, 5, 10, 15, 1, 6, 11, 12, 2, 7, 8, 13, 3, 4, 9, 14);
+        }
+
+#define ONEQUAD_TRANSPOSE(A, B, C, D)                                     \
+    {                                                                     \
+        __m128i t0, t1, t2, t3;                                           \
+        x_##A = _mm256_add_epi32(x_##A, orig##A);                         \
+        x_##B = _mm256_add_epi32(x_##B, orig##B);                         \
+        x_##C = _mm256_add_epi32(x_##C, orig##C);                         \
+        x_##D = _mm256_add_epi32(x_##D, orig##D);                         \
+        t_##A = _mm256_unpacklo_epi32(x_##A, x_##B);                      \
+        t_##B = _mm256_unpacklo_epi32(x_##C, x_##D);                      \
+        t_##C = _mm256_unpackhi_epi32(x_##A, x_##B);                      \
+        t_##D = _mm256_unpackhi_epi32(x_##C, x_##D);                      \
+        x_##A = _mm256_unpacklo_epi64(t_##A, t_##B);                      \
+        x_##B = _mm256_unpackhi_epi64(t_##A, t_##B);                      \
+        x_##C = _mm256_unpacklo_epi64(t_##C, t_##D);                      \
+        x_##D = _mm256_unpackhi_epi64(t_##C, t_##D);                      \
+        t0    = _mm_xor_si128(_mm256_extracti128_si256(x_##A, 0),         \
+                           _mm_loadu_si128((const __m128i*) (m + 0))); \
+        _mm_storeu_si128((__m128i*) (c + 0), t0);                         \
+        t1 = _mm_xor_si128(_mm256_extracti128_si256(x_##B, 0),            \
+                           _mm_loadu_si128((const __m128i*) (m + 64)));   \
+        _mm_storeu_si128((__m128i*) (c + 64), t1);                        \
+        t2 = _mm_xor_si128(_mm256_extracti128_si256(x_##C, 0),            \
+                           _mm_loadu_si128((const __m128i*) (m + 128)));  \
+        _mm_storeu_si128((__m128i*) (c + 128), t2);                       \
+        t3 = _mm_xor_si128(_mm256_extracti128_si256(x_##D, 0),            \
+                           _mm_loadu_si128((const __m128i*) (m + 192)));  \
+        _mm_storeu_si128((__m128i*) (c + 192), t3);                       \
+        t0 = _mm_xor_si128(_mm256_extracti128_si256(x_##A, 1),            \
+                           _mm_loadu_si128((const __m128i*) (m + 256)));  \
+        _mm_storeu_si128((__m128i*) (c + 256), t0);                       \
+        t1 = _mm_xor_si128(_mm256_extracti128_si256(x_##B, 1),            \
+                           _mm_loadu_si128((const __m128i*) (m + 320)));  \
+        _mm_storeu_si128((__m128i*) (c + 320), t1);                       \
+        t2 = _mm_xor_si128(_mm256_extracti128_si256(x_##C, 1),            \
+                           _mm_loadu_si128((const __m128i*) (m + 384)));  \
+        _mm_storeu_si128((__m128i*) (c + 384), t2);                       \
+        t3 = _mm_xor_si128(_mm256_extracti128_si256(x_##D, 1),            \
+                           _mm_loadu_si128((const __m128i*) (m + 448)));  \
+        _mm_storeu_si128((__m128i*) (c + 448), t3);                       \
+    }
+
+#define ONEQUAD(A, B, C, D) ONEQUAD_TRANSPOSE(A, B, C, D)
+
+#define ONEQUAD_UNPCK(A, B, C, D)                    \
+    {                                                \
+        x_##A = _mm256_add_epi32(x_##A, orig##A);    \
+        x_##B = _mm256_add_epi32(x_##B, orig##B);    \
+        x_##C = _mm256_add_epi32(x_##C, orig##C);    \
+        x_##D = _mm256_add_epi32(x_##D, orig##D);    \
+        t_##A = _mm256_unpacklo_epi32(x_##A, x_##B); \
+        t_##B = _mm256_unpacklo_epi32(x_##C, x_##D); \
+        t_##C = _mm256_unpackhi_epi32(x_##A, x_##B); \
+        t_##D = _mm256_unpackhi_epi32(x_##C, x_##D); \
+        x_##A = _mm256_unpacklo_epi64(t_##A, t_##B); \
+        x_##B = _mm256_unpackhi_epi64(t_##A, t_##B); \
+        x_##C = _mm256_unpacklo_epi64(t_##C, t_##D); \
+        x_##D = _mm256_unpackhi_epi64(t_##C, t_##D); \
+    }
+
+#define ONEOCTO(A, B, C, D, A2, B2, C2, D2)                          \
+    {                                                                \
+        ONEQUAD_UNPCK(A, B, C, D);                                   \
+        ONEQUAD_UNPCK(A2, B2, C2, D2);                               \
+        t_##A  = _mm256_permute2x128_si256(x_##A, x_##A2, 0x20);     \
+        t_##A2 = _mm256_permute2x128_si256(x_##A, x_##A2, 0x31);     \
+        t_##B  = _mm256_permute2x128_si256(x_##B, x_##B2, 0x20);     \
+        t_##B2 = _mm256_permute2x128_si256(x_##B, x_##B2, 0x31);     \
+        t_##C  = _mm256_permute2x128_si256(x_##C, x_##C2, 0x20);     \
+        t_##C2 = _mm256_permute2x128_si256(x_##C, x_##C2, 0x31);     \
+        t_##D  = _mm256_permute2x128_si256(x_##D, x_##D2, 0x20);     \
+        t_##D2 = _mm256_permute2x128_si256(x_##D, x_##D2, 0x31);     \
+        t_##A  = _mm256_xor_si256(                                   \
+            t_##A, _mm256_loadu_si256((const __m256i*) (m + 0)));   \
+        t_##B = _mm256_xor_si256(                                    \
+            t_##B, _mm256_loadu_si256((const __m256i*) (m + 64)));   \
+        t_##C = _mm256_xor_si256(                                    \
+            t_##C, _mm256_loadu_si256((const __m256i*) (m + 128)));  \
+        t_##D = _mm256_xor_si256(                                    \
+            t_##D, _mm256_loadu_si256((const __m256i*) (m + 192)));  \
+        t_##A2 = _mm256_xor_si256(                                   \
+            t_##A2, _mm256_loadu_si256((const __m256i*) (m + 256))); \
+        t_##B2 = _mm256_xor_si256(                                   \
+            t_##B2, _mm256_loadu_si256((const __m256i*) (m + 320))); \
+        t_##C2 = _mm256_xor_si256(                                   \
+            t_##C2, _mm256_loadu_si256((const __m256i*) (m + 384))); \
+        t_##D2 = _mm256_xor_si256(                                   \
+            t_##D2, _mm256_loadu_si256((const __m256i*) (m + 448))); \
+        _mm256_storeu_si256((__m256i*) (c + 0), t_##A);              \
+        _mm256_storeu_si256((__m256i*) (c + 64), t_##B);             \
+        _mm256_storeu_si256((__m256i*) (c + 128), t_##C);            \
+        _mm256_storeu_si256((__m256i*) (c + 192), t_##D);            \
+        _mm256_storeu_si256((__m256i*) (c + 256), t_##A2);           \
+        _mm256_storeu_si256((__m256i*) (c + 320), t_##B2);           \
+        _mm256_storeu_si256((__m256i*) (c + 384), t_##C2);           \
+        _mm256_storeu_si256((__m256i*) (c + 448), t_##D2);           \
+    }
+
+        ONEOCTO(0, 1, 2, 3, 4, 5, 6, 7);
+        m += 32;
+        c += 32;
+        ONEOCTO(8, 9, 10, 11, 12, 13, 14, 15);
+        m -= 32;
+        c -= 32;
+
+#undef ONEQUAD
+#undef ONEQUAD_TRANSPOSE
+#undef ONEQUAD_UNPCK
+#undef ONEOCTO
+
+        bytes -= 512;
+        c += 512;
+        m += 512;
+    }
+}
+#undef VEC8_ROT
+#undef VEC8_QUARTERROUND
+#undef VEC8_QUARTERROUND_NAIVE
+#undef VEC8_QUARTERROUND_SHUFFLE
+#undef VEC8_QUARTERROUND_SHUFFLE2
+#undef VEC8_LINE1
+#undef VEC8_LINE2
+#undef VEC8_LINE3
+#undef VEC8_LINE4
+#undef VEC8_ROUND
+#undef VEC8_ROUND_SEQ
+#undef VEC8_ROUND_HALF
+#undef VEC8_ROUND_HALFANDHALF
+/* inlined sodium_dolbeau_u4.h */
+
+#define VEC4_ROT(A, IMM) \
+    _mm_or_si128(_mm_slli_epi32(A, IMM), _mm_srli_epi32(A, (32 - IMM)))
+
+/* same, but replace 2 of the shift/shift/or "rotation" by byte shuffles (8 &
+ * 16) (better) */
+#define VEC4_QUARTERROUND_SHUFFLE(A, B, C, D) \
+    x_##A = _mm_add_epi32(x_##A, x_##B);      \
+    t_##A = _mm_xor_si128(x_##D, x_##A);      \
+    x_##D = _mm_shuffle_epi8(t_##A, rot16);   \
+    x_##C = _mm_add_epi32(x_##C, x_##D);      \
+    t_##C = _mm_xor_si128(x_##B, x_##C);      \
+    x_##B = VEC4_ROT(t_##C, 12);              \
+    x_##A = _mm_add_epi32(x_##A, x_##B);      \
+    t_##A = _mm_xor_si128(x_##D, x_##A);      \
+    x_##D = _mm_shuffle_epi8(t_##A, rot8);    \
+    x_##C = _mm_add_epi32(x_##C, x_##D);      \
+    t_##C = _mm_xor_si128(x_##B, x_##C);      \
+    x_##B = VEC4_ROT(t_##C, 7)
+
+#define VEC4_QUARTERROUND(A, B, C, D) VEC4_QUARTERROUND_SHUFFLE(A, B, C, D)
+
+if (bytes >= 256) {
+    /* constant for shuffling bytes (replacing multiple-of-8 rotates) */
+    __m128i rot16 =
+        _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    __m128i rot8 =
+        _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+
+    __m128i x_0  = _mm_set1_epi32(x[0]);
+    __m128i x_1  = _mm_set1_epi32(x[1]);
+    __m128i x_2  = _mm_set1_epi32(x[2]);
+    __m128i x_3  = _mm_set1_epi32(x[3]);
+    __m128i x_4  = _mm_set1_epi32(x[4]);
+    __m128i x_5  = _mm_set1_epi32(x[5]);
+    __m128i x_6  = _mm_set1_epi32(x[6]);
+    __m128i x_7  = _mm_set1_epi32(x[7]);
+    __m128i x_8  = _mm_set1_epi32(x[8]);
+    __m128i x_9  = _mm_set1_epi32(x[9]);
+    __m128i x_10 = _mm_set1_epi32(x[10]);
+    __m128i x_11 = _mm_set1_epi32(x[11]);
+    __m128i x_12;
+    __m128i x_13;
+    __m128i x_14   = _mm_set1_epi32(x[14]);
+    __m128i x_15   = _mm_set1_epi32(x[15]);
+    __m128i orig0  = x_0;
+    __m128i orig1  = x_1;
+    __m128i orig2  = x_2;
+    __m128i orig3  = x_3;
+    __m128i orig4  = x_4;
+    __m128i orig5  = x_5;
+    __m128i orig6  = x_6;
+    __m128i orig7  = x_7;
+    __m128i orig8  = x_8;
+    __m128i orig9  = x_9;
+    __m128i orig10 = x_10;
+    __m128i orig11 = x_11;
+    __m128i orig12;
+    __m128i orig13;
+    __m128i orig14 = x_14;
+    __m128i orig15 = x_15;
+    __m128i t_0, t_1, t_2, t_3, t_4, t_5, t_6, t_7, t_8, t_9, t_10, t_11, t_12,
+        t_13, t_14, t_15;
+
+    uint32_t in12, in13;
+    int      i;
+
+    while (bytes >= 256) {
+        const __m128i addv12 = _mm_set_epi64x(1, 0);
+        const __m128i addv13 = _mm_set_epi64x(3, 2);
+        __m128i       t12, t13;
+        uint64_t      in1213;
+
+        x_0  = orig0;
+        x_1  = orig1;
+        x_2  = orig2;
+        x_3  = orig3;
+        x_4  = orig4;
+        x_5  = orig5;
+        x_6  = orig6;
+        x_7  = orig7;
+        x_8  = orig8;
+        x_9  = orig9;
+        x_10 = orig10;
+        x_11 = orig11;
+        x_14 = orig14;
+        x_15 = orig15;
+
+        in12   = x[12];
+        in13   = x[13];
+        in1213 = ((uint64_t) in12) | (((uint64_t) in13) << 32);
+        t12    = _mm_set1_epi64x(in1213);
+        t13    = _mm_set1_epi64x(in1213);
+
+        x_12 = _mm_add_epi64(addv12, t12);
+        x_13 = _mm_add_epi64(addv13, t13);
+
+        t12 = _mm_unpacklo_epi32(x_12, x_13);
+        t13 = _mm_unpackhi_epi32(x_12, x_13);
+
+        x_12 = _mm_unpacklo_epi32(t12, t13);
+        x_13 = _mm_unpackhi_epi32(t12, t13);
+
+        orig12 = x_12;
+        orig13 = x_13;
+
+        in1213 += 4;
+
+        x[12] = in1213 & 0xFFFFFFFF;
+        x[13] = (in1213 >> 32) & 0xFFFFFFFF;
+
+        for (i = 0; i < ROUNDS; i += 2) {
+            VEC4_QUARTERROUND(0, 4, 8, 12);
+            VEC4_QUARTERROUND(1, 5, 9, 13);
+            VEC4_QUARTERROUND(2, 6, 10, 14);
+            VEC4_QUARTERROUND(3, 7, 11, 15);
+            VEC4_QUARTERROUND(0, 5, 10, 15);
+            VEC4_QUARTERROUND(1, 6, 11, 12);
+            VEC4_QUARTERROUND(2, 7, 8, 13);
+            VEC4_QUARTERROUND(3, 4, 9, 14);
+        }
+
+#define ONEQUAD_TRANSPOSE(A, B, C, D)                                          \
+    {                                                                          \
+        __m128i t0, t1, t2, t3;                                                \
+                                                                               \
+        x_##A = _mm_add_epi32(x_##A, orig##A);                                 \
+        x_##B = _mm_add_epi32(x_##B, orig##B);                                 \
+        x_##C = _mm_add_epi32(x_##C, orig##C);                                 \
+        x_##D = _mm_add_epi32(x_##D, orig##D);                                 \
+        t_##A = _mm_unpacklo_epi32(x_##A, x_##B);                              \
+        t_##B = _mm_unpacklo_epi32(x_##C, x_##D);                              \
+        t_##C = _mm_unpackhi_epi32(x_##A, x_##B);                              \
+        t_##D = _mm_unpackhi_epi32(x_##C, x_##D);                              \
+        x_##A = _mm_unpacklo_epi64(t_##A, t_##B);                              \
+        x_##B = _mm_unpackhi_epi64(t_##A, t_##B);                              \
+        x_##C = _mm_unpacklo_epi64(t_##C, t_##D);                              \
+        x_##D = _mm_unpackhi_epi64(t_##C, t_##D);                              \
+                                                                               \
+        t0 = _mm_xor_si128(x_##A, _mm_loadu_si128((const __m128i*) (m + 0)));  \
+        _mm_storeu_si128((__m128i*) (c + 0), t0);                              \
+        t1 = _mm_xor_si128(x_##B, _mm_loadu_si128((const __m128i*) (m + 64))); \
+        _mm_storeu_si128((__m128i*) (c + 64), t1);                             \
+        t2 =                                                                   \
+            _mm_xor_si128(x_##C, _mm_loadu_si128((const __m128i*) (m + 128))); \
+        _mm_storeu_si128((__m128i*) (c + 128), t2);                            \
+        t3 =                                                                   \
+            _mm_xor_si128(x_##D, _mm_loadu_si128((const __m128i*) (m + 192))); \
+        _mm_storeu_si128((__m128i*) (c + 192), t3);                            \
+    }
+
+#define ONEQUAD(A, B, C, D) ONEQUAD_TRANSPOSE(A, B, C, D)
+
+        ONEQUAD(0, 1, 2, 3);
+        m += 16;
+        c += 16;
+        ONEQUAD(4, 5, 6, 7);
+        m += 16;
+        c += 16;
+        ONEQUAD(8, 9, 10, 11);
+        m += 16;
+        c += 16;
+        ONEQUAD(12, 13, 14, 15);
+        m -= 48;
+        c -= 48;
+
+#undef ONEQUAD
+#undef ONEQUAD_TRANSPOSE
+
+        bytes -= 256;
+        c += 256;
+        m += 256;
+    }
+}
+#undef VEC4_ROT
+#undef VEC4_QUARTERROUND
+#undef VEC4_QUARTERROUND_SHUFFLE
+/* inlined sodium_dolbeau_u1.h */
+while (bytes >= 64) {
+    __m128i       x_0, x_1, x_2, x_3;
+    __m128i       t_1;
+    const __m128i rot16 =
+        _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    const __m128i rot8 =
+        _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+
+    uint32_t in12;
+    uint32_t in13;
+    int      i;
+
+    x_0 = _mm_loadu_si128((const __m128i*) (x + 0));
+    x_1 = _mm_loadu_si128((const __m128i*) (x + 4));
+    x_2 = _mm_loadu_si128((const __m128i*) (x + 8));
+    x_3 = _mm_loadu_si128((const __m128i*) (x + 12));
+
+    for (i = 0; i < ROUNDS; i += 2) {
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x93);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x39);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x39);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x93);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+    }
+    x_0 = _mm_add_epi32(x_0, _mm_loadu_si128((const __m128i*) (x + 0)));
+    x_1 = _mm_add_epi32(x_1, _mm_loadu_si128((const __m128i*) (x + 4)));
+    x_2 = _mm_add_epi32(x_2, _mm_loadu_si128((const __m128i*) (x + 8)));
+    x_3 = _mm_add_epi32(x_3, _mm_loadu_si128((const __m128i*) (x + 12)));
+    x_0 = _mm_xor_si128(x_0, _mm_loadu_si128((const __m128i*) (m + 0)));
+    x_1 = _mm_xor_si128(x_1, _mm_loadu_si128((const __m128i*) (m + 16)));
+    x_2 = _mm_xor_si128(x_2, _mm_loadu_si128((const __m128i*) (m + 32)));
+    x_3 = _mm_xor_si128(x_3, _mm_loadu_si128((const __m128i*) (m + 48)));
+    _mm_storeu_si128((__m128i*) (c + 0), x_0);
+    _mm_storeu_si128((__m128i*) (c + 16), x_1);
+    _mm_storeu_si128((__m128i*) (c + 32), x_2);
+    _mm_storeu_si128((__m128i*) (c + 48), x_3);
+
+    in12 = x[12];
+    in13 = x[13];
+    in12++;
+    if (in12 == 0) {
+        in13++;
+    }
+    x[12] = in12;
+    x[13] = in13;
+
+    bytes -= 64;
+    c += 64;
+    m += 64;
+}
+/* inlined sodium_dolbeau_u0.h */
+if (bytes > 0) {
+    __m128i       x_0, x_1, x_2, x_3;
+    __m128i       t_1;
+    const __m128i rot16 =
+        _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
+    const __m128i rot8 =
+        _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
+    uint8_t partialblock[64];
+
+    unsigned int i;
+
+    x_0 = _mm_loadu_si128((const __m128i*) (x + 0));
+    x_1 = _mm_loadu_si128((const __m128i*) (x + 4));
+    x_2 = _mm_loadu_si128((const __m128i*) (x + 8));
+    x_3 = _mm_loadu_si128((const __m128i*) (x + 12));
+
+    for (i = 0; i < ROUNDS; i += 2) {
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x93);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x39);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_3 = _mm_shuffle_epi8(x_3, rot16);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_1 = _mm_xor_si128(x_1, x_2);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 12);
+        t_1 = _mm_srli_epi32(t_1, 20);
+        x_1 = _mm_xor_si128(x_1, t_1);
+
+        x_0 = _mm_add_epi32(x_0, x_1);
+        x_3 = _mm_xor_si128(x_3, x_0);
+        x_0 = _mm_shuffle_epi32(x_0, 0x39);
+        x_3 = _mm_shuffle_epi8(x_3, rot8);
+
+        x_2 = _mm_add_epi32(x_2, x_3);
+        x_3 = _mm_shuffle_epi32(x_3, 0x4e);
+        x_1 = _mm_xor_si128(x_1, x_2);
+        x_2 = _mm_shuffle_epi32(x_2, 0x93);
+
+        t_1 = x_1;
+        x_1 = _mm_slli_epi32(x_1, 7);
+        t_1 = _mm_srli_epi32(t_1, 25);
+        x_1 = _mm_xor_si128(x_1, t_1);
+    }
+    x_0 = _mm_add_epi32(x_0, _mm_loadu_si128((const __m128i*) (x + 0)));
+    x_1 = _mm_add_epi32(x_1, _mm_loadu_si128((const __m128i*) (x + 4)));
+    x_2 = _mm_add_epi32(x_2, _mm_loadu_si128((const __m128i*) (x + 8)));
+    x_3 = _mm_add_epi32(x_3, _mm_loadu_si128((const __m128i*) (x + 12)));
+    _mm_storeu_si128((__m128i*) (partialblock + 0), x_0);
+    _mm_storeu_si128((__m128i*) (partialblock + 16), x_1);
+    _mm_storeu_si128((__m128i*) (partialblock + 32), x_2);
+    _mm_storeu_si128((__m128i*) (partialblock + 48), x_3);
+
+    for (i = 0; i < bytes; i++) {
+        c[i] = m[i] ^ partialblock[i];
+    }
+
+    sodium_memzero(partialblock, sizeof partialblock);
+}
+}
+
+static int
+stream_ref(unsigned char *c, unsigned long long clen, const unsigned char *n,
+           const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
+    chacha_keysetup(&ctx, k);
+    chacha_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ietf_ext_ref(unsigned char *c, unsigned long long clen,
+                    const unsigned char *n, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    COMPILER_ASSERT(crypto_stream_chacha20_KEYBYTES == 256 / 8);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha20_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                  unsigned long long mlen, const unsigned char *n, uint64_t ic,
+                  const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[8];
+    uint32_t          ic_high;
+    uint32_t          ic_low;
+
+    if (!mlen) {
+        return 0;
+    }
+    ic_high = (uint32_t) (ic >> 32);
+    ic_low  = (uint32_t) ic;
+    STORE32_LE(&ic_bytes[0], ic_low);
+    STORE32_LE(&ic_bytes[4], ic_high);
+    chacha_keysetup(&ctx, k);
+    chacha_ivsetup(&ctx, n, ic_bytes);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+static int
+stream_ietf_ext_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           uint32_t ic, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[4];
+
+    if (!mlen) {
+        return 0;
+    }
+    STORE32_LE(ic_bytes, ic);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, ic_bytes);
+    chacha20_encrypt_bytes(&ctx, m, c, mlen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
+struct crypto_stream_chacha20_implementation
+    crypto_stream_chacha20_dolbeau_avx2_implementation = {
+        SODIUM_C99(.stream =) stream_ref,
+        SODIUM_C99(.stream_ietf_ext =) stream_ietf_ext_ref,
+        SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic,
+        SODIUM_C99(.stream_ietf_ext_xor_ic =) stream_ietf_ext_ref_xor_ic
+    };
+
+# ifdef __clang__
+#  pragma clang attribute pop
+# endif
+
+#endif
+
+int chacha20_dolbeau_link_warning_dummy = 0;
+#undef chacha_ctx
+#undef chacha_keysetup
+#undef chacha_ivsetup
+#undef chacha_ietf_ivsetup
+#undef chacha20_encrypt_bytes
+#undef stream_ref
+#undef stream_ietf_ext_ref
+#undef stream_ref_xor_ic
+#undef stream_ietf_ext_ref_xor_ic
+#undef ROUNDS
+#undef VEC8_ROT
+#undef VEC8_QUARTERROUND_NAIVE
+#undef VEC8_QUARTERROUND_SHUFFLE
+#undef VEC8_QUARTERROUND_SHUFFLE2
+#undef VEC8_QUARTERROUND
+#undef VEC8_LINE1
+#undef VEC8_LINE2
+#undef VEC8_LINE3
+#undef VEC8_LINE4
+#undef VEC8_ROUND_SEQ
+#undef VEC8_ROUND_HALF
+#undef VEC8_ROUND_HALFANDHALF
+#undef VEC8_ROUND
+#undef ONEQUAD_TRANSPOSE
+#undef ONEQUAD
+#undef ONEQUAD_UNPCK
+#undef ONEOCTO
+#undef VEC4_ROT
+#undef VEC4_QUARTERROUND_SHUFFLE
+#undef VEC4_QUARTERROUND
+
+/* ================= sodium_stream_chacha20.c ================= */
+#define implementation implementation__cc20
+#include <stdio.h>
+
+#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
+    defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
+#endif
+#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
+#endif
+
+static const crypto_stream_chacha20_implementation *implementation =
+    &crypto_stream_chacha20_ref_implementation;
+
+size_t
+crypto_stream_chacha20_keybytes(void) {
+    return crypto_stream_chacha20_KEYBYTES;
+}
+
+size_t
+crypto_stream_chacha20_noncebytes(void) {
+    return crypto_stream_chacha20_NONCEBYTES;
+}
+
+size_t
+crypto_stream_chacha20_messagebytes_max(void)
+{
+    return crypto_stream_chacha20_MESSAGEBYTES_MAX;
+}
+
+size_t
+crypto_stream_chacha20_ietf_keybytes(void) {
+    return crypto_stream_chacha20_ietf_KEYBYTES;
+}
+
+size_t
+crypto_stream_chacha20_ietf_noncebytes(void) {
+    return crypto_stream_chacha20_ietf_NONCEBYTES;
+}
+
+size_t
+crypto_stream_chacha20_ietf_messagebytes_max(void)
+{
+    return crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX;
+}
+
+int
+crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
+                       const unsigned char *n, const unsigned char *k)
+{
+    if (clen > crypto_stream_chacha20_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return implementation->stream(c, clen, n, k);
+}
+
+int
+crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
+                              unsigned long long mlen,
+                              const unsigned char *n, uint64_t ic,
+                              const unsigned char *k)
+{
+    if (mlen > crypto_stream_chacha20_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return implementation->stream_xor_ic(c, m, mlen, n, ic, k);
+}
+
+int
+crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           const unsigned char *k)
+{
+    if (mlen > crypto_stream_chacha20_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return implementation->stream_xor_ic(c, m, mlen, n, 0U, k);
+}
+
+int
+crypto_stream_chacha20_ietf_ext(unsigned char *c, unsigned long long clen,
+                                const unsigned char *n, const unsigned char *k)
+{
+    if (clen > crypto_stream_chacha20_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return implementation->stream_ietf_ext(c, clen, n, k);
+}
+
+int
+crypto_stream_chacha20_ietf_ext_xor_ic(unsigned char *c, const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n, uint32_t ic,
+                                       const unsigned char *k)
+{
+    if (mlen > crypto_stream_chacha20_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return implementation->stream_ietf_ext_xor_ic(c, m, mlen, n, ic, k);
+}
+
+static int
+crypto_stream_chacha20_ietf_ext_xor(unsigned char *c, const unsigned char *m,
+                                    unsigned long long mlen, const unsigned char *n,
+                                    const unsigned char *k)
+{
+    if (mlen > crypto_stream_chacha20_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return implementation->stream_ietf_ext_xor_ic(c, m, mlen, n, 0U, k);
+}
+
+int
+crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+{
+    if (clen > crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return crypto_stream_chacha20_ietf_ext(c, clen, n, k);
+}
+
+int
+crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint32_t ic,
+                                   const unsigned char *k)
+{
+    if ((unsigned long long) ic >
+        (64ULL * (1ULL << 32)) / 64ULL - (mlen + 63ULL) / 64ULL) {
+        sodium_misuse();
+    }
+    return crypto_stream_chacha20_ietf_ext_xor_ic(c, m, mlen, n, ic, k);
+}
+
+int
+crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char *n,
+                                const unsigned char *k)
+{
+    if (mlen > crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    return crypto_stream_chacha20_ietf_ext_xor(c, m, mlen, n, k);
+}
+
+void
+crypto_stream_chacha20_ietf_keygen(unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES])
+{
+    randombytes_buf(k, crypto_stream_chacha20_ietf_KEYBYTES);
+}
+
+void
+crypto_stream_chacha20_keygen(unsigned char k[crypto_stream_chacha20_KEYBYTES])
+{
+    randombytes_buf(k, crypto_stream_chacha20_KEYBYTES);
+}
+
+int
+_crypto_stream_chacha20_pick_best_implementation(void)
+{
+    implementation = &crypto_stream_chacha20_ref_implementation;
+#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
+    defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
+    if (sodium_runtime_has_avx2()) {
+        #if NETCODE_CRYPTO_LOGS
+        printf( "chacha20 -> avx2\n" );
+        #endif // #if NETCODE_CRYPTO_LOGS
+        implementation = &crypto_stream_chacha20_dolbeau_avx2_implementation;
+        return 0;
+    }
+#endif
+#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
+    if (sodium_runtime_has_ssse3()) {
+        #if NETCODE_CRYPTO_LOGS
+        printf( "chacha20 -> ssse3\n" );
+        #endif // #if NETCODE_CRYPTO_LOGS
+        implementation = &crypto_stream_chacha20_dolbeau_ssse3_implementation;
+        return 0;
+    }
+#endif
+    #if NETCODE_CRYPTO_LOGS
+    printf( "chacha20 -> ref\n" );
+    #endif // #if NETCODE_CRYPTO_LOGS
+    return 0;
+}
+#undef implementation
+
+/* ================= sodium_core_hchacha20.c ================= */
+
+#include <stdint.h>
+#include <stdlib.h>
+
+
+#define QUARTERROUND(A, B, C, D)     \
+  do {                               \
+      A += B; D = ROTL32(D ^ A, 16); \
+      C += D; B = ROTL32(B ^ C, 12); \
+      A += B; D = ROTL32(D ^ A,  8); \
+      C += D; B = ROTL32(B ^ C,  7); \
+  } while(0)
+
+int
+crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
+                      const unsigned char *k, const unsigned char *c)
+{
+    int      i;
+    uint32_t x0, x1, x2, x3, x4, x5, x6, x7;
+    uint32_t x8, x9, x10, x11, x12, x13, x14, x15;
+
+    if (c == NULL) {
+        x0 = 0x61707865;
+        x1 = 0x3320646e;
+        x2 = 0x79622d32;
+        x3 = 0x6b206574;
+    } else {
+        x0 = LOAD32_LE(c +  0);
+        x1 = LOAD32_LE(c +  4);
+        x2 = LOAD32_LE(c +  8);
+        x3 = LOAD32_LE(c + 12);
+    }
+    x4  = LOAD32_LE(k +  0);
+    x5  = LOAD32_LE(k +  4);
+    x6  = LOAD32_LE(k +  8);
+    x7  = LOAD32_LE(k + 12);
+    x8  = LOAD32_LE(k + 16);
+    x9  = LOAD32_LE(k + 20);
+    x10 = LOAD32_LE(k + 24);
+    x11 = LOAD32_LE(k + 28);
+    x12 = LOAD32_LE(in +  0);
+    x13 = LOAD32_LE(in +  4);
+    x14 = LOAD32_LE(in +  8);
+    x15 = LOAD32_LE(in + 12);
+
+    for (i = 0; i < 10; i++) {
+        QUARTERROUND(x0, x4,  x8, x12);
+        QUARTERROUND(x1, x5,  x9, x13);
+        QUARTERROUND(x2, x6, x10, x14);
+        QUARTERROUND(x3, x7, x11, x15);
+        QUARTERROUND(x0, x5, x10, x15);
+        QUARTERROUND(x1, x6, x11, x12);
+        QUARTERROUND(x2, x7,  x8, x13);
+        QUARTERROUND(x3, x4,  x9, x14);
+    }
+
+    STORE32_LE(out +  0, x0);
+    STORE32_LE(out +  4, x1);
+    STORE32_LE(out +  8, x2);
+    STORE32_LE(out + 12, x3);
+    STORE32_LE(out + 16, x12);
+    STORE32_LE(out + 20, x13);
+    STORE32_LE(out + 24, x14);
+    STORE32_LE(out + 28, x15);
+
+    return 0;
+}
+
+size_t
+crypto_core_hchacha20_outputbytes(void)
+{
+    return crypto_core_hchacha20_OUTPUTBYTES;
+}
+
+size_t
+crypto_core_hchacha20_inputbytes(void)
+{
+    return crypto_core_hchacha20_INPUTBYTES;
+}
+
+size_t
+crypto_core_hchacha20_keybytes(void)
+{
+    return crypto_core_hchacha20_KEYBYTES;
+}
+
+size_t
+crypto_core_hchacha20_constbytes(void)
+{
+    return crypto_core_hchacha20_CONSTBYTES;
+}
+#undef QUARTERROUND
+
+/* ================= sodium_poly1305_donna.c ================= */
+
+
+#ifdef HAVE_TI_MODE
+/* inlined sodium_poly1305_donna64.h */
+/*
+   poly1305 implementation using 64 bit * 64 bit = 128 bit multiplication
+   and 128 bit addition
+*/
+
+
+#define MUL(out, x, y) out = ((uint128_t) x * y)
+#define ADD(out, in) out += in
+#define ADDLO(out, in) out += in
+#define SHR(in, shift) (unsigned long long) (in >> (shift))
+#define LO(in) (unsigned long long) (in)
+
+#if defined(_MSC_VER)
+# define POLY1305_NOINLINE __declspec(noinline)
+#elif defined(__clang__) || defined(__GNUC__)
+# define POLY1305_NOINLINE __attribute__((noinline))
+#else
+# define POLY1305_NOINLINE
+#endif
+
+#define poly1305_block_size 16
+
+/* 17 + sizeof(unsigned long long) + 8*sizeof(unsigned long long) */
+typedef struct poly1305_state_internal_t {
+    unsigned long long r[3];
+    unsigned long long h[3];
+    unsigned long long pad[2];
+    unsigned long long leftover;
+    unsigned char      buffer[poly1305_block_size];
+    unsigned char      final;
+} poly1305_state_internal_t;
+
+static void
+poly1305_init(poly1305_state_internal_t *st, const unsigned char key[32])
+{
+    unsigned long long t0, t1;
+
+    /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
+    t0 = LOAD64_LE(&key[0]);
+    t1 = LOAD64_LE(&key[8]);
+
+    /* wiped after finalization */
+    st->r[0] = (t0) &0xffc0fffffff;
+    st->r[1] = ((t0 >> 44) | (t1 << 20)) & 0xfffffc0ffff;
+    st->r[2] = ((t1 >> 24)) & 0x00ffffffc0f;
+
+    /* h = 0 */
+    st->h[0] = 0;
+    st->h[1] = 0;
+    st->h[2] = 0;
+
+    /* save pad for later */
+    st->pad[0] = LOAD64_LE(&key[16]);
+    st->pad[1] = LOAD64_LE(&key[24]);
+
+    st->leftover = 0;
+    st->final    = 0;
+}
+
+static void
+poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m,
+                unsigned long long bytes)
+{
+    const unsigned long long hibit =
+        (st->final) ? 0ULL : (1ULL << 40); /* 1 << 128 */
+    unsigned long long r0, r1, r2;
+    unsigned long long s1, s2;
+    unsigned long long h0, h1, h2;
+    unsigned long long c;
+    uint128_t          d0, d1, d2, d;
+
+    r0 = st->r[0];
+    r1 = st->r[1];
+    r2 = st->r[2];
+
+    h0 = st->h[0];
+    h1 = st->h[1];
+    h2 = st->h[2];
+
+    s1 = r1 * (5 << 2);
+    s2 = r2 * (5 << 2);
+
+    while (bytes >= poly1305_block_size) {
+        unsigned long long t0, t1;
+
+        /* h += m[i] */
+        t0 = LOAD64_LE(&m[0]);
+        t1 = LOAD64_LE(&m[8]);
+
+        h0 += ((t0) &0xfffffffffff);
+        h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff);
+        h2 += (((t1 >> 24)) & 0x3ffffffffff) | hibit;
+
+        /* h *= r */
+        MUL(d0, h0, r0);
+        MUL(d, h1, s2);
+        ADD(d0, d);
+        MUL(d, h2, s1);
+        ADD(d0, d);
+        MUL(d1, h0, r1);
+        MUL(d, h1, r0);
+        ADD(d1, d);
+        MUL(d, h2, s2);
+        ADD(d1, d);
+        MUL(d2, h0, r2);
+        MUL(d, h1, r1);
+        ADD(d2, d);
+        MUL(d, h2, r0);
+        ADD(d2, d);
+
+        /* (partial) h %= p */
+        c  = SHR(d0, 44);
+        h0 = LO(d0) & 0xfffffffffff;
+        ADDLO(d1, c);
+        c  = SHR(d1, 44);
+        h1 = LO(d1) & 0xfffffffffff;
+        ADDLO(d2, c);
+        c  = SHR(d2, 42);
+        h2 = LO(d2) & 0x3ffffffffff;
+        h0 += c * 5;
+        c  = (h0 >> 44);
+        h0 = h0 & 0xfffffffffff;
+        h1 += c;
+
+        m += poly1305_block_size;
+        bytes -= poly1305_block_size;
+    }
+
+    st->h[0] = h0;
+    st->h[1] = h1;
+    st->h[2] = h2;
+}
+
+static POLY1305_NOINLINE void
+poly1305_finish(poly1305_state_internal_t *st, unsigned char mac[16])
+{
+    unsigned long long h0, h1, h2, c;
+    unsigned long long g0, g1, g2;
+    unsigned long long t0, t1;
+
+    /* process the remaining block */
+    if (st->leftover) {
+        unsigned long long i = st->leftover;
+
+        st->buffer[i] = 1;
+
+        for (i = i + 1; i < poly1305_block_size; i++) {
+            st->buffer[i] = 0;
+        }
+        st->final = 1;
+        poly1305_blocks(st, st->buffer, poly1305_block_size);
+    }
+
+    /* fully carry h */
+    h0 = st->h[0];
+    h1 = st->h[1];
+    h2 = st->h[2];
+
+    c = (h1 >> 44);
+    h1 &= 0xfffffffffff;
+    h2 += c;
+    c = (h2 >> 42);
+    h2 &= 0x3ffffffffff;
+    h0 += c * 5;
+    c = (h0 >> 44);
+    h0 &= 0xfffffffffff;
+    h1 += c;
+    c = (h1 >> 44);
+    h1 &= 0xfffffffffff;
+    h2 += c;
+    c = (h2 >> 42);
+    h2 &= 0x3ffffffffff;
+    h0 += c * 5;
+    c = (h0 >> 44);
+    h0 &= 0xfffffffffff;
+    h1 += c;
+
+    /* compute h + -p */
+    g0 = h0 + 5;
+    c  = (g0 >> 44);
+    g0 &= 0xfffffffffff;
+    g1 = h1 + c;
+    c  = (g1 >> 44);
+    g1 &= 0xfffffffffff;
+    g2 = h2 + c - (1ULL << 42);
+
+    /* select h if h < p, or h + -p if h >= p */
+    c = (g2 >> ((sizeof(unsigned long long) * 8) - 1)) - 1;
+    g0 &= c;
+    g1 &= c;
+    g2 &= c;
+    c  = ~c;
+    h0 = (h0 & c) | g0;
+    h1 = (h1 & c) | g1;
+    h2 = (h2 & c) | g2;
+
+    /* h = (h + pad) */
+    t0 = st->pad[0];
+    t1 = st->pad[1];
+
+    h0 += ((t0) &0xfffffffffff);
+    c = (h0 >> 44);
+    h0 &= 0xfffffffffff;
+    h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff) + c;
+    c = (h1 >> 44);
+    h1 &= 0xfffffffffff;
+    h2 += (((t1 >> 24)) & 0x3ffffffffff) + c;
+    h2 &= 0x3ffffffffff;
+
+    /* mac = h % (2^128) */
+    h0 = ((h0) | (h1 << 44));
+    h1 = ((h1 >> 20) | (h2 << 24));
+
+    STORE64_LE(&mac[0], h0);
+    STORE64_LE(&mac[8], h1);
+
+    /* zero out the state */
+    sodium_memzero((void *) st, sizeof *st);
+}
+#else
+/* inlined sodium_poly1305_donna32.h */
+/*
+   poly1305 implementation using 32 bit * 32 bit = 64 bit multiplication
+   and 64 bit addition
+*/
+
+#if defined(_MSC_VER)
+# define POLY1305_NOINLINE __declspec(noinline)
+#elif defined(__clang__) || defined(__GNUC__)
+# define POLY1305_NOINLINE __attribute__((noinline))
+#else
+# define POLY1305_NOINLINE
+#endif
+
+
+#define poly1305_block_size 16
+
+/* 17 + sizeof(unsigned long long) + 14*sizeof(unsigned long) */
+typedef struct poly1305_state_internal_t {
+    unsigned long      r[5];
+    unsigned long      h[5];
+    unsigned long      pad[4];
+    unsigned long long leftover;
+    unsigned char      buffer[poly1305_block_size];
+    unsigned char      final;
+} poly1305_state_internal_t;
+
+static void
+poly1305_init(poly1305_state_internal_t *st, const unsigned char key[32])
+{
+    /* r &= 0xffffffc0ffffffc0ffffffc0fffffff - wiped after finalization */
+    st->r[0] = (LOAD32_LE(&key[0])) & 0x3ffffff;
+    st->r[1] = (LOAD32_LE(&key[3]) >> 2) & 0x3ffff03;
+    st->r[2] = (LOAD32_LE(&key[6]) >> 4) & 0x3ffc0ff;
+    st->r[3] = (LOAD32_LE(&key[9]) >> 6) & 0x3f03fff;
+    st->r[4] = (LOAD32_LE(&key[12]) >> 8) & 0x00fffff;
+
+    /* h = 0 */
+    st->h[0] = 0;
+    st->h[1] = 0;
+    st->h[2] = 0;
+    st->h[3] = 0;
+    st->h[4] = 0;
+
+    /* save pad for later */
+    st->pad[0] = LOAD32_LE(&key[16]);
+    st->pad[1] = LOAD32_LE(&key[20]);
+    st->pad[2] = LOAD32_LE(&key[24]);
+    st->pad[3] = LOAD32_LE(&key[28]);
+
+    st->leftover = 0;
+    st->final    = 0;
+}
+
+static void
+poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m,
+                unsigned long long bytes)
+{
+    const unsigned long hibit = (st->final) ? 0UL : (1UL << 24); /* 1 << 128 */
+    unsigned long       r0, r1, r2, r3, r4;
+    unsigned long       s1, s2, s3, s4;
+    unsigned long       h0, h1, h2, h3, h4;
+    unsigned long long  d0, d1, d2, d3, d4;
+    unsigned long       c;
+
+    r0 = st->r[0];
+    r1 = st->r[1];
+    r2 = st->r[2];
+    r3 = st->r[3];
+    r4 = st->r[4];
+
+    s1 = r1 * 5;
+    s2 = r2 * 5;
+    s3 = r3 * 5;
+    s4 = r4 * 5;
+
+    h0 = st->h[0];
+    h1 = st->h[1];
+    h2 = st->h[2];
+    h3 = st->h[3];
+    h4 = st->h[4];
+
+    while (bytes >= poly1305_block_size) {
+        /* h += m[i] */
+        h0 += (LOAD32_LE(m + 0)) & 0x3ffffff;
+        h1 += (LOAD32_LE(m + 3) >> 2) & 0x3ffffff;
+        h2 += (LOAD32_LE(m + 6) >> 4) & 0x3ffffff;
+        h3 += (LOAD32_LE(m + 9) >> 6) & 0x3ffffff;
+        h4 += (LOAD32_LE(m + 12) >> 8) | hibit;
+
+        /* h *= r */
+        d0 = ((unsigned long long) h0 * r0) + ((unsigned long long) h1 * s4) +
+             ((unsigned long long) h2 * s3) + ((unsigned long long) h3 * s2) +
+             ((unsigned long long) h4 * s1);
+        d1 = ((unsigned long long) h0 * r1) + ((unsigned long long) h1 * r0) +
+             ((unsigned long long) h2 * s4) + ((unsigned long long) h3 * s3) +
+             ((unsigned long long) h4 * s2);
+        d2 = ((unsigned long long) h0 * r2) + ((unsigned long long) h1 * r1) +
+             ((unsigned long long) h2 * r0) + ((unsigned long long) h3 * s4) +
+             ((unsigned long long) h4 * s3);
+        d3 = ((unsigned long long) h0 * r3) + ((unsigned long long) h1 * r2) +
+             ((unsigned long long) h2 * r1) + ((unsigned long long) h3 * r0) +
+             ((unsigned long long) h4 * s4);
+        d4 = ((unsigned long long) h0 * r4) + ((unsigned long long) h1 * r3) +
+             ((unsigned long long) h2 * r2) + ((unsigned long long) h3 * r1) +
+             ((unsigned long long) h4 * r0);
+
+        /* (partial) h %= p */
+        c  = (unsigned long) (d0 >> 26);
+        h0 = (unsigned long) d0 & 0x3ffffff;
+        d1 += c;
+        c  = (unsigned long) (d1 >> 26);
+        h1 = (unsigned long) d1 & 0x3ffffff;
+        d2 += c;
+        c  = (unsigned long) (d2 >> 26);
+        h2 = (unsigned long) d2 & 0x3ffffff;
+        d3 += c;
+        c  = (unsigned long) (d3 >> 26);
+        h3 = (unsigned long) d3 & 0x3ffffff;
+        d4 += c;
+        c  = (unsigned long) (d4 >> 26);
+        h4 = (unsigned long) d4 & 0x3ffffff;
+        h0 += c * 5;
+        c  = (h0 >> 26);
+        h0 = h0 & 0x3ffffff;
+        h1 += c;
+
+        m += poly1305_block_size;
+        bytes -= poly1305_block_size;
+    }
+
+    st->h[0] = h0;
+    st->h[1] = h1;
+    st->h[2] = h2;
+    st->h[3] = h3;
+    st->h[4] = h4;
+}
+
+static POLY1305_NOINLINE void
+poly1305_finish(poly1305_state_internal_t *st, unsigned char mac[16])
+{
+    unsigned long      h0, h1, h2, h3, h4, c;
+    unsigned long      g0, g1, g2, g3, g4;
+    unsigned long long f;
+    unsigned long      mask;
+
+    /* process the remaining block */
+    if (st->leftover) {
+        unsigned long long i = st->leftover;
+
+        st->buffer[i++] = 1;
+        for (; i < poly1305_block_size; i++) {
+            st->buffer[i] = 0;
+        }
+        st->final = 1;
+        poly1305_blocks(st, st->buffer, poly1305_block_size);
+    }
+
+    /* fully carry h */
+    h0 = st->h[0];
+    h1 = st->h[1];
+    h2 = st->h[2];
+    h3 = st->h[3];
+    h4 = st->h[4];
+
+    c  = h1 >> 26;
+    h1 = h1 & 0x3ffffff;
+    h2 += c;
+    c  = h2 >> 26;
+    h2 = h2 & 0x3ffffff;
+    h3 += c;
+    c  = h3 >> 26;
+    h3 = h3 & 0x3ffffff;
+    h4 += c;
+    c  = h4 >> 26;
+    h4 = h4 & 0x3ffffff;
+    h0 += c * 5;
+    c  = h0 >> 26;
+    h0 = h0 & 0x3ffffff;
+    h1 += c;
+
+    /* compute h + -p */
+    g0 = h0 + 5;
+    c  = g0 >> 26;
+    g0 &= 0x3ffffff;
+    g1 = h1 + c;
+    c  = g1 >> 26;
+    g1 &= 0x3ffffff;
+    g2 = h2 + c;
+    c  = g2 >> 26;
+    g2 &= 0x3ffffff;
+    g3 = h3 + c;
+    c  = g3 >> 26;
+    g3 &= 0x3ffffff;
+    g4 = h4 + c - (1UL << 26);
+
+    /* select h if h < p, or h + -p if h >= p */
+    mask = (g4 >> ((sizeof(unsigned long) * 8) - 1)) - 1;
+    g0 &= mask;
+    g1 &= mask;
+    g2 &= mask;
+    g3 &= mask;
+    g4 &= mask;
+    mask = ~mask;
+
+    h0 = (h0 & mask) | g0;
+    h1 = (h1 & mask) | g1;
+    h2 = (h2 & mask) | g2;
+    h3 = (h3 & mask) | g3;
+    h4 = (h4 & mask) | g4;
+
+    /* h = h % (2^128) */
+    h0 = ((h0) | (h1 << 26)) & 0xffffffff;
+    h1 = ((h1 >> 6) | (h2 << 20)) & 0xffffffff;
+    h2 = ((h2 >> 12) | (h3 << 14)) & 0xffffffff;
+    h3 = ((h3 >> 18) | (h4 << 8)) & 0xffffffff;
+
+    /* mac = (h + pad) % (2^128) */
+    f  = (unsigned long long) h0 + st->pad[0];
+    h0 = (unsigned long) f;
+    f  = (unsigned long long) h1 + st->pad[1] + (f >> 32);
+    h1 = (unsigned long) f;
+    f  = (unsigned long long) h2 + st->pad[2] + (f >> 32);
+    h2 = (unsigned long) f;
+    f  = (unsigned long long) h3 + st->pad[3] + (f >> 32);
+    h3 = (unsigned long) f;
+
+    STORE32_LE(mac + 0, (uint32_t) h0);
+    STORE32_LE(mac + 4, (uint32_t) h1);
+    STORE32_LE(mac + 8, (uint32_t) h2);
+    STORE32_LE(mac + 12, (uint32_t) h3);
+
+    /* zero out the state */
+    sodium_memzero((void *) st, sizeof *st);
+}
+#endif
+
+static void
+poly1305_update(poly1305_state_internal_t *st, const unsigned char *m,
+                unsigned long long bytes)
+{
+    unsigned long long i;
+
+    /* handle leftover */
+    if (st->leftover) {
+        unsigned long long want = (poly1305_block_size - st->leftover);
+
+        if (want > bytes) {
+            want = bytes;
+        }
+        for (i = 0; i < want; i++) {
+            st->buffer[st->leftover + i] = m[i];
+        }
+        bytes -= want;
+        m += want;
+        st->leftover += want;
+        if (st->leftover < poly1305_block_size) {
+            return;
+        }
+        poly1305_blocks(st, st->buffer, poly1305_block_size);
+        st->leftover = 0;
+    }
+
+    /* process full blocks */
+    if (bytes >= poly1305_block_size) {
+        unsigned long long want = (bytes & ~(poly1305_block_size - 1));
+
+        poly1305_blocks(st, m, want);
+        m += want;
+        bytes -= want;
+    }
+
+    /* store leftover */
+    if (bytes) {
+        for (i = 0; i < bytes; i++) {
+            st->buffer[st->leftover + i] = m[i];
+        }
+        st->leftover += bytes;
+    }
+}
+
+static int
+crypto_onetimeauth_poly1305_donna(unsigned char *out, const unsigned char *m,
+                                  unsigned long long   inlen,
+                                  const unsigned char *key)
+{
+    CRYPTO_ALIGN(64) poly1305_state_internal_t state;
+
+    poly1305_init(&state, key);
+    poly1305_update(&state, m, inlen);
+    poly1305_finish(&state, out);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_donna_init(crypto_onetimeauth_poly1305_state *state,
+                                       const unsigned char *key)
+{
+    COMPILER_ASSERT(sizeof(crypto_onetimeauth_poly1305_state) >=
+        sizeof(poly1305_state_internal_t));
+    poly1305_init((poly1305_state_internal_t *) (void *) state, key);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_donna_update(
+    crypto_onetimeauth_poly1305_state *state, const unsigned char *in,
+    unsigned long long inlen)
+{
+    poly1305_update((poly1305_state_internal_t *) (void *) state, in, inlen);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_donna_final(
+    crypto_onetimeauth_poly1305_state *state, unsigned char *out)
+{
+    poly1305_finish((poly1305_state_internal_t *) (void *) state, out);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_donna_verify(const unsigned char *h,
+                                         const unsigned char *in,
+                                         unsigned long long   inlen,
+                                         const unsigned char *k)
+{
+    unsigned char correct[16];
+
+    crypto_onetimeauth_poly1305_donna(correct, in, inlen, k);
+
+    return crypto_verify_16(h, correct);
+}
+
+struct crypto_onetimeauth_poly1305_implementation
+    crypto_onetimeauth_poly1305_donna_implementation = {
+        SODIUM_C99(.onetimeauth =) crypto_onetimeauth_poly1305_donna,
+        SODIUM_C99(.onetimeauth_verify =)
+            crypto_onetimeauth_poly1305_donna_verify,
+        SODIUM_C99(.onetimeauth_init =) crypto_onetimeauth_poly1305_donna_init,
+        SODIUM_C99(.onetimeauth_update =)
+            crypto_onetimeauth_poly1305_donna_update,
+        SODIUM_C99(.onetimeauth_final =) crypto_onetimeauth_poly1305_donna_final
+    };
+#undef MUL
+#undef ADD
+#undef ADDLO
+#undef SHR
+#undef LO
+#undef POLY1305_NOINLINE
+#undef poly1305_block_size
+
+/* ================= sodium_poly1305-sse2.c ================= */
+#define poly1305_state_internal_t poly1305_state_internal_t__sse2
+#define poly1305_init poly1305_init__sse2
+#define poly1305_blocks poly1305_blocks__sse2
+#define poly1305_update poly1305_update__sse2
+#define poly1305_finish poly1305_finish__sse2
+#define poly1305_final poly1305_final__sse2
+#define poly1305_state_internal poly1305_state_internal__sse2
+
+#include <stdint.h>
+#include <string.h>
+
+
+#if defined(HAVE_TI_MODE) && defined(HAVE_EMMINTRIN_H)
+
+# ifdef __clang__
+#  pragma clang attribute push(__attribute__((target("sse2"))), apply_to = function)
+# elif defined(__GNUC__)
+#  pragma GCC target("sse2")
+# endif
+
+# include <emmintrin.h>
+
+typedef __m128i xmmi;
+
+# if defined(_MSC_VER)
+#  define POLY1305_NOINLINE __declspec(noinline)
+# elif defined(__clang__) || defined(__GNUC__)
+#  define POLY1305_NOINLINE __attribute__((noinline))
+# else
+#  define POLY1305_NOINLINE
+# endif
+
+# define poly1305_block_size 32
+
+enum poly1305_state_flags_t {
+    poly1305_started       = 1,
+    poly1305_final_shift8  = 4,
+    poly1305_final_shift16 = 8,
+    poly1305_final_r2_r    = 16, /* use [r^2,r] for the final block */
+    poly1305_final_r_1     = 32  /* use [r,1] for the final block */
+};
+
+typedef struct poly1305_state_internal_t {
+    union {
+        uint64_t h[3];
+        uint32_t hh[10];
+    } H;                                            /*  40 bytes  */
+    uint32_t           R[5];                        /*  20 bytes  */
+    uint32_t           R2[5];                       /*  20 bytes  */
+    uint32_t           R4[5];                       /*  20 bytes  */
+    uint64_t           pad[2];                      /*  16 bytes  */
+    uint64_t           flags;                       /*   8 bytes  */
+    unsigned long long leftover;                    /* 8 bytes */
+    unsigned char      buffer[poly1305_block_size]; /* 32 bytes */
+} poly1305_state_internal_t;                        /* 164 bytes total */
+
+/*
+ * _mm_loadl_epi64() is turned into a simple MOVQ. So, unaligned accesses are
+ * totally fine, even though this intrinsic requires a __m128i* input.
+ * This confuses dynamic analysis, so force alignment, only in debug mode.
+ */
+# ifdef DEBUG
+static xmmi
+_fakealign_mm_loadl_epi64(const void *m)
+{
+    xmmi tmp;
+    memcpy(&tmp, m, 8);
+
+    return _mm_loadl_epi64(&tmp);
+}
+# define _mm_loadl_epi64(X) _fakealign_mm_loadl_epi64(X)
+#endif
+
+/* copy 0-31 bytes */
+static inline void
+poly1305_block_copy31(unsigned char *dst, const unsigned char *src,
+                      unsigned long long bytes)
+{
+    if (bytes & 16) {
+        _mm_store_si128((xmmi *) (void *) dst,
+                        _mm_loadu_si128((const xmmi *) (const void *) src));
+        src += 16;
+        dst += 16;
+    }
+    if (bytes & 8) {
+        memcpy(dst, src, 8);
+        src += 8;
+        dst += 8;
+    }
+    if (bytes & 4) {
+        memcpy(dst, src, 4);
+        src += 4;
+        dst += 4;
+    }
+    if (bytes & 2) {
+        memcpy(dst, src, 2);
+        src += 2;
+        dst += 2;
+    }
+    if (bytes & 1) {
+        *dst = *src;
+    }
+}
+
+static POLY1305_NOINLINE void
+poly1305_init_ext(poly1305_state_internal_t *st, const unsigned char key[32],
+                  unsigned long long bytes)
+{
+    uint32_t          *R;
+    uint128_t          d[3];
+    uint64_t           r0, r1, r2;
+    uint64_t           rt0, rt1, rt2, st2, c;
+    uint64_t           t0, t1;
+    unsigned long long i;
+
+    if (!bytes) {
+        bytes = ~(unsigned long long) 0;
+    }
+    /* H = 0 */
+    _mm_storeu_si128((xmmi *) (void *) &st->H.hh[0], _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) &st->H.hh[4], _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) &st->H.hh[8], _mm_setzero_si128());
+
+    /* clamp key */
+    memcpy(&t0, key, 8);
+    memcpy(&t1, key + 8, 8);
+    r0 = t0 & 0xffc0fffffff;
+    t0 >>= 44;
+    t0 |= t1 << 20;
+    r1 = t0 & 0xfffffc0ffff;
+    t1 >>= 24;
+    r2 = t1 & 0x00ffffffc0f;
+
+    /* r^1 */
+    R    = st->R;
+    R[0] = (uint32_t)(r0) &0x3ffffff;
+    R[1] = (uint32_t)((r0 >> 26) | (r1 << 18)) & 0x3ffffff;
+    R[2] = (uint32_t)((r1 >> 8)) & 0x3ffffff;
+    R[3] = (uint32_t)((r1 >> 34) | (r2 << 10)) & 0x3ffffff;
+    R[4] = (uint32_t)((r2 >> 16));
+
+    /* save pad */
+    memcpy(&st->pad[0], key + 16, 8);
+    memcpy(&st->pad[1], key + 24, 8);
+
+    rt0 = r0;
+    rt1 = r1;
+    rt2 = r2;
+
+    /* r^2, r^4 */
+    for (i = 0; i < 2; i++) {
+        if (i == 0) {
+            R = st->R2;
+            if (bytes <= 16) {
+                break;
+            }
+        } else if (i == 1) {
+            R = st->R4;
+            if (bytes < 96) {
+                break;
+            }
+        }
+        st2 = rt2 * (5 << 2);
+
+        d[0] = ((uint128_t) rt0 * rt0) + ((uint128_t)(rt1 * 2) * st2);
+        d[1] = ((uint128_t) rt2 * st2) + ((uint128_t)(rt0 * 2) * rt1);
+        d[2] = ((uint128_t) rt1 * rt1) + ((uint128_t)(rt2 * 2) * rt0);
+
+        rt0 = (uint64_t) d[0] & 0xfffffffffff;
+        c   = (uint64_t)(d[0] >> 44);
+        d[1] += c;
+
+        rt1 = (uint64_t) d[1] & 0xfffffffffff;
+        c   = (uint64_t)(d[1] >> 44);
+        d[2] += c;
+
+        rt2 = (uint64_t) d[2] & 0x3ffffffffff;
+        c   = (uint64_t)(d[2] >> 42);
+        rt0 += c * 5;
+        c   = (rt0 >> 44);
+        rt0 = rt0 & 0xfffffffffff;
+        rt1 += c;
+        c   = (rt1 >> 44);
+        rt1 = rt1 & 0xfffffffffff;
+        rt2 += c; /* even if rt2 overflows, it will still fit in rp4 safely, and
+                     is safe to multiply with */
+
+        R[0] = (uint32_t)(rt0) &0x3ffffff;
+        R[1] = (uint32_t)((rt0 >> 26) | (rt1 << 18)) & 0x3ffffff;
+        R[2] = (uint32_t)((rt1 >> 8)) & 0x3ffffff;
+        R[3] = (uint32_t)((rt1 >> 34) | (rt2 << 10)) & 0x3ffffff;
+        R[4] = (uint32_t)((rt2 >> 16));
+    }
+    st->flags    = 0;
+    st->leftover = 0U;
+}
+
+static volatile uint64_t optblocker_u64;
+
+static POLY1305_NOINLINE void
+poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m,
+                unsigned long long bytes)
+{
+    CRYPTO_ALIGN(64)
+    xmmi HIBIT =
+        _mm_shuffle_epi32(_mm_cvtsi32_si128(1 << 24), _MM_SHUFFLE(1, 0, 1, 0));
+    const xmmi MMASK = _mm_shuffle_epi32(_mm_cvtsi32_si128((1 << 26) - 1),
+                                         _MM_SHUFFLE(1, 0, 1, 0));
+    const xmmi FIVE =
+        _mm_shuffle_epi32(_mm_cvtsi32_si128(5), _MM_SHUFFLE(1, 0, 1, 0));
+    xmmi H0, H1, H2, H3, H4;
+    xmmi T0, T1, T2, T3, T4, T5, T6, T7, T8;
+    xmmi M0, M1, M2, M3, M4;
+    xmmi M5, M6, M7, M8;
+    xmmi C1, C2;
+    xmmi R20, R21, R22, R23, R24, S21, S22, S23, S24;
+    xmmi R40, R41, R42, R43, R44, S41, S42, S43, S44;
+
+    if (st->flags & poly1305_final_shift8) {
+        HIBIT = _mm_srli_si128(HIBIT, 8);
+    }
+    if (st->flags & poly1305_final_shift16) {
+        HIBIT = _mm_setzero_si128();
+    }
+    if (!(st->flags & poly1305_started)) {
+        /* H = [Mx,My] */
+        T5 = _mm_unpacklo_epi64(
+            _mm_loadl_epi64((const xmmi *) (const void *) (m + 0)),
+            _mm_loadl_epi64((const xmmi *) (const void *) (m + 16)));
+        T6 = _mm_unpacklo_epi64(
+            _mm_loadl_epi64((const xmmi *) (const void *) (m + 8)),
+            _mm_loadl_epi64((const xmmi *) (const void *) (m + 24)));
+        H0 = _mm_and_si128(MMASK, T5);
+        H1 = _mm_and_si128(MMASK, _mm_srli_epi64(T5, 26));
+        T5 = _mm_or_si128(_mm_srli_epi64(T5, 52), _mm_slli_epi64(T6, 12));
+        H2 = _mm_and_si128(MMASK, T5);
+        H3 = _mm_and_si128(MMASK, _mm_srli_epi64(T5, 26));
+        H4 = _mm_srli_epi64(T6, 40);
+        H4 = _mm_or_si128(H4, HIBIT);
+        m += 32;
+        bytes -= 32;
+        st->flags |= poly1305_started;
+    } else {
+        T0 = _mm_loadu_si128((const xmmi *) (const void *) &st->H.hh[0]);
+        T1 = _mm_loadu_si128((const xmmi *) (const void *) &st->H.hh[4]);
+        T2 = _mm_loadu_si128((const xmmi *) (const void *) &st->H.hh[8]);
+        H0 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(1, 1, 0, 0));
+        H1 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(3, 3, 2, 2));
+        H2 = _mm_shuffle_epi32(T1, _MM_SHUFFLE(1, 1, 0, 0));
+        H3 = _mm_shuffle_epi32(T1, _MM_SHUFFLE(3, 3, 2, 2));
+        H4 = _mm_shuffle_epi32(T2, _MM_SHUFFLE(1, 1, 0, 0));
+    }
+    if (st->flags & (poly1305_final_r2_r | poly1305_final_r_1)) {
+        if (st->flags & poly1305_final_r2_r) {
+            /* use [r^2, r] */
+            T2  = _mm_loadu_si128((const xmmi *) (const void *) &st->R[0]);
+            T3  = _mm_cvtsi32_si128(st->R[4]);
+            T0  = _mm_loadu_si128((const xmmi *) (const void *) &st->R2[0]);
+            T1  = _mm_cvtsi32_si128(st->R2[4]);
+            T4  = _mm_unpacklo_epi32(T0, T2);
+            T5  = _mm_unpackhi_epi32(T0, T2);
+            R24 = _mm_unpacklo_epi64(T1, T3);
+        } else {
+            /* use [r^1, 1] */
+            T0  = _mm_loadu_si128((const xmmi *) (const void *) &st->R[0]);
+            T1  = _mm_cvtsi32_si128(st->R[4]);
+            T2  = _mm_cvtsi32_si128(1);
+            T4  = _mm_unpacklo_epi32(T0, T2);
+            T5  = _mm_unpackhi_epi32(T0, T2);
+            R24 = T1;
+        }
+        R20 = _mm_shuffle_epi32(T4, _MM_SHUFFLE(1, 1, 0, 0));
+        R21 = _mm_shuffle_epi32(T4, _MM_SHUFFLE(3, 3, 2, 2));
+        R22 = _mm_shuffle_epi32(T5, _MM_SHUFFLE(1, 1, 0, 0));
+        R23 = _mm_shuffle_epi32(T5, _MM_SHUFFLE(3, 3, 2, 2));
+    } else {
+        /* use [r^2, r^2] */
+        T0  = _mm_loadu_si128((const xmmi *) (const void *) &st->R2[0]);
+        T1  = _mm_cvtsi32_si128(st->R2[4]);
+        R20 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(0, 0, 0, 0));
+        R21 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(1, 1, 1, 1));
+        R22 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(2, 2, 2, 2));
+        R23 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(3, 3, 3, 3));
+        R24 = _mm_shuffle_epi32(T1, _MM_SHUFFLE(0, 0, 0, 0));
+    }
+    S21 = _mm_mul_epu32(R21, FIVE);
+    S22 = _mm_mul_epu32(R22, FIVE);
+    S23 = _mm_mul_epu32(R23, FIVE);
+    S24 = _mm_mul_epu32(R24, FIVE);
+
+    if (bytes >= 64) {
+        T0  = _mm_loadu_si128((const xmmi *) (const void *) &st->R4[0]);
+        T1  = _mm_cvtsi32_si128(st->R4[4]);
+        R40 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(0, 0, 0, 0));
+        R41 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(1, 1, 1, 1));
+        R42 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(2, 2, 2, 2));
+        R43 = _mm_shuffle_epi32(T0, _MM_SHUFFLE(3, 3, 3, 3));
+        R44 = _mm_shuffle_epi32(T1, _MM_SHUFFLE(0, 0, 0, 0));
+        S41 = _mm_mul_epu32(R41, FIVE);
+        S42 = _mm_mul_epu32(R42, FIVE);
+        S43 = _mm_mul_epu32(R43, FIVE);
+        S44 = _mm_mul_epu32(R44, FIVE);
+
+        while (bytes >= 64) {
+            xmmi v00, v01, v02, v03, v04;
+            xmmi v10, v11, v12, v13, v14;
+            xmmi v20, v21, v22, v23, v24;
+            xmmi v30, v31, v32, v33, v34;
+            xmmi v40, v41, v42, v43, v44;
+            xmmi T14, T15;
+
+            /* H *= [r^4,r^4], preload [Mx,My] */
+            T15 = S42;
+            T0  = H4;
+            T0  = _mm_mul_epu32(T0, S41);
+            v01 = H3;
+            v01 = _mm_mul_epu32(v01, T15);
+            T14 = S43;
+            T1  = H4;
+            T1  = _mm_mul_epu32(T1, T15);
+            v11 = H3;
+            v11 = _mm_mul_epu32(v11, T14);
+            T2  = H4;
+            T2  = _mm_mul_epu32(T2, T14);
+            T0  = _mm_add_epi64(T0, v01);
+            T15 = S44;
+            v02 = H2;
+            v02 = _mm_mul_epu32(v02, T14);
+            T3  = H4;
+            T3  = _mm_mul_epu32(T3, T15);
+            T1  = _mm_add_epi64(T1, v11);
+            v03 = H1;
+            v03 = _mm_mul_epu32(v03, T15);
+            v12 = H2;
+            v12 = _mm_mul_epu32(v12, T15);
+            T0  = _mm_add_epi64(T0, v02);
+            T14 = R40;
+            v21 = H3;
+            v21 = _mm_mul_epu32(v21, T15);
+            v31 = H3;
+            v31 = _mm_mul_epu32(v31, T14);
+            T0  = _mm_add_epi64(T0, v03);
+            T4  = H4;
+            T4  = _mm_mul_epu32(T4, T14);
+            T1  = _mm_add_epi64(T1, v12);
+            v04 = H0;
+            v04 = _mm_mul_epu32(v04, T14);
+            T2  = _mm_add_epi64(T2, v21);
+            v13 = H1;
+            v13 = _mm_mul_epu32(v13, T14);
+            T3  = _mm_add_epi64(T3, v31);
+            T15 = R41;
+            v22 = H2;
+            v22 = _mm_mul_epu32(v22, T14);
+            v32 = H2;
+            v32 = _mm_mul_epu32(v32, T15);
+            T0  = _mm_add_epi64(T0, v04);
+            v41 = H3;
+            v41 = _mm_mul_epu32(v41, T15);
+            T1  = _mm_add_epi64(T1, v13);
+            v14 = H0;
+            v14 = _mm_mul_epu32(v14, T15);
+            T2  = _mm_add_epi64(T2, v22);
+            T14 = R42;
+            T5  = _mm_unpacklo_epi64(
+                _mm_loadl_epi64((const xmmi *) (const void *) (m + 0)),
+                _mm_loadl_epi64((const xmmi *) (const void *) (m + 16)));
+            v23 = H1;
+            v23 = _mm_mul_epu32(v23, T15);
+            T3  = _mm_add_epi64(T3, v32);
+            v33 = H1;
+            v33 = _mm_mul_epu32(v33, T14);
+            T4  = _mm_add_epi64(T4, v41);
+            v42 = H2;
+            v42 = _mm_mul_epu32(v42, T14);
+            T1  = _mm_add_epi64(T1, v14);
+            T15 = R43;
+            T6  = _mm_unpacklo_epi64(
+                _mm_loadl_epi64((const xmmi *) (const void *) (m + 8)),
+                _mm_loadl_epi64((const xmmi *) (const void *) (m + 24)));
+            v24 = H0;
+            v24 = _mm_mul_epu32(v24, T14);
+            T2  = _mm_add_epi64(T2, v23);
+            v34 = H0;
+            v34 = _mm_mul_epu32(v34, T15);
+            T3  = _mm_add_epi64(T3, v33);
+            M0  = _mm_and_si128(MMASK, T5);
+            v43 = H1;
+            v43 = _mm_mul_epu32(v43, T15);
+            T4  = _mm_add_epi64(T4, v42);
+            M1  = _mm_and_si128(MMASK, _mm_srli_epi64(T5, 26));
+            v44 = H0;
+            v44 = _mm_mul_epu32(v44, R44);
+            T2  = _mm_add_epi64(T2, v24);
+            T5  = _mm_or_si128(_mm_srli_epi64(T5, 52), _mm_slli_epi64(T6, 12));
+            T3  = _mm_add_epi64(T3, v34);
+            M3  = _mm_and_si128(MMASK, _mm_srli_epi64(T6, 14));
+            T4  = _mm_add_epi64(T4, v43);
+            M2  = _mm_and_si128(MMASK, T5);
+            T4  = _mm_add_epi64(T4, v44);
+            M4  = _mm_or_si128(_mm_srli_epi64(T6, 40), HIBIT);
+
+            /* H += [Mx',My'] */
+            T5 = _mm_loadu_si128((const xmmi *) (const void *) (m + 32));
+            T6 = _mm_loadu_si128((const xmmi *) (const void *) (m + 48));
+            T7 = _mm_unpacklo_epi32(T5, T6);
+            T8 = _mm_unpackhi_epi32(T5, T6);
+            M5 = _mm_unpacklo_epi32(T7, _mm_setzero_si128());
+            M6 = _mm_unpackhi_epi32(T7, _mm_setzero_si128());
+            M7 = _mm_unpacklo_epi32(T8, _mm_setzero_si128());
+            M8 = _mm_unpackhi_epi32(T8, _mm_setzero_si128());
+            M6 = _mm_slli_epi64(M6, 6);
+            M7 = _mm_slli_epi64(M7, 12);
+            M8 = _mm_slli_epi64(M8, 18);
+            T0 = _mm_add_epi64(T0, M5);
+            T1 = _mm_add_epi64(T1, M6);
+            T2 = _mm_add_epi64(T2, M7);
+            T3 = _mm_add_epi64(T3, M8);
+            T4 = _mm_add_epi64(T4, HIBIT);
+
+            /* H += [Mx,My]*[r^2,r^2] */
+            T15 = S22;
+            v00 = M4;
+            v00 = _mm_mul_epu32(v00, S21);
+            v01 = M3;
+            v01 = _mm_mul_epu32(v01, T15);
+            T14 = S23;
+            v10 = M4;
+            v10 = _mm_mul_epu32(v10, T15);
+            v11 = M3;
+            v11 = _mm_mul_epu32(v11, T14);
+            T0  = _mm_add_epi64(T0, v00);
+            v20 = M4;
+            v20 = _mm_mul_epu32(v20, T14);
+            T0  = _mm_add_epi64(T0, v01);
+            T15 = S24;
+            v02 = M2;
+            v02 = _mm_mul_epu32(v02, T14);
+            T1  = _mm_add_epi64(T1, v10);
+            v30 = M4;
+            v30 = _mm_mul_epu32(v30, T15);
+            T1  = _mm_add_epi64(T1, v11);
+            v03 = M1;
+            v03 = _mm_mul_epu32(v03, T15);
+            T2  = _mm_add_epi64(T2, v20);
+            v12 = M2;
+            v12 = _mm_mul_epu32(v12, T15);
+            T0  = _mm_add_epi64(T0, v02);
+            T14 = R20;
+            v21 = M3;
+            v21 = _mm_mul_epu32(v21, T15);
+            T3  = _mm_add_epi64(T3, v30);
+            v31 = M3;
+            v31 = _mm_mul_epu32(v31, T14);
+            T0  = _mm_add_epi64(T0, v03);
+            v40 = M4;
+            v40 = _mm_mul_epu32(v40, T14);
+            T1  = _mm_add_epi64(T1, v12);
+            v04 = M0;
+            v04 = _mm_mul_epu32(v04, T14);
+            T2  = _mm_add_epi64(T2, v21);
+            v13 = M1;
+            v13 = _mm_mul_epu32(v13, T14);
+            T3  = _mm_add_epi64(T3, v31);
+            T15 = R21;
+            v22 = M2;
+            v22 = _mm_mul_epu32(v22, T14);
+            T4  = _mm_add_epi64(T4, v40);
+            v32 = M2;
+            v32 = _mm_mul_epu32(v32, T15);
+            T0  = _mm_add_epi64(T0, v04);
+            v41 = M3;
+            v41 = _mm_mul_epu32(v41, T15);
+            T1  = _mm_add_epi64(T1, v13);
+            v14 = M0;
+            v14 = _mm_mul_epu32(v14, T15);
+            T2  = _mm_add_epi64(T2, v22);
+            T14 = R22;
+            v23 = M1;
+            v23 = _mm_mul_epu32(v23, T15);
+            T3  = _mm_add_epi64(T3, v32);
+            v33 = M1;
+            v33 = _mm_mul_epu32(v33, T14);
+            T4  = _mm_add_epi64(T4, v41);
+            v42 = M2;
+            v42 = _mm_mul_epu32(v42, T14);
+            T1  = _mm_add_epi64(T1, v14);
+            T15 = R23;
+            v24 = M0;
+            v24 = _mm_mul_epu32(v24, T14);
+            T2  = _mm_add_epi64(T2, v23);
+            v34 = M0;
+            v34 = _mm_mul_epu32(v34, T15);
+            T3  = _mm_add_epi64(T3, v33);
+            v43 = M1;
+            v43 = _mm_mul_epu32(v43, T15);
+            T4  = _mm_add_epi64(T4, v42);
+            v44 = M0;
+            v44 = _mm_mul_epu32(v44, R24);
+            T2  = _mm_add_epi64(T2, v24);
+            T3  = _mm_add_epi64(T3, v34);
+            T4  = _mm_add_epi64(T4, v43);
+            T4  = _mm_add_epi64(T4, v44);
+
+            /* reduce */
+            C1 = _mm_srli_epi64(T0, 26);
+            C2 = _mm_srli_epi64(T3, 26);
+            T0 = _mm_and_si128(T0, MMASK);
+            T3 = _mm_and_si128(T3, MMASK);
+            T1 = _mm_add_epi64(T1, C1);
+            T4 = _mm_add_epi64(T4, C2);
+            C1 = _mm_srli_epi64(T1, 26);
+            C2 = _mm_srli_epi64(T4, 26);
+            T1 = _mm_and_si128(T1, MMASK);
+            T4 = _mm_and_si128(T4, MMASK);
+            T2 = _mm_add_epi64(T2, C1);
+            T0 = _mm_add_epi64(T0, _mm_mul_epu32(C2, FIVE));
+            C1 = _mm_srli_epi64(T2, 26);
+            C2 = _mm_srli_epi64(T0, 26);
+            T2 = _mm_and_si128(T2, MMASK);
+            T0 = _mm_and_si128(T0, MMASK);
+            T3 = _mm_add_epi64(T3, C1);
+            T1 = _mm_add_epi64(T1, C2);
+            C1 = _mm_srli_epi64(T3, 26);
+            T3 = _mm_and_si128(T3, MMASK);
+            T4 = _mm_add_epi64(T4, C1);
+
+            /* Final: H = (H*[r^4,r^4] + [Mx,My]*[r^2,r^2] + [Mx',My']) */
+            H0 = T0;
+            H1 = T1;
+            H2 = T2;
+            H3 = T3;
+            H4 = T4;
+
+            m += 64;
+            bytes -= 64;
+        }
+    }
+
+    if (bytes >= 32) {
+        xmmi v01, v02, v03, v04;
+        xmmi v11, v12, v13, v14;
+        xmmi v21, v22, v23, v24;
+        xmmi v31, v32, v33, v34;
+        xmmi v41, v42, v43, v44;
+        xmmi T14, T15;
+
+        /* H *= [r^2,r^2] */
+        T15 = S22;
+        T0  = H4;
+        T0  = _mm_mul_epu32(T0, S21);
+        v01 = H3;
+        v01 = _mm_mul_epu32(v01, T15);
+        T14 = S23;
+        T1  = H4;
+        T1  = _mm_mul_epu32(T1, T15);
+        v11 = H3;
+        v11 = _mm_mul_epu32(v11, T14);
+        T2  = H4;
+        T2  = _mm_mul_epu32(T2, T14);
+        T0  = _mm_add_epi64(T0, v01);
+        T15 = S24;
+        v02 = H2;
+        v02 = _mm_mul_epu32(v02, T14);
+        T3  = H4;
+        T3  = _mm_mul_epu32(T3, T15);
+        T1  = _mm_add_epi64(T1, v11);
+        v03 = H1;
+        v03 = _mm_mul_epu32(v03, T15);
+        v12 = H2;
+        v12 = _mm_mul_epu32(v12, T15);
+        T0  = _mm_add_epi64(T0, v02);
+        T14 = R20;
+        v21 = H3;
+        v21 = _mm_mul_epu32(v21, T15);
+        v31 = H3;
+        v31 = _mm_mul_epu32(v31, T14);
+        T0  = _mm_add_epi64(T0, v03);
+        T4  = H4;
+        T4  = _mm_mul_epu32(T4, T14);
+        T1  = _mm_add_epi64(T1, v12);
+        v04 = H0;
+        v04 = _mm_mul_epu32(v04, T14);
+        T2  = _mm_add_epi64(T2, v21);
+        v13 = H1;
+        v13 = _mm_mul_epu32(v13, T14);
+        T3  = _mm_add_epi64(T3, v31);
+        T15 = R21;
+        v22 = H2;
+        v22 = _mm_mul_epu32(v22, T14);
+        v32 = H2;
+        v32 = _mm_mul_epu32(v32, T15);
+        T0  = _mm_add_epi64(T0, v04);
+        v41 = H3;
+        v41 = _mm_mul_epu32(v41, T15);
+        T1  = _mm_add_epi64(T1, v13);
+        v14 = H0;
+        v14 = _mm_mul_epu32(v14, T15);
+        T2  = _mm_add_epi64(T2, v22);
+        T14 = R22;
+        v23 = H1;
+        v23 = _mm_mul_epu32(v23, T15);
+        T3  = _mm_add_epi64(T3, v32);
+        v33 = H1;
+        v33 = _mm_mul_epu32(v33, T14);
+        T4  = _mm_add_epi64(T4, v41);
+        v42 = H2;
+        v42 = _mm_mul_epu32(v42, T14);
+        T1  = _mm_add_epi64(T1, v14);
+        T15 = R23;
+        v24 = H0;
+        v24 = _mm_mul_epu32(v24, T14);
+        T2  = _mm_add_epi64(T2, v23);
+        v34 = H0;
+        v34 = _mm_mul_epu32(v34, T15);
+        T3  = _mm_add_epi64(T3, v33);
+        v43 = H1;
+        v43 = _mm_mul_epu32(v43, T15);
+        T4  = _mm_add_epi64(T4, v42);
+        v44 = H0;
+        v44 = _mm_mul_epu32(v44, R24);
+        T2  = _mm_add_epi64(T2, v24);
+        T3  = _mm_add_epi64(T3, v34);
+        T4  = _mm_add_epi64(T4, v43);
+        T4  = _mm_add_epi64(T4, v44);
+
+        /* H += [Mx,My] */
+        if (m) {
+            T5 = _mm_loadu_si128((const xmmi *) (const void *) (m + 0));
+            T6 = _mm_loadu_si128((const xmmi *) (const void *) (m + 16));
+            T7 = _mm_unpacklo_epi32(T5, T6);
+            T8 = _mm_unpackhi_epi32(T5, T6);
+            M0 = _mm_unpacklo_epi32(T7, _mm_setzero_si128());
+            M1 = _mm_unpackhi_epi32(T7, _mm_setzero_si128());
+            M2 = _mm_unpacklo_epi32(T8, _mm_setzero_si128());
+            M3 = _mm_unpackhi_epi32(T8, _mm_setzero_si128());
+            M1 = _mm_slli_epi64(M1, 6);
+            M2 = _mm_slli_epi64(M2, 12);
+            M3 = _mm_slli_epi64(M3, 18);
+            T0 = _mm_add_epi64(T0, M0);
+            T1 = _mm_add_epi64(T1, M1);
+            T2 = _mm_add_epi64(T2, M2);
+            T3 = _mm_add_epi64(T3, M3);
+            T4 = _mm_add_epi64(T4, HIBIT);
+        }
+
+        /* reduce */
+        C1 = _mm_srli_epi64(T0, 26);
+        C2 = _mm_srli_epi64(T3, 26);
+        T0 = _mm_and_si128(T0, MMASK);
+        T3 = _mm_and_si128(T3, MMASK);
+        T1 = _mm_add_epi64(T1, C1);
+        T4 = _mm_add_epi64(T4, C2);
+        C1 = _mm_srli_epi64(T1, 26);
+        C2 = _mm_srli_epi64(T4, 26);
+        T1 = _mm_and_si128(T1, MMASK);
+        T4 = _mm_and_si128(T4, MMASK);
+        T2 = _mm_add_epi64(T2, C1);
+        T0 = _mm_add_epi64(T0, _mm_mul_epu32(C2, FIVE));
+        C1 = _mm_srli_epi64(T2, 26);
+        C2 = _mm_srli_epi64(T0, 26);
+        T2 = _mm_and_si128(T2, MMASK);
+        T0 = _mm_and_si128(T0, MMASK);
+        T3 = _mm_add_epi64(T3, C1);
+        T1 = _mm_add_epi64(T1, C2);
+        C1 = _mm_srli_epi64(T3, 26);
+        T3 = _mm_and_si128(T3, MMASK);
+        T4 = _mm_add_epi64(T4, C1);
+
+        /* H = (H*[r^2,r^2] + [Mx,My]) */
+        H0 = T0;
+        H1 = T1;
+        H2 = T2;
+        H3 = T3;
+        H4 = T4;
+    }
+
+    if (m) {
+        T0 = _mm_shuffle_epi32(H0, _MM_SHUFFLE(0, 0, 2, 0));
+        T1 = _mm_shuffle_epi32(H1, _MM_SHUFFLE(0, 0, 2, 0));
+        T2 = _mm_shuffle_epi32(H2, _MM_SHUFFLE(0, 0, 2, 0));
+        T3 = _mm_shuffle_epi32(H3, _MM_SHUFFLE(0, 0, 2, 0));
+        T4 = _mm_shuffle_epi32(H4, _MM_SHUFFLE(0, 0, 2, 0));
+        T0 = _mm_unpacklo_epi64(T0, T1);
+        T1 = _mm_unpacklo_epi64(T2, T3);
+        _mm_storeu_si128((xmmi *) (void *) &st->H.hh[0], T0);
+        _mm_storeu_si128((xmmi *) (void *) &st->H.hh[4], T1);
+        _mm_storel_epi64((xmmi *) (void *) &st->H.hh[8], T4);
+    } else {
+        uint32_t t0, t1, t2, t3, t4, b;
+        uint64_t h0, h1, h2, g0, g1, g2, c, nc;
+
+        /* H = H[0]+H[1] */
+        T0 = H0;
+        T1 = H1;
+        T2 = H2;
+        T3 = H3;
+        T4 = H4;
+
+        T0 = _mm_add_epi64(T0, _mm_srli_si128(T0, 8));
+        T1 = _mm_add_epi64(T1, _mm_srli_si128(T1, 8));
+        T2 = _mm_add_epi64(T2, _mm_srli_si128(T2, 8));
+        T3 = _mm_add_epi64(T3, _mm_srli_si128(T3, 8));
+        T4 = _mm_add_epi64(T4, _mm_srli_si128(T4, 8));
+
+        t0 = _mm_cvtsi128_si32(T0);
+        b  = (t0 >> 26);
+        t0 &= 0x3ffffff;
+        t1 = _mm_cvtsi128_si32(T1) + b;
+        b  = (t1 >> 26);
+        t1 &= 0x3ffffff;
+        t2 = _mm_cvtsi128_si32(T2) + b;
+        b  = (t2 >> 26);
+        t2 &= 0x3ffffff;
+        t3 = _mm_cvtsi128_si32(T3) + b;
+        b  = (t3 >> 26);
+        t3 &= 0x3ffffff;
+        t4 = _mm_cvtsi128_si32(T4) + b;
+
+        /* everything except t4 is in range, so this is all safe */
+        h0 = (((uint64_t) t0) | ((uint64_t) t1 << 26)) & 0xfffffffffffull;
+        h1 = (((uint64_t) t1 >> 18) | ((uint64_t) t2 << 8) |
+              ((uint64_t) t3 << 34)) &
+             0xfffffffffffull;
+        h2 = (((uint64_t) t3 >> 10) | ((uint64_t) t4 << 16));
+
+        c = (h2 >> 42);
+        h2 &= 0x3ffffffffff;
+        h0 += c * 5;
+        c = (h0 >> 44);
+        h0 &= 0xfffffffffff;
+        h1 += c;
+        c = (h1 >> 44);
+        h1 &= 0xfffffffffff;
+        h2 += c;
+        c = (h2 >> 42);
+        h2 &= 0x3ffffffffff;
+        h0 += c * 5;
+        c = (h0 >> 44);
+        h0 &= 0xfffffffffff;
+        h1 += c;
+
+        g0 = h0 + 5;
+        c  = (g0 >> 44);
+        g0 &= 0xfffffffffff;
+        g1 = h1 + c;
+        c  = (g1 >> 44);
+        g1 &= 0xfffffffffff;
+        g2 = h2 + c - ((uint64_t) 1 << 42);
+
+        c  = (((g2 >> 61) ^ optblocker_u64) >> 2) - 1;
+        nc = ~c;
+        h0 = (h0 & nc) | (g0 & c);
+        h1 = (h1 & nc) | (g1 & c);
+        h2 = (h2 & nc) | (g2 & c);
+
+        st->H.h[0] = h0;
+        st->H.h[1] = h1;
+        st->H.h[2] = h2;
+    }
+}
+
+static void
+poly1305_update(poly1305_state_internal_t *st, const unsigned char *m,
+                unsigned long long bytes)
+{
+    unsigned long long i;
+
+    /* handle leftover */
+    if (st->leftover) {
+        unsigned long long want = (poly1305_block_size - st->leftover);
+
+        if (want > bytes) {
+            want = bytes;
+        }
+        for (i = 0; i < want; i++) {
+            st->buffer[st->leftover + i] = m[i];
+        }
+        bytes -= want;
+        m += want;
+        st->leftover += want;
+        if (st->leftover < poly1305_block_size) {
+            return;
+        }
+        poly1305_blocks(st, st->buffer, poly1305_block_size);
+        st->leftover = 0;
+    }
+
+    /* process full blocks */
+    if (bytes >= poly1305_block_size) {
+        unsigned long long want = (bytes & ~(poly1305_block_size - 1));
+
+        poly1305_blocks(st, m, want);
+        m += want;
+        bytes -= want;
+    }
+
+    /* store leftover */
+    if (bytes) {
+        for (i = 0; i < bytes; i++) {
+            st->buffer[st->leftover + i] = m[i];
+        }
+        st->leftover += bytes;
+    }
+}
+
+static POLY1305_NOINLINE void
+poly1305_finish_ext(poly1305_state_internal_t *st, const unsigned char *m,
+                    unsigned long long leftover, unsigned char mac[16])
+{
+    uint64_t h0, h1, h2;
+
+    if (leftover) {
+        CRYPTO_ALIGN(16) unsigned char final[32] = { 0 };
+
+        poly1305_block_copy31(final, m, leftover);
+        if (leftover != 16) {
+            final[leftover] = 1;
+        }
+        st->flags |=
+            (leftover >= 16) ? poly1305_final_shift8 : poly1305_final_shift16;
+        poly1305_blocks(st, final, 32);
+    }
+
+    if (st->flags & poly1305_started) {
+        /* finalize, H *= [r^2,r], or H *= [r,1] */
+        if (!leftover || (leftover > 16)) {
+            st->flags |= poly1305_final_r2_r;
+        } else {
+            st->flags |= poly1305_final_r_1;
+        }
+        poly1305_blocks(st, NULL, 32);
+    }
+
+    h0 = st->H.h[0];
+    h1 = st->H.h[1];
+    h2 = st->H.h[2];
+
+    /* pad */
+    h0 = ((h0) | (h1 << 44));
+    h1 = ((h1 >> 20) | (h2 << 24));
+#ifdef HAVE_AMD64_ASM
+    __asm__ __volatile__(
+        "addq %2, %0 ;\n"
+        "adcq %3, %1 ;\n"
+        : "+r"(h0), "+r"(h1)
+        : "r"(st->pad[0]), "r"(st->pad[1])
+        : "flags", "cc");
+#else
+    {
+        uint128_t h;
+
+        memcpy(&h, &st->pad[0], 16);
+        h += ((uint128_t) h1 << 64) | h0;
+        h0 = (uint64_t) h;
+        h1 = (uint64_t)(h >> 64);
+    }
+#endif
+    _mm_storeu_si128((xmmi *) (void *) st + 0, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 1, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 2, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 3, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 4, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 5, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 6, _mm_setzero_si128());
+    _mm_storeu_si128((xmmi *) (void *) st + 7, _mm_setzero_si128());
+
+    memcpy(&mac[0], &h0, 8);
+    memcpy(&mac[8], &h1, 8);
+
+    sodium_memzero((void *) st, sizeof *st);
+}
+
+static void
+poly1305_finish(poly1305_state_internal_t *st, unsigned char mac[16])
+{
+    poly1305_finish_ext(st, st->buffer, st->leftover, mac);
+}
+
+static int
+crypto_onetimeauth_poly1305_sse2_init(crypto_onetimeauth_poly1305_state *state,
+                                      const unsigned char *key)
+{
+    COMPILER_ASSERT(sizeof(crypto_onetimeauth_poly1305_state) >=
+                    sizeof(poly1305_state_internal_t));
+    poly1305_init_ext((poly1305_state_internal_t *) (void *) state, key, 0U);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_sse2_update(
+    crypto_onetimeauth_poly1305_state *state, const unsigned char *in,
+    unsigned long long inlen)
+{
+    poly1305_update((poly1305_state_internal_t *) (void *) state, in, inlen);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_sse2_final(crypto_onetimeauth_poly1305_state *state,
+                                       unsigned char *out)
+{
+    poly1305_finish((poly1305_state_internal_t *) (void *) state, out);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_sse2(unsigned char *out, const unsigned char *m,
+                                 unsigned long long   inlen,
+                                 const unsigned char *key)
+{
+    CRYPTO_ALIGN(64) poly1305_state_internal_t st;
+    unsigned long long                         blocks;
+
+    poly1305_init_ext(&st, key, inlen);
+    blocks = inlen & ~31;
+    if (blocks > 0) {
+        poly1305_blocks(&st, m, blocks);
+        m += blocks;
+        inlen -= blocks;
+    }
+    poly1305_finish_ext(&st, m, inlen, out);
+
+    return 0;
+}
+
+static int
+crypto_onetimeauth_poly1305_sse2_verify(const unsigned char *h,
+                                        const unsigned char *in,
+                                        unsigned long long   inlen,
+                                        const unsigned char *k)
+{
+    unsigned char correct[16];
+
+    crypto_onetimeauth_poly1305_sse2(correct, in, inlen, k);
+
+    return crypto_verify_16(h, correct);
+}
+
+struct crypto_onetimeauth_poly1305_implementation
+    crypto_onetimeauth_poly1305_sse2_implementation = {
+        SODIUM_C99(.onetimeauth =) crypto_onetimeauth_poly1305_sse2,
+        SODIUM_C99(.onetimeauth_verify =)
+            crypto_onetimeauth_poly1305_sse2_verify,
+        SODIUM_C99(.onetimeauth_init =) crypto_onetimeauth_poly1305_sse2_init,
+        SODIUM_C99(.onetimeauth_update =)
+            crypto_onetimeauth_poly1305_sse2_update,
+        SODIUM_C99(.onetimeauth_final =) crypto_onetimeauth_poly1305_sse2_final
+    };
+
+# ifdef __clang__
+#  pragma clang attribute pop
+# endif
+
+#endif
+
+int poly1305_sse2_link_warning_dummy = 0;
+#undef poly1305_state_internal_t
+#undef poly1305_init
+#undef poly1305_blocks
+#undef poly1305_update
+#undef poly1305_finish
+#undef poly1305_final
+#undef poly1305_state_internal
+#undef POLY1305_NOINLINE
+#undef poly1305_block_size
+#undef _mm_loadl_epi64
+
+/* ================= sodium_onetimeauth_poly1305.c ================= */
+#define implementation implementation__poly
+
+
+#if defined(HAVE_TI_MODE) && defined(HAVE_EMMINTRIN_H)
+#endif
+
+static const crypto_onetimeauth_poly1305_implementation *implementation =
+    &crypto_onetimeauth_poly1305_donna_implementation;
+
+int
+crypto_onetimeauth_poly1305(unsigned char *out, const unsigned char *in,
+                            unsigned long long inlen, const unsigned char *k)
+{
+    return implementation->onetimeauth(out, in, inlen, k);
+}
+
+int
+crypto_onetimeauth_poly1305_verify(const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long   inlen,
+                                   const unsigned char *k)
+{
+    return implementation->onetimeauth_verify(h, in, inlen, k);
+}
+
+int
+crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state *state,
+                                 const unsigned char *key)
+{
+    return implementation->onetimeauth_init(state, key);
+}
+
+int
+crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen)
+{
+    return implementation->onetimeauth_update(state, in, inlen);
+}
+
+int
+crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
+                                  unsigned char *out)
+{
+    return implementation->onetimeauth_final(state, out);
+}
+
+size_t
+crypto_onetimeauth_poly1305_bytes(void)
+{
+    return crypto_onetimeauth_poly1305_BYTES;
+}
+
+size_t
+crypto_onetimeauth_poly1305_keybytes(void)
+{
+    return crypto_onetimeauth_poly1305_KEYBYTES;
+}
+
+size_t
+crypto_onetimeauth_poly1305_statebytes(void)
+{
+    return sizeof(crypto_onetimeauth_poly1305_state);
+}
+
+void
+crypto_onetimeauth_poly1305_keygen(
+    unsigned char k[crypto_onetimeauth_poly1305_KEYBYTES])
+{
+    randombytes_buf(k, crypto_onetimeauth_poly1305_KEYBYTES);
+}
+
+int
+_crypto_onetimeauth_poly1305_pick_best_implementation(void)
+{
+    implementation = &crypto_onetimeauth_poly1305_donna_implementation;
+#if defined(HAVE_TI_MODE) && defined(HAVE_EMMINTRIN_H)
+    if (sodium_runtime_has_sse2()) {
+        #if NETCODE_CRYPTO_LOGS
+        printf( "poly1305 -> sse3\n" );
+        #endif // #if NETCODE_CRYPTO_LOGS
+        implementation = &crypto_onetimeauth_poly1305_sse2_implementation;
+        return 0;
+    }
+#endif
+    #if NETCODE_CRYPTO_LOGS
+    printf( "poly1305 -> ref\n" );
+    #endif // #if NETCODE_CRYPTO_LOGS
+    return 0;
+}
+#undef implementation
+
+/* ================= sodium_aead_chacha20poly1305.c ================= */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+
+
+
+static const unsigned char _pad0[16] = { 0 };
+
+int
+crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
+                                              unsigned char *mac,
+                                              unsigned long long *maclen_p,
+                                              const unsigned char *m,
+                                              unsigned long long mlen,
+                                              const unsigned char *ad,
+                                              unsigned long long adlen,
+                                              const unsigned char *nsec,
+                                              const unsigned char *npub,
+                                              const unsigned char *k)
+{
+    crypto_onetimeauth_poly1305_state state;
+    unsigned char                     block0[64U];
+    unsigned char                     slen[8U];
+
+    (void) nsec;
+    crypto_stream_chacha20(block0, sizeof block0, npub, k);
+    crypto_onetimeauth_poly1305_init(&state, block0);
+    sodium_memzero(block0, sizeof block0);
+
+    crypto_onetimeauth_poly1305_update(&state, ad, adlen);
+    STORE64_LE(slen, (uint64_t) adlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_stream_chacha20_xor_ic(c, m, mlen, npub, 1U, k);
+
+    crypto_onetimeauth_poly1305_update(&state, c, mlen);
+    STORE64_LE(slen, (uint64_t) mlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_onetimeauth_poly1305_final(&state, mac);
+    sodium_memzero(&state, sizeof state);
+
+    if (maclen_p != NULL) {
+        *maclen_p = crypto_aead_chacha20poly1305_ABYTES;
+    }
+    return 0;
+}
+
+int
+crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
+                                     unsigned long long *clen_p,
+                                     const unsigned char *m,
+                                     unsigned long long mlen,
+                                     const unsigned char *ad,
+                                     unsigned long long adlen,
+                                     const unsigned char *nsec,
+                                     const unsigned char *npub,
+                                     const unsigned char *k)
+{
+    unsigned long long clen = 0ULL;
+    int                ret;
+
+    if (mlen > crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    ret = crypto_aead_chacha20poly1305_encrypt_detached(c,
+                                                        c + mlen, NULL,
+                                                        m, mlen,
+                                                        ad, adlen,
+                                                        nsec, npub, k);
+    if (clen_p != NULL) {
+        if (ret == 0) {
+            clen = mlen + crypto_aead_chacha20poly1305_ABYTES;
+        }
+        *clen_p = clen;
+    }
+    return ret;
+}
+
+int
+crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long *maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+{
+    crypto_onetimeauth_poly1305_state state;
+    unsigned char                     block0[64U];
+    unsigned char                     slen[8U];
+
+    (void) nsec;
+    crypto_stream_chacha20_ietf(block0, sizeof block0, npub, k);
+    crypto_onetimeauth_poly1305_init(&state, block0);
+    sodium_memzero(block0, sizeof block0);
+
+    crypto_onetimeauth_poly1305_update(&state, ad, adlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - adlen) & 0xf);
+
+    crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, npub, 1U, k);
+
+    crypto_onetimeauth_poly1305_update(&state, c, mlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - mlen) & 0xf);
+
+    STORE64_LE(slen, (uint64_t) adlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    STORE64_LE(slen, (uint64_t) mlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_onetimeauth_poly1305_final(&state, mac);
+    sodium_memzero(&state, sizeof state);
+
+    if (maclen_p != NULL) {
+        *maclen_p = crypto_aead_chacha20poly1305_ietf_ABYTES;
+    }
+    return 0;
+}
+
+int
+crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
+                                          unsigned long long *clen_p,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *nsec,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+{
+    unsigned long long clen = 0ULL;
+    int                ret;
+
+    if (mlen > crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    ret = crypto_aead_chacha20poly1305_ietf_encrypt_detached(c,
+                                                             c + mlen, NULL,
+                                                             m, mlen,
+                                                             ad, adlen,
+                                                             nsec, npub, k);
+    if (clen_p != NULL) {
+        if (ret == 0) {
+            clen = mlen + crypto_aead_chacha20poly1305_ietf_ABYTES;
+        }
+        *clen_p = clen;
+    }
+    return ret;
+}
+
+int
+crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
+                                              unsigned char *nsec,
+                                              const unsigned char *c,
+                                              unsigned long long clen,
+                                              const unsigned char *mac,
+                                              const unsigned char *ad,
+                                              unsigned long long adlen,
+                                              const unsigned char *npub,
+                                              const unsigned char *k)
+{
+    crypto_onetimeauth_poly1305_state state;
+    unsigned char                     block0[64U];
+    unsigned char                     slen[8U];
+    unsigned char                     computed_mac[crypto_aead_chacha20poly1305_ABYTES];
+    unsigned long long                mlen;
+    int                               ret;
+
+    (void) nsec;
+    crypto_stream_chacha20(block0, sizeof block0, npub, k);
+    crypto_onetimeauth_poly1305_init(&state, block0);
+    sodium_memzero(block0, sizeof block0);
+
+    crypto_onetimeauth_poly1305_update(&state, ad, adlen);
+    STORE64_LE(slen, (uint64_t) adlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    mlen = clen;
+    crypto_onetimeauth_poly1305_update(&state, c, mlen);
+    STORE64_LE(slen, (uint64_t) mlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_onetimeauth_poly1305_final(&state, computed_mac);
+    sodium_memzero(&state, sizeof state);
+
+    COMPILER_ASSERT(sizeof computed_mac == 16U);
+    ret = crypto_verify_16(computed_mac, mac);
+    sodium_memzero(computed_mac, sizeof computed_mac);
+    if (m == NULL) {
+        return ret;
+    }
+    if (ret != 0) {
+        memset(m, 0, mlen);
+        return -1;
+    }
+    ACQUIRE_FENCE;
+    crypto_stream_chacha20_xor_ic(m, c, mlen, npub, 1U, k);
+
+    return 0;
+}
+
+int
+crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
+                                     unsigned long long *mlen_p,
+                                     unsigned char *nsec,
+                                     const unsigned char *c,
+                                     unsigned long long clen,
+                                     const unsigned char *ad,
+                                     unsigned long long adlen,
+                                     const unsigned char *npub,
+                                     const unsigned char *k)
+{
+    unsigned long long mlen = 0ULL;
+    int                ret = -1;
+
+    if (clen >= crypto_aead_chacha20poly1305_ABYTES) {
+        ret = crypto_aead_chacha20poly1305_decrypt_detached
+            (m, nsec,
+             c, clen - crypto_aead_chacha20poly1305_ABYTES,
+             c + clen - crypto_aead_chacha20poly1305_ABYTES,
+             ad, adlen, npub, k);
+    }
+    if (mlen_p != NULL) {
+        if (ret == 0) {
+            mlen = clen - crypto_aead_chacha20poly1305_ABYTES;
+        }
+        *mlen_p = mlen;
+    }
+    return ret;
+}
+
+int
+crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+{
+    crypto_onetimeauth_poly1305_state state;
+    unsigned char                     block0[64U];
+    unsigned char                     slen[8U];
+    unsigned char                     computed_mac[crypto_aead_chacha20poly1305_ietf_ABYTES];
+    unsigned long long                mlen;
+    int                               ret;
+
+    (void) nsec;
+    crypto_stream_chacha20_ietf(block0, sizeof block0, npub, k);
+    crypto_onetimeauth_poly1305_init(&state, block0);
+    sodium_memzero(block0, sizeof block0);
+
+    crypto_onetimeauth_poly1305_update(&state, ad, adlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - adlen) & 0xf);
+
+    mlen = clen;
+    crypto_onetimeauth_poly1305_update(&state, c, mlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - mlen) & 0xf);
+
+    STORE64_LE(slen, (uint64_t) adlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    STORE64_LE(slen, (uint64_t) mlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_onetimeauth_poly1305_final(&state, computed_mac);
+    sodium_memzero(&state, sizeof state);
+
+    COMPILER_ASSERT(sizeof computed_mac == 16U);
+    ret = crypto_verify_16(computed_mac, mac);
+    sodium_memzero(computed_mac, sizeof computed_mac);
+    if (m == NULL) {
+        return ret;
+    }
+    if (ret != 0) {
+        memset(m, 0, mlen);
+        return -1;
+    }
+    ACQUIRE_FENCE;
+    crypto_stream_chacha20_ietf_xor_ic(m, c, mlen, npub, 1U, k);
+
+    return 0;
+}
+
+int
+crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
+                                          unsigned long long *mlen_p,
+                                          unsigned char *nsec,
+                                          const unsigned char *c,
+                                          unsigned long long clen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+{
+    unsigned long long mlen = 0ULL;
+    int                ret = -1;
+
+    if (clen >= crypto_aead_chacha20poly1305_ietf_ABYTES) {
+        ret = crypto_aead_chacha20poly1305_ietf_decrypt_detached
+            (m, nsec,
+             c, clen - crypto_aead_chacha20poly1305_ietf_ABYTES,
+             c + clen - crypto_aead_chacha20poly1305_ietf_ABYTES,
+             ad, adlen, npub, k);
+    }
+    if (mlen_p != NULL) {
+        if (ret == 0) {
+            mlen = clen - crypto_aead_chacha20poly1305_ietf_ABYTES;
+        }
+        *mlen_p = mlen;
+    }
+    return ret;
+}
+
+size_t
+crypto_aead_chacha20poly1305_ietf_keybytes(void)
+{
+    return crypto_aead_chacha20poly1305_ietf_KEYBYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_ietf_npubbytes(void)
+{
+    return crypto_aead_chacha20poly1305_ietf_NPUBBYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_ietf_nsecbytes(void)
+{
+    return crypto_aead_chacha20poly1305_ietf_NSECBYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_ietf_abytes(void)
+{
+    return crypto_aead_chacha20poly1305_ietf_ABYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_ietf_messagebytes_max(void)
+{
+    return crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX;
+}
+
+void
+crypto_aead_chacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
+{
+    randombytes_buf(k, crypto_aead_chacha20poly1305_ietf_KEYBYTES);
+}
+
+size_t
+crypto_aead_chacha20poly1305_keybytes(void)
+{
+    return crypto_aead_chacha20poly1305_KEYBYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_npubbytes(void)
+{
+    return crypto_aead_chacha20poly1305_NPUBBYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_nsecbytes(void)
+{
+    return crypto_aead_chacha20poly1305_NSECBYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_abytes(void)
+{
+    return crypto_aead_chacha20poly1305_ABYTES;
+}
+
+size_t
+crypto_aead_chacha20poly1305_messagebytes_max(void)
+{
+    return crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX;
+}
+
+void
+crypto_aead_chacha20poly1305_keygen(unsigned char k[crypto_aead_chacha20poly1305_KEYBYTES])
+{
+    randombytes_buf(k, crypto_aead_chacha20poly1305_KEYBYTES);
+}
+
+/* ================= sodium_aead_xchacha20poly1305.c ================= */
+#define _pad0 _pad0__x
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+
+
+
+static const unsigned char _pad0[16] = { 0 };
+
+static int
+_encrypt_detached(unsigned char *c,
+                  unsigned char *mac,
+                  unsigned long long *maclen_p,
+                  const unsigned char *m,
+                  unsigned long long mlen,
+                  const unsigned char *ad,
+                  unsigned long long adlen,
+                  const unsigned char *nsec,
+                  const unsigned char *npub,
+                  const unsigned char *k)
+{
+    crypto_onetimeauth_poly1305_state state;
+    unsigned char                     block0[64U];
+    unsigned char                     slen[8U];
+
+    (void) nsec;
+    crypto_stream_chacha20_ietf_ext(block0, sizeof block0, npub, k);
+    crypto_onetimeauth_poly1305_init(&state, block0);
+    sodium_memzero(block0, sizeof block0);
+
+    crypto_onetimeauth_poly1305_update(&state, ad, adlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - adlen) & 0xf);
+
+    crypto_stream_chacha20_ietf_ext_xor_ic(c, m, mlen, npub, 1U, k);
+
+    crypto_onetimeauth_poly1305_update(&state, c, mlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - mlen) & 0xf);
+
+    STORE64_LE(slen, (uint64_t) adlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    STORE64_LE(slen, (uint64_t) mlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_onetimeauth_poly1305_final(&state, mac);
+    sodium_memzero(&state, sizeof state);
+
+    if (maclen_p != NULL) {
+        *maclen_p = crypto_aead_chacha20poly1305_ietf_ABYTES;
+    }
+    return 0;
+}
+
+static int
+_decrypt_detached(unsigned char *m,
+                  unsigned char *nsec,
+                  const unsigned char *c,
+                  unsigned long long clen,
+                  const unsigned char *mac,
+                  const unsigned char *ad,
+                  unsigned long long adlen,
+                  const unsigned char *npub,
+                  const unsigned char *k)
+{
+    crypto_onetimeauth_poly1305_state state;
+    unsigned char                     block0[64U];
+    unsigned char                     slen[8U];
+    unsigned char                     computed_mac[crypto_aead_chacha20poly1305_ietf_ABYTES];
+    unsigned long long                mlen;
+    int                               ret;
+
+    (void) nsec;
+    crypto_stream_chacha20_ietf_ext(block0, sizeof block0, npub, k);
+    crypto_onetimeauth_poly1305_init(&state, block0);
+    sodium_memzero(block0, sizeof block0);
+
+    crypto_onetimeauth_poly1305_update(&state, ad, adlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - adlen) & 0xf);
+
+    mlen = clen;
+    crypto_onetimeauth_poly1305_update(&state, c, mlen);
+    crypto_onetimeauth_poly1305_update(&state, _pad0, (0x10 - mlen) & 0xf);
+
+    STORE64_LE(slen, (uint64_t) adlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    STORE64_LE(slen, (uint64_t) mlen);
+    crypto_onetimeauth_poly1305_update(&state, slen, sizeof slen);
+
+    crypto_onetimeauth_poly1305_final(&state, computed_mac);
+    sodium_memzero(&state, sizeof state);
+
+    COMPILER_ASSERT(sizeof computed_mac == 16U);
+    ret = crypto_verify_16(computed_mac, mac);
+    sodium_memzero(computed_mac, sizeof computed_mac);
+    if (m == NULL) {
+        return ret;
+    }
+    if (ret != 0) {
+        memset(m, 0, mlen);
+        return -1;
+    }
+    ACQUIRE_FENCE;
+    crypto_stream_chacha20_ietf_ext_xor_ic(m, c, mlen, npub, 1U, k);
+
+    return 0;
+}
+
+int
+crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
+                                                    unsigned char *mac,
+                                                    unsigned long long *maclen_p,
+                                                    const unsigned char *m,
+                                                    unsigned long long mlen,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *nsec,
+                                                    const unsigned char *npub,
+                                                    const unsigned char *k)
+{
+    unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
+    unsigned char npub2[crypto_aead_chacha20poly1305_ietf_NPUBBYTES] = { 0 };
+    int           ret;
+
+    crypto_core_hchacha20(k2, npub, k, NULL);
+    memcpy(npub2 + 4, npub + crypto_core_hchacha20_INPUTBYTES,
+           crypto_aead_chacha20poly1305_ietf_NPUBBYTES - 4);
+    ret = _encrypt_detached(c, mac, maclen_p, m, mlen, ad, adlen,
+                            nsec, npub2, k2);
+    sodium_memzero(k2, crypto_core_hchacha20_OUTPUTBYTES);
+
+    return ret;
+}
+
+int
+crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
+                                           unsigned long long *clen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+{
+    unsigned long long clen = 0ULL;
+    int                ret;
+
+    if (mlen > crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX) {
+        sodium_misuse();
+    }
+    ret = crypto_aead_xchacha20poly1305_ietf_encrypt_detached
+        (c, c + mlen, NULL, m, mlen, ad, adlen, nsec, npub, k);
+    if (clen_p != NULL) {
+        if (ret == 0) {
+            clen = mlen + crypto_aead_xchacha20poly1305_ietf_ABYTES;
+        }
+        *clen_p = clen;
+    }
+    return ret;
+}
+
+int
+crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char *m,
+                                                    unsigned char *nsec,
+                                                    const unsigned char *c,
+                                                    unsigned long long clen,
+                                                    const unsigned char *mac,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *npub,
+                                                    const unsigned char *k)
+{
+    unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
+    unsigned char npub2[crypto_aead_chacha20poly1305_ietf_NPUBBYTES] = { 0 };
+    int           ret;
+
+    crypto_core_hchacha20(k2, npub, k, NULL);
+    memcpy(npub2 + 4, npub + crypto_core_hchacha20_INPUTBYTES,
+           crypto_aead_chacha20poly1305_ietf_NPUBBYTES - 4);
+    ret = _decrypt_detached(m, nsec, c, clen, mac, ad, adlen, npub2, k2);
+    sodium_memzero(k2, crypto_core_hchacha20_OUTPUTBYTES);
+
+    return ret;
+}
+
+int
+crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
+                                           unsigned long long *mlen_p,
+                                           unsigned char *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+{
+    unsigned long long mlen = 0ULL;
+    int                ret  = -1;
+
+    if (clen >= crypto_aead_xchacha20poly1305_ietf_ABYTES) {
+        ret = crypto_aead_xchacha20poly1305_ietf_decrypt_detached
+            (m, nsec,
+             c, clen - crypto_aead_xchacha20poly1305_ietf_ABYTES,
+             c + clen - crypto_aead_xchacha20poly1305_ietf_ABYTES,
+             ad, adlen, npub, k);
+    }
+    if (mlen_p != NULL) {
+        if (ret == 0) {
+            mlen = clen - crypto_aead_xchacha20poly1305_ietf_ABYTES;
+        }
+        *mlen_p = mlen;
+    }
+    return ret;
+}
+
+size_t
+crypto_aead_xchacha20poly1305_ietf_keybytes(void)
+{
+    return crypto_aead_xchacha20poly1305_ietf_KEYBYTES;
+}
+
+size_t
+crypto_aead_xchacha20poly1305_ietf_npubbytes(void)
+{
+    return crypto_aead_xchacha20poly1305_ietf_NPUBBYTES;
+}
+
+size_t
+crypto_aead_xchacha20poly1305_ietf_nsecbytes(void)
+{
+    return crypto_aead_xchacha20poly1305_ietf_NSECBYTES;
+}
+
+size_t
+crypto_aead_xchacha20poly1305_ietf_abytes(void)
+{
+    return crypto_aead_xchacha20poly1305_ietf_ABYTES;
+}
+
+size_t
+crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void)
+{
+    return crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX;
+}
+
+void
+crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
+{
+    randombytes_buf(k, crypto_aead_xchacha20poly1305_ietf_KEYBYTES);
+}
+#undef _pad0
+
diff --git a/thirdparty/sodium/sodium.h b/thirdparty/sodium/sodium.h
new file mode 100644
index 000000000..3abbdf8de
--- /dev/null
+++ b/thirdparty/sodium/sodium.h
@@ -0,0 +1,1304 @@
+/*
+ * ISC License
+ *
+ * Copyright (c) 2013-2026
+ * Frank Denis <j at pureftpd dot org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Amalgamated libsodium subset for yojimbo/netcode — generated; do not edit by hand. */
+
+#ifndef SODIUM_AMALGAM_H
+#define SODIUM_AMALGAM_H
+
+/* ================= sodium_stream_chacha20.h ================= */
+
+#ifndef stream_chacha20_H
+#define stream_chacha20_H
+
+#include <stdint.h>
+
+typedef struct crypto_stream_chacha20_implementation
+{
+	int (*stream)(unsigned char* c, unsigned long long clen, const unsigned char* n, const unsigned char* k);
+	int (*stream_ietf_ext)(unsigned char* c, unsigned long long clen, const unsigned char* n, const unsigned char* k);
+	int (*stream_xor_ic)(unsigned char* c, const unsigned char* m, unsigned long long mlen, const unsigned char* n,
+						 uint64_t ic, const unsigned char* k);
+	int (*stream_ietf_ext_xor_ic)(unsigned char* c, const unsigned char* m, unsigned long long mlen,
+								  const unsigned char* n, uint32_t ic, const unsigned char* k);
+} crypto_stream_chacha20_implementation;
+
+#endif
+/* ================= sodium_export.h ================= */
+
+#ifndef sodium_export_H
+#define sodium_export_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <limits.h>
+
+#if !defined(__clang__) && !defined(__GNUC__)
+#ifdef __attribute__
+#undef __attribute__
+#endif
+#define __attribute__(a)
+#endif
+
+#ifndef CRYPTO_ALIGN
+#if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+#define CRYPTO_ALIGN(x) __declspec(align(x))
+#else
+#define CRYPTO_ALIGN(x) __attribute__((aligned(x)))
+#endif
+#endif
+
+#define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
+#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+
+#endif
+/* ================= sodium_crypto_stream_chacha20.h ================= */
+#ifndef crypto_stream_chacha20_H
+#define crypto_stream_chacha20_H
+
+/*
+ *  WARNING: This is just a stream cipher. It is NOT authenticated encryption.
+ *  While it provides some protection against eavesdropping, it does NOT
+ *  provide any security against active attacks.
+ *  Unless you know what you're doing, what you are looking for is probably
+ *  the crypto_box functions.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+extern "C" {
+#endif
+
+#define crypto_stream_chacha20_KEYBYTES 32U
+size_t crypto_stream_chacha20_keybytes(void);
+
+#define crypto_stream_chacha20_NONCEBYTES 8U
+size_t crypto_stream_chacha20_noncebytes(void);
+
+#define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+size_t crypto_stream_chacha20_messagebytes_max(void);
+
+/* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
+
+int crypto_stream_chacha20(unsigned char* c, unsigned long long clen, const unsigned char* n, const unsigned char* k)
+	__attribute__((nonnull));
+
+int crypto_stream_chacha20_xor(unsigned char* c, const unsigned char* m, unsigned long long mlen,
+							   const unsigned char* n, const unsigned char* k) __attribute__((nonnull));
+
+int crypto_stream_chacha20_xor_ic(unsigned char* c, const unsigned char* m, unsigned long long mlen,
+								  const unsigned char* n, uint64_t ic, const unsigned char* k) __attribute__((nonnull));
+
+void crypto_stream_chacha20_keygen(unsigned char k[crypto_stream_chacha20_KEYBYTES]) __attribute__((nonnull));
+
+/* ChaCha20 with a 96-bit nonce and a 32-bit counter (IETF) */
+
+#define crypto_stream_chacha20_ietf_KEYBYTES 32U
+size_t crypto_stream_chacha20_ietf_keybytes(void);
+
+#define crypto_stream_chacha20_ietf_NONCEBYTES 12U
+size_t crypto_stream_chacha20_ietf_noncebytes(void);
+
+#define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+
+int crypto_stream_chacha20_ietf(unsigned char* c, unsigned long long clen, const unsigned char* n,
+								const unsigned char* k) __attribute__((nonnull));
+
+int crypto_stream_chacha20_ietf_xor(unsigned char* c, const unsigned char* m, unsigned long long mlen,
+									const unsigned char* n, const unsigned char* k) __attribute__((nonnull));
+
+int crypto_stream_chacha20_ietf_xor_ic(unsigned char* c, const unsigned char* m, unsigned long long mlen,
+									   const unsigned char* n, uint32_t ic, const unsigned char* k)
+	__attribute__((nonnull));
+
+void crypto_stream_chacha20_ietf_keygen(unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES]) __attribute__((nonnull));
+
+/* Aliases */
+
+#define crypto_stream_chacha20_IETF_KEYBYTES crypto_stream_chacha20_ietf_KEYBYTES
+#define crypto_stream_chacha20_IETF_NONCEBYTES crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_chacha20-ref.h ================= */
+
+#include <stdint.h>
+
+extern struct crypto_stream_chacha20_implementation crypto_stream_chacha20_ref_implementation;
+/* ================= sodium_core.h ================= */
+
+#ifndef sodium_core_H
+#define sodium_core_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sodium_init(void) __attribute__((warn_unused_result));
+
+/* ---- */
+
+int sodium_set_misuse_handler(void (*handler)(void));
+
+void sodium_misuse(void) __attribute__((noreturn));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_aead_chacha20poly1305.h ================= */
+#ifndef crypto_aead_chacha20poly1305_H
+#define crypto_aead_chacha20poly1305_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+extern "C" {
+#endif
+
+/* -- IETF ChaCha20-Poly1305 construction with a 96-bit nonce and a 32-bit internal counter -- */
+
+#define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
+size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
+
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
+size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX                                                             \
+	SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, (64ULL * ((1ULL << 32) - 1ULL)))
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
+
+int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char* c, unsigned long long* clen_p, const unsigned char* m,
+											  unsigned long long mlen, const unsigned char* ad,
+											  unsigned long long adlen, const unsigned char* nsec,
+											  const unsigned char* npub, const unsigned char* k)
+	__attribute__((nonnull(1, 8, 9)));
+
+int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char* m, unsigned long long* mlen_p, unsigned char* nsec,
+											  const unsigned char* c, unsigned long long clen, const unsigned char* ad,
+											  unsigned long long adlen, const unsigned char* npub,
+											  const unsigned char* k) __attribute__((warn_unused_result))
+__attribute__((nonnull(4, 8, 9)));
+
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char* c, unsigned char* mac,
+													   unsigned long long* maclen_p, const unsigned char* m,
+													   unsigned long long mlen, const unsigned char* ad,
+													   unsigned long long adlen, const unsigned char* nsec,
+													   const unsigned char* npub, const unsigned char* k)
+	__attribute__((nonnull(1, 2, 9, 10)));
+
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char* m, unsigned char* nsec, const unsigned char* c,
+													   unsigned long long clen, const unsigned char* mac,
+													   const unsigned char* ad, unsigned long long adlen,
+													   const unsigned char* npub, const unsigned char* k)
+	__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+
+void crypto_aead_chacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
+	__attribute__((nonnull));
+
+/* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit internal counter -- */
+
+#define crypto_aead_chacha20poly1305_KEYBYTES 32U
+size_t crypto_aead_chacha20poly1305_keybytes(void);
+
+#define crypto_aead_chacha20poly1305_NSECBYTES 0U
+size_t crypto_aead_chacha20poly1305_nsecbytes(void);
+
+#define crypto_aead_chacha20poly1305_NPUBBYTES 8U
+size_t crypto_aead_chacha20poly1305_npubbytes(void);
+
+#define crypto_aead_chacha20poly1305_ABYTES 16U
+size_t crypto_aead_chacha20poly1305_abytes(void);
+
+#define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
+
+int crypto_aead_chacha20poly1305_encrypt(unsigned char* c, unsigned long long* clen_p, const unsigned char* m,
+										 unsigned long long mlen, const unsigned char* ad, unsigned long long adlen,
+										 const unsigned char* nsec, const unsigned char* npub, const unsigned char* k)
+	__attribute__((nonnull(1, 8, 9)));
+
+int crypto_aead_chacha20poly1305_decrypt(unsigned char* m, unsigned long long* mlen_p, unsigned char* nsec,
+										 const unsigned char* c, unsigned long long clen, const unsigned char* ad,
+										 unsigned long long adlen, const unsigned char* npub, const unsigned char* k)
+	__attribute__((warn_unused_result)) __attribute__((nonnull(4, 8, 9)));
+
+int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char* c, unsigned char* mac, unsigned long long* maclen_p,
+												  const unsigned char* m, unsigned long long mlen,
+												  const unsigned char* ad, unsigned long long adlen,
+												  const unsigned char* nsec, const unsigned char* npub,
+												  const unsigned char* k) __attribute__((nonnull(1, 2, 9, 10)));
+
+int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char* m, unsigned char* nsec, const unsigned char* c,
+												  unsigned long long clen, const unsigned char* mac,
+												  const unsigned char* ad, unsigned long long adlen,
+												  const unsigned char* npub, const unsigned char* k)
+	__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+
+void crypto_aead_chacha20poly1305_keygen(unsigned char k[crypto_aead_chacha20poly1305_KEYBYTES])
+	__attribute__((nonnull));
+
+/* Aliases */
+
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_aead_xchacha20poly1305.h ================= */
+#ifndef crypto_aead_xchacha20poly1305_H
+#define crypto_aead_xchacha20poly1305_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+extern "C" {
+#endif
+
+#define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
+size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
+
+#define crypto_aead_xchacha20poly1305_ietf_NSECBYTES 0U
+size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes(void);
+
+#define crypto_aead_xchacha20poly1305_ietf_NPUBBYTES 24U
+size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
+
+#define crypto_aead_xchacha20poly1305_ietf_ABYTES 16U
+size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
+
+#define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX                                                            \
+	(SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+
+int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char* c, unsigned long long* clen_p, const unsigned char* m,
+											   unsigned long long mlen, const unsigned char* ad,
+											   unsigned long long adlen, const unsigned char* nsec,
+											   const unsigned char* npub, const unsigned char* k)
+	__attribute__((nonnull(1, 8, 9)));
+
+int crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char* m, unsigned long long* mlen_p, unsigned char* nsec,
+											   const unsigned char* c, unsigned long long clen, const unsigned char* ad,
+											   unsigned long long adlen, const unsigned char* npub,
+											   const unsigned char* k) __attribute__((warn_unused_result))
+__attribute__((nonnull(4, 8, 9)));
+
+int crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char* c, unsigned char* mac,
+														unsigned long long* maclen_p, const unsigned char* m,
+														unsigned long long mlen, const unsigned char* ad,
+														unsigned long long adlen, const unsigned char* nsec,
+														const unsigned char* npub, const unsigned char* k)
+	__attribute__((nonnull(1, 2, 9, 10)));
+
+int crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char* m, unsigned char* nsec, const unsigned char* c,
+														unsigned long long clen, const unsigned char* mac,
+														const unsigned char* ad, unsigned long long adlen,
+														const unsigned char* npub, const unsigned char* k)
+	__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 9, 9)));
+
+void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
+	__attribute__((nonnull));
+
+/* Aliases */
+
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_core_hchacha20.h ================= */
+#ifndef crypto_core_hchacha20_H
+#define crypto_core_hchacha20_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define crypto_core_hchacha20_OUTPUTBYTES 32U
+size_t crypto_core_hchacha20_outputbytes(void);
+
+#define crypto_core_hchacha20_INPUTBYTES 16U
+size_t crypto_core_hchacha20_inputbytes(void);
+
+#define crypto_core_hchacha20_KEYBYTES 32U
+size_t crypto_core_hchacha20_keybytes(void);
+
+#define crypto_core_hchacha20_CONSTBYTES 16U
+size_t crypto_core_hchacha20_constbytes(void);
+
+int crypto_core_hchacha20(unsigned char* out, const unsigned char* in, const unsigned char* k, const unsigned char* c)
+	__attribute__((nonnull(1, 2, 3)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_onetimeauth_poly1305.h ================= */
+#ifndef crypto_onetimeauth_poly1305_H
+#define crypto_onetimeauth_poly1305_H
+
+#ifdef __cplusplus
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+
+typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state
+{
+	unsigned char opaque[256];
+} crypto_onetimeauth_poly1305_state;
+
+size_t crypto_onetimeauth_poly1305_statebytes(void);
+
+#define crypto_onetimeauth_poly1305_BYTES 16U
+size_t crypto_onetimeauth_poly1305_bytes(void);
+
+#define crypto_onetimeauth_poly1305_KEYBYTES 32U
+size_t crypto_onetimeauth_poly1305_keybytes(void);
+
+int crypto_onetimeauth_poly1305(unsigned char* out, const unsigned char* in, unsigned long long inlen,
+								const unsigned char* k) __attribute__((nonnull));
+
+int crypto_onetimeauth_poly1305_verify(const unsigned char* h, const unsigned char* in, unsigned long long inlen,
+									   const unsigned char* k) __attribute__((warn_unused_result))
+__attribute__((nonnull));
+
+int crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state* state, const unsigned char* key)
+	__attribute__((nonnull));
+
+int crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state* state, const unsigned char* in,
+									   unsigned long long inlen) __attribute__((nonnull));
+
+int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state* state, unsigned char* out)
+	__attribute__((nonnull));
+
+void crypto_onetimeauth_poly1305_keygen(unsigned char k[crypto_onetimeauth_poly1305_KEYBYTES]) __attribute__((nonnull));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_onetimeauth.h ================= */
+#ifndef crypto_onetimeauth_H
+#define crypto_onetimeauth_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+extern "C" {
+#endif
+
+typedef crypto_onetimeauth_poly1305_state crypto_onetimeauth_state;
+
+size_t crypto_onetimeauth_statebytes(void);
+
+#define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
+size_t crypto_onetimeauth_bytes(void);
+
+#define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
+size_t crypto_onetimeauth_keybytes(void);
+
+#define crypto_onetimeauth_PRIMITIVE "poly1305"
+const char* crypto_onetimeauth_primitive(void);
+
+int crypto_onetimeauth(unsigned char* out, const unsigned char* in, unsigned long long inlen, const unsigned char* k)
+	__attribute__((nonnull));
+
+int crypto_onetimeauth_verify(const unsigned char* h, const unsigned char* in, unsigned long long inlen,
+							  const unsigned char* k) __attribute__((warn_unused_result)) __attribute__((nonnull));
+
+int crypto_onetimeauth_init(crypto_onetimeauth_state* state, const unsigned char* key) __attribute__((nonnull));
+
+int crypto_onetimeauth_update(crypto_onetimeauth_state* state, const unsigned char* in, unsigned long long inlen)
+	__attribute__((nonnull));
+
+int crypto_onetimeauth_final(crypto_onetimeauth_state* state, unsigned char* out) __attribute__((nonnull));
+
+void crypto_onetimeauth_keygen(unsigned char k[crypto_onetimeauth_KEYBYTES]) __attribute__((nonnull));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_verify_16.h ================= */
+#ifndef crypto_verify_16_H
+#define crypto_verify_16_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define crypto_verify_16_BYTES 16U
+size_t crypto_verify_16_bytes(void);
+
+int crypto_verify_16(const unsigned char* x, const unsigned char* y) __attribute__((warn_unused_result))
+__attribute__((nonnull));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_verify_32.h ================= */
+#ifndef crypto_verify_32_H
+#define crypto_verify_32_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define crypto_verify_32_BYTES 32U
+size_t crypto_verify_32_bytes(void);
+
+int crypto_verify_32(const unsigned char* x, const unsigned char* y) __attribute__((warn_unused_result))
+__attribute__((nonnull));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_crypto_verify_64.h ================= */
+#ifndef crypto_verify_64_H
+#define crypto_verify_64_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define crypto_verify_64_BYTES 64U
+size_t crypto_verify_64_bytes(void);
+
+int crypto_verify_64(const unsigned char* x, const unsigned char* y) __attribute__((warn_unused_result))
+__attribute__((nonnull));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_dolbeau_chacha20-avx2.h ================= */
+
+#include <stdint.h>
+
+extern struct crypto_stream_chacha20_implementation crypto_stream_chacha20_dolbeau_avx2_implementation;
+/* ================= sodium_dolbeau_chacha20-ssse3.h ================= */
+
+#include <stdint.h>
+
+extern struct crypto_stream_chacha20_implementation crypto_stream_chacha20_dolbeau_ssse3_implementation;
+/* ================= sodium_onetimeauth_poly1305.h ================= */
+
+#ifndef onetimeauth_poly1305_H
+#define onetimeauth_poly1305_H
+
+typedef struct crypto_onetimeauth_poly1305_implementation
+{
+	int (*onetimeauth)(unsigned char* out, const unsigned char* in, unsigned long long inlen, const unsigned char* k);
+	int (*onetimeauth_verify)(const unsigned char* h, const unsigned char* in, unsigned long long inlen,
+							  const unsigned char* k);
+	int (*onetimeauth_init)(crypto_onetimeauth_poly1305_state* state, const unsigned char* key);
+	int (*onetimeauth_update)(crypto_onetimeauth_poly1305_state* state, const unsigned char* in,
+							  unsigned long long inlen);
+	int (*onetimeauth_final)(crypto_onetimeauth_poly1305_state* state, unsigned char* out);
+} crypto_onetimeauth_poly1305_implementation;
+
+#endif
+/* ================= sodium_poly1305-sse2.h ================= */
+#ifndef poly1305_sse2_H
+#define poly1305_sse2_H
+
+#include <stddef.h>
+
+extern struct crypto_onetimeauth_poly1305_implementation crypto_onetimeauth_poly1305_sse2_implementation;
+
+#endif /* poly1305_sse2_H */
+/* ================= sodium_poly1305_donna.h ================= */
+#ifndef poly1305_donna_H
+#define poly1305_donna_H
+
+#include <stddef.h>
+
+extern struct crypto_onetimeauth_poly1305_implementation crypto_onetimeauth_poly1305_donna_implementation;
+
+#endif /* poly1305_donna_H */
+/* ================= sodium_private_chacha20_ietf_ext.h ================= */
+#ifndef chacha20_ietf_ext_H
+#define chacha20_ietf_ext_H
+
+#include <stdint.h>
+
+/* The ietf_ext variant allows the internal counter to overflow into the IV */
+
+int crypto_stream_chacha20_ietf_ext(unsigned char* c, unsigned long long clen, const unsigned char* n,
+									const unsigned char* k);
+
+int crypto_stream_chacha20_ietf_ext_xor_ic(unsigned char* c, const unsigned char* m, unsigned long long mlen,
+										   const unsigned char* n, uint32_t ic, const unsigned char* k);
+#endif
+
+/* ================= sodium_private_common.h ================= */
+#ifndef common_H
+#define common_H 1
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(_MSC_VER)
+#pragma warning(disable : 4127)
+#pragma warning(disable : 4244)
+#pragma warning(disable : 4668)
+#pragma warning(disable : 4456)
+#endif
+
+#define COMPILER_ASSERT(X) (void)sizeof(char[(X) ? 1 : -1])
+
+/* 128-bit integer support: enables the Poly1305 donna64 and SSE2 code paths.
+   Available on 64-bit GCC/Clang targets (x86-64, arm64, ...); not on MSVC. */
+#if !defined(HAVE_TI_MODE) && defined(__SIZEOF_INT128__)
+#define HAVE_TI_MODE 1
+#endif
+
+/* Optimisation barriers used by the constant-time code and by the AEAD decrypt
+   paths (libsodium 1.0.21/1.0.22). Upstream gets these from autoconf; this
+   amalgamation derives them from the compiler's own macros, as it already does
+   for HAVE_TI_MODE and the SIMD intrinsics above.
+
+   ACQUIRE_FENCE is placed after MAC verification and before the plaintext is
+   produced, so a speculative read cannot reach unauthenticated plaintext.
+   Falling back to (void) 0 matches upstream's behaviour when autoconf detects
+   no fence primitive: correct and interoperable, without the hardening. */
+#if !defined(HAVE_GCC_MEMORY_FENCES) && (defined(__GNUC__) || defined(__clang__))
+#define HAVE_GCC_MEMORY_FENCES 1
+#endif
+#if !defined(HAVE_INLINE_ASM) && (defined(__GNUC__) || defined(__clang__)) && !defined(_MSC_VER)
+#define HAVE_INLINE_ASM 1
+#endif
+
+#ifdef HAVE_GCC_MEMORY_FENCES
+#define ACQUIRE_FENCE __atomic_thread_fence(__ATOMIC_ACQUIRE)
+#elif defined(HAVE_C11_MEMORY_FENCES)
+#define ACQUIRE_FENCE atomic_thread_fence(memory_order_acquire)
+#else
+#define ACQUIRE_FENCE (void)0
+#endif
+
+#ifdef HAVE_TI_MODE
+#if defined(__SIZEOF_INT128__)
+typedef unsigned __int128 uint128_t;
+#else
+typedef unsigned uint128_t __attribute__((mode(TI)));
+#endif
+#endif
+
+#define ROTL32(X, B) rotl32((X), (B))
+static inline uint32_t rotl32(const uint32_t x, const int b)
+{
+	return (x << b) | (x >> (32 - b));
+}
+
+#define ROTL64(X, B) rotl64((X), (B))
+static inline uint64_t rotl64(const uint64_t x, const int b)
+{
+	return (x << b) | (x >> (64 - b));
+}
+
+#define ROTR32(X, B) rotr32((X), (B))
+static inline uint32_t rotr32(const uint32_t x, const int b)
+{
+	return (x >> b) | (x << (32 - b));
+}
+
+#define ROTR64(X, B) rotr64((X), (B))
+static inline uint64_t rotr64(const uint64_t x, const int b)
+{
+	return (x >> b) | (x << (64 - b));
+}
+
+#define LOAD64_LE(SRC) load64_le(SRC)
+static inline uint64_t load64_le(const uint8_t src[8])
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+	uint64_t w;
+	memcpy(&w, src, sizeof w);
+	return w;
+#else
+	uint64_t w = (uint64_t)src[0];
+	w |= (uint64_t)src[1] << 8;
+	w |= (uint64_t)src[2] << 16;
+	w |= (uint64_t)src[3] << 24;
+	w |= (uint64_t)src[4] << 32;
+	w |= (uint64_t)src[5] << 40;
+	w |= (uint64_t)src[6] << 48;
+	w |= (uint64_t)src[7] << 56;
+	return w;
+#endif
+}
+
+#define STORE64_LE(DST, W) store64_le((DST), (W))
+static inline void store64_le(uint8_t dst[8], uint64_t w)
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+	memcpy(dst, &w, sizeof w);
+#else
+	dst[0] = (uint8_t)w;
+	w >>= 8;
+	dst[1] = (uint8_t)w;
+	w >>= 8;
+	dst[2] = (uint8_t)w;
+	w >>= 8;
+	dst[3] = (uint8_t)w;
+	w >>= 8;
+	dst[4] = (uint8_t)w;
+	w >>= 8;
+	dst[5] = (uint8_t)w;
+	w >>= 8;
+	dst[6] = (uint8_t)w;
+	w >>= 8;
+	dst[7] = (uint8_t)w;
+#endif
+}
+
+#define LOAD32_LE(SRC) load32_le(SRC)
+static inline uint32_t load32_le(const uint8_t src[4])
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+	uint32_t w;
+	memcpy(&w, src, sizeof w);
+	return w;
+#else
+	uint32_t w = (uint32_t)src[0];
+	w |= (uint32_t)src[1] << 8;
+	w |= (uint32_t)src[2] << 16;
+	w |= (uint32_t)src[3] << 24;
+	return w;
+#endif
+}
+
+#define STORE32_LE(DST, W) store32_le((DST), (W))
+static inline void store32_le(uint8_t dst[4], uint32_t w)
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+	memcpy(dst, &w, sizeof w);
+#else
+	dst[0] = (uint8_t)w;
+	w >>= 8;
+	dst[1] = (uint8_t)w;
+	w >>= 8;
+	dst[2] = (uint8_t)w;
+	w >>= 8;
+	dst[3] = (uint8_t)w;
+#endif
+}
+
+/* ----- */
+
+#define LOAD64_BE(SRC) load64_be(SRC)
+static inline uint64_t load64_be(const uint8_t src[8])
+{
+#ifdef NATIVE_BIG_ENDIAN
+	uint64_t w;
+	memcpy(&w, src, sizeof w);
+	return w;
+#else
+	uint64_t w = (uint64_t)src[7];
+	w |= (uint64_t)src[6] << 8;
+	w |= (uint64_t)src[5] << 16;
+	w |= (uint64_t)src[4] << 24;
+	w |= (uint64_t)src[3] << 32;
+	w |= (uint64_t)src[2] << 40;
+	w |= (uint64_t)src[1] << 48;
+	w |= (uint64_t)src[0] << 56;
+	return w;
+#endif
+}
+
+#define STORE64_BE(DST, W) store64_be((DST), (W))
+static inline void store64_be(uint8_t dst[8], uint64_t w)
+{
+#ifdef NATIVE_BIG_ENDIAN
+	memcpy(dst, &w, sizeof w);
+#else
+	dst[7] = (uint8_t)w;
+	w >>= 8;
+	dst[6] = (uint8_t)w;
+	w >>= 8;
+	dst[5] = (uint8_t)w;
+	w >>= 8;
+	dst[4] = (uint8_t)w;
+	w >>= 8;
+	dst[3] = (uint8_t)w;
+	w >>= 8;
+	dst[2] = (uint8_t)w;
+	w >>= 8;
+	dst[1] = (uint8_t)w;
+	w >>= 8;
+	dst[0] = (uint8_t)w;
+#endif
+}
+
+#define LOAD32_BE(SRC) load32_be(SRC)
+static inline uint32_t load32_be(const uint8_t src[4])
+{
+#ifdef NATIVE_BIG_ENDIAN
+	uint32_t w;
+	memcpy(&w, src, sizeof w);
+	return w;
+#else
+	uint32_t w = (uint32_t)src[3];
+	w |= (uint32_t)src[2] << 8;
+	w |= (uint32_t)src[1] << 16;
+	w |= (uint32_t)src[0] << 24;
+	return w;
+#endif
+}
+
+#define STORE32_BE(DST, W) store32_be((DST), (W))
+static inline void store32_be(uint8_t dst[4], uint32_t w)
+{
+#ifdef NATIVE_BIG_ENDIAN
+	memcpy(dst, &w, sizeof w);
+#else
+	dst[3] = (uint8_t)w;
+	w >>= 8;
+	dst[2] = (uint8_t)w;
+	w >>= 8;
+	dst[1] = (uint8_t)w;
+	w >>= 8;
+	dst[0] = (uint8_t)w;
+#endif
+}
+
+#define XOR_BUF(OUT, IN, N) xor_buf((OUT), (IN), (N))
+static inline void xor_buf(unsigned char* out, const unsigned char* in, size_t n)
+{
+	size_t i;
+
+	for (i = 0; i < n; i++)
+	{
+		out[i] ^= in[i];
+	}
+}
+
+#if !defined(__clang__) && !defined(__GNUC__)
+#ifdef __attribute__
+#undef __attribute__
+#endif
+#define __attribute__(a)
+#endif
+
+#ifndef CRYPTO_ALIGN
+#if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+#define CRYPTO_ALIGN(x) __declspec(align(x))
+#else
+#define CRYPTO_ALIGN(x) __attribute__((aligned(x)))
+#endif
+#endif
+
+/*
+ * SIMD / intrinsics feature selection.
+ *
+ * The optimized implementations kept for the primitives yojimbo uses
+ * (ChaCha20 SSSE3/AVX2, Poly1305 SSE2) enable their own instruction set
+ * per-function with #pragma target on GCC/Clang, and the fastest variant the
+ * running CPU actually supports is chosen at runtime (see sodium_runtime.c and
+ * the *_pick_best_implementation() functions). So on any x86 target we enable
+ * the intrinsic headers unconditionally and let runtime dispatch decide; targets
+ * with no specialized implementation (e.g. arm64) fall back to the portable
+ * reference code, which is correct on every platform. A build may still predefine
+ * NETCODE_X64 / NETCODE_AVX / NETCODE_AVX2 to force the x86 set on.
+ *
+ * Note: the amd64/AVX *assembly* paths (HAVE_AMD64_ASM / HAVE_AVX_ASM) are left
+ * off on purpose. They only accelerated primitives that have been pruned from
+ * this copy; the kept SSE2/SSSE3/AVX2 code is pure intrinsics.
+ */
+
+#if defined(__clang__) || defined(__GNUC__)
+#if defined(__x86_64__) || defined(__amd64__) || defined(__i386__) || NETCODE_X64 || NETCODE_AVX || NETCODE_AVX2
+#define HAVE_MMINTRIN_H 1
+#define HAVE_EMMINTRIN_H 1 /* SSE2   */
+#define HAVE_PMMINTRIN_H 1 /* SSE3   */
+#define HAVE_TMMINTRIN_H 1 /* SSSE3  */
+#define HAVE_SMMINTRIN_H 1 /* SSE4.1 */
+#define HAVE_AVXINTRIN_H 1 /* AVX    */
+#define HAVE_WMMINTRIN_H 1
+#define HAVE_AVX2INTRIN_H 1 /* AVX2   */
+#define HAVE_CPUID 1
+#endif
+#endif
+
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))
+
+#include <intrin.h>
+
+#define HAVE_INTRIN_H 1
+#define HAVE_MMINTRIN_H 1
+#define HAVE_EMMINTRIN_H 1
+#define HAVE_PMMINTRIN_H 1
+#define HAVE_TMMINTRIN_H 1
+#define HAVE_SMMINTRIN_H 1
+
+#if _MSC_VER >= 1600
+#define HAVE_WMMINTRIN_H 1
+#endif
+
+/* MSVC has no per-function target pragma, so AVX/AVX2 codegen requires the
+   matching /arch: switch (which predefines __AVX__ / __AVX2__). Honor that, and
+   still allow an explicit NETCODE_AVX/NETCODE_AVX2 override. */
+#if defined(__AVX__) || NETCODE_AVX || NETCODE_AVX2
+#define HAVE_AVXINTRIN_H 1
+#endif
+#if (defined(__AVX2__) || NETCODE_AVX2) && _MSC_VER >= 1700 && defined(_M_X64)
+#define HAVE_AVX2INTRIN_H 1
+#endif
+
+#elif defined(HAVE_INTRIN_H)
+
+#include <intrin.h>
+
+#endif
+
+#ifdef HAVE_LIBCTGRIND
+extern void ct_poison(const void*, size_t);
+extern void ct_unpoison(const void*, size_t);
+#define POISON(X, L) ct_poison((X), (L))
+#define UNPOISON(X, L) ct_unpoison((X), (L))
+#else
+#define POISON(X, L) (void)0
+#define UNPOISON(X, L) (void)0
+#endif
+
+#endif
+/* ================= sodium_private_implementations.h ================= */
+#ifndef implementations_H
+#define implementations_H
+
+int _crypto_generichash_blake2b_pick_best_implementation(void);
+int _crypto_onetimeauth_poly1305_pick_best_implementation(void);
+int _crypto_scalarmult_curve25519_pick_best_implementation(void);
+int _crypto_stream_chacha20_pick_best_implementation(void);
+int _crypto_stream_salsa20_pick_best_implementation(void);
+
+#endif
+/* ================= sodium_private_mutex.h ================= */
+#ifndef mutex_H
+#define mutex_H 1
+
+extern int sodium_crit_enter(void);
+extern int sodium_crit_leave(void);
+
+#endif
+/* ================= sodium_private_sse2_64_32.h ================= */
+#ifndef sse2_64_32_H
+#define sse2_64_32_H 1
+
+#ifdef HAVE_INTRIN_H
+#include <intrin.h>
+#endif
+
+#if defined(HAVE_EMMINTRIN_H) &&                                                                                       \
+	!(defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64))
+
+#include <emmintrin.h>
+#include <stdint.h>
+
+#ifndef _mm_set_epi64x
+#define _mm_set_epi64x(Q0, Q1) sodium__mm_set_epi64x((Q0), (Q1))
+static inline __m128i sodium__mm_set_epi64x(int64_t q1, int64_t q0)
+{
+	union
+	{
+		int64_t as64;
+		int32_t as32[2];
+	} x0, x1;
+	x0.as64 = q0;
+	x1.as64 = q1;
+	return _mm_set_epi32(x1.as32[1], x1.as32[0], x0.as32[1], x0.as32[0]);
+}
+#endif
+
+#ifndef _mm_set1_epi64x
+#define _mm_set1_epi64x(Q) sodium__mm_set1_epi64x(Q)
+static inline __m128i sodium__mm_set1_epi64x(int64_t q)
+{
+	return _mm_set_epi64x(q, q);
+}
+#endif
+
+#ifndef _mm_cvtsi64_si128
+#define _mm_cvtsi64_si128(Q) sodium__mm_cvtsi64_si128(Q)
+static inline __m128i sodium__mm_cvtsi64_si128(int64_t q)
+{
+	union
+	{
+		int64_t as64;
+		int32_t as32[2];
+	} x;
+	x.as64 = q;
+	return _mm_setr_epi32(x.as32[0], x.as32[1], 0, 0);
+}
+#endif
+
+#endif
+
+#endif
+/* ================= sodium_randombytes.h ================= */
+
+#ifndef randombytes_H
+#define randombytes_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+extern "C" {
+#endif
+
+typedef struct randombytes_implementation
+{
+	const char* (*implementation_name)(void);		 /* required */
+	uint32_t (*random)(void);						 /* required */
+	void (*stir)(void);								 /* optional */
+	uint32_t (*uniform)(const uint32_t upper_bound); /* optional, a default implementation will be used if NULL */
+	void (*buf)(void* const buf, const size_t size); /* required */
+	int (*close)(void);								 /* optional */
+} randombytes_implementation;
+
+#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+
+#define randombytes_SEEDBYTES 32U
+size_t randombytes_seedbytes(void);
+
+void randombytes_buf(void* const buf, const size_t size) __attribute__((nonnull));
+
+void randombytes_buf_deterministic(void* const buf, const size_t size, const unsigned char seed[randombytes_SEEDBYTES])
+	__attribute__((nonnull));
+
+uint32_t randombytes_random(void);
+
+uint32_t randombytes_uniform(const uint32_t upper_bound);
+
+void randombytes_stir(void);
+
+int randombytes_close(void);
+
+int randombytes_set_implementation(randombytes_implementation* impl) __attribute__((nonnull));
+
+const char* randombytes_implementation_name(void);
+
+/* -- NaCl compatibility interface -- */
+
+void randombytes(unsigned char* const buf, const unsigned long long buf_len) __attribute__((nonnull));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_randombytes_sysrandom.h ================= */
+
+#ifndef randombytes_sysrandom_H
+#define randombytes_sysrandom_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct randombytes_implementation randombytes_sysrandom_implementation;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_runtime.h ================= */
+
+#ifndef sodium_runtime_H
+#define sodium_runtime_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sodium_runtime_has_neon(void);
+
+int sodium_runtime_has_sse2(void);
+
+int sodium_runtime_has_sse3(void);
+
+int sodium_runtime_has_ssse3(void);
+
+int sodium_runtime_has_sse41(void);
+
+int sodium_runtime_has_avx(void);
+
+int sodium_runtime_has_avx2(void);
+
+int sodium_runtime_has_avx512f(void);
+
+int sodium_runtime_has_pclmul(void);
+
+int sodium_runtime_has_aesni(void);
+
+int sodium_runtime_has_rdrand(void);
+
+/* ------------------------------------------------------------------------- */
+
+int _sodium_runtime_get_cpu_features(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_utils.h ================= */
+
+#ifndef sodium_utils_H
+#define sodium_utils_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef SODIUM_C99
+#if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+#define SODIUM_C99(X)
+#else
+#define SODIUM_C99(X) X
+#endif
+#endif
+
+void sodium_memzero(void* const pnt, const size_t len) __attribute__((nonnull));
+
+void sodium_stackzero(const size_t len);
+
+/*
+ * WARNING: sodium_memcmp() must be used to verify if two secret keys
+ * are equal, in constant time.
+ * It returns 0 if the keys are equal, and -1 if they differ.
+ * This function is not designed for lexicographical comparisons.
+ */
+int sodium_memcmp(const void* const b1_, const void* const b2_, size_t len) __attribute__((warn_unused_result))
+__attribute__((nonnull));
+
+/*
+ * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
+ * It is suitable for lexicographical comparisons, or to compare nonces
+ * and counters stored in little-endian format.
+ * However, it is slower than sodium_memcmp().
+ */
+int sodium_compare(const unsigned char* b1_, const unsigned char* b2_, size_t len) __attribute__((warn_unused_result))
+__attribute__((nonnull));
+
+int sodium_is_zero(const unsigned char* n, const size_t nlen);
+
+void sodium_increment(unsigned char* n, const size_t nlen);
+
+void sodium_add(unsigned char* a, const unsigned char* b, const size_t len) __attribute__((nonnull));
+
+void sodium_sub(unsigned char* a, const unsigned char* b, const size_t len) __attribute__((nonnull));
+
+char* sodium_bin2hex(char* const hex, const size_t hex_maxlen, const unsigned char* const bin, const size_t bin_len)
+	__attribute__((nonnull));
+
+int sodium_hex2bin(unsigned char* const bin, const size_t bin_maxlen, const char* const hex, const size_t hex_len,
+				   const char* const ignore, size_t* const bin_len, const char** const hex_end)
+	__attribute__((nonnull(1, 3)));
+
+#define sodium_base64_VARIANT_ORIGINAL 1
+#define sodium_base64_VARIANT_ORIGINAL_NO_PADDING 3
+#define sodium_base64_VARIANT_URLSAFE 5
+#define sodium_base64_VARIANT_URLSAFE_NO_PADDING 7
+
+/*
+ * Computes the required length to encode BIN_LEN bytes as a base64 string
+ * using the given variant. The computed length includes a trailing \0.
+ */
+#define sodium_base64_ENCODED_LEN(BIN_LEN, VARIANT)                                                                    \
+	(((BIN_LEN) / 3U) * 4U +                                                                                           \
+	 ((((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) >> 1)) & 1U) *                       \
+		 (4U - ((0U - (((VARIANT) & 2U) >> 1)) & (3U - ((BIN_LEN) - ((BIN_LEN) / 3U) * 3U)))) +                        \
+	 1U)
+
+size_t sodium_base64_encoded_len(const size_t bin_len, const int variant);
+
+char* sodium_bin2base64(char* const b64, const size_t b64_maxlen, const unsigned char* const bin, const size_t bin_len,
+						const int variant) __attribute__((nonnull));
+
+int sodium_base642bin(unsigned char* const bin, const size_t bin_maxlen, const char* const b64, const size_t b64_len,
+					  const char* const ignore, size_t* const bin_len, const char** const b64_end, const int variant)
+	__attribute__((nonnull(1, 3)));
+
+int sodium_mlock(void* const addr, const size_t len) __attribute__((nonnull));
+
+int sodium_munlock(void* const addr, const size_t len) __attribute__((nonnull));
+
+/* WARNING: sodium_malloc() and sodium_allocarray() are not general-purpose
+ * allocation functions.
+ *
+ * They return a pointer to a region filled with 0xd0 bytes, immediately
+ * followed by a guard page.
+ * As a result, accessing a single byte after the requested allocation size
+ * will intentionally trigger a segmentation fault.
+ *
+ * A canary and an additional guard page placed before the beginning of the
+ * region may also kill the process if a buffer underflow is detected.
+ *
+ * The memory layout is:
+ * [unprotected region size (read only)][guard page (no access)][unprotected pages (read/write)][guard page (no access)]
+ * With the layout of the unprotected pages being:
+ * [optional padding][16-bytes canary][user region]
+ *
+ * However:
+ * - These functions are significantly slower than standard functions
+ * - Each allocation requires 3 or 4 additional pages
+ * - The returned address will not be aligned if the allocation size is not
+ *   a multiple of the required alignment. For this reason, these functions
+ *   are designed to store data, such as secret keys and messages.
+ *
+ * sodium_malloc() can be used to allocate any libsodium data structure.
+ *
+ * The crypto_generichash_state structure is packed and its length is
+ * either 357 or 361 bytes. For this reason, when using sodium_malloc() to
+ * allocate a crypto_generichash_state structure, padding must be added in
+ * order to ensure proper alignment. crypto_generichash_statebytes()
+ * returns the rounded up structure size, and should be prefered to sizeof():
+ * state = sodium_malloc(crypto_generichash_statebytes());
+ */
+
+void* sodium_malloc(const size_t size) __attribute__((malloc));
+
+void* sodium_allocarray(size_t count, size_t size) __attribute__((malloc));
+
+void sodium_free(void* ptr);
+
+int sodium_mprotect_noaccess(void* ptr) __attribute__((nonnull));
+
+int sodium_mprotect_readonly(void* ptr) __attribute__((nonnull));
+
+int sodium_mprotect_readwrite(void* ptr) __attribute__((nonnull));
+
+int sodium_pad(size_t* padded_buflen_p, unsigned char* buf, size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+	__attribute__((nonnull(2)));
+
+int sodium_unpad(size_t* unpadded_buflen_p, const unsigned char* buf, size_t padded_buflen, size_t blocksize)
+	__attribute__((nonnull(2)));
+
+/* -------- */
+
+int _sodium_alloc_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* ================= sodium_version.h ================= */
+#ifndef sodium_version_H
+#define sodium_version_H
+
+#define SODIUM_VERSION_STRING "1.0.22"
+
+#define SODIUM_LIBRARY_VERSION_MAJOR 26
+#define SODIUM_LIBRARY_VERSION_MINOR 2
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char* sodium_version_string(void);
+
+int sodium_library_version_major(void);
+
+int sodium_library_version_minor(void);
+
+int sodium_library_minimal(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif /* SODIUM_AMALGAM_H */
diff --git a/thirdparty/spdlog b/thirdparty/spdlog
new file mode 160000
index 000000000..ff261af75
--- /dev/null
+++ b/thirdparty/spdlog
@@ -0,0 +1 @@
+Subproject commit ff261af757ce7e454b184a2fc957bd8ea2f001a0
diff --git a/include/stb b/thirdparty/stb
similarity index 100%
rename from include/stb
rename to thirdparty/stb
diff --git a/include/yaml-cpp b/thirdparty/yaml-cpp
similarity index 100%
rename from include/yaml-cpp
rename to thirdparty/yaml-cpp
diff --git a/thirdparty/zstd b/thirdparty/zstd
new file mode 160000
index 000000000..5233c58e6
--- /dev/null
+++ b/thirdparty/zstd
@@ -0,0 +1 @@
+Subproject commit 5233c58e6ca0b1c4c6b353ad79649191ed195bdc
diff --git a/tools/build_managed.py b/tools/build_managed.py
new file mode 100644
index 000000000..f7c96dfa3
--- /dev/null
+++ b/tools/build_managed.py
@@ -0,0 +1,118 @@
+"""Build managed C# projects for Chained Engine.
+
+Usage:
+    python tools/build_managed.py build-managed \\
+        --project managed/Chained.Managed.csproj \\
+        --output build/bin/Debug \\
+        --coral-dir build/vendor/coral \\
+        --configuration Debug \\
+        --copy-coral --write-props --parallel
+"""
+import argparse
+import os
+import shutil
+import subprocess
+from pathlib import Path
+from typing import Optional
+
+CORAL_ARTIFACTS = [
+    "Coral.Managed.dll",
+    "Coral.Managed.runtimeconfig.json",
+    "Coral.Managed.deps.json",
+    "Coral.Managed.pdb",
+]
+
+PROPS_TEMPLATE = (
+    "<Project>\n"
+    "  <PropertyGroup>\n"
+    "    <CoralManagedDir>$(MSBuildThisFileDirectory){relative_coral_dir}</CoralManagedDir>\n"
+    "  </PropertyGroup>\n"
+    "</Project>\n"
+)
+
+
+def find_dotnet() -> Optional[str]:
+    if dotnet_root := os.environ.get("DOTNET_ROOT"):
+        for name in ("dotnet.exe", "dotnet"):
+            if (candidate := Path(dotnet_root) / name).exists():
+                return str(candidate)
+    if dotnet := shutil.which("dotnet"):
+        return dotnet
+    common = [
+        "C:/Program Files/dotnet/dotnet.exe",
+        "C:/Program Files (x86)/dotnet/dotnet.exe",
+        "/usr/bin/dotnet",
+        "/usr/share/dotnet/dotnet",
+    ]
+    return next((str(p) for path in common if (p := Path(path)).exists()), None)
+
+
+def write_if_changed(path: Path, content: str) -> None:
+    if not (path.exists() and path.read_text(encoding="utf-8") == content):
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_text(content, encoding="utf-8")
+
+
+def build_managed(
+    project: Path,
+    output_dir: Path,
+    coral_dir: Path,
+    configuration: str,
+    copy_coral: bool,
+    parallel: bool,
+    write_props: bool,
+) -> None:
+    if not (dotnet := find_dotnet()):
+        raise FileNotFoundError("Could not find dotnet. Set DOTNET_ROOT or add dotnet to PATH.")
+
+    if write_props:
+        relative = os.path.normpath(os.path.relpath(coral_dir, start=project.parent))
+        write_if_changed(
+            project.parent / "ManagedDependencies.props",
+            PROPS_TEMPLATE.format(relative_coral_dir=relative),
+        )
+
+    output_dir.mkdir(parents=True, exist_ok=True)
+    command = [
+        dotnet, "build", str(project),
+        "-c", configuration,
+        "--output", str(output_dir),
+        f"-p:CoralManagedDir={coral_dir}",
+    ]
+    if parallel:
+        command.append("-m")
+
+    subprocess.run(command, cwd=str(project.parent), check=True)
+
+    if copy_coral:
+        for name in CORAL_ARTIFACTS:
+            if not (src := coral_dir / name).exists():
+                raise FileNotFoundError(f"Missing Coral artifact: {src}")
+            shutil.copy2(src, output_dir / name)
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Build managed C# projects")
+    parser.add_argument("--project", required=True, help="Path to .csproj")
+    parser.add_argument("--output", required=True, help="Output directory for DLLs")
+    parser.add_argument("--coral-dir", required=True, help="Directory containing Coral.Managed artifacts")
+    parser.add_argument("--configuration", default="Debug", help="Build configuration (Debug/Release)")
+    parser.add_argument("--copy-coral", action="store_true", help="Copy Coral.Managed artifacts to output")
+    parser.add_argument("--write-props", action="store_true", help="Write ManagedDependencies.props")
+    parser.add_argument("--parallel", action="store_true", help="Use parallel MSBuild")
+
+    args = parser.parse_args()
+
+    build_managed(
+        Path(args.project).resolve(),
+        Path(args.output).resolve(),
+        Path(args.coral_dir).resolve(),
+        args.configuration,
+        args.copy_coral,
+        args.parallel,
+        args.write_props,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/create_game.py b/tools/create_game.py
new file mode 100644
index 000000000..dcaa151ce
--- /dev/null
+++ b/tools/create_game.py
@@ -0,0 +1,199 @@
+#!/usr/bin/env python3
+"""Scaffolds a new game project under game/<name>/ with boilerplate files.
+
+Usage:
+    python tools/create_game.py <GameName>
+    python tools/create_game.py MyGame --csproj assets/scripts/MyGame.Scripts.csproj
+
+Generated:
+    game/<name>/
+    ├── CMakeLists.txt          # chained_add_game() boilerplate
+    ├── <Name>.chproject        # project metadata (YAML)
+    ├── src/
+    │   └── main.cpp            # CreateApplication entry point
+    └── assets/
+        └── scripts/            # empty, for C# scripts
+"""
+
+import argparse
+import re
+import sys
+from pathlib import Path
+
+
+# ── CMakeLists.txt template ──
+# We use PYTHON_PLACEHOLDER syntax (uppercase with underscores) to avoid
+# clashes with CMake ${VAR} syntax and Python {var} format strings.
+# After .substitute(), we do .replace() to turn them into real CMake syntax.
+_TEMPLATE_CMAKELISTS = """\
+# Game: $PYDISPLAY_NAME
+
+chained_add_game($PYTARGET_NAME
+    PROJECT_GAME $PYGAME_DIR
+    $PYCSHARP_LINE)
+
+# Copy game assets (only if source files changed)
+set(GAME_ASSET_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
+set(GAME_ASSET_DST_DIR "$<TARGET_FILE_DIR:$PYTARGET_NAME>Exe>/assets")
+
+add_custom_command(TARGET $PYTARGET_NAME Exe POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${GAME_ASSET_DST_DIR}"
+    COMMAND ${CMAKE_COMMAND} -DSOURCE="${GAME_ASSET_SRC_DIR}" -DDEST="${GAME_ASSET_DST_DIR}" -P "${CMAKE_SOURCE_DIR}/cmake/CopyIfDifferent.cmake"
+    COMMENT "Syncing game assets from ${GAME_ASSET_SRC_DIR} to ${GAME_ASSET_DST_DIR}..."
+)
+
+# Sync engine resources (shaders, fonts, icons, config) to game output
+if(COMMAND ch_add_resource_sync)
+    ch_add_resource_sync($PYTARGET_NAME Exe)
+endif()
+
+# Pass source game directory so runtime can load assets from source during development
+target_compile_definitions($PYTARGET_NAME Exe PRIVATE
+    CH_SOURCE_GAME_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+)
+"""
+
+# ── main.cpp template ──
+_TEMPLATE_MAIN_CPP = """\
+#include "engine/app/entry_point.h"
+#include "engine/core/platform.h"
+#include "engine/runtime/runtime_layer.h"
+
+namespace Chained
+{
+Application* CreateApplication(ApplicationCommandLineArgs args)
+{
+    ApplicationSpecification spec;
+    spec.Name = "$PYDISPLAY_NAME";
+    spec.CommandLineArgs = args;
+    spec.EnableScripting = true;
+    spec.EngineRoot = Platform::GetExecutableDirectory();
+    spec.WorkingDirectory = Platform::GetExecutableDirectory().string();
+
+    // Resolve project path: first CLI arg or default
+    std::filesystem::path projectPath;
+    for (int i = 0; i < args.Count; ++i)
+    {
+        std::string arg = args.Args[i];
+        if (arg.ends_with(".chproject"))
+        {
+            projectPath = arg;
+            break;
+        }
+    }
+
+    if (projectPath.empty() || !std::filesystem::exists(projectPath))
+    {
+        projectPath = std::filesystem::path(spec.WorkingDirectory) / (spec.Name + ".chproject");
+    }
+
+    auto* app = new Application(spec);
+    app->PushLayer(std::make_unique<RuntimeLayer>(projectPath.string()));
+    return app;
+}
+} // namespace Chained
+"""
+
+# ── .chproject template ──
+# Uses PY* placeholders similarly
+_TEMPLATE_CHPROJECT = """\
+Project:
+  Name: $PYDISPLAY_NAME
+  IconPath: engine/resources/icons/chaineddecos.jpg
+  StartScene: scenes/start_menu.chscene
+  AssetDirectory: assets
+  ActiveScene: assets/scenes/untitled.chscene
+  Physics:
+    Gravity: 9.8
+    FixedTimestep: 0.02
+  Animation:
+    TargetFPS: 60
+  Render:
+    ShadowResolution: 2048
+    EnableShadows: true
+    AntiAliasingSamples: 4
+  Mesh:
+    ImportMaterials: true
+    CalculateTangents: true
+    FlipUVs: true
+  Window:
+    Width: 1920
+    Height: 1080
+    VSync: false
+  Audio:
+    MasterVolume: 1
+    MusicVolume: 1
+    SFXVolume: 1
+  Runtime:
+    Fullscreen: false
+    ShowStats: true
+    EnableConsole: false
+    TargetFPS: 0
+  Scripting:
+    ModuleName: $PYSCRIPTS_DLL
+    ModuleDirectory: assets/bin
+    AutoLoad: true
+  Export:
+    Mode: 1
+    ZipThreshold: 0.3
+    DataVersion: 0
+  BuildConfig: 0
+"""
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Create a new game project scaffold.")
+    parser.add_argument("name", help="Game name (e.g. MyGame, ChainedDecos)")
+    parser.add_argument(
+        "--csproj",
+        default=None,
+        help="Relative path to C# project (e.g. assets/scripts/MyGame.Scripts.csproj)",
+    )
+    args = parser.parse_args()
+
+    display_name = args.name
+    # Derive CMake-safe target name (replace non-alphanumeric with underscore)
+    target_name = re.sub(r"[^A-Za-z0-9_]", "_", display_name)
+    game_dir = display_name.lower()
+
+    root = Path(__file__).resolve().parent.parent / "game" / game_dir
+
+    if root.exists():
+        print(f"Error: {root} already exists.", file=sys.stderr)
+        sys.exit(1)
+
+    # Create directory structure
+    (root / "assets" / "scripts").mkdir(parents=True)
+
+    # CMakeLists.txt — substitute placeholders then replace CMake syntax
+    csproj_line = f'CSHARP_PROJECT "{args.csproj}"\n    ' if args.csproj else ""
+    cmake_content = _TEMPLATE_CMAKELISTS.replace(
+        "$PYDISPLAY_NAME", display_name
+    ).replace("$PYTARGET_NAME", target_name).replace("$PYGAME_DIR", game_dir).replace(
+        "$PYCSHARP_LINE", csproj_line
+    )
+    (root / "CMakeLists.txt").write_text(cmake_content)
+
+    # src/main.cpp
+    main_cpp = _TEMPLATE_MAIN_CPP.replace("$PYDISPLAY_NAME", display_name)
+    (root / "src" / "main.cpp").write_text(main_cpp)
+
+    # .chproject — substitute placeholders then replace CMake syntax
+    scripts_dll = f"{target_name}.Scripts.dll"
+    chproject_content = _TEMPLATE_CHPROJECT.replace(
+        "$PYDISPLAY_NAME", display_name
+    ).replace("$PYSCRIPTS_DLL", scripts_dll)
+    (root / f"{display_name}.chproject").write_text(chproject_content)
+
+    print(f"Created game project: {root}")
+    print(f"  CMakeLists.txt      — chained_add_game({target_name})")
+    print(f"  src/main.cpp        — CreateApplication entry point")
+    print(f"  assets/scripts/     — for C# scripts")
+    print(f"  {display_name}.chproject — project metadata")
+    print()
+    print("Add to build:")
+    print(f'  cmake --preset windows-clang -DCH_ACTIVE_GAME={game_dir}')
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/tools/generate_glue.py b/tools/generate_glue.py
new file mode 100644
index 000000000..5e2cacb62
--- /dev/null
+++ b/tools/generate_glue.py
@@ -0,0 +1,360 @@
+#!/usr/bin/env python3
+"""
+Generate C++ glue code from C# [NativeProperty] attributes.
+
+Scans component wrapper files in engine/scripting/managed/src/Components/ and
+produces three files in the output directory:
+  - script_glue_generated.h          (declarations)
+  - script_glue_generated.cpp        (getter/setter implementations)
+  - script_glue_generated_reg.inl    (AddInternalCall registration snippet)
+
+[NativeCall] attributes are NOT processed — those have hand-written
+implementations in script_glue_*.cpp files.
+
+Usage:
+    python tools/generate_glue.py --cs-dir engine/scripting/managed/src/Components \
+                                  --output-dir engine/scripting/generated
+"""
+
+import argparse
+import re
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Optional
+
+
+# ── Type mapping: C# type -> C++ type ──────────────────────────────────────────
+
+CS_TO_CPP = {
+    "float":   "float",
+    "double":  "double",
+    "int":     "int",
+    "uint":    "uint32_t",
+    "long":    "int64_t",
+    "ulong":   "uint64_t",
+    "byte":    "uint8_t",
+    "bool":    "uint8_t",
+    "Vector2": "glm::vec2",
+    "Vector3": "glm::vec3",
+    "Vector4": "glm::vec4",
+}
+
+STRUCT_TYPES = {"Vector2", "Vector3", "Vector4"}
+BOOL_TYPES = {"bool"}
+
+
+@dataclass
+class NativeProperty:
+    cs_name: str           # e.g. "MovementSpeed"
+    cs_type: str           # e.g. "float", "Vector3", "bool"
+    getter: Optional[str]  # e.g. "PlayerComponent_GetMovementSpeed"
+    setter: Optional[str]  # e.g. "PlayerComponent_SetMovementSpeed"
+    cs_class: str = ""     # filled later, e.g. "PlayerComponent"
+
+    @property
+    def cpp_type(self) -> str:
+        return CS_TO_CPP.get(self.cs_type, self.cs_type)
+
+    @property
+    def is_struct(self) -> bool:
+        return self.cs_type in STRUCT_TYPES
+
+    @property
+    def is_bool(self) -> bool:
+        return self.cs_type in BOOL_TYPES
+
+
+# ── Parsing ────────────────────────────────────────────────────────────────────
+
+NATIVE_PROPERTY_RE = re.compile(
+    r'\[NativeProperty\s*\(\s*"([^"]+)"\s*,\s*"([^"]+)"'
+    r'(?:\s*,\s*"([^"]*)")?'
+    r'(?:\s*,\s*"([^"]*)")?\s*\)\s*\]'
+)
+
+CLASS_RE = re.compile(
+    r'(?:public|internal)\s+partial\s+(?:class|struct)\s+(\w+)'
+)
+
+
+def parse_cs_file(filepath: Path) -> list[NativeProperty]:
+    content = filepath.read_text(encoding="utf-8")
+    properties = []
+
+    # Find class name
+    class_match = CLASS_RE.search(content)
+    class_name = class_match.group(1) if class_match else filepath.stem
+
+    # Parse [NativeProperty] attributes
+    for m in NATIVE_PROPERTY_RE.finditer(content):
+        prop_name = m.group(1)
+        prop_type = m.group(2)
+        getter = m.group(3) if m.group(3) else None
+        setter = m.group(4) if m.group(4) else None
+
+        # Skip empty strings
+        getter = getter or None
+        setter = setter or None
+
+        properties.append(NativeProperty(
+            cs_name=prop_name,
+            cs_type=prop_type,
+            getter=getter,
+            setter=setter,
+            cs_class=class_name,
+        ))
+
+    return properties
+
+
+# ── C++ Code Generation ────────────────────────────────────────────────────────
+
+def generate_getter(prop: NativeProperty, ns: str) -> str:
+    """Generate a single C++ getter function."""
+    cpp_type = prop.cpp_type
+    func_name = prop.getter
+
+    if prop.is_struct:
+        return f"""\
+\tCH_SCRIPT_FUNC void {func_name}(uint64_t entityID, {cpp_type}* outVal)
+\t{{
+\t\tEntity entity = GetEntity(entityID);
+\t\tif (entity && entity.HasComponent<{ns}::{prop.cs_class}>() && outVal)
+\t\t{{
+\t\t\t*outVal = entity.GetComponent<{ns}::{prop.cs_class}>().{prop.cs_name};
+\t\t}}
+\t\telse if (outVal)
+\t\t{{
+\t\t\t*outVal = {{}};
+\t\t}}
+\t}}"""
+
+    elif prop.is_bool:
+        return f"""\
+\tCH_SCRIPT_FUNC uint8_t {func_name}(uint64_t entityID)
+\t{{
+\t\tEntity entity = GetEntity(entityID);
+\t\treturn entity && entity.HasComponent<{ns}::{prop.cs_class}>()
+\t\t\t   ? entity.GetComponent<{ns}::{prop.cs_class}>().{prop.cs_name}
+\t\t\t   : false;
+\t}}"""
+    else:
+        default = "0" if cpp_type in ("float", "double", "int", "uint32_t", "int64_t", "uint64_t") else "0"
+        return f"""\
+\tCH_SCRIPT_FUNC {cpp_type} {func_name}(uint64_t entityID)
+\t{{
+\t\tEntity entity = GetEntity(entityID);
+\t\treturn entity && entity.HasComponent<{ns}::{prop.cs_class}>()
+\t\t\t   ? entity.GetComponent<{ns}::{prop.cs_class}>().{prop.cs_name}
+\t\t\t   : {default};
+\t}}"""
+
+
+def generate_setter(prop: NativeProperty, ns: str) -> str:
+    """Generate a single C++ setter function."""
+    cpp_type = prop.cpp_type
+    func_name = prop.setter
+
+    if prop.is_struct:
+        return f"""\
+\tCH_SCRIPT_FUNC void {func_name}(uint64_t entityID, {cpp_type}* inVal)
+\t{{
+\t\tEntity entity = GetEntity(entityID);
+\t\tif (entity && entity.HasComponent<{ns}::{prop.cs_class}>() && inVal)
+\t\t{{
+\t\t\tentity.GetComponent<{ns}::{prop.cs_class}>().{prop.cs_name} = *inVal;
+\t\t}}
+\t}}"""
+
+    elif prop.is_bool:
+        return f"""\
+\tCH_SCRIPT_FUNC void {func_name}(uint64_t entityID, uint8_t value)
+\t{{
+\t\tEntity entity = GetEntity(entityID);
+\t\tif (entity && entity.HasComponent<{ns}::{prop.cs_class}>())
+\t\t{{
+\t\t\tentity.GetComponent<{ns}::{prop.cs_class}>().{prop.cs_name} = value;
+\t\t}}
+\t}}"""
+    else:
+        return f"""\
+\tCH_SCRIPT_FUNC void {func_name}(uint64_t entityID, {cpp_type} value)
+\t{{
+\t\tEntity entity = GetEntity(entityID);
+\t\tif (entity && entity.HasComponent<{ns}::{prop.cs_class}>())
+\t\t{{
+\t\t\tentity.GetComponent<{ns}::{prop.cs_class}>().{prop.cs_name} = value;
+\t\t}}
+\t}}"""
+
+
+def prop_return_type(prop: NativeProperty) -> str:
+    if prop.is_struct:
+        return "void"
+    if prop.is_bool:
+        return "uint8_t"
+    return prop.cpp_type
+
+
+def prop_getter_params(prop: NativeProperty) -> str:
+    if prop.is_struct:
+        return f"uint64_t entityID, {prop.cpp_type}* outVal"
+    return "uint64_t entityID"
+
+
+def prop_setter_params(prop: NativeProperty) -> str:
+    if prop.is_struct:
+        return f"uint64_t entityID, {prop.cpp_type}* inVal"
+    return f"uint64_t entityID, {prop.cpp_type} value"
+
+
+def generate_header(properties: list[NativeProperty], ns: str) -> str:
+    lines = [
+        "// <auto-generated/>",
+        "// Generated by tools/generate_glue.py — do not edit by hand.",
+        "#ifndef SCRIPT_GLUE_GENERATED_H",
+        "#define SCRIPT_GLUE_GENERATED_H",
+        "",
+        '#include "script_glue_internal.h"',
+        '#include "engine/scene/components.h"',
+        '#include "engine/scene/entity.h"',
+        "",
+        "namespace Chained",
+        "{",
+        "",
+    ]
+
+    # Group properties by class
+    props_by_class: dict[str, list[NativeProperty]] = {}
+    for p in properties:
+        props_by_class.setdefault(p.cs_class, []).append(p)
+
+    for class_name, props in props_by_class.items():
+        lines.append(f"\t// ── {class_name} ──────────────────────────────────────────────")
+        for prop in props:
+            if prop.getter:
+                lines.append(f"\tCH_SCRIPT_FUNC {prop_return_type(prop)} {prop.getter}({prop_getter_params(prop)});")
+            if prop.setter:
+                lines.append(f"\tCH_SCRIPT_FUNC void {prop.setter}({prop_setter_params(prop)});")
+        lines.append("")
+
+    lines.append("} // namespace Chained")
+    lines.append("#endif // SCRIPT_GLUE_GENERATED_H")
+    return "\n".join(lines) + "\n"
+
+
+def generate_cpp(properties: list[NativeProperty], ns: str) -> str:
+    lines = [
+        "// <auto-generated/>",
+        "// Generated by tools/generate_glue.py — do not edit by hand.",
+        "",
+        '#include "script_glue_generated.h"',
+        "",
+        "namespace Chained",
+        "{",
+        "",
+    ]
+
+    # Group properties by class
+    props_by_class: dict[str, list[NativeProperty]] = {}
+    for p in properties:
+        props_by_class.setdefault(p.cs_class, []).append(p)
+
+    for class_name, props in props_by_class.items():
+        lines.append(f"\t// ── {class_name} ──────────────────────────────────────────────")
+        for prop in props:
+            if prop.getter:
+                lines.append(generate_getter(prop, ns))
+                lines.append("")
+            if prop.setter:
+                lines.append(generate_setter(prop, ns))
+                lines.append("")
+
+    lines.append("} // namespace Chained")
+    return "\n".join(lines) + "\n"
+
+
+def generate_registration(properties: list[NativeProperty]) -> str:
+    lines = [
+        "// <auto-generated/>",
+        "// Generated by tools/generate_glue.py — do not edit by hand.",
+        "",
+    ]
+
+    # Group properties by class
+    props_by_class: dict[str, list[NativeProperty]] = {}
+    for p in properties:
+        props_by_class.setdefault(p.cs_class, []).append(p)
+
+    for class_name, props in props_by_class.items():
+        lines.append(f"\t// ── {class_name} ──────────────────────────────────────────────")
+        for prop in props:
+            if prop.getter:
+                lines.append(f'\tassembly.AddInternalCall("Chained.{class_name}", "{prop.getter}_Ptr",')
+                lines.append(f'\t\t\t\t\t\t\t\t (void*)&{prop.getter});')
+            if prop.setter:
+                lines.append(f'\tassembly.AddInternalCall("Chained.{class_name}", "{prop.setter}_Ptr",')
+                lines.append(f'\t\t\t\t\t\t\t\t (void*)&{prop.setter});')
+        lines.append("")
+
+    return "\n".join(lines) + "\n"
+
+
+# ── Main ───────────────────────────────────────────────────────────────────────
+
+def main():
+    parser = argparse.ArgumentParser(description="Generate C++ glue from C# NativeProperty attributes")
+    parser.add_argument("--cs-dir", required=True, help="Directory containing C# component wrappers")
+    parser.add_argument("--output-dir", required=True, help="Output directory for generated C++ files")
+    parser.add_argument("--namespace", default="Chained", help="C++ namespace (default: Chained)")
+    parser.add_argument("--classes", nargs="*", default=None,
+                        help="Only process these C# class names (e.g. PlayerComponent SpawnComponent). "
+                             "If omitted, processes all classes found.")
+    args = parser.parse_args()
+
+    cs_dir = Path(args.cs_dir)
+    out_dir = Path(args.output_dir)
+    ns = args.namespace
+
+    if not cs_dir.exists():
+        print(f"Error: C# directory not found: {cs_dir}", file=sys.stderr)
+        sys.exit(1)
+
+    out_dir.mkdir(parents=True, exist_ok=True)
+
+    all_properties: list[NativeProperty] = []
+
+    for cs_file in sorted(cs_dir.glob("*.cs")):
+        props = parse_cs_file(cs_file)
+        if args.classes:
+            props = [p for p in props if p.cs_class in args.classes]
+        all_properties.extend(props)
+
+    if not all_properties:
+        print("Warning: No [NativeProperty] attributes found.", file=sys.stderr)
+        # Still write empty files so CMake doesn't fail
+        (out_dir / "script_glue_generated.h").write_text(
+            "// <auto-generated/> — no native properties found\n", encoding="utf-8")
+        (out_dir / "script_glue_generated.cpp").write_text(
+            "// <auto-generated/> — no native properties found\n", encoding="utf-8")
+        (out_dir / "script_glue_generated_reg.inl").write_text(
+            "// <auto-generated/> — no native properties found\n", encoding="utf-8")
+        return
+
+    header = generate_header(all_properties, ns)
+    cpp = generate_cpp(all_properties, ns)
+    reg = generate_registration(all_properties)
+
+    (out_dir / "script_glue_generated.h").write_text(header, encoding="utf-8")
+    (out_dir / "script_glue_generated.cpp").write_text(cpp, encoding="utf-8")
+    (out_dir / "script_glue_generated_reg.inl").write_text(reg, encoding="utf-8")
+
+    print(f"Generated glue for {len(all_properties)} properties")
+    print(f"  -> {out_dir / 'script_glue_generated.h'}")
+    print(f"  -> {out_dir / 'script_glue_generated.cpp'}")
+    print(f"  -> {out_dir / 'script_glue_generated_reg.inl'}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/sync_resources.py b/tools/sync_resources.py
new file mode 100644
index 000000000..bb10875a4
--- /dev/null
+++ b/tools/sync_resources.py
@@ -0,0 +1,100 @@
+"""Sync engine resources (shaders, fonts, icons, config) into binary output directories.
+
+Usage:
+    python tools/sync_resources.py sync-resources \\
+        --root . \\
+        --bin build/windows-clang/bin \\
+        --all-configs
+"""
+import argparse
+import filecmp
+import os
+import shutil
+from pathlib import Path
+from typing import Optional
+
+BUILD_CONFIGS = ["Debug", "Release", "RelWithDebInfo"]
+
+
+def _sync_dir(src: Path, dst: Path) -> None:
+    """Incrementally syncs src into dst — only copies new/changed files."""
+    if not src.is_dir():
+        return
+
+    src_files = {p.relative_to(src) for p in src.rglob("*") if p.is_file()}
+    dst_files = {p.relative_to(dst) for p in dst.rglob("*") if p.is_file()} if dst.is_dir() else set()
+
+    copied = 0
+    removed = 0
+
+    for rel in sorted(src_files):
+        s = src / rel
+        d = dst / rel
+        d.parent.mkdir(parents=True, exist_ok=True)
+        if not d.exists() or not filecmp.cmp(s, d, shallow=False):
+            shutil.copy2(s, d)
+            copied += 1
+
+    for rel in sorted(dst_files - src_files):
+        (dst / rel).unlink(missing_ok=True)
+        removed += 1
+
+    if dst.is_dir():
+        for dirpath, _, _ in os.walk(dst, topdown=False):
+            try:
+                os.rmdir(dirpath)
+            except OSError:
+                pass
+
+    print(f"  Synced: {src} -> {dst}  ({copied} copied, {removed} removed)")
+
+
+def sync_resources(
+    project_root: Path,
+    bin_dir: Path,
+    config: Optional[str],
+    all_configs: bool,
+) -> None:
+    """Copy engine resources into the correct binary output folder."""
+    resources_src = project_root / "resources"
+    if not resources_src.exists():
+        print(f"Warning: Source resources directory '{resources_src}' does not exist.")
+        return
+
+    if all_configs:
+        synced = False
+        for cfg in BUILD_CONFIGS:
+            cfg_bin = bin_dir / cfg
+            if cfg_bin.exists():
+                _sync_dir(resources_src, cfg_bin / "resources")
+                synced = True
+        if not synced:
+            _sync_dir(resources_src, bin_dir / "resources")
+    elif config:
+        _sync_dir(resources_src, bin_dir / config / "resources")
+    else:
+        _sync_dir(resources_src, bin_dir / "resources")
+
+    print("Success: resources synced!")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Sync engine resources to build output")
+    parser.add_argument("command", nargs="?", help=argparse.SUPPRESS)
+    parser.add_argument("--root", required=True, help="Project root (folder that contains resources/)")
+    parser.add_argument("--bin", required=True, help="Binary output base directory (build/<preset>/bin)")
+    parser.add_argument("--config", default=None, help="Single build config to target (Debug/Release/…)")
+    parser.add_argument("--all-configs", action="store_true", help="Sync into every config sub-dir that exists")
+
+    args = parser.parse_args()
+
+    sync_resources(
+        Path(args.root).resolve(),
+        Path(args.bin).resolve(),
+        args.config,
+        args.all_configs,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/sync_scripts.py b/tools/sync_scripts.py
new file mode 100644
index 000000000..1d41f4560
--- /dev/null
+++ b/tools/sync_scripts.py
@@ -0,0 +1,81 @@
+"""Sync C# script DLLs from build output to game assets directories.
+
+After CMake builds C# scripts into build/<preset>/bin/<Config>/scripts/<Game>/,
+this script copies them to:
+  1. game/<game>/assets/bin/         — for the editor (source tree)
+  2. build/<preset>/bin/<Config>/assets/bin/ — for runtime (build output)
+
+Usage:
+    python tools/sync_scripts.py sync \\
+        --build-dir build/windows-clang/bin/Debug \\
+        --game-dir game/chaineddecos
+"""
+import argparse
+import filecmp
+import os
+import shutil
+from pathlib import Path
+
+
+def sync_scripts(build_dir: Path, game_dir: Path) -> None:
+    """Copy C# DLLs from scripts/<Game>/ to assets/bin/ in both source and build."""
+    scripts_src = build_dir / "scripts"
+
+    if not scripts_src.is_dir():
+        print(f"Warning: Scripts directory '{scripts_src}' does not exist. Skipping.")
+        return
+
+    # Find game script directories under scripts/
+    game_dirs = [d for d in scripts_src.iterdir() if d.is_dir()]
+    if not game_dirs:
+        print("Warning: No game script directories found in scripts/. Skipping.")
+        return
+
+    for game_scripts_dir in game_dirs:
+        game_name = game_scripts_dir.name
+
+        # Destination 1: source tree (for editor)
+        game_assets_bin = game_dir / "assets" / "bin"
+
+        # Destination 2: build output (for runtime)
+        build_assets_bin = build_dir / "assets" / "bin"
+
+        for dest in [game_assets_bin, build_assets_bin]:
+            _sync_dlls(game_scripts_dir, dest)
+
+    print("Success: scripts synced!")
+
+
+def _sync_dlls(src: Path, dst: Path) -> None:
+    """Copy DLL/PDB/runtimeconfig files from src to dst."""
+    if not src.is_dir():
+        return
+
+    dst.mkdir(parents=True, exist_ok=True)
+
+    copied = 0
+    for file in src.iterdir():
+        if file.suffix.lower() in (".dll", ".pdb", ".json"):
+            dest_file = dst / file.name
+            if not dest_file.exists() or not filecmp.cmp(file, dest_file, shallow=False):
+                shutil.copy2(file, dest_file)
+                copied += 1
+
+    print(f"  {src.name} -> {dst}  ({copied} files synced)")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Sync C# script DLLs to game assets")
+    parser.add_argument("--build-dir", required=True, help="Build output directory (build/<preset>/bin/<Config>)")
+    parser.add_argument("--game-dir", required=True, help="Game project directory (game/<game>)")
+
+    args = parser.parse_args()
+
+    sync_scripts(
+        Path(args.build_dir).resolve(),
+        Path(args.game_dir).resolve(),
+    )
+
+
+if __name__ == "__main__":
+    main()